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()) { 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) { 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 @@ */ --> - +