Merge remote-tracking branch 'act4/ACP2E-3563' into PR_Apr23_doleksandr

Author: o-dubovyk

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Sidebar/Cart.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -15,7 +15,6 @@
  * Adminhtml sales order create sidebar cart block
  *
  * @api
- * @author      Magento Core Team <core@magentocommerce.com>
  * @since 100.0.2
  */
 class Cart extends \Magento\Sales\Block\Adminhtml\Order\Create\Sidebar\AbstractSidebar
@@ -59,16 +58,6 @@ public function getItemCollection()
         $collection = $this->getData('item_collection');
         if ($collection === null) {
             $collection = $this->getCreateOrderModel()->getCustomerCart()->getAllVisibleItems();
-            $transferredItems = $this->getCreateOrderModel()->getSession()->getTransferredItems() ?? [];
-            $transferredItems = $transferredItems[$this->getDataId()] ?? [];
-            if (!empty($transferredItems)) {
-                foreach ($collection as $key => $item) {
-                    if (in_array($item->getId(), $transferredItems)) {
-                        unset($collection[$key]);
-                    }
-                }
-            }
-
             $this->setData('item_collection', $collection);
         }
         return $collection;

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

@@ -2359,25 +2359,22 @@ private function formattedOptions(\Magento\Catalog\Model\Product $product, $buyR
     }
 
     /**
-     * Remove cart from transferred items and update the qty.
+     * Remove cart from transferred items
      *
      * @param int|null|Item $cartItem
      * @param int $itemId
      * @return void
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @see AC-14442
      */
     private function removeCartTransferredItemsAndUpdateQty(int|null|Item $cartItem, int $itemId)
     {
         $removeCartTransferredItems = $this->getSession()->getTransferredItems() ?? [];
         if (isset($removeCartTransferredItems['cart'])) {
             $removeTransferredItemKey = array_search($cartItem->getId(), $removeCartTransferredItems['cart']);
-            if ($removeCartTransferredItems['cart'][$removeTransferredItemKey]) {
+            if ($removeTransferredItemKey !== false && $removeCartTransferredItems['cart'][$removeTransferredItemKey]) {
                 $cartItem->clearMessage();
                 $cartItem->setHasError(false);
-                if (isset($this->request->get('item')[$itemId]['qty'])) {
-                    $qty = $this->request->get('item')[$itemId]['qty'];
-                    $cartItem->setQty($qty);
-                }
-
                 if ($cartItem->getHasError()) {
                     throw new LocalizedException(__($cartItem->getMessage()));
                 }

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

@@ -182,8 +182,10 @@
         <actionGroup ref="AdminClickUpdateChangesOnCreateOrderPageActionGroup" stepKey="clickOnUpdateButton1"/>
         <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForAdminCreateOrderShoppingCartSectionPageLoad1"/>
 
-        <dontSee selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct.name$$" stepKey="donSeeProductInShoppingCart"/>
-        <dontSee selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct1.name$$" stepKey="dontSeeSecondProductInShoppingCart"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="donSeeProductInShoppingCart"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="dontSeeSecondProductInShoppingCart"/>
+        <see selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct.name$$" stepKey="seeProductInShoppingCart2"/>
+        <see selector="{{AdminCreateOrderShoppingCartSection.shoppingCartBlock}}" userInput="$$simpleProduct1.name$$" stepKey="seeSecondProductInShoppingCart2"/>
 
         <dontSee selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$$simpleProduct.name$$" stepKey="seeSimpleProductInWishList1"/>
         <dontSee selector="{{AdminCreateOrderWishListSection.wishListBlock}}" userInput="$$createConfigProduct.name$$" stepKey="seeConfigurableProductInWishList1"/>

app/code/Magento/Sales/i18n/en_US.csv

@@ -528,6 +528,7 @@ Subtotal:,Subtotal:
 Refresh,Refresh
 Item,Item
 "Add To Order","Add To Order"
+"Add to the new order", "Add to the new order"
 "Configure and Add to Order","Configure and Add to Order"
 "No items","No items"
 "Append Comments","Append Comments"

app/code/Magento/Sales/view/adminhtml/templates/order/create/sidebar/items.phtml

@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2025 Adobe
+ * Copyright 2013 Adobe
  * All Rights Reserved.
  */
 
@@ -64,9 +64,9 @@ $sideBarPermissionCheck = $block->getData('sideBarPermissionCheck');
                     <?php endif; ?>
 
                     <th class="col-add">
-                        <span title="<?= $escaper->escapeHtml(__('Add To Order')) ?>"
+                        <span title="<?= $escaper->escapeHtml(__('Add to the new order')) ?>"
                               class="icon icon-add">
-                            <span><?= $escaper->escapeHtml(__('Add To Order')) ?></span>
+                            <span><?= $escaper->escapeHtml(__('Add to the new order')) ?></span>
                         </span>
                     </th>
                 </tr>
@@ -145,7 +145,7 @@ $sideBarPermissionCheck = $block->getData('sideBarPermissionCheck');
                                            name="sidebar[<?= $escaper->escapeHtmlAttr($block->getSidebarStorageAction())
                                             ?>][<?= (int) $block->getIdentifierId($_item) ?>]"
                                            value="<?= $block->canDisplayItemQty() ? (float) $_item->getQty() : 1 ?>"
-                                           title="<?= $escaper->escapeHtml(__('Add To Order')) ?>"/>
+                                           title="<?= $escaper->escapeHtml(__('Add to the new order')) ?>"/>
                                     <label class="admin__field-label"
                                            for="sidebar-<?= $escaper->escapeHtmlAttr($block->getSidebarStorageAction())
                                             ?>-<?= (int) $block->getIdentifierId($_item) ?>">

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

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -122,7 +122,7 @@ public function testAddProductToOrderFromShoppingCart(bool $asJson, bool $asJsVa
         } else {
             $body = $this->getResponse()->getBody();
         }
-        $this->assertStringNotContainsString("sidebar[add_cart_item][$itemId]", $body);
+        $this->assertStringContainsString("sidebar[add_cart_item][$itemId]", $body);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Sales/Model/AdminOrder/CreateTest.php

@@ -699,14 +699,15 @@ public function testMoveQuoteItemToCart()
         /** @var SessionQuote $session */
         $session = $this->objectManager->create(SessionQuote::class);
         $session->setCustomerId($fixtureCustomerId);
-        $session->setTransferredItems(['cart' => [124]]);
+
         /** @var $quoteFixture Quote */
         $quoteFixture = $this->objectManager->create(Quote::class);
         $quoteFixture->load('test01', 'reserved_order_id');
         $quoteFixture->setCustomerIsGuest(false)->setCustomerId($fixtureCustomerId)->save();
 
         $customerQuote = $this->model->getCustomerCart();
         $item = $customerQuote->getAllVisibleItems()[0];
+        $session->setTransferredItems(['cart' => [$item->getId()]]);
 
         $this->model->moveQuoteItem($item, 'cart', 3);
         self::assertEquals(4, $item->getQty(), 'Number of Qty isn\'t correct for Quote item.');