Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

magento/magento2#38059 Fix issue with product in cart's removed after… #38069

Closed
wants to merge 5 commits into from
Closed

magento/magento2#38059 Fix issue with product in cart's removed after… #38069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d72ecc9
magento/magento2#38059 Fix issue with product in cart's removed after…
BeggiNN Oct 13, 2023
ac476f6
Merge branch '2.4-develop' into fix-for-issue-38059
engcom-Hotel Oct 17, 2023
3c82728
Mftf test coverage added
engcom-Echo Nov 3, 2023
6643e15
Merge branch '2.4-develop' into fix-for-issue-38059
engcom-Echo Nov 3, 2023
0ed44a8
Merge branch '2.4-develop' into fix-for-issue-38059
engcom-Bravo May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions app/code/Magento/Sales/Model/Reorder/Reorder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,13 @@ public function execute(string $orderNumber, string $storeId): Data\ReorderOutpu
$storeId = (string) $this->storeManager->getStore()->getId();
$this->addItemsToCart($cart, $order->getItemsCollection(), $storeId);

try {
$this->cartRepository->save($cart);
} catch (\Magento\Framework\Exception\LocalizedException $e) {
// handle exception from \Magento\Quote\Model\QuoteRepository\SaveHandler::save
$this->addError($e->getMessage());
if (!$cart->getHasError()) {
try {
$this->cartRepository->save($cart);
} catch (\Magento\Framework\Exception\LocalizedException $e) {
// handle exception from \Magento\Quote\Model\QuoteRepository\SaveHandler::save
$this->addError($e->getMessage());
}
}

$savedCart = $this->cartRepository->get($cart->getId());
Expand Down
111 changes: 111 additions & 0 deletions .../Sales/Test/Mftf/Test/StorefrontAddProductFromReorderUntilMaximumQtyAllowedInCartTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
-->
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
<test name="StorefrontAddProductFromReorderUntilMaximumQtyAllowedInCart">
<annotations>
<stories value="ReorderMaximumQtyAllowed"/>
<title value="Make reorder as customer on frontend to verify customer card"/>
<description value="Make reorder with custom product price on frontend"/>
<severity value="CRITICAL"/>
<testCaseId value="PR-38069"/>
<group value="sales"/>
</annotations>
<before>
<!--Enable flat rate shipping-->
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}"
stepKey="enableFlatRate"/>

<createData entity="SimpleSubCategory" stepKey="createCategory"/>
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
<field key="price">100.00</field>
<requiredEntity createDataKey="createCategory"/>
</createData>

<!-- Create Customer Account -->
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>

<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
</before>
<after>
<actionGroup ref="AdminLogoutActionGroup" stepKey="LogoutAsAdmin"/>
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
</after>

<actionGroup ref="AdminClearFiltersActionGroup" stepKey="openProductCatalogPage"/>
<actionGroup ref="OpenEditProductOnBackendActionGroup" stepKey="clickFirstRowToOpenDefaultSimpleProduct">
<argument name="product" value="$$createSimpleProduct$$"/>
</actionGroup>

<!--Go to Advance Inventory and Enable Backorder and disable Manage Stock as No-->
<actionGroup ref="AdminClickOnAdvancedInventoryLinkActionGroup" stepKey="clickOnAdvancedInventoryLink"/>
<actionGroup ref="AdminSetMaxAllowedQtyForProductActionGroup" stepKey="fillMaxAllowedQty">
<argument name="qty" value="1"/>
</actionGroup>
<actionGroup ref="AdminSubmitAdvancedInventoryFormActionGroup" stepKey="clickDoneButton"/>
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveProduct"/>
<!-- Create new order -->
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="CreateNewOrder">
<argument name="customer" value="Simple_US_Customer"/>
</actionGroup>

<!-- Add product to order -->
<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addProductToOrder">
<argument name="product" value="$$createSimpleProduct$$"/>
<argument name="productQty" value="1"/>
</actionGroup>
<waitForPageLoad stepKey="WaitForProductAdd"/>
<waitForLoadingMaskToDisappear stepKey="WaitForProductAddLoading"/>

<!-- Set product custom price -->
<click selector="{{OrdersGridSection.customPrice($$createSimpleProduct.name$$)}}" stepKey="ClickOnCustomPrice"/>
<fillField selector="{{OrdersGridSection.customPriceInput($$createSimpleProduct.name$$)}}" userInput="10.00"
stepKey="FillCustomPrice"/>
<click selector="{{AdminOrderFormItemsSection.updateItemsAndQuantities}}" stepKey="clickUpdateItemsAndQuantities"/>
<waitForPageLoad stepKey="waitForItemsAndQuantitiesUpdating"/>

<!--Select FlatRate shipping method-->
<actionGroup ref="OrderSelectFlatRateShippingActionGroup" stepKey="orderSelectFlatRateShippingMethod"/>

<!--Submit order-->
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="submitOrder"/>
<waitForPageLoad stepKey="WaitForOrderSubmit"/>

<!--Login customer on storefront-->
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
<argument name="Customer" value="$$createCustomer$$" />
</actionGroup>

<!-- Go to my Orders page -->
<amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onMyAccount"/>
<waitForPageLoad stepKey="waitForAccountPage"/>
<click selector="{{StorefrontCustomerSidebarSection.sidebarTab('My Orders')}}" stepKey="clickOnMyOrders"/>
<waitForPageLoad stepKey="waitForOrdersLoad"/>

<!-- Clicking on Reorder link from Order Details Tab -->
<click selector="{{StorefrontCustomerOrderViewSection.reorder}}" stepKey="clickReorder"/>

<!-- Go to my Orders page -->
<amOnPage url="{{StorefrontCustomerDashboardPage.url}}" stepKey="onMyAccountAgain"/>
<waitForPageLoad stepKey="waitForAccountPageAgain"/>
<click selector="{{StorefrontCustomerSidebarSection.sidebarTab('My Orders')}}" stepKey="clickOnMyOrdersAgain"/>
<waitForPageLoad stepKey="waitForOrdersLoadAgain"/>

<!-- Clicking on Reorder link from Order Details Tab -->
<click selector="{{StorefrontCustomerOrderViewSection.reorder}}" stepKey="clickReorderAgain"/>

<!-- Verify product is still in the cart -->
<actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="openMiniCart"/>
<actionGroup ref="AssertStorefrontMiniCartSubtotalActionGroup" stepKey="assertSubtotal">
<argument name="subtotal" value="$100.00"/>
</actionGroup>
</test>
</tests>