- Added the shipping origin based on WFA rules back for shipping meth…

…ods that use the origin to determine shipping costs, the addres of the warehouse remains an estimation
marellocommerce · Jul 31, 2020 · f230508 · f230508
1 parent 1f44fe2
commit f230508
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Marello/Bundle/OrderBundle/Factory/OrderShippingContextFactory.php b/src/Marello/Bundle/OrderBundle/Factory/OrderShippingContextFactory.php
@@ -92,6 +92,12 @@ public function create($order)
             ->setCurrency($order->getCurrency());
 
         $convertedLineItems = $this->shippingLineItemConverter->convertLineItems($orderItems);
+
+        $this->orderWarehousesProvider->setEstimation($this->estimation);
+        $shippingOrigin = $this->getShippingOrigin($order);
+        if (null !== $shippingOrigin) {
+            $shippingContextBuilder->setShippingOrigin($shippingOrigin);
+        }
         if (null !== $order->getShippingAddress()) {
             $shippingContextBuilder->setShippingAddress($order->getShippingAddress());
         }