merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6268 from jitendra-webkul/master 

Issue #6267 fixed
This commit is contained in:
Jitendra Singh 2022-04-07 19:06:28 +05:30 committed by GitHub
parent 8a6bd3aa1c b08db7f29c
commit 8dc456c034
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/Webkul/Sales/src/Repositories/OrderRepository.php
View File

@ -74,9 +74,13 @@ class OrderRepository extends Repository
$order->payment()->create($data['payment']); $order->payment()->create($data['payment']);
if (isset($data['shipping_address'])) { if (isset($data['shipping_address'])) {
unset($data['shipping_address']['customer_id']);
$order->addresses()->create($data['shipping_address']); $order->addresses()->create($data['shipping_address']);
} }
unset($data['billing_address']['customer_id']);
$order->addresses()->create($data['billing_address']); $order->addresses()->create($data['billing_address']);
foreach ($data['items'] as $item) { foreach ($data['items'] as $item) {

2
tests/functional/Checkout/Order/OrderCest.php
View File

@ -137,13 +137,11 @@ class OrderCest
$I->seeRecord(OrderAddress::class, array_merge($addressData, [ $I->seeRecord(OrderAddress::class, array_merge($addressData, [
'order_id' => $order->id, 'order_id' => $order->id,
'address_type' => OrderAddress::ADDRESS_TYPE_SHIPPING, 'address_type' => OrderAddress::ADDRESS_TYPE_SHIPPING,
'customer_id' => $mocks['customer']->id,
])); ]));
$I->seeRecord(OrderAddress::class, array_merge($addressData, [ $I->seeRecord(OrderAddress::class, array_merge($addressData, [
'order_id' => $order->id, 'order_id' => $order->id,
'address_type' => OrderAddress::ADDRESS_TYPE_BILLING, 'address_type' => OrderAddress::ADDRESS_TYPE_BILLING,
'customer_id' => $mocks['customer']->id,
])); ]));
$I->seeRecord(OrderPayment::class, [ $I->seeRecord(OrderPayment::class, [