Skip to content

Commit 3388dc9

Browse files
authored
Merge pull request #24 from mygento/OD-771
Add track info notification
2 parents aa06807 + 02eb59e commit 3388dc9

32 files changed

+73
-68
lines changed

Api/Service/BaseInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public function getOrderRepository();
4343
*/
4444
public function getTaxInfoForItems(
4545
\Magento\Sales\Api\Data\OrderInterface $order,
46-
\Mygento\Shipment\Helper\Data $helper
46+
\Mygento\Shipment\Helper\Data $helper,
4747
);
4848

4949
/**
@@ -61,6 +61,6 @@ public function convertEstimateToDate(string $code, int $estimate): string;
6161
public function addOrderComment(
6262
\Magento\Sales\Model\Order $order,
6363
string $status,
64-
string $comment = ''
64+
string $comment = '',
6565
);
6666
}

Api/Service/OrderInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public function setTracking(
4040
\Magento\Sales\Model\Order $order,
4141
string $carrierCode,
4242
string $trackingCode,
43-
bool $notify = false
43+
bool $notify = false,
4444
);
4545

4646
/**
@@ -65,6 +65,6 @@ public function failOrder($order, array $messages);
6565
public function addOrderComment(
6666
\Magento\Sales\Model\Order $order,
6767
string $status,
68-
string $comment = ''
68+
string $comment = '',
6969
);
7070
}

Block/Adminhtml/Config/Carrier/TrackStatuses.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ protected function _prepareArrayRow(\Magento\Framework\DataObject $row)
6464

6565
$row->setData(
6666
'option_extra_attrs',
67-
$optionExtraAttr
67+
$optionExtraAttr,
6868
);
6969
}
7070

@@ -77,7 +77,7 @@ private function getCarrierStatusesRenderer()
7777
$this->carrierStatuses = $this->getLayout()->createBlock(
7878
$this->getCarrierStatusBlock(),
7979
'',
80-
['data' => ['is_render_to_js_template' => true]]
80+
['data' => ['is_render_to_js_template' => true]],
8181
);
8282
}
8383

@@ -93,7 +93,7 @@ private function getOrderStatusesRenderer()
9393
$this->orderStatuses = $this->getLayout()->createBlock(
9494
OrderStatuses::class,
9595
'',
96-
['data' => ['is_render_to_js_template' => true]]
96+
['data' => ['is_render_to_js_template' => true]],
9797
);
9898
}
9999

Block/Adminhtml/Config/Magento/OrderStatuses.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class OrderStatuses extends \Magento\Framework\View\Element\Html\Select
2323
public function __construct(
2424
\Magento\Framework\View\Element\Context $context,
2525
\Mygento\Base\Model\Source\Status $orderStatuses,
26-
array $data = []
26+
array $data = [],
2727
) {
2828
$this->orderStatuses = $orderStatuses;
2929
parent::__construct($context, $data);

Block/Adminhtml/Order/Estimate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function __construct(
3131
\Magento\Sales\Model\AdminOrder\Create $orderCreate,
3232
\Magento\Framework\Pricing\PriceCurrencyInterface $priceCurrency,
3333
\Magento\Tax\Helper\Data $taxData,
34-
array $data = []
34+
array $data = [],
3535
) {
3636
parent::__construct($context, $sessionQuote, $orderCreate, $priceCurrency, $taxData, $data);
3737
$this->serializer = $serializer;

Block/Adminhtml/Order/Tab/Delivery.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public function __construct(
3030
\Mygento\Shipment\Helper\Data $helper,
3131
\Magento\Framework\Registry $coreRegistry,
3232
\Magento\Backend\Block\Template\Context $context,
33-
array $data = []
33+
array $data = [],
3434
) {
3535
$this->helper = $helper;
3636
$this->coreRegistry = $coreRegistry;
@@ -106,7 +106,7 @@ public function getTabUrl()
106106
{
107107
return $this->getUrl(
108108
'mygento_' . $this->helper->getCode() . '/*/deliverytab',
109-
['_current' => true]
109+
['_current' => true],
110110
);
111111
}
112112

@@ -118,7 +118,7 @@ public function getLink($action)
118118
{
119119
return $this->_urlBuilder->getUrl(
120120
'mygento_' . $this->helper->getCode() . '/delivery/' . $action,
121-
['_secure' => true, 'order_id' => $this->getOrder()->getId()]
121+
['_secure' => true, 'order_id' => $this->getOrder()->getId()],
122122
);
123123
}
124124
}

Controller/Adminhtml/Order/DeliveryDate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class DeliveryDate extends \Magento\Backend\App\Action
2828
public function __construct(
2929
\Magento\Sales\Api\OrderRepositoryInterface $repo,
3030
\Magento\Framework\Controller\Result\JsonFactory $jsonFactory,
31-
\Magento\Backend\App\Action\Context $context
31+
\Magento\Backend\App\Action\Context $context,
3232
) {
3333
parent::__construct($context);
3434
$this->repo = $repo;

Controller/Adminhtml/Order/DeliveryTab.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public function __construct(
6262
\Magento\Framework\Controller\Result\RawFactory $resultRawFactory,
6363
OrderManagementInterface $orderManagement,
6464
OrderRepositoryInterface $orderRepository,
65-
LoggerInterface $logger
65+
LoggerInterface $logger,
6666
) {
6767
parent::__construct(
6868
$context,
@@ -75,7 +75,7 @@ public function __construct(
7575
$resultRawFactory,
7676
$orderManagement,
7777
$orderRepository,
78-
$logger
78+
$logger,
7979
);
8080
$this->layoutFactory = $layoutFactory;
8181
}

Controller/Adminhtml/Order/DeliveryTime.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class DeliveryTime extends \Magento\Backend\App\Action
2828
public function __construct(
2929
\Magento\Sales\Api\OrderRepositoryInterface $repo,
3030
\Magento\Framework\Controller\Result\JsonFactory $jsonFactory,
31-
\Magento\Backend\App\Action\Context $context
31+
\Magento\Backend\App\Action\Context $context,
3232
) {
3333
parent::__construct($context);
3434
$this->repo = $repo;

Helper/Data.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ public function __construct(
4646
\Magento\Framework\Api\FilterBuilder $filterBuilder,
4747
\Mygento\Base\Model\LogManager $logManager,
4848
\Magento\Framework\Encryption\Encryptor $encryptor,
49-
\Magento\Framework\App\Helper\Context $context
49+
\Magento\Framework\App\Helper\Context $context,
5050
) {
5151
parent::__construct(
5252
$logManager,
5353
$encryptor,
54-
$context
54+
$context,
5555
);
5656
$this->checkoutSession = $checkoutSession;
5757
$this->filterBuilder = $filterBuilder;
@@ -184,7 +184,7 @@ public function getAutoShippingStatuses($scopeCode = null): array
184184
{
185185
return array_filter(explode(
186186
',',
187-
$this->getConfig(self::XML_AUTO_SHIPPING_STATUSES, $scopeCode) ?: ''
187+
$this->getConfig(self::XML_AUTO_SHIPPING_STATUSES, $scopeCode) ?: '',
188188
));
189189
}
190190

@@ -195,7 +195,7 @@ public function getTrackCheckStatuses($scopeCode = null): array
195195
{
196196
return array_filter(explode(
197197
',',
198-
$this->getConfig(self::XML_SHIPMENT_TRACK_STATUSES, $scopeCode) ?: ''
198+
$this->getConfig(self::XML_SHIPMENT_TRACK_STATUSES, $scopeCode) ?: '',
199199
));
200200
}
201201

@@ -264,7 +264,7 @@ public function getMarkingRefund($scopeCode = null)
264264
public function getCarrierFilters(
265265
string $field = 'shipping_method',
266266
$value = null,
267-
string $condition = 'like'
267+
string $condition = 'like',
268268
): array {
269269
if ($value === null) {
270270
$value = $this->getCarrierCode() . '_%';

0 commit comments

Comments
 (0)