Skip to content

Commit c3505d0

Browse files
Merge branch 'develop' into ACQE-Version2-functional-mainline-deployment
2 parents f3929ba + c18eb5f commit c3505d0

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

InventoryAdminUi/Test/Mftf/Test/GuestCustomerCreatedOrderWithSimpleProductFromHomepageWithFreeShippingMethodTest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -66,6 +66,7 @@
6666
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckout"/>
6767
<waitForPageLoad stepKey="waitFroPaymentSelectionPageLoad"/>
6868
<actionGroup ref="GuestCheckoutFillingShippingSectionActionGroup" stepKey="fillAddress">
69+
<argument name="shippingMethod" value="Free Shipping"/>
6970
<argument name="customerVar" value="MsiCustomer1"/>
7071
<argument name="customerAddressVar" value="CustomerAddressSimple"/>
7172
</actionGroup>

InventorySourceSelectionApi/Model/Algorithms/Result/GetDefaultSortedSourcesResult.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public function execute(
9595

9696
$itemsTdDeliver = [];
9797
foreach ($inventoryRequest->getItems() as $item) {
98-
$normalizedSku = $this->normalizeSku($item->getSku());
98+
$normalizedSku = $this->normalizeSku(trim($item->getSku()));
9999
$itemsTdDeliver[$normalizedSku] = $item->getQty();
100100
}
101101

@@ -111,14 +111,14 @@ public function execute(
111111
);
112112

113113
foreach ($sourceItems as $sourceItem) {
114-
$normalizedSku = $this->normalizeSku($sourceItem->getSku());
114+
$normalizedSku = $this->normalizeSku(trim($sourceItem->getSku()));
115115
$sourceItemQtyAvailable = $this->getSourceItemQtyAvailable->execute($sourceItem);
116116
$qtyToDeduct = min(max($sourceItemQtyAvailable, 0.0), $itemsTdDeliver[$normalizedSku] ?? 0.0);
117117

118118
$sourceItemSelections[] = $this->sourceSelectionItemFactory->create(
119119
[
120120
'sourceCode' => $sourceItem->getSourceCode(),
121-
'sku' => $sourceItem->getSku(),
121+
'sku' => trim($sourceItem->getSku()),
122122
'qtyToDeduct' => $qtyToDeduct,
123123
'qtyAvailable' => $sourceItemQtyAvailable
124124
]

0 commit comments

Comments
 (0)