From b53f5880b753897ce97ad5cfb45c7bda1f3dc450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89bano=20Penha=20Andrello=20Lopes?= Date: Sat, 14 Sep 2019 15:41:49 -0300 Subject: [PATCH 1/3] MAG-482: Minor fix --- Controller/Webhooks/Index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/Webhooks/Index.php b/Controller/Webhooks/Index.php index f0dedacf..700b6295 100644 --- a/Controller/Webhooks/Index.php +++ b/Controller/Webhooks/Index.php @@ -126,7 +126,7 @@ public function processRequest($request, $hash, $topic) $caseData = array( "case" => $case, "order" => $order, - "request" => $requestJson + "response" => $requestJson ); if ($case->isEmpty()) { From 53a6703613ac63b689aeafc38ce55fb5c4d8be0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89bano=20Penha=20Andrello=20Lopes?= Date: Tue, 17 Sep 2019 00:23:57 -0300 Subject: [PATCH 2/3] 3.4.4: Change version number --- composer.json | 2 +- etc/module.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 1c02113b..e453849d 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "php": ">=5.5.22" }, "type": "magento2-module", - "version": "3.4.3", + "version": "3.4.4", "autoload": { "files": [ "registration.php" diff --git a/etc/module.xml b/etc/module.xml index 2b297755..f66a0312 100644 --- a/etc/module.xml +++ b/etc/module.xml @@ -5,7 +5,7 @@ */ --> - + From 3d2feeb305a06f8481cb50e23c928413b5177541 Mon Sep 17 00:00:00 2001 From: Ebano Lopes Date: Wed, 25 Sep 2019 02:06:46 +0000 Subject: [PATCH 3/3] MAG-479: Prevent sending all tracking numbers on fulfillment --- Helper/FulfillmentHelper.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Helper/FulfillmentHelper.php b/Helper/FulfillmentHelper.php index 54e9ede5..12a38fdf 100644 --- a/Helper/FulfillmentHelper.php +++ b/Helper/FulfillmentHelper.php @@ -243,6 +243,11 @@ public function getTrackingNumbers(\Magento\Sales\Model\Order\Shipment $shipment $trackingNumbers = array(); $trackingCollection = $shipment->getTracksCollection(); + /** + * Sometimes Magento loads tracking collection before the $shipment object gets loaded, leaving collection + * without shipment filter. Forcing shipment filter to avoid issues. + */ + $trackingCollection->setShipmentFilter($shipment->getId()); /** @var \Magento\Sales\Model\Order\Shipment\Track $tracking */ foreach ($trackingCollection->getItems() as $tracking) {