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

Commit d33124b

Browse files
ivan-logeecomivan-logeecom
committed
Release version 2.0.26
ISSUE: CS-4903
1 parent 56e5c8f commit d33124b

Some content is hidden

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

51 files changed

+85
-225
lines changed

‎Api/ConfigInterface.php

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
/**
66
* Interface ConfigInterface
77
*
8-
* @package SendCloud\SendCloud\Api
98
*/
109
interface ConfigInterface
1110
{

‎Api/DeliveryMethodNames.php

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
namespace SendCloud\SendCloud\Api;
44

5-
/**
6-
* Interface DeliveryMethodNames
7-
* @package SendCloud\SendCloud\Api
8-
*/
95
interface DeliveryMethodNames
106
{
117
const NAMES = [

‎Block/Checkout/Config.php

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
use Magento\Store\Model\ScopeInterface;
77
use SendCloud\SendCloud\Logger\SendCloudLogger;
88

9-
/**
10-
* Class Config
11-
*/
129
class Config extends Template
1310
{
1411
private SendCloudLogger $sendCloudLogger;

‎Block/System/Config/Form/Button.php

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22

33
namespace SendCloud\SendCloud\Block\System\Config\Form;
44

5-
/**
6-
* Class Button
7-
*
8-
*/
95
class Button extends \Magento\Config\Block\System\Config\Form\Field
106
{
117
protected $_template = 'system/config/button/button.phtml';

‎Block/System/Config/Form/DynamicCheckoutDeprecatedMessage.php

-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@
44

55
use Magento\Config\Block\System\Config\Form\Field;
66

7-
/**
8-
* Class DynamicCheckoutDeprecatedMessage
9-
*
10-
* @package SendCloud\SendCloud\Block\System\Config\Form
11-
*/
127
class DynamicCheckoutDeprecatedMessage extends Field
138
{
149
protected $_template = 'system/config/form/general_message.phtml';

‎Checkout/Contracts/CheckoutConfiguratorFactoryInterface.php

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
/**
99
* Interface CheckouConfiguratiorFactoryInterface
10-
* @package SendCloud\SendCloud\Checkout\Contracts
1110
*/
1211
interface CheckoutConfiguratorFactoryInterface
1312
{

‎Checkout/Contracts/CheckoutServiceFactoryInterface.php

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
/**
88
* Interface CheckoutServiceFactory
9-
* @package SendCloud\SendCloud\Block\Checkout\Contracts
109
*/
1110
interface CheckoutServiceFactoryInterface
1211
{

‎Checkout/Factories/CheckoutServiceFactory.php

+1-6
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@
1616
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryMethod;
1717
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryZone;
1818

19-
/**
20-
* Class CheckoutServiceFactory
21-
* @package SendCloud\SendCloud\Checkout\Factories
22-
*/
2319
class CheckoutServiceFactory implements CheckoutServiceFactoryInterface
2420
{
2521
/**
@@ -57,8 +53,7 @@ public function __construct(
5753
SendcloudDeliveryZone $sendcloudDeliveryZone,
5854
SendcloudDeliveryMethod $sendcloudDeliveryMethod,
5955
SendCloudLogger $sendCloudLogger
60-
)
61-
{
56+
) {
6257
$this->storage = new CheckoutStorage($sendcloudDeliveryZone, $sendcloudDeliveryMethod, $sendCloudLogger);
6358
$this->deliveryMethodService = new DeliveryMethodService($this->storage);
6459
$this->deliveryZoneService = new DeliveryZoneService($this->storage);

‎Checkout/Services/CurrencyService.php

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
use Magento\Store\Model\StoreManagerInterface;
66
use SendCloud\SendCloud\CheckoutCore\Contracts\Services\CurrencyService as CurrencyServiceInterface;
77

8-
/**
9-
* Class CurrencyService
10-
* @package SendCloud\SendCloud\Checkout\Services
11-
*/
128
class CurrencyService implements CurrencyServiceInterface
139
{
1410
/**

‎Checkout/Services/DeliveryMethodSetupService.php

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
use SendCloud\SendCloud\CheckoutCore\Contracts\Services\DeliveryMethodSetupService as DeliveryMethodSetupServiceInterface;
66

7-
/**
8-
* Class DeliveryMethodSetupService
9-
* @package SendCloud\SendCloud\Checkout\Services
10-
*/
117
class DeliveryMethodSetupService implements DeliveryMethodSetupServiceInterface
128
{
139

‎Checkout/Services/DeliveryZoneSetupService.php

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
use SendCloud\SendCloud\CheckoutCore\Contracts\Services\DeliveryZoneSetupService as DeliveryZoneSetupServiceInterface;
66

7-
/**
8-
* Class DeliveryZoneSetupService
9-
* @package SendCloud\SendCloud\Checkout\Services
10-
*/
117
class DeliveryZoneSetupService implements DeliveryZoneSetupServiceInterface
128
{
139

‎Checkout/Services/ProxyService.php

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
use SendCloud\SendCloud\CheckoutCore\Contracts\Proxies\CheckoutProxy;
66

7-
/**
8-
* Class ProxyService
9-
* @package SendCloud\SendCloud\Checkout\Services
10-
*/
117
class ProxyService implements CheckoutProxy
128
{
139

‎Controller/Adminhtml/AutoConnect/AutoGenerateApiUser.php

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@
1010
use Magento\Authorization\Model\UserContextInterface;
1111
use Magento\Authorization\Model\ResourceModel\Role\CollectionFactory as RoleCollectionFactory;
1212

13-
/**
14-
* Class AutoGenerateApiUser
15-
*
16-
*/
1713
class AutoGenerateApiUser
1814
{
1915

‎Controller/Adminhtml/Configuration/Save.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public function __construct(
3939
ReinitableConfigInterface $scopeConfig,
4040
WriterInterface $writer,
4141
Context $context,
42-
SendCloudLogger $logger)
43-
{
42+
SendCloudLogger $logger
43+
) {
4444
parent::__construct($context);
4545
$this->writer = $writer;
4646
$this->scopeConfig = $scopeConfig;

‎Controller/Adminhtml/System/Config/Save.php

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
/**
1212
* System Configuration Save Controller
1313
*
14-
* @author Magento Core Team <[email protected]>
1514
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
1615
*/
1716
class Save extends MagentoSave

‎Controller/Multishipping/Index.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class Index extends \Magento\Framework\App\Action\Action
2828
public function __construct(
2929
SendcloudDeliveryMethod $sendcloudDeliveryMethod,
3030
Context $context,
31-
SendCloudLogger $logger)
32-
{
31+
SendCloudLogger $logger
32+
) {
3333
parent::__construct($context);
3434
$this->sendcloudDeliveryMethod = $sendcloudDeliveryMethod;
3535
$this->logger = $logger;

‎Controller/Support/Display.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
1010
use SendCloud\SendCloud\Services\BusinessLogic\SupportService;
1111

12-
/**
13-
* Class Display
14-
*
15-
* @package SendCloud\SendCloud\Controller\Support
16-
*/
1712
class Display extends Action implements HttpPostActionInterface
1813
{
1914
/**
@@ -39,8 +34,7 @@ public function __construct(
3934
JsonFactory $resultJsonFactory,
4035
SupportService $supportService,
4136
RequestInterface $request
42-
)
43-
{
37+
) {
4438
parent::__construct($context);
4539
$this->resultJsonFactory = $resultJsonFactory;
4640
$this->supportService = $supportService;

‎Controller/Support/Modify.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
1010
use SendCloud\SendCloud\Services\BusinessLogic\SupportService;
1111

12-
/**
13-
* Class Modify
14-
*
15-
* @package SendCloud\SendCloud\Controller\Adminhtml\Support
16-
*/
1712
class Modify extends Action implements HttpPostActionInterface
1813
{
1914
/**
@@ -44,8 +39,7 @@ public function __construct(
4439
JsonFactory $resultJsonFactory,
4540
SupportService $supportService,
4641
RequestInterface $request
47-
)
48-
{
42+
) {
4943
parent::__construct($context);
5044
$this->resultJsonFactory = $resultJsonFactory;
5145
$this->supportService = $supportService;

‎Helper/Checkout.php

-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
use Magento\Store\Model\ScopeInterface;
99
use SendCloud\SendCloud\Logger\SendCloudLogger;
1010

11-
/**
12-
* Class Checkout
13-
*/
1411
class Checkout extends AbstractHelper
1512
{
1613
/**

‎Logger/SendCloudHandler.php

-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
use Monolog\Logger;
55
use Magento\Framework\Logger\Handler\Base;
66

7-
/**
8-
* Class SendCloudHandler
9-
*/
107
class SendCloudHandler extends Base
118
{
129

‎Logger/SendCloudLogger.php

-5
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
use SendCloud\SendCloud\Api\ConfigInterface;
88
use Stringable;
99

10-
/**
11-
* Class SendCloudLogger
12-
*
13-
* @package SendCloud\SendCloud\Logger
14-
*/
1510
class SendCloudLogger extends Logger
1611
{
1712
/**

‎Model/AbstractDomen.php

-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
use Magento\Framework\Model\AbstractModel;
66
use SendCloud\SendCloud\Model\ResourceModel\AbstractDomen as AbstractDomenResourceModel;
77

8-
/**
9-
* Class AbstractDomen
10-
* @package SendCloud\SendCloud\Model
11-
*/
128
class AbstractDomen extends AbstractModel
139
{
1410

‎Model/Carrier/SendCloud.php

-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@
2828
use SendCloud\SendCloud\Logger\SendCloudLogger;
2929
use SendCloud\SendCloud\Model\ResourceModel\Carrier\ServicepointrateFactory;
3030

31-
/**
32-
* Class SendCloud
33-
*/
3431
class SendCloud extends Tablerate
3532
{
3633

‎Model/Config.php

+1-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@
77
use Magento\Framework\App\Config\Storage\WriterInterface;
88
use Magento\Framework\App\Cache\Manager;
99

10-
/**
11-
* Class Config
12-
*
13-
* @package SendCloud\SendCloud\Model
14-
*/
1510
class Config implements ConfigInterface
1611
{
1712
const MIN_LOG_LEVEL_PATH = 'sendcloud/general/minimal_log_level';
@@ -42,8 +37,7 @@ public function __construct(
4237
WriterInterface $configWriter,
4338
ScopeConfigInterface $scopeConfig,
4439
Manager $cacheManager
45-
)
46-
{
40+
) {
4741
$this->configWriter = $configWriter;
4842
$this->scopeConfig = $scopeConfig;
4943
$this->cacheManager = $cacheManager;

‎Model/ResourceModel/AbstractDomen/Collection.php

-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@
66
use SendCloud\SendCloud\Model\AbstractDomen;
77
use SendCloud\SendCloud\Model\ResourceModel\AbstractDomen as AbstractDomenResourceModel;
88

9-
/**
10-
* Class Collection
11-
* @package SendCloud\SendCloud\Model\ResourceModel\SendclooudDeliveryZone
12-
*/
139
class Collection extends AbstractCollection
1410
{
1511

‎Model/ResourceModel/SendcloudDeliveryMethod.php

-4
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
use SendCloud\SendCloud\CheckoutCore\API\Checkout\Delivery\Method\DeliveryMethod as DeliveryMethodDTO;
99
use SendCloud\SendCloud\CheckoutCore\Domain\Delivery\DeliveryMethod;
1010

11-
/**
12-
* Class SendcloudDeliveryMethod
13-
* @package SendCloud\SendCloud\Model\ResourceModel
14-
*/
1511
class SendcloudDeliveryMethod extends AbstractDomen
1612
{
1713
const SERVICE_POINT_DELIVERY = 'service_point_delivery';

‎Model/ResourceModel/SendcloudDeliveryMethod/Collection.php

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
use SendCloud\SendCloud\Model\SendcloudDeliveryMethod;
1010
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryMethod as SendcloudResourceDeliveyMethodResourceModel;
1111

12-
/**
13-
* Class Collection
14-
* @package SendCloud\SendCloud\Model\ResourceModel\SendclooudDeliveryZone
15-
*/
1612
class Collection extends AbstractCollection implements SearchResultInterface
1713
{
1814
/**

‎Model/ResourceModel/SendcloudDeliveryZone.php

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
use SendCloud\SendCloud\CheckoutCore\API\Checkout\Delivery\Zone\DeliveryZone as DeliveryZoneDTO;
1010
use SendCloud\SendCloud\CheckoutCore\Domain\Delivery\DeliveryZone;
1111

12-
/**
13-
* Class SendcloudDeliveryZone
14-
* @package SendCloud\SendCloud\Model\ResourceModel
15-
*/
1612
class SendcloudDeliveryZone extends AbstractDomen
1713
{
1814
/**

‎Model/ResourceModel/SendcloudDeliveryZone/Collection.php

-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
use SendCloud\SendCloud\Model\SendcloudDeliveryZone;
1010
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryZone as SendcloudResourceDeliveyZoneResourceModel;
1111

12-
/**
13-
* Class Collection
14-
* @package SendCloud\SendCloud\Model\ResourceModel\SendclooudDeliveryZone
15-
*/
1612
class Collection extends AbstractCollection implements SearchResultInterface
1713
{
1814
/**

‎Model/SendcloudDeliveryMethod.php

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryMethod as SendcloudDeliveryMethodResourceModel;
66

7-
/**
8-
* Class SendcloudDeliveryMethod
9-
* @package SendCloud\SendCloud\Model
10-
*/
117
class SendcloudDeliveryMethod extends AbstractDomen
128
{
139

‎Model/SendcloudDeliveryZone.php

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44

55
use SendCloud\SendCloud\Model\ResourceModel\SendcloudDeliveryZone as SendcloudDeliveryZoneResourceModel;
66

7-
/**
8-
* Class SendcloudDeliveryZone
9-
* @package SendCloud\SendCloud\Model
10-
*/
117
class SendcloudDeliveryZone extends AbstractDomen
128
{
139

‎Observer/AddSendCloudVariable.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public function execute(Observer $observer)
4646

4747
if ($this->order->getSendcloudServicePointId()) {
4848
$this->getServicePointVariables($transportObject);
49-
} else if ($this->order->getSendcloudCheckoutData()) {
49+
} elseif ($this->order->getSendcloudCheckoutData()) {
5050
$this->getCheckoutData($transportObject);
5151
}
5252

@@ -88,7 +88,7 @@ private function getCheckoutData($transportObject)
8888
$checkoutData['delivery_method_data'] ?
8989
$checkoutData['delivery_method_data']['formatted_delivery_date'] :
9090
null;
91-
} else if ($checkoutData['delivery_method_type'] === 'service_point_delivery') {
91+
} elseif ($checkoutData['delivery_method_type'] === 'service_point_delivery') {
9292
$transportObject['sc_servicepoint_id'] = $checkoutData['delivery_method_data']['service_point']['id'];
9393
$transportObject['sc_servicepoint_name'] = $checkoutData['delivery_method_data']['service_point']['name'];
9494
$transportObject['sc_servicepoint_street'] = $checkoutData['delivery_method_data']['service_point']['street'];

0 commit comments

Comments
 (0)