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

Author: SmVladyslav

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);
-                    $data['remove'][$itemId] = 'cart';
+                    $this->removeItem($itemId, 'cart');
                 }
             }
         }
@@ -984,7 +984,7 @@ public function applySidebarData($data)
                 );
                 if ($item->getId()) {
                     $this->addProduct($item->getProduct(), $item->getBuyRequest()->toArray());
-                    $data['remove'][$itemId] = 'wishlist';
+                    $this->removeItem($itemId, 'wishlist');
                 }
             }
         }

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

@@ -136,15 +136,18 @@
         <see selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$$simpleProduct.name$$" stepKey="seeSimpleProductInWishList"/>
         <see selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProductInWishList"/>
 
-        <!-- Add products to order from Wish List -->
+        <!-- Move products to order from Wish List -->
         <waitForElementVisible selector="{{AdminCreateOrderWishListSection.addProductToOrderCheckBox($$simpleProduct.name$$)}}" stepKey="waitForCheckBoxToVisible"/>
         <click selector="{{AdminCreateOrderWishListSection.addProductToOrderCheckBox($$simpleProduct.name$$)}}" stepKey="selectProductToAddToOrder"/>
+        <click selector="{{AdminCustomerCreateNewOrderSection.updateChangesBtn}}" stepKey="clickOnUpdateButton"/>
         <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"/>
-        <waitForPageLoad stepKey="waitForAdminOrderItemsOrderedSectionPageLoad1"/>
+
+        <!-- After move, assert products are NOT present in Wish List section -->
+        <dontSee selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$simpleProduct.name$" stepKey="dontSeeSimpleProductInWishList"/>
+        <dontSee selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$createConfigProduct.name$" stepKey="dontSeeConfigurableProductInWishList"/>
 
         <!-- Assert Products in Order item section -->
         <see selector="{{AdminOrderItemsOrderedSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeSimpleProductInOrderItemGrid"/>
@@ -171,10 +174,6 @@
         <dontSee selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct.name$$" stepKey="donSeeProductInShoppingCart"/>
         <dontSee selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct1.name$$" stepKey="dontSeeSecondProductInShoppingCart"/>
 
-        <!-- After move, assert products are present in Wish List section -->
-        <see selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$$simpleProduct.name$$" stepKey="seeSimpleProductInWishList1"/>
-        <see selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProductInWishList1"/>
-
         <!-- After move, assert products are present in order items section -->
         <see selector="{{AdminOrderItemsOrderedSection.productName}}" userInput="$$simpleProduct.name$$" stepKey="seeSimpleProductInOrderItemGrid1"/>
         <see selector="{{AdminOrderItemsOrderedSection.productName}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigProductInOrderItemGrid1"/>

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

@@ -942,7 +942,8 @@ define([
          */
         sidebarConfigureProduct: function (listType, productId, itemId) {
             // create additional fields
-            var params = {};
+            var params = {},
+                isWishlist = !!itemId;
             params.reset_shipping = true;
             params.add_product = productId;
             this.prepareParams(params);
@@ -963,10 +964,18 @@ define([
             }.bind(this));
             // response handler
             productConfigure.setOnLoadIFrameCallback(listType, function (response) {
+                var area = ['items', 'shipping_method', 'billing_method', 'totals', 'giftmessage'];
+
                 if (!response.ok) {
                     return;
                 }
-                this.loadArea(['items', 'shipping_method', 'billing_method', 'totals', 'giftmessage'], true);
+                if (isWishlist) {
+                    this.removeSidebarItem(itemId, 'wishlist').done(function () {
+                        this.loadArea(area, true);
+                    }.bind(this));
+                } else {
+                    this.loadArea(area, true);
+                }
             }.bind(this));
             // show item configuration
             itemId = itemId ? itemId : productId;
@@ -975,7 +984,10 @@ define([
         },
 
         removeSidebarItem: function (id, from) {
-            this.loadArea(['sidebar_' + from], 'sidebar_data_' + from, {remove_item: id, from: from});
+            return this.loadArea(['sidebar_' + from], 'sidebar_data_' + from, {
+                remove_item: id,
+                from: from
+            });
         },
 
         itemsUpdate: function () {

dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Create/LoadBlockTest.php

@@ -225,7 +225,7 @@ public function testAddProductToOrderFromWishList(): void
         $params = $this->hydrateParams();
         $this->dispatchWitParams($params, $post);
 
-        $wishlistItems->clear();
+        $wishlistItems->clear()->load();
         $this->assertEmpty($wishlistItems);
         $quoteItems = $this->session->getQuote()->getItemsCollection();
         $this->assertCount(1, $quoteItems);