Skip to content

Commit 0b7455f

Browse files
ysapigaysapiga
committed
MAGETWO-70996: [GitHub] Customer Address "default billing address" Attribute Not Used in Checkout #8777 
1 parent 5ec72e4 commit 0b7455f

File tree

5 files changed

+32
-33
lines changed

5 files changed

+32
-33
lines changed

‎app/code/Magento/Braintree/Test/Mftf/Test/BraintreeCreditCardOnCheckoutTest.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@
8787
<waitForPageLoad stepKey="waitForPageLoad10"/>
8888
<click selector="{{BraintreeConfigurationPaymentSection.paymentMethod}}" stepKey="SelectBraintreePaymentMethod1"/>
8989
<waitForPageLoad stepKey="waitForPageLoad11"/>
90-
<click selector="{{CheckoutPaymentSection.shippingAndBillingAddressSame}}" stepKey="CheckCheckBox"/>
91-
<click selector="{{CheckoutPaymentSection.shippingAndBillingAddressSame}}" stepKey="UncheckCheckBox"/>
92-
93-
<click selector="{{CheckoutShippingSection.updateAddress}}" stepKey="clickToUpdate"/>
9490
<waitForPageLoad stepKey="waitForPageLoad12"/>
9591
<!--Place order-->
9692
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="PlaceOrder1"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@
5454
<element name="addressBook" type="button" selector="//a[text()='Address Book']"/>
5555
<element name="noQuotes" type="text" selector=".no-quotes-block"/>
5656
<element name="paymentMethodByName" type="text" selector="//*[@id='checkout-payment-method-load']//*[contains(@class, 'payment-group')]//label[normalize-space(.)='{{var1}}']" parameterized="true"/>
57-
<element name="addressOptionByName" type="text" selector=" //option[text()='{{action}}']" parameterized="true"/>
57+
<element name="billingAddressSelect" type="select" selector="select[name='billing_address_id']"/>
5858
</section>
5959
</sections>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@
2525
<requiredEntity createDataKey="createCategory"/>
2626
</createData>
2727
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
28+
<!--Go to Storefront as Customer-->
29+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
30+
<argument name="Customer" value="$$createCustomer$$" />
31+
</actionGroup>
2832
</before>
2933
<after>
30-
<!--Logout from customer account-->
31-
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
3234
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
3335
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3436
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
37+
<!--Logout from customer account-->
38+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
3539
</after>
36-
<!--Go to Storefront as Customer-->
37-
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
38-
<argument name="Customer" value="$$createCustomer$$" />
39-
</actionGroup>
4040
<!-- Add simple product to cart and go to checkout-->
4141
<actionGroup ref="AddSimpleProductToCart" stepKey="addProductToCart">
4242
<argument name="product" value="$$createProduct$$"/>
@@ -53,7 +53,7 @@
5353
<waitForPageLoad stepKey="waitForAddressSaved"/>
5454
<dontSeeElement selector="{{StorefrontCheckoutAddressPopupSection.newAddressModalPopup}}" stepKey="dontSeeModalPopup"/>
5555
<!--Select Shipping Rate "Flat Rate" and click "Next" button-->
56-
<click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('Flat Rate')}}" stepKey="selectFlatShippingMethod"/>
56+
<actionGroup ref="CheckoutSelectFlatRateShippingMethodActionGroup" stepKey="selectFlatRateShipping"/>
5757
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask2"/>
5858
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNext"/>
5959
<!--Verify that "My billing and shipping address are the same" is unchecked and billing address is preselected-->

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

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -186,20 +186,20 @@
186186
<see selector="{{StorefrontMinicartSection.quantity}}" userInput="1" stepKey="seeCartQuantity2"/>
187187
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="goToCheckoutFromMinicart2" />
188188

189-
<click stepKey="changeShippingAddress" selector="{{CheckoutShippingMethodsSection.shipHereButton}}"/>
190-
<waitForElementNotVisible stepKey="waitForShippingMethodLoaderNotVisible" selector="{{CheckoutShippingMethodsSection.shippingMethodLoader}}" time="30"/>
191-
<waitForElementVisible stepKey="waitForShippingMethodRadioToBeVisible" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" time="30"/>
189+
<click selector="{{CheckoutShippingMethodsSection.shipHereButton}}" stepKey="changeShippingAddress"/>
190+
<waitForElementNotVisible selector="{{CheckoutShippingMethodsSection.shippingMethodLoader}}" time="30" stepKey="waitForShippingMethodLoaderNotVisible"/>
191+
<waitForElementVisible selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" time="30" stepKey="waitForShippingMethodRadioToBeVisible"/>
192192
<waitForPageLoad stepKey="waitForPageLoad23"/>
193-
<click stepKey="selectFirstShippingMethod2" selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}"/>
194-
<waitForElement stepKey="waitForShippingMethodSelect2" selector="{{CheckoutShippingMethodsSection.next}}" time="30"/>
195-
<click stepKey="clickNextOnShippingMethodLoad2" selector="{{CheckoutShippingMethodsSection.next}}" />
193+
<click selector="{{CheckoutShippingMethodsSection.firstShippingMethod}}" stepKey="selectFirstShippingMethod2"/>
194+
<waitForElement selector="{{CheckoutShippingMethodsSection.next}}" time="30" stepKey="waitForShippingMethodSelect2"/>
195+
<click selector="{{CheckoutShippingMethodsSection.next}}" stepKey="clickNextOnShippingMethodLoad2"/>
196196
<!-- Checkout select Check/Money Order payment -->
197197
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment2"/>
198-
<waitForElement stepKey="waitForPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" time="30" />
199-
<see stepKey="seeBillingAddressIsCorrect2" selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" />
200-
<click stepKey="clickPlaceOrderButton2" selector="{{CheckoutPaymentSection.placeOrder}}" />
198+
<waitForElement selector="{{CheckoutPaymentSection.placeOrder}}" time="30" stepKey="waitForPlaceOrderButton2"/>
199+
<see selector="{{CheckoutPaymentSection.billingAddress}}" userInput="{{US_Address_NY.street[0]}}" stepKey="seeBillingAddressIsCorrect2" />
200+
<click selector="{{CheckoutPaymentSection.placeOrder}}" stepKey="clickPlaceOrderButton2"/>
201201
<waitForPageLoad stepKey="waitForOrderSuccessPage2"/>
202-
<see stepKey="seeSuccessMessage2" selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" />
202+
<see selector="{{CheckoutSuccessMainSection.success}}" userInput="Your order number is:" stepKey="seeSuccessMessage2"/>
203203
</test>
204204
<test name="StorefrontCustomerCheckoutTestWithRestrictedCountriesForPayment">
205205
<annotations>
@@ -216,18 +216,18 @@
216216
<createData entity="ApiSimpleProduct" stepKey="createProduct">
217217
<requiredEntity createDataKey="createCategory"/>
218218
</createData>
219-
<magentoCLI stepKey="setShowBillingAddressOnCheckout" command="config:set checkout/options/display_billing_address_on 1" />
220-
<magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 1" />
221-
<magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry GB" />
219+
<magentoCLI command="config:set checkout/options/display_billing_address_on 1" stepKey="setShowBillingAddressOnPaymentPage" />
220+
<magentoCLI command="config:set payment/checkmo/allowspecific 1" stepKey="allowSpecificValue" />
221+
<magentoCLI command="config:set payment/checkmo/specificcountry GB" stepKey="specificCountryValue" />
222222
<createData entity="Simple_US_Customer" stepKey="simpleuscustomer"/>
223223
</before>
224224
<after>
225-
<amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
226225
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
227226
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
228-
<magentoCLI stepKey="allowSpecificValue" command="config:set payment/checkmo/allowspecific 0" />
229-
<magentoCLI stepKey="specificCountryValue" command="config:set payment/checkmo/specificcountry ''" />
230-
<magentoCLI stepKey="setShowBillingAddressOnCheckout" command="config:set checkout/options/display_billing_address_on 0" />
227+
<magentoCLI command="config:set payment/checkmo/allowspecific 0" stepKey="allowSpecificValue" />
228+
<magentoCLI command="config:set payment/checkmo/specificcountry ''" stepKey="specificCountryValue" />
229+
<magentoCLI command="config:set checkout/options/display_billing_address_on 0" stepKey="setDisplayBillingAddressOnPaymentMethod" />
230+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
231231
</after>
232232
<!-- Login as Customer -->
233233
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
@@ -255,9 +255,9 @@
255255
<dontsee selector="{{CheckoutPaymentSection.paymentMethodByName('Check / Money order')}}" stepKey="paymentMethodDoesNotAvailable"/>
256256

257257
<!-- Fill UK Address and verify that payment available and checkout successful -->
258-
<click selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="UncheckCheckCheckBox"/>
258+
<uncheckOption selector="{{StorefrontCheckoutPaymentMethodSection.billingAddressSameAsShippingShared}}" stepKey="uncheckBillingAddressSameAsShippingCheckCheckBox"/>
259259
<click selector="{{CheckoutShippingSection.addressDropdown}}" stepKey="clickOnAddressDropDown"/>
260-
<click selector="{{CheckoutPaymentSection.addressOptionByName('New Address')}}" stepKey="clickOnNewAddress"/>
260+
<selectOption selector="{{CheckoutPaymentSection.billingAddressSelect}}" userInput="New Address" stepKey="clickOnNewAddress"/>
261261
<waitForPageLoad stepKey="waitNewAddressBillingForm"/>
262262
<actionGroup ref="LoggedInCheckoutFillNewBillingAddressActionGroup" stepKey="changeAddress">
263263
<argument name="Address" value="updateCustomerUKAddress"/>

‎app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,11 +244,14 @@ define([
244244
}
245245

246246
if (quote.isVirtual() || !quote.billingAddress()) {
247-
addressList.some(function (addrs) {
247+
isBillingAddressInitialized = addressList.some(function (addrs) {
248248
if (addrs.isDefaultBilling()) {
249249
selectBillingAddress(addrs);
250-
isBillingAddressInitialized = true;
250+
251+
return true;
251252
}
253+
254+
return false;
252255
});
253256
}
254257

0 commit comments

Comments
 (0)