Skip to content
This repository was archived by the owner on Feb 5, 2024. It is now read-only.

Commit 56e5c8f

Browse files
ivan-logeecomivan-logeecom
committed
Release version 2.0.25
ISSUE: SCFL-708
1 parent 2b5a6a9 commit 56e5c8f

File tree

72 files changed

+803
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+803
-219
lines changed

‎Api/ConfigInterface.php

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?php
2+
3+
namespace SendCloud\SendCloud\Api;
4+
5+
/**
6+
* Interface ConfigInterface
7+
*
8+
* @package SendCloud\SendCloud\Api
9+
*/
10+
interface ConfigInterface
11+
{
12+
/**
13+
* Retrieves minimal log level.
14+
*
15+
* @return string|null
16+
*/
17+
public function getMinimalLogLevel(): ?string;
18+
19+
/**
20+
* Sets minimal log level.
21+
*
22+
* @param int $logLevel
23+
*
24+
* @return void
25+
*/
26+
public function saveMinimalLogLevel(int $logLevel): void;
27+
}

‎Block/Checkout/Config.php

+23-2
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,47 @@
44

55
use Magento\Framework\View\Element\Template;
66
use Magento\Store\Model\ScopeInterface;
7+
use SendCloud\SendCloud\Logger\SendCloudLogger;
78

89
/**
910
* Class Config
1011
*/
1112
class Config extends Template
1213
{
14+
private SendCloudLogger $sendCloudLogger;
15+
16+
/**
17+
* Config Constructor.
18+
*
19+
* @param Template\Context $context
20+
* @param array $data
21+
*/
22+
public function __construct(SendCloudLogger $sendCloudLogger, Template\Context $context, array $data = [])
23+
{
24+
parent::__construct($context, $data);
25+
$this->sendCloudLogger = $sendCloudLogger;
26+
}
27+
1328
/**
1429
* @return mixed
1530
*/
1631
public function getScriptUrl()
1732
{
18-
return $this->_scopeConfig->getValue('sendcloud/sendcloud/script_url', ScopeInterface::SCOPE_STORE);
33+
$scriptUrl = $this->_scopeConfig->getValue('sendcloud/sendcloud/script_url', ScopeInterface::SCOPE_STORE);
34+
$this->sendCloudLogger->info("Script url: " . $scriptUrl);
35+
36+
return $scriptUrl;
1937
}
2038

2139
/**
2240
* @return mixed
2341
*/
2442
public function getLocale()
2543
{
26-
return $this->_scopeConfig->getValue('general/locale/code', ScopeInterface::SCOPE_STORE);
44+
$locale = $this->_scopeConfig->getValue('general/locale/code', ScopeInterface::SCOPE_STORE);
45+
$this->sendCloudLogger->info("Locale: " . $locale);
46+
47+
return $locale;
2748
}
2849

2950
/**

‎Block/Checkout/MultiShipping.php

+18-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
namespace SendCloud\SendCloud\Block\Checkout;
44

55
use Magento\Directory\Helper\Data;
6+
use Magento\Framework\Filter\DataObject\GridFactory;
67
use Magento\Framework\Pricing\PriceCurrencyInterface;
78
use Magento\Framework\View\Element\Template;
9+
use Magento\Framework\View\Element\Template\Context;
810
use Magento\Multishipping\Block\Checkout\Shipping;
911
use Magento\Store\Model\ScopeInterface;
1012
use SendCloud\SendCloud\Helper\WeightConverter;
13+
use SendCloud\SendCloud\Logger\SendCloudLogger;
1114
use SendCloud\SendCloud\Plugin\Quote\Address\Rate;
1215

1316
class MultiShipping extends Shipping
@@ -18,15 +21,22 @@ class MultiShipping extends Shipping
1821
private $magentoHelper;
1922

2023
/**
24+
* SendCloudLogger
25+
*/
26+
private $sendcloudLogger;
27+
28+
/**
29+
* @param SendCloudLogger $sendCloudLogger
2130
* @param Data $magentoHelper
22-
* @param Template\Context $context
23-
* @param \Magento\Framework\Filter\DataObject\GridFactory $filterGridFactory
31+
* @param Context $context
32+
* @param GridFactory $filterGridFactory
2433
* @param \Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping
2534
* @param \Magento\Tax\Helper\Data $taxHelper
2635
* @param PriceCurrencyInterface $priceCurrency
2736
* @param array $data
2837
*/
2938
public function __construct(
39+
SendCloudLogger $sendCloudLogger,
3040
Data $magentoHelper,
3141
\Magento\Framework\View\Element\Template\Context $context,
3242
\Magento\Framework\Filter\DataObject\GridFactory $filterGridFactory,
@@ -37,6 +47,7 @@ public function __construct(
3747
) {
3848
parent::__construct($context, $filterGridFactory, $multishipping, $taxHelper, $priceCurrency, $data);
3949
$this->magentoHelper = $magentoHelper;
50+
$this->sendcloudLogger = $sendCloudLogger;
4051
}
4152

4253
public function getMethods()
@@ -55,6 +66,9 @@ public function getMethods()
5566
}
5667
}
5768
}
69+
70+
$this->sendcloudLogger->info("SendCloud\SendCloud\Block\Checkout\MultiShipping::getMethods(): " . json_encode($codes));
71+
5872
return $codes;
5973
}
6074

@@ -71,6 +85,8 @@ public function getAddressesFormated()
7185
$formated[$address->getData('address_id')] = $data;
7286
}
7387

88+
$this->sendcloudLogger->info("SendCloud\SendCloud\Block\Checkout\MultiShipping::getAddressesFormated(): " . json_encode($formated));
89+
7490
return $formated;
7591
}
7692
}

‎Block/Checkout/Overview.php

+10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Magento\Framework\Pricing\PriceCurrencyInterface;
66
use Magento\Framework\Serialize\Serializer\Json;
77
use Magento\Quote\Model\Quote\Address;
8+
use SendCloud\SendCloud\Logger\SendCloudLogger;
89

910
class Overview extends \Magento\Multishipping\Block\Checkout\Overview
1011
{
@@ -13,7 +14,13 @@ class Overview extends \Magento\Multishipping\Block\Checkout\Overview
1314
*/
1415
private $serializer;
1516

17+
/**
18+
* SendCloudLogger
19+
*/
20+
private $sendcloudLogger;
21+
1622
public function __construct(
23+
SendCloudLogger $sendCloudLogger,
1724
Json $serializer,
1825
\Magento\Framework\View\Element\Template\Context $context,
1926
\Magento\Multishipping\Model\Checkout\Type\Multishipping $multishipping,
@@ -33,6 +40,7 @@ public function __construct(
3340
$data
3441
);
3542
$this->serializer = $serializer;
43+
$this->sendcloudLogger = $sendCloudLogger;
3644
}
3745

3846
/**
@@ -43,6 +51,8 @@ public function __construct(
4351
*/
4452
public function getShippingAddressSendcloudData($address)
4553
{
54+
$this->sendcloudLogger->info("SendCloud\SendCloud\Block\Checkout\Overview::getShippingAddressSendcloudData(): " . json_encode($address->toArray()));
55+
4656
$quote = $this->getQuote();
4757
$multishippingData = $this->serializer->unserialize($quote->getData('sendcloud_multishipping_data'));
4858
if ($multishippingData && array_key_exists($address->getId(), $multishippingData)) {

‎Checkout/Factories/CheckoutConfiguratorFactory.php

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use SendCloud\SendCloud\CheckoutCore\Validators\NullRequestValidator;
1313
use SendCloud\SendCloud\CheckoutCore\Validators\UpdateRequestValidator;
1414
use SendCloud\SendCloud\Helper\Data;
15+
use SendCloud\SendCloud\Logger\SendCloudLogger;
1516
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryMethod;
1617
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryZone;
1718

@@ -37,9 +38,10 @@ public function __construct(
3738
SendcloudDeliveryZone $sendcloudDeliveryZone,
3839
SendcloudDeliveryMethod $sendcloudDeliveryMethod,
3940
StoreManagerInterface $storeManager,
40-
Data $helper
41+
Data $helper,
42+
SendCloudLogger $sendCloudLogger
4143
) {
42-
$this->serviceFactory = new CheckoutServiceFactory($sendcloudDeliveryZone, $sendcloudDeliveryMethod);
44+
$this->serviceFactory = new CheckoutServiceFactory($sendcloudDeliveryZone, $sendcloudDeliveryMethod, $sendCloudLogger);
4345
$this->updateRequestValidator = new UpdateRequestValidator($helper->getVersion(), new CurrencyService($storeManager));
4446
$this->deleteRequestValidator = new NullRequestValidator();
4547
}

‎Checkout/Factories/CheckoutServiceFactory.php

+8-2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use SendCloud\SendCloud\CheckoutCore\Contracts\Proxies\CheckoutProxy;
1313
use SendCloud\SendCloud\CheckoutCore\Services\DeliveryMethodService;
1414
use SendCloud\SendCloud\CheckoutCore\Services\DeliveryZoneService;
15+
use SendCloud\SendCloud\Logger\SendCloudLogger;
1516
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryMethod;
1617
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryZone;
1718

@@ -50,10 +51,15 @@ class CheckoutServiceFactory implements CheckoutServiceFactoryInterface
5051
* CheckoutServiceFactory constructor.
5152
* @param SendcloudDeliveryZone $sendcloudDeliveryZone
5253
* @param SendcloudDeliveryMethod $sendcloudDeliveryMethod
54+
* @param SendCloudLogger $sendCloudLogger
5355
*/
54-
public function __construct(SendcloudDeliveryZone $sendcloudDeliveryZone, SendcloudDeliveryMethod $sendcloudDeliveryMethod)
56+
public function __construct(
57+
SendcloudDeliveryZone $sendcloudDeliveryZone,
58+
SendcloudDeliveryMethod $sendcloudDeliveryMethod,
59+
SendCloudLogger $sendCloudLogger
60+
)
5561
{
56-
$this->storage = new CheckoutStorage($sendcloudDeliveryZone, $sendcloudDeliveryMethod);
62+
$this->storage = new CheckoutStorage($sendcloudDeliveryZone, $sendcloudDeliveryMethod, $sendCloudLogger);
5763
$this->deliveryMethodService = new DeliveryMethodService($this->storage);
5864
$this->deliveryZoneService = new DeliveryZoneService($this->storage);
5965
$this->deliveryMethodSetupService = new DeliveryMethodSetupService();

‎Checkout/Storage/CheckoutStorage.php

+56-4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use SendCloud\SendCloud\CheckoutCore\Contracts\Storage\CheckoutStorage as CheckoutStorageInterface;
66
use SendCloud\SendCloud\CheckoutCore\Domain\Delivery\DeliveryMethod;
77
use SendCloud\SendCloud\CheckoutCore\Domain\Delivery\DeliveryZone;
8+
use SendCloud\SendCloud\Logger\SendCloudLogger;
89
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryMethod;
910
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryZone;
1011

@@ -19,17 +20,25 @@ class CheckoutStorage implements CheckoutStorageInterface
1920
*/
2021
private $sendcloudDeliveryMethodResourceModel;
2122

23+
/**
24+
* @var SendCloudLogger
25+
*/
26+
private $logger;
27+
2228
/**
2329
* CheckoutStorage constructor.
2430
* @param SendcloudDeliveryZone $sendcloudDeliveryZoneResourceModel
2531
* @param SendcloudDeliveryMethod $sendcloudDeliveryMethodResourceModel
32+
* @param SendCloudLogger $logger
2633
*/
2734
public function __construct(
2835
SendcloudDeliveryZone $sendcloudDeliveryZoneResourceModel,
29-
SendcloudDeliveryMethod $sendcloudDeliveryMethodResourceModel
36+
SendcloudDeliveryMethod $sendcloudDeliveryMethodResourceModel,
37+
SendCloudLogger $logger
3038
) {
3139
$this->sendcloudDeliveryZoneResourceModel = $sendcloudDeliveryZoneResourceModel;
3240
$this->sendcloudDeliveryMethodResourceModel = $sendcloudDeliveryMethodResourceModel;
41+
$this->logger = $logger;
3342
}
3443

3544
/**
@@ -40,7 +49,12 @@ public function __construct(
4049
*/
4150
public function findAllZoneConfigs()
4251
{
43-
return $this->sendcloudDeliveryZoneResourceModel->selectAll();
52+
$zones = $this->sendcloudDeliveryZoneResourceModel->selectAll();
53+
$this->logger->info(
54+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::findAllZoneConfigs(): " . json_encode($zones)
55+
);
56+
57+
return $zones;
4458
}
4559

4660
/**
@@ -51,6 +65,9 @@ public function findAllZoneConfigs()
5165
*/
5266
public function deleteSpecificZoneConfigs(array $ids)
5367
{
68+
$this->logger->info(
69+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::deleteSpecificZoneConfigs(): " . json_encode($ids)
70+
);
5471
$this->sendcloudDeliveryZoneResourceModel->deleteOne($ids);
5572
}
5673

@@ -71,6 +88,9 @@ public function deleteAllZoneConfigs()
7188
*/
7289
public function updateZoneConfigs(array $zones)
7390
{
91+
$this->logger->info(
92+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::updateZoneConfigs(): " . json_encode($zones)
93+
);
7494
$this->sendcloudDeliveryZoneResourceModel->update($zones);
7595
}
7696

@@ -81,6 +101,9 @@ public function updateZoneConfigs(array $zones)
81101
*/
82102
public function createZoneConfigs(array $zones)
83103
{
104+
$this->logger->info(
105+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::createZoneConfigs(): " . json_encode($zones)
106+
);
84107
$this->sendcloudDeliveryZoneResourceModel->create($zones);
85108
}
86109

@@ -92,7 +115,12 @@ public function createZoneConfigs(array $zones)
92115
*/
93116
public function findAllMethodConfigs()
94117
{
95-
return $this->sendcloudDeliveryMethodResourceModel->selectAll();
118+
$methods = $this->sendcloudDeliveryMethodResourceModel->selectAll();
119+
$this->logger->info(
120+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::findAllMethodConfigs(): " . json_encode($methods)
121+
);
122+
123+
return $methods;
96124
}
97125

98126
/**
@@ -103,6 +131,9 @@ public function findAllMethodConfigs()
103131
*/
104132
public function deleteSpecificMethodConfigs(array $ids)
105133
{
134+
$this->logger->info(
135+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::deleteSpecificMethodConfigs(): " . json_encode($ids)
136+
);
106137
$this->sendcloudDeliveryMethodResourceModel->deleteOne($ids);
107138
}
108139

@@ -124,6 +155,11 @@ public function deleteAllMethodConfigs()
124155
public function updateMethodConfigs(array $methods)
125156
{
126157
$additionalData = $this->getAdditionalData($methods);
158+
$this->logger->info(
159+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::updateMethodConfigs(): " .
160+
"methods: ". json_encode($methods) .
161+
"additional data: " . json_encode($additionalData)
162+
);
127163
$this->sendcloudDeliveryMethodResourceModel->update($methods, $additionalData);
128164
}
129165

@@ -135,6 +171,11 @@ public function updateMethodConfigs(array $methods)
135171
public function createMethodConfigs(array $methods)
136172
{
137173
$additionalData = $this->getAdditionalData($methods);
174+
$this->logger->info(
175+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::createMethodConfigs(): " .
176+
"methods: ". json_encode($methods) .
177+
"additional data: " . json_encode($additionalData)
178+
);
138179
$this->sendcloudDeliveryMethodResourceModel->create($methods, $additionalData);
139180
}
140181

@@ -154,6 +195,10 @@ public function deleteAllMethodData()
154195
*/
155196
public function findZoneConfigs(array $ids)
156197
{
198+
$this->logger->info(
199+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::createMethodConfigs(): " . json_encode($ids)
200+
);
201+
157202
return $this->sendcloudDeliveryZoneResourceModel->find($ids);
158203
}
159204

@@ -165,7 +210,14 @@ public function findZoneConfigs(array $ids)
165210
*/
166211
public function findMethodInZones(array $zoneIds)
167212
{
168-
return $this->sendcloudDeliveryMethodResourceModel->findInZones($zoneIds);
213+
$methods = $this->sendcloudDeliveryMethodResourceModel->findInZones($zoneIds);
214+
$this->logger->info(
215+
"SendCloud\SendCloud\Checkout\Storage\CheckoutStorage::findMethodInZones(): " .
216+
"zones: " . json_encode($zoneIds) .
217+
"methods: " . json_encode($methods)
218+
);
219+
220+
return $methods;
169221
}
170222

171223
/**

‎CheckoutCore/API/Checkout/Checkout.php

-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@
55
use SendCloud\SendCloud\CheckoutCore\API\Checkout\Delivery\Zone\DeliveryZone;
66
use SendCloud\SendCloud\CheckoutCore\DTO\DataTransferObject;
77

8-
/**
9-
* Class Checkout
10-
*
11-
* @package SendCloud\SendCloud\CheckoutCore\API\Checkout
12-
*/
138
class Checkout extends DataTransferObject
149
{
1510
/**

0 commit comments

Comments
 (0)