INTER-4546: Hydrate Shipping Address From Magento Quote (#308)

bold-commerce · Aug 15, 2024 · 19fffea · 19fffea
1 parent 63a17e2
commit 19fffea
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/Model/Order/HydrateOrderFromQuote.php b/Model/Order/HydrateOrderFromQuote.php
@@ -88,12 +88,14 @@ public function hydrate(CartInterface $quote, string $publicOrderId): void
     {
         $websiteId = (int)$quote->getStore()->getWebsiteId();
         $billingAddress = $this->quoteToOrderAddressConverter->convert($quote->getBillingAddress());
+        $shippingAddress = null;
 
         if ($quote->getIsVirtual()) {
             $totals = $quote->getBillingAddress()->getTotals();
         } else {
             $totals = $quote->getShippingAddress()->getTotals();
             $shippingDescription = $quote->getShippingAddress()->getShippingDescription();
+            $shippingAddress = $this->quoteToOrderAddressConverter->convert($quote->getShippingAddress());
         }
 
         list($fees, $discounts) = $this->getFeesAndDiscounts($totals);
@@ -123,6 +125,10 @@ public function hydrate(CartInterface $quote, string $publicOrderId): void
             ],
         ];
 
+        if ($shippingAddress !== null) {
+            $body['shipping_address'] = $this->addressConverter->convert($shippingAddress);
+        }
+
         if ($quote->getCustomer()->getId()) {
             $body['customer'] = [
                 'platform_id' => (string)$quote->getCustomerId(),

diff --git a/Test/Integration/Model/Order/HydrateOrderFromQuoteTest.php b/Test/Integration/Model/Order/HydrateOrderFromQuoteTest.php
@@ -105,6 +105,21 @@ public function testHydratesOrderFromQuoteSuccessfully(bool $quoteItemHasWeight)
                         'shipping_total' => 0,
                         'order_total' => 2000,
                     ],
+                    'shipping_address' => [
+                        'id' => null,
+                        'business_name' => 'CompanyName',
+                        'country_code' => 'US',
+                        'country' => 'United States',
+                        'city' => 'CityM',
+                        'first_name' => 'John',
+                        'last_name' => 'Smith',
+                        'phone_number' => '3468676',
+                        'postal_code' => '75477',
+                        'province' => 'Alabama',
+                        'province_code' => 'AL',
+                        'address_line_1' => 'Green str, 67',
+                        'address_line_2' => '',
+                    ],
                     'customer' => [
                         'platform_id' => '1',
                         'first_name' => 'John',