Skip to content

Commit 4972858

Browse files
serhii-balkoserhii-balko
committed
Merge remote-tracking branch 'origin/MC-36088' into 2.4-develop-pr40
2 parents 70223c0 + 965bb72 commit 4972858

File tree

7 files changed

+84
-1
lines changed

7 files changed

+84
-1
lines changed

‎app/code/Magento/Checkout/Model/ShippingInformationManagement.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,11 @@ public function saveAddressInformation(
209209
if (!$quote->getIsVirtual()
210210
&& !$shippingAddress->getShippingRateByCode($shippingAddress->getShippingMethod())
211211
) {
212-
throw new NoSuchEntityException(
212+
$errorMessage = $methodCode ?
213213
__('Carrier with such method not found: %1, %2', $carrierCode, $methodCode)
214+
: __('The shipping method is missing. Select the shipping method and try again.');
215+
throw new NoSuchEntityException(
216+
$errorMessage
214217
);
215218
}
216219

‎app/code/Magento/Checkout/Test/Mftf/Data/ConfigData.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@
8181
<data key="label">All Allowed Countries</data>
8282
<data key="value">0</data>
8383
</entity>
84+
<entity name="EnableFlatRateShowMethodNoApplicableConfigData">
85+
<data key="path">carriers/flatrate/showmethod</data>
86+
<data key="scope">carriers</data>
87+
<data key="scope_id">1</data>
88+
<data key="label">Show Method if Not Applicable</data>
89+
<data key="value">1</data>
90+
</entity>
8491
<entity name="DisableFlatRateConfigData">
8592
<data key="path">carriers/flatrate/active</data>
8693
<data key="scope">carriers</data>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutShippingMethodsSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,6 @@
2020
<element name="shippingMethodLoader" type="button" selector="//div[contains(@class, 'checkout-shipping-method')]/following-sibling::div[contains(@class, 'loading-mask')]"/>
2121
<element name="freeShippingShippingMethod" type="input" selector="#s_method_freeshipping_freeshipping" timeout="30"/>
2222
<element name="noQuotesMsg" type="text" selector="#checkout-step-shipping_method div"/>
23+
<element name="price" type="text" selector="//*[@id='checkout-shipping-method-load']//td[@class='col col-price']"/>
2324
</section>
2425
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontCheckoutForShowShippingMethodNoApplicableTest.xml

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="StorefrontCheckoutForShowShippingMethodNoApplicableTest">
12+
<annotations>
13+
<stories value="Checkout for not applicable shipping method"/>
14+
<title value="Storefront checkout for not applicable shipping method test"/>
15+
<description value="Checkout flow if shipping rates are not applicable"/>
16+
<severity value="AVERAGE"/>
17+
<testCaseId value="MC-37420"/>
18+
<group value="checkout"/>
19+
</annotations>
20+
<before>
21+
<!-- Create simple product -->
22+
<createData entity="SimpleProduct2" stepKey="createProduct"/>
23+
<!-- Enable flat rate shipping to specific country - Afghanistan -->
24+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
25+
<magentoCLI command="config:set {{EnableFlatRateToSpecificCountriesConfigData.path}} {{EnableFlatRateToSpecificCountriesConfigData.value}}" stepKey="allowFlatRateSpecificCountries"/>
26+
<magentoCLI command="config:set {{EnableFlatRateToAfghanistanConfigData.path}} {{EnableFlatRateToAfghanistanConfigData.value}}" stepKey="enableFlatRateToAfghanistan"/>
27+
<!-- Enable Show Method if Not Applicable-->
28+
<magentoCLI command="config:set {{EnableFlatRateShowMethodNoApplicableConfigData.path}} {{EnableFlatRateShowMethodNoApplicableConfigData.value}}" stepKey="enableShowMethodNoApplicable"/>
29+
<!-- Create Customer with filled Shipping & Billing Address -->
30+
<createData entity="CustomerEntityOne" stepKey="createCustomer"/>
31+
</before>
32+
<after>
33+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutFromStorefront"/>
34+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
35+
<magentoCLI command="config:set {{EnableFlatRateToAllAllowedCountriesConfigData.path}} {{EnableFlatRateToAllAllowedCountriesConfigData.value}}" stepKey="allowFlatRateToAllCountries"/>
36+
<magentoCLI command="config:set {{EnableFlatRateShowMethodNoApplicableConfigData.path}} 0" stepKey="disableShowMethodNoApplicable"/>
37+
<!-- Delete product -->
38+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
39+
</after>
40+
<!-- Login with created Customer -->
41+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
42+
<argument name="Customer" value="$$createCustomer$$"/>
43+
</actionGroup>
44+
<!-- Add product to cart -->
45+
<actionGroup ref="OpenStoreFrontProductPageActionGroup" stepKey="openProductPage">
46+
<argument name="productUrlKey" value="$$createProduct.custom_attributes[url_key]$$"/>
47+
</actionGroup>
48+
<actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
49+
<argument name="product" value="$$createProduct$$"/>
50+
<argument name="productCount" value="1"/>
51+
</actionGroup>
52+
<!-- Go to checkout page -->
53+
<actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="openCheckoutShippingPage"/>
54+
<!-- Assert shipping price for US > California -->
55+
<dontSeeElement selector="{{CheckoutShippingMethodsSection.price}}" stepKey="dontSeePrice"/>
56+
<!-- Assert Next button is available -->
57+
<seeElement selector="{{CheckoutShippingMethodsSection.next}}" stepKey="seeNextButton"/>
58+
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNextButton"/>
59+
<!-- Assert order cannot be placed and error message will shown. -->
60+
<waitForPageLoad stepKey="waitForError"/>
61+
<see stepKey="seeShippingMethodError" userInput="The shipping method is missing. Select the shipping method and try again."/>
62+
</test>
63+
</tests>

‎app/code/Magento/Checkout/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,3 +185,4 @@ Payment,Payment
185185
"Close","Close"
186186
"Show Cross-sell Items in the Shopping Cart","Show Cross-sell Items in the Shopping Cart"
187187
"You added %1 to your <a href=""%2"">shopping cart</a>.","You added %1 to your <a href=""%2"">shopping cart</a>."
188+
"The shipping method is missing. Select the shipping method and try again.","The shipping method is missing. Select the shipping method and try again."

‎app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,12 @@ define([
299299
this.source.set('params.invalid', false);
300300
this.triggerShippingDataValidateEvent();
301301

302+
if (!quote.shippingMethod()['method_code']) {
303+
this.errorValidationMessage(
304+
$t('The shipping method is missing. Select the shipping method and try again.')
305+
);
306+
}
307+
302308
if (emailValidationResult &&
303309
this.source.get('params.invalid') ||
304310
!quote.shippingMethod()['method_code'] ||

‎app/code/Magento/Checkout/view/frontend/web/template/shipping-address/shipping-method-item.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
attr="'aria-labelledby': 'label_method_' + method.method_code + '_' + method.carrier_code + ' ' + 'label_carrier_' + method.method_code + '_' + method.carrier_code,
1616
'checked': element.rates().length == 1 || element.isSelected" />
1717
</td>
18+
<!-- ko ifnot: (method.error_message) -->
1819
<td class="col col-price">
1920
<each args="element.getRegion('price')" render="" />
2021
</td>
22+
<!-- /ko -->
2123
<td class="col col-method"
2224
attr="'id': 'label_method_' + method.method_code + '_' + method.carrier_code"
2325
text="method.method_title" />

0 commit comments

Comments
 (0)