MC-36779: Product still present in the Wish List after added to order #31110

SmVladyslav · 2020-12-01T15:01:19Z

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Fixes Product still present in the Wish List after added to order #30260 (MC-36779)

Manual testing scenarios (*)

...
...

Questions or comments

Contribution checklist (*)

Pull request has a meaningful description of its purpose
All commits are accompanied by meaningful commit messages
All new or changed code is covered with unit/integration tests (if applicable)
All automated tests passed successfully (all builds are green)

m2-assistant · 2020-12-01T15:01:22Z

Hi @SmVladyslav. Thank you for your contribution
Here is some useful tips how you can test your changes using Magento test environment.
Add the comment under your pull request to deploy test or vanilla Magento instance:

@magento give me test instance - deploy test instance based on PR changes
@magento give me 2.4-develop instance - deploy vanilla Magento instance

❗ Automated tests can be triggered manually with an appropriate comment:

@magento run all tests - run or re-run all required tests against the PR changes
@magento run <test-build(s)> - run or re-run specific test build(s)
For example: @magento run Unit Tests

<test-build(s)> is a comma-separated list of build names. Allowed build names are:

Database Compare
Functional Tests CE
Functional Tests EE,
Functional Tests B2B
Integration Tests
Magento Health Index
Sample Data Tests CE
Sample Data Tests EE
Sample Data Tests B2B
Static Tests
Unit Tests
WebAPI Tests

You can find more information about the builds here

ℹ️ Please run only needed test builds instead of all when developing. Please run all test builds before sending your PR for review.

For more details, please, review the Magento Contributor Guide documentation.

⚠️ According to the Magento Contribution requirements, all Pull Requests must go through the Community Contributions Triage process. Community Contributions Triage is a public meeting.

🕙 You can find the schedule on the Magento Community Calendar page.

📞 The triage of Pull Requests happens in the queue order. If you want to speed up the delivery of your contribution, please join the Community Contributions Triage session to discuss the appropriate ticket.

🎥 You can find the recording of the previous Community Contributions Triage on the Magento Youtube Channel

✏️ Feel free to post questions/proposals/feedback related to the Community Contributions Triage process to the corresponding Slack Channel

SmVladyslav · 2020-12-01T15:02:37Z

@magento run all tests

lbajsarowicz

🟡 @SmVladyslav I see that you reference the array key, but as far as I understand - there's no guarantee this key will exist. Isn't that necessary to check whether the key exist? (eg. isset())

lbajsarowicz · 2020-12-01T20:32:41Z

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -970,7 +970,7 @@ public function applySidebarData($data)
                $item = $this->getCustomerCart()->getItemById($itemId);
                if ($item) {
                    $this->moveQuoteItem($item, 'order', $qty);
-                    $this->removeItem($itemId, 'cart');
+                    $data['remove'][$itemId] = 'cart';


What if $data['remove'] does not exist?

In this case we put value under key that will be processed on line 996. I have rewritten that code to be more readable.

lbajsarowicz · 2020-12-01T20:33:06Z

app/code/Magento/Sales/Model/AdminOrder/Create.php

@@ -984,6 +984,7 @@ public function applySidebarData($data)
                );
                if ($item->getId()) {
                    $this->addProduct($item->getProduct(), $item->getBuyRequest()->toArray());
+                    $data['remove'][$itemId] = 'wishlist';


What if $data['remove'] does not exist?

In this case we put value under key that will be processed on line 996. I have rewritten that code to be more readable.

lbajsarowicz · 2020-12-01T20:35:50Z

@magento run Functional Tests CE, Functional Tests B2B, Unit Tests, WebAPI Tests

SmVladyslav · 2020-12-02T14:31:15Z

@magento run all tests

SmVladyslav · 2020-12-07T09:45:38Z

@magento run all tests

SmVladyslav · 2020-12-07T12:27:50Z

@magento run Functional Tests B2B, Functional Tests CE, Integration Tests, WebAPI Tests

SmVladyslav · 2020-12-08T07:44:49Z

@magento run Functional Tests B2B, Functional Tests EE, Integration Tests

SmVladyslav · 2020-12-08T08:01:09Z

@magento run Functional Tests EE

zakdma · 2020-12-08T11:47:48Z

app/code/Magento/Sales/view/adminhtml/web/order/create/scripts.js

@@ -963,10 +964,18 @@ define([
            }.bind(this));
            // response handler
            productConfigure.setOnLoadIFrameCallback(listType, function (response) {
+                var area = ['items', 'shipping_method', 'billing_method', 'totals', 'giftmessage'];


zakdma · 2020-12-08T11:55:06Z

app/code/Magento/Sales/Test/Mftf/Test/CreateOrderFromEditCustomerPageTest.xml

        <click selector="{{AdminCreateOrderWishListSection.addConfigProductToOrder($$createConfigProduct.name$$)}}" stepKey="AddConfigurableProductToOrder"/>
        <waitForElementVisible selector="{{AdminOrderFormConfigureProductSection.optionSelect($$createConfigProductAttribute.default_frontend_label$$)}}" stepKey="waitForConfigurablePopover"/>
        <selectOption selector="{{AdminOrderFormConfigureProductSection.optionSelect($$createConfigProductAttribute.default_frontend_label$$)}}" userInput="$$getConfigAttributeOption1.label$$" stepKey="selectConfigurableOption"/>
        <click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="clickOkButton"/>
-        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickOnUpdateButton"/>
+        <comment userInput="Click OK button to update lists" stepKey="clickOnUpdateButton"/>


userInput="Action should be removed but replaced with comment due to backward compatibility"

SmVladyslav · 2020-12-08T12:02:35Z

@magento run all tests

zakdma · 2020-12-10T09:33:52Z

@magento import code to https://github.com/magento-tsg/magento2ce

magento-engcom-team · 2020-12-10T09:36:28Z

@zakdma, an error occurred during the Pull Request import.

magento-engcom-team · 2020-12-10T09:36:40Z

@zakdma, an error occurred during the Pull Request import.

zakdma · 2020-12-10T10:07:32Z

@magento import code to https://github.com/magento-tsg/magento2ce

magento-engcom-team · 2020-12-10T10:09:47Z

@zakdma the branch with code successfully imported intomagento-tsg/magento2ce repository. Branch name: imported-magento-magento2-31110.

engcom-Bravo · 2020-12-10T12:14:48Z

✔️ QA Passed

Manual testing scenario

Go to admin -> sales -> orders -> Created New Order -> Select Customer
Add simple product to the Order
Select Action => Move to Wish List
Click Update Items and Quantities button
Select checkbox 'Add To Order' => yes
Click Update Changes button

Before applying fix:
The product has been added to Cart but still remained in the Wish List

After applying fix
Product moved to Order, wish List is empty

lbajsarowicz · 2020-12-10T19:51:57Z

@magento run Functional Tests B2B

m2-assistant · 2020-12-12T08:00:00Z

Hi @SmVladyslav, thank you for your contribution!
Please, complete Contribution Survey, it will take less than a minute.
Your feedback will help us to improve contribution process.

SmVladyslav added 2 commits December 1, 2020 16:57

MC-36779: Product still present in the Wish List after added to order

71ae5db

Merge remote-tracking branch 'origin/2.4-develop' into MC-36779

07cd2ed

m2-community-project bot added Priority: P2 A defect with this priority could have functionality issues which are not to expectations. Severity: S2 Major restrictions or short-term circumventions are required until a fix is available. labels Dec 1, 2020

magento-engcom-team added Component: Sales Release Line: 2.4 labels Dec 1, 2020

m2-community-project bot added this to Pending Review in High Priority Pull Requests Dashboard Dec 1, 2020

m2-community-project bot added the Progress: pending review label Dec 1, 2020

lbajsarowicz reviewed Dec 1, 2020

View reviewed changes

m2-community-project bot assigned lbajsarowicz Dec 1, 2020

m2-community-project bot moved this from Pending Review to Review in Progress in High Priority Pull Requests Dashboard Dec 1, 2020

m2-community-project bot added Progress: review and removed Progress: pending review labels Dec 1, 2020

MC-36779: Product still present in the Wish List after added to order

c3e897c

SmVladyslav added 2 commits December 7, 2020 11:01

Merge remote-tracking branch 'origin/2.4-develop' into MC-36779

f8d2414

MC-36779: Product still present in the Wish List after added to order

f65490b

zakdma suggested changes Dec 8, 2020

View reviewed changes

m2-community-project bot assigned zakdma Dec 8, 2020

m2-community-project bot moved this from Review in Progress to Changes Requested in High Priority Pull Requests Dashboard Dec 8, 2020

m2-community-project bot added Progress: needs update and removed Progress: review labels Dec 8, 2020

MC-36779: Product still present in the Wish List after added to order

44809b9

m2-community-project bot moved this from Changes Requested to Review in Progress in High Priority Pull Requests Dashboard Dec 8, 2020

m2-community-project bot added Progress: review and removed Progress: needs update labels Dec 8, 2020

zakdma approved these changes Dec 8, 2020

View reviewed changes

m2-community-project bot moved this from Review in Progress to Ready for Testing in High Priority Pull Requests Dashboard Dec 8, 2020

m2-community-project bot added Progress: ready for testing and removed Progress: review labels Dec 8, 2020

engcom-Bravo self-assigned this Dec 10, 2020

engcom-Bravo moved this from Ready for Testing to Testing in Progress in High Priority Pull Requests Dashboard Dec 10, 2020

m2-community-project bot added Progress: testing in progress and removed Progress: ready for testing labels Dec 10, 2020

engcom-Bravo added the QA: Added to Regression Scope Scenario was analysed and added to Regression Testing Scope label Dec 10, 2020

engcom-Bravo moved this from Testing in Progress to Extended Testing (optional) in High Priority Pull Requests Dashboard Dec 10, 2020

m2-community-project bot moved this from Extended Testing (optional) to Ready for Testing in High Priority Pull Requests Dashboard Dec 10, 2020

m2-community-project bot added Progress: ready for testing and removed Progress: testing in progress labels Dec 10, 2020

m2-community-project bot moved this from Ready for Testing to Extended Testing (optional) in High Priority Pull Requests Dashboard Dec 10, 2020

m2-community-project bot added the Progress: extended testing label Dec 10, 2020

magento-engcom-team merged commit 2504806 into magento:2.4-develop Dec 12, 2020

engcom-Foxtrot moved this from Extended Testing (optional) to Recently Merged in High Priority Pull Requests Dashboard Dec 14, 2020

magento-engcom-team removed this from Recently Merged in High Priority Pull Requests Dashboard Oct 14, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MC-36779: Product still present in the Wish List after added to order #31110

MC-36779: Product still present in the Wish List after added to order #31110

SmVladyslav commented Dec 1, 2020

m2-assistant bot commented Dec 1, 2020

SmVladyslav commented Dec 1, 2020

lbajsarowicz left a comment

lbajsarowicz Dec 1, 2020

SmVladyslav Dec 2, 2020

lbajsarowicz Dec 1, 2020

SmVladyslav Dec 2, 2020

lbajsarowicz commented Dec 1, 2020

SmVladyslav commented Dec 2, 2020

SmVladyslav commented Dec 7, 2020

SmVladyslav commented Dec 7, 2020

SmVladyslav commented Dec 8, 2020

SmVladyslav commented Dec 8, 2020

zakdma Dec 8, 2020

SmVladyslav Dec 8, 2020

zakdma Dec 8, 2020

SmVladyslav Dec 8, 2020

SmVladyslav commented Dec 8, 2020

zakdma commented Dec 10, 2020

magento-engcom-team commented Dec 10, 2020

magento-engcom-team commented Dec 10, 2020

zakdma commented Dec 10, 2020

magento-engcom-team commented Dec 10, 2020

engcom-Bravo commented Dec 10, 2020

lbajsarowicz commented Dec 10, 2020

m2-assistant bot commented Dec 12, 2020

MC-36779: Product still present in the Wish List after added to order #31110

MC-36779: Product still present in the Wish List after added to order #31110

Conversation

SmVladyslav commented Dec 1, 2020

Description (*)

Related Pull Requests

Fixed Issues (if relevant)

Manual testing scenarios (*)

Questions or comments

Contribution checklist (*)

m2-assistant bot commented Dec 1, 2020

SmVladyslav commented Dec 1, 2020

lbajsarowicz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lbajsarowicz commented Dec 1, 2020

SmVladyslav commented Dec 2, 2020

SmVladyslav commented Dec 7, 2020

SmVladyslav commented Dec 7, 2020

SmVladyslav commented Dec 8, 2020

SmVladyslav commented Dec 8, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SmVladyslav commented Dec 8, 2020

zakdma commented Dec 10, 2020

magento-engcom-team commented Dec 10, 2020

magento-engcom-team commented Dec 10, 2020

zakdma commented Dec 10, 2020

magento-engcom-team commented Dec 10, 2020

engcom-Bravo commented Dec 10, 2020

Manual testing scenario

lbajsarowicz commented Dec 10, 2020

m2-assistant bot commented Dec 12, 2020