Skip to content

Commit 860f46f

Browse files
svitjasvitja
committed
Merge remote-tracking branch 'origin/2.2-develop-pr69' into 2.2-develop-pr69
2 parents 5f67587 + 63bd239 commit 860f46f

9 files changed

+160
-5
lines changed

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ class ShippingInformationManagement implements \Magento\Checkout\Api\ShippingInf
9898
* @param \Magento\Customer\Api\AddressRepositoryInterface $addressRepository
9999
* @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
100100
* @param \Magento\Quote\Model\Quote\TotalsCollector $totalsCollector
101-
* @param CartExtensionFactory|null $cartExtensionFactory,
102-
* @param ShippingAssignmentFactory|null $shippingAssignmentFactory,
101+
* @param CartExtensionFactory|null $cartExtensionFactory
102+
* @param ShippingAssignmentFactory|null $shippingAssignmentFactory
103103
* @param ShippingFactory|null $shippingFactory
104104
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
105105
*/
@@ -150,6 +150,10 @@ public function saveAddressInformation(
150150
$address->setCustomerAddressId(null);
151151
}
152152

153+
if ($billingAddress && !$billingAddress->getCustomerAddressId()) {
154+
$billingAddress->setCustomerAddressId(null);
155+
}
156+
153157
if (!$address->getCountryId()) {
154158
throw new StateException(__('Shipping address is not set'));
155159
}
@@ -203,6 +207,8 @@ protected function validateQuote(\Magento\Quote\Model\Quote $quote)
203207
}
204208

205209
/**
210+
* Prepare shipping assignment.
211+
*
206212
* @param CartInterface $quote
207213
* @param AddressInterface $address
208214
* @param string $method

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/GuestCheckoutFillingShippingSectionActionGroup.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,13 @@
3232
<seeInCurrentUrl url="{{CheckoutPage.url}}/#payment" stepKey="assertCheckoutPaymentUrl"/>
3333
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask1"/>
3434
</actionGroup>
35+
36+
<actionGroup name="GuestCheckoutFillingShippingSectionWithoutPaymentsActionGroup" extends="GuestCheckoutFillingShippingSectionActionGroup">
37+
<waitForElement selector="{{CheckoutPaymentSection.isPaymentSection}}" time="30" stepKey="waitForPaymentSectionLoaded"/>
38+
</actionGroup>
39+
40+
<actionGroup name="GuestCheckoutFillingShippingSectionWithoutRegionActionGroup" extends="GuestCheckoutFillingShippingSectionActionGroup">
41+
<selectOption selector="{{CheckoutShippingSection.country}}" userInput="{{customerAddressVar.country}}" after="enterPostcode" stepKey="selectCountry"/>
42+
<remove keyForRemoval="selectRegion"/>
43+
</actionGroup>
3544
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<!-- Logged in user checkout add new adress shipping section -->
1212
<actionGroup name="LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup">
1313
<arguments>
@@ -21,6 +21,14 @@
2121
<fillField selector="{{CheckoutShippingSection.addTelephone}}" userInput="{{customerAddressVar.telephone}}" stepKey="enterTelephone"/>
2222
<click selector="{{CheckoutShippingSection.addSaveButton}}" stepKey="clickSaveAdressAdd"/>
2323
<waitForPageLoad stepKey="waitPageLoad"/>
24-
<see stepKey="seeRegionSelected" selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.state}}"/>
24+
<see selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.state}}" stepKey="seeRegionSelected"/>
25+
</actionGroup>
26+
27+
<actionGroup name="LoggedInUserCheckoutAddNewShippingSectionWithoutRegionActionGroup"
28+
extends="LoggedInUserCheckoutAddNewAddressInShippingSectionActionGroup">
29+
<remove keyForRemoval="selectRegion"/>
30+
<remove keyForRemoval="seeRegionSelected"/>
31+
<selectOption selector="{{CheckoutShippingSection.addCountry}}" userInput="{{customerAddressVar.country}}" after="enterPostcode" stepKey="enterCountry"/>
32+
<see selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{customerAddressVar.city}}" after="waitPageLoad" stepKey="seeCitySelected"/>
2533
</actionGroup>
2634
</actionGroups>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,6 @@
4242
<element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
4343
<element name="orderSummaryTotal" type="text" selector="tr.grand.totals span.price" />
4444
<element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[contains(., '{{paymentName}}')]/..//input[@type='radio']" parameterized="true"/>
45+
<element name="noPaymentMethods" type="text" selector=".no-quotes-block"/>
4546
</section>
4647
</sections>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<element name="addState" type="select" selector="#shipping-new-address-form select[name='region_id']"/>
3131
<element name="addPostcode" type="input" selector="#shipping-new-address-form input[name='postcode']"/>
3232
<element name="addTelephone" type="input" selector="#shipping-new-address-form input[name='telephone']"/>
33-
<element name="addcCountry" type="select" selector="#shipping-new-address-form select[name='country_id']"/>
33+
<element name="addCountry" type="select" selector="#shipping-new-address-form select[name='country_id']"/>
3434
<element name="addSaveButton" type="button" selector=".action.primary.action-save-address"/>
3535
<element name="editActiveAddress" type="button" selector="//div[@class='shipping-address-item selected-item']//span[text()='Edit']" timeout="30"/>
3636
</section>

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

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
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="StorefrontCustomerCheckoutTestWithRestrictedCountriesForPaymentTest"
12+
extends="StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest">
13+
<annotations>
14+
<stories value="Checkout via the Storefront"/>
15+
<title value="Checkout via Customer Checkout with restricted countries for payment"/>
16+
<description value="Should be able to place an order as a Customer with restricted countries for payment."/>
17+
<testCaseId value="MC-10831"/>
18+
</annotations>
19+
<before>
20+
<createData entity="Simple_US_Customer" stepKey="createSimpleUsCustomer"/>
21+
</before>
22+
<after>
23+
<actionGroup ref="CustomerLogoutStorefrontActionGroup" stepKey="customerLogoutStorefront"/>
24+
<deleteData createDataKey="createSimpleUsCustomer" stepKey="deleteCustomer"/>
25+
</after>
26+
27+
<remove keyForRemoval="guestCheckoutFillingShippingSection"/>
28+
<remove keyForRemoval="guestCheckoutFillingShippingSectionUK"/>
29+
<remove keyForRemoval="guestPlaceOrder"/>
30+
31+
<!-- Login as Customer -->
32+
<actionGroup ref="CustomerLoginOnStorefront" before="goToProductPage" stepKey="customerLogin">
33+
<argument name="customer" value="$$createSimpleUsCustomer$$" />
34+
</actionGroup>
35+
36+
<!-- Select address and go to payments page-->
37+
<see selector="{{CheckoutShippingSection.selectedShippingAddress}}" userInput="{{US_Address_TX.state}}" after="shippingStepIsOpened" stepKey="seeRegion" />
38+
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" after="seeRegion" stepKey="waitNextButton"/>
39+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" after="waitNextButton" stepKey="selectShippingMethod"/>
40+
<click selector="{{CheckoutShippingMethodsSection.next}}" after="selectShippingMethod" stepKey="clickNextButton" />
41+
<waitForPageLoad after="clickNextButton" stepKey="waitBillingForm"/>
42+
<seeElement selector="{{CheckoutPaymentSection.isPaymentSection}}" after="waitBillingForm" stepKey="checkoutPaymentStepIsOpened"/>
43+
44+
<!-- Fill UK Address and verify that payment available and checkout successful -->
45+
<click selector="{{CheckoutShippingSection.newAdress}}" after="shippingStepIsOpened1" stepKey="fillNewAddress" />
46+
<actionGroup ref="LoggedInUserCheckoutAddNewShippingSectionWithoutRegionActionGroup" after="fillNewAddress" stepKey="customerCheckoutFillingShippingSectionUK">
47+
<argument name="customerVar" value="$$createSimpleUsCustomer$$" />
48+
<argument name="customerAddressVar" value="UK_Default_Address" />
49+
</actionGroup>
50+
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" after="customerCheckoutFillingShippingSectionUK" stepKey="waitNextButton1"/>
51+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" after="waitNextButton1" stepKey="selectShippingMethod1"/>
52+
<click selector="{{CheckoutShippingMethodsSection.next}}" after="selectShippingMethod1" stepKey="clickNextButton1" />
53+
54+
<actionGroup ref="CheckoutPlaceOrderActionGroup" after="selectCheckMoneyOrderPayment" stepKey="customerPlaceorder">
55+
<argument name="orderNumberMessage" value="CONST.successCheckoutOrderNumberMessage" />
56+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
57+
</actionGroup>
58+
</test>
59+
</tests>

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

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
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="StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Checkout via Guest Checkout"/>
15+
<title value="Checkout via Guest Checkout with restricted countries for payment"/>
16+
<description value="Should be able to place an order as a Guest with restricted countries for payment."/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-8243"/>
19+
<group value="checkout"/>
20+
</annotations>
21+
<before>
22+
<createData entity="_defaultCategory" stepKey="createCategory"/>
23+
<createData entity="ApiSimpleProduct" stepKey="createProduct">
24+
<requiredEntity createDataKey="createCategory"/>
25+
</createData>
26+
<magentoCLI command="config:set payment/checkmo/allowspecific" arguments="1" stepKey="setAllowSpecificCountiesValue" />
27+
<magentoCLI command="config:set payment/checkmo/specificcountry" arguments="GB" stepKey="setSpecificCountryValue" />
28+
</before>
29+
<after>
30+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
31+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
32+
<magentoCLI command="config:set payment/checkmo/allowspecific" arguments="0" stepKey="unsetAllowSpecificCountiesValue"/>
33+
<magentoCLI command="config:set payment/checkmo/specificcountry" arguments="''" stepKey="unsetSpecificCountryValue" />
34+
</after>
35+
36+
<!-- Add product to cart -->
37+
<amOnPage url="{{StorefrontProductPage.url($$createProduct.sku$$)}}" stepKey="goToProductPage"/>
38+
<actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addProductToCart">
39+
<argument name="productName" value="$$createProduct.name$$"/>
40+
</actionGroup>
41+
<!-- Go to checkout page -->
42+
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart" />
43+
44+
<!-- Fill US Address and verify that no payment available -->
45+
<seeElement selector="{{CheckoutShippingSection.isShippingStep}}" stepKey="shippingStepIsOpened"/>
46+
<actionGroup ref="GuestCheckoutFillingShippingSectionWithoutPaymentsActionGroup" stepKey="guestCheckoutFillingShippingSection">
47+
<argument name="customerVar" value="Simple_US_Customer"/>
48+
<argument name="customerAddressVar" value="US_Address_TX"/>
49+
<argument name="shippingMethod" value="Flat Rate" type="string"/>
50+
</actionGroup>
51+
52+
<waitForElementVisible selector="{{CheckoutPaymentSection.noPaymentMethods}}" stepKey="waitMessage"/>
53+
<see userInput="No Payment method available." stepKey="checkMessage"/>
54+
55+
<!-- Fill UK Address and verify that payment available and checkout successful -->
56+
<click selector="{{CheckoutHeaderSection.shippingMethodStep}}" stepKey="goToShipping" />
57+
<waitForElementVisible selector="{{CheckoutShippingSection.isShippingStep}}" stepKey="shippingStepIsOpened1"/>
58+
59+
<actionGroup ref="GuestCheckoutFillingShippingSectionWithoutRegionActionGroup" stepKey="guestCheckoutFillingShippingSectionUK">
60+
<argument name="customerVar" value="Simple_US_Customer" />
61+
<argument name="customerAddressVar" value="UK_Default_Address" />
62+
<argument name="shippingMethod" value="Flat Rate" type="string"/>
63+
</actionGroup>
64+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrderPayment" />
65+
<actionGroup ref="CheckoutPlaceOrderActionGroup" stepKey="guestPlaceOrder">
66+
<argument name="orderNumberMessage" value="CONST.successGuestCheckoutOrderNumberMessage" />
67+
<argument name="emailYouMessage" value="CONST.successCheckoutEmailYouMessage" />
68+
</actionGroup>
69+
</test>
70+
</tests>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ define([
247247
*/
248248
setShippingInformation: function () {
249249
if (this.validateShippingInformation()) {
250+
quote.billingAddress(null);
250251
checkoutDataResolver.resolveBillingAddress();
251252
setShippingInformationAction().done(
252253
function () {

‎app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<data key="state"></data>
102102
<data key="postcode">SE1 7RW</data>
103103
<data key="country_id">GB</data>
104+
<data key="country">United Kingdom</data>
104105
<data key="telephone">444-44-444-44</data>
105106
</entity>
106107
</entities>

0 commit comments

Comments
 (0)