From 5dc3e61c083a3bdc2792e8ff7da3ea84e3640b80 Mon Sep 17 00:00:00 2001 From: jitendra Date: Thu, 7 Apr 2022 17:56:01 +0530 Subject: [PATCH 1/2] Issue #6267 fixed --- packages/Webkul/Sales/src/Repositories/OrderRepository.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/Webkul/Sales/src/Repositories/OrderRepository.php b/packages/Webkul/Sales/src/Repositories/OrderRepository.php index 63e6bead1..30a8012e5 100755 --- a/packages/Webkul/Sales/src/Repositories/OrderRepository.php +++ b/packages/Webkul/Sales/src/Repositories/OrderRepository.php @@ -74,9 +74,13 @@ class OrderRepository extends Repository $order->payment()->create($data['payment']); if (isset($data['shipping_address'])) { + unset($data['shipping_address']['customer_id']); + $order->addresses()->create($data['shipping_address']); } + unset($data['billing_address']['customer_id']); + $order->addresses()->create($data['billing_address']); foreach ($data['items'] as $item) { From b08db7f29c34454d0b475cc615897848847817ab Mon Sep 17 00:00:00 2001 From: jitendra Date: Thu, 7 Apr 2022 18:07:23 +0530 Subject: [PATCH 2/2] Updated test case --- tests/functional/Checkout/Order/OrderCest.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/functional/Checkout/Order/OrderCest.php b/tests/functional/Checkout/Order/OrderCest.php index 05c82a47d..7e370a52b 100644 --- a/tests/functional/Checkout/Order/OrderCest.php +++ b/tests/functional/Checkout/Order/OrderCest.php @@ -137,13 +137,11 @@ class OrderCest $I->seeRecord(OrderAddress::class, array_merge($addressData, [ 'order_id' => $order->id, 'address_type' => OrderAddress::ADDRESS_TYPE_SHIPPING, - 'customer_id' => $mocks['customer']->id, ])); $I->seeRecord(OrderAddress::class, array_merge($addressData, [ 'order_id' => $order->id, 'address_type' => OrderAddress::ADDRESS_TYPE_BILLING, - 'customer_id' => $mocks['customer']->id, ])); $I->seeRecord(OrderPayment::class, [