If order address does not exists on previous order than do not replic…

…ate it
webgriffe · May 23, 2023 · d827dd3 · d827dd3
1 parent 547bdd3
commit d827dd3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/ReorderProcessing/ReorderDataProvider.php b/src/ReorderProcessing/ReorderDataProvider.php
@@ -16,12 +16,13 @@ public function process(OrderInterface $order, OrderInterface $reorder): void
         $reorder->setNotes($order->getNotes());
         $reorder->setLocaleCode($order->getLocaleCode());
 
-        /** @var AddressInterface $billingAddress */
         $billingAddress = $order->getBillingAddress();
-
-        /** @var AddressInterface $shippingAddress */
+        if ($billingAddress !== null) {
+            $reorder->setBillingAddress(clone $billingAddress);
+        }
         $shippingAddress = $order->getShippingAddress();
-        $reorder->setBillingAddress(clone $billingAddress);
-        $reorder->setShippingAddress(clone $shippingAddress);
+        if ($shippingAddress !== null) {
+            $reorder->setShippingAddress(clone $shippingAddress);
+        }
     }
 }