Merge branch 'ACQE-7713' into ACQE-4Version-functional-mainline-deployment

Author: chandrakalahanchinal

InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialInvoiceForOrderWithVirtualProductOnCustomStockTest.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
+  * Copyright 2024 Adobe
+  * All rights reserved.
   * See COPYING.txt for license details.
   */
 -->
@@ -48,13 +49,6 @@
             <comment userInput="BIC workaround" stepKey="saveCustomStock"/>
             <comment userInput="BIC workaround" stepKey="reindexCacheFlushAfterAssignDefaultStockToMainWebsite"/>
 
-            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
-                <argument name="indices" value=""/>
-            </actionGroup>
-            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
-                <argument name="tags" value="full_page"/>
-            </actionGroup>
-
             <createData entity="VirtualProduct" stepKey="virtualProduct">
                 <requiredEntity createDataKey="category"/>
             </createData>
@@ -69,6 +63,12 @@
             </actionGroup>
             <fillField selector="{{AdminProductSourcesGrid.rowQty('2')}}" userInput="100" stepKey="setCustomSourceQuantity2"/>
             <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveEditedVirtualProduct"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
 
         <after>
@@ -146,8 +146,8 @@
             <argument name="selector" value="AdminProductGridFilterSection.skuFilter"/>
             <argument name="value" value="$$virtualProduct.sku$$"/>
         </actionGroup>
-        <see selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource.source[name]$$)}}" userInput="99" stepKey="checkProductSourceQtyAfterInvoiceCreated"/>
-        <see selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource2.source[name]$$)}}" userInput="100" stepKey="checkProductSource2QtyAfterInvoiceCreated"/>
-        <see selector="{{AdminProductGridSection.productSalableQty('1',$$customStock.stock[name]$$)}}" userInput="197" stepKey="checkSalableQtyAfterInvoiceCreated"/>
+        <waitForText selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource.source[name]$$)}}" userInput="99" stepKey="checkProductSourceQtyAfterInvoiceCreated"/>
+        <waitForText selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource2.source[name]$$)}}" userInput="100" stepKey="checkProductSource2QtyAfterInvoiceCreated"/>
+        <waitForText selector="{{AdminProductGridSection.productSalableQty('1',$$customStock.stock[name]$$)}}" userInput="197" stepKey="checkSalableQtyAfterInvoiceCreated"/>
     </test>
 </tests>

InventoryAdminUi/Test/Mftf/Test/AdminUserApplyToSeveralSimpleProductsMassActionUnAssignProductSourcesOnProductsGridToUnAssignAllAssignedSourcesTest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
+  * Copyright 2025 Adobe
+  * All Rights Reserved.
   */
 -->
 
@@ -17,6 +17,7 @@
             <severity value="CRITICAL"/>
             <group value="msi"/>
             <group value="multi_mode"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

InventoryInStorePickupAdminUi/Test/Mftf/Test/StorePickupDeliveryMethodHiddenInOrderCreatedFromAdminWhenNotAllProductsAvailableForPickupTest.xml

@@ -15,6 +15,7 @@
             <description value="Store Pickup delivery method hidden in order created from Admin when not all products available for pickup"/>
             <testCaseId value="ACQE-6625"/>
             <severity value="CRITICAL"/>
+            <group value="pr_exclude"/>
         </annotations>
 
         <before>

InventorySourceSelectionApi/Model/Algorithms/Result/GetDefaultSortedSourcesResult.php

@@ -95,7 +95,7 @@ public function execute(
 
         $itemsTdDeliver = [];
         foreach ($inventoryRequest->getItems() as $item) {
-            $normalizedSku = $this->normalizeSku($item->getSku());
+            $normalizedSku = $this->normalizeSku(trim($item->getSku()));
             $itemsTdDeliver[$normalizedSku] = $item->getQty();
         }
 
@@ -111,14 +111,14 @@ public function execute(
             );
 
         foreach ($sourceItems as $sourceItem) {
-            $normalizedSku = $this->normalizeSku($sourceItem->getSku());
+            $normalizedSku = $this->normalizeSku(trim($sourceItem->getSku()));
             $sourceItemQtyAvailable = $this->getSourceItemQtyAvailable->execute($sourceItem);
             $qtyToDeduct = min(max($sourceItemQtyAvailable, 0.0), $itemsTdDeliver[$normalizedSku] ?? 0.0);
 
             $sourceItemSelections[] = $this->sourceSelectionItemFactory->create(
                 [
                     'sourceCode' => $sourceItem->getSourceCode(),
-                    'sku' => $sourceItem->getSku(),
+                    'sku' => trim($sourceItem->getSku()),
                     'qtyToDeduct' => $qtyToDeduct,
                     'qtyAvailable' => $sourceItemQtyAvailable
                 ]