Skip to content

Commit 91f30aa

Browse files
yelahin-serhiyyelahin-serhiy
committed
MC-19105: One item purchased turns into two items on reorder (Multi-shipping)
1 parent d334838 commit 91f30aa

File tree

3 files changed

+198
-0
lines changed

3 files changed

+198
-0
lines changed

‎dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_configurable_product.php

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
use Magento\Checkout\Model\Session;
9+
use Magento\Eav\Model\Config;
10+
use Magento\Framework\DataObject;
11+
use Magento\Quote\Api\CartRepositoryInterface;
12+
use Magento\Quote\Api\Data\AddressInterface;
13+
use Magento\Quote\Api\Data\PaymentInterface;
14+
use Magento\Quote\Model\Quote;
15+
use Magento\Quote\Model\Quote\Address\Rate;
16+
use Magento\TestFramework\Helper\Bootstrap;
17+
use Magento\TestFramework\ObjectManager;
18+
19+
require __DIR__ . '/../../ConfigurableProduct/_files/configurable_products.php';
20+
21+
/** @var ObjectManager $objectManager */
22+
$objectManager = Bootstrap::getObjectManager();
23+
24+
$product = $productRepository->getById(10);
25+
$product->setStockData(['use_config_manage_stock' => 1, 'qty' => 2, 'is_qty_decimal' => 0, 'is_in_stock' => 1]);
26+
$productRepository->save($product);
27+
28+
/** @var Quote $quote */
29+
$quote = $objectManager->create(Quote::class);
30+
$request = $objectManager->create(DataObject::class);
31+
32+
/** @var Config $eavConfig */
33+
$eavConfig = $objectManager->get(Config::class);
34+
/** @var $attribute */
35+
$attribute = $eavConfig->getAttribute('catalog_product', 'test_configurable');
36+
37+
$request->setData(
38+
[
39+
'product_id' => $productRepository->get('configurable')->getId(),
40+
'selected_configurable_option' => '1',
41+
'super_attribute' => [
42+
$attribute->getAttributeId() => $attribute->getOptions()[1]->getValue()
43+
],
44+
'qty' => '2'
45+
]
46+
);
47+
48+
$quote->setStoreId(1)
49+
->setIsActive(
50+
true
51+
)->setIsMultiShipping(
52+
1
53+
)->setReservedOrderId(
54+
'test_order_with_configurable_product'
55+
)->setCustomerEmail(
56+
'store@example.com'
57+
)->addProduct(
58+
$productRepository->get('configurable'),
59+
$request
60+
);
61+
62+
/** @var PaymentInterface $payment */
63+
$payment = $objectManager->create(PaymentInterface::class);
64+
$payment->setMethod('checkmo');
65+
$quote->setPayment($payment);
66+
67+
$addressList = [
68+
[
69+
'firstname' => 'Jonh',
70+
'lastname' => 'Doe',
71+
'telephone' => '0333-233-221',
72+
'street' => ['Main Division 1'],
73+
'city' => 'Culver City',
74+
'region' => 'CA',
75+
'postcode' => 90800,
76+
'country_id' => 'US',
77+
'email' => 'store@example.com',
78+
'address_type' => 'shipping',
79+
],
80+
[
81+
'firstname' => 'Antoni',
82+
'lastname' => 'Holmes',
83+
'telephone' => '0333-233-221',
84+
'street' => ['Second Division 2'],
85+
'city' => 'Denver',
86+
'region' => 'CO',
87+
'postcode' => 80203,
88+
'country_id' => 'US',
89+
'email' => 'customer002@shipping.test',
90+
'address_type' => 'shipping'
91+
],
92+
];
93+
94+
$methodCode = 'flatrate_flatrate';
95+
foreach ($addressList as $data) {
96+
/** @var Rate $rate */
97+
$rate = $objectManager->create(Rate::class);
98+
$rate->setCode($methodCode)
99+
->setPrice(5.00);
100+
101+
$address = $objectManager->create(AddressInterface::class, ['data' => $data]);
102+
$address->setShippingMethod($methodCode)
103+
->addShippingRate($rate)
104+
->setShippingAmount(5.00)
105+
->setBaseShippingAmount(5.00);
106+
107+
$quote->addAddress($address);
108+
}
109+
110+
/** @var CartRepositoryInterface $quoteRepository */
111+
$quoteRepository = $objectManager->get(CartRepositoryInterface::class);
112+
$quoteRepository->save($quote);
113+
114+
$items = $quote->getAllItems();
115+
116+
foreach ($quote->getAllShippingAddresses() as $address) {
117+
foreach ($items as $item) {
118+
$item->setQty(1);
119+
$address->setTotalQty(1);
120+
$address->addItem($item);
121+
};
122+
}
123+
124+
$billingAddressData = [
125+
'firstname' => 'Jonh',
126+
'lastname' => 'Doe',
127+
'telephone' => '0333-233-221',
128+
'street' => ['Third Division 1'],
129+
'city' => 'New York',
130+
'region' => 'NY',
131+
'postcode' => 10029,
132+
'country_id' => 'US',
133+
'email' => 'store@example.com',
134+
'address_type' => 'billing',
135+
];
136+
137+
/** @var AddressInterface $address */
138+
$billingAddress = $objectManager->create(AddressInterface::class, ['data' => $billingAddressData]);
139+
$quote->setBillingAddress($billingAddress);
140+
$quote->collectTotals();
141+
$quoteRepository->save($quote);
142+
143+
/** @var Session $session */
144+
$session = $objectManager->get(Session::class);
145+
$session->setQuoteId($quote->getId());

‎dev/tests/integration/testsuite/Magento/Multishipping/Fixtures/quote_with_configurable_product_rollback.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
/**
3+
* Rollback for quote_with_configurable_product_last_variation.php fixture.
4+
*
5+
* Copyright © Magento, Inc. All rights reserved.
6+
* See COPYING.txt for license details.
7+
*/
8+
declare(strict_types=1);
9+
10+
use Magento\Quote\Model\Quote;
11+
use Magento\TestFramework\Helper\Bootstrap;
12+
use Magento\TestFramework\ObjectManager;
13+
14+
/** @var $objectManager ObjectManager */
15+
$objectManager = Bootstrap::getObjectManager();
16+
$quote = $objectManager->create(Quote::class);
17+
$quote->load('test_order_with_configurable_product', 'reserved_order_id')->delete();

‎dev/tests/integration/testsuite/Magento/Multishipping/Model/Checkout/Type/MultishippingTest.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,42 @@ public function testCreateOrdersWithSomeFailedOrders()
361361
);
362362
}
363363

364+
/**
365+
* Check product parent item id in order item
366+
*
367+
* @magentoDataFixture Magento/Multishipping/Fixtures/quote_with_configurable_product.php
368+
*/
369+
public function testCreateOrdersWithConfigurableProduct()
370+
{
371+
$quote = $this->getQuote('test_order_with_configurable_product');
372+
/** @var CheckoutSession $session */
373+
$session = $this->objectManager->get(CheckoutSession::class);
374+
$session->replaceQuote($quote);
375+
376+
$this->model->createOrders();
377+
378+
$quoteItemParentIds = [];
379+
foreach ($quote->getAllItems() as $quoteItem) {
380+
$quoteItemParentIds[] = $quoteItem->getParentItemId();
381+
}
382+
383+
$orderList = $this->getOrderList((int)$quote->getId());
384+
$firstOrder = array_shift($orderList);
385+
$secondOrder = array_shift($orderList);
386+
387+
$firstOrderItemParentsIds = [];
388+
foreach ($firstOrder->getItems() as $orderItem) {
389+
$firstOrderItemParentsIds[] = $orderItem->getParentItemId();
390+
}
391+
$secondOrderItemParentsIds = [];
392+
foreach ($secondOrder->getItems() as $orderItem) {
393+
$secondOrderItemParentsIds[] = $orderItem->getParentItemId();
394+
}
395+
396+
$this->assertNotNull($firstOrderItemParentsIds[1]);
397+
$this->assertNotNull($secondOrderItemParentsIds[1]);
398+
}
399+
364400
/**
365401
* Returns order service mock with successful place on first call and exceptions on other calls.
366402
*

0 commit comments

Comments
 (0)