Merge remote-tracking branch 'github-magento2ce/MC-16375' into EPAM-PR-71

Author: nikshostko

app/code/Magento/Braintree/Plugin/DisableQuoteAddressValidation.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Braintree\Plugin;
+
+use Magento\Quote\Model\QuoteManagement;
+use Magento\Quote\Api\CartManagementInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Plugin for QuoteManagement to disable quote address validation
+ */
+class DisableQuoteAddressValidation
+{
+    /**
+     * Disable quote address validation before submit order
+     *
+     * @param QuoteManagement $subject
+     * @param Quote $quote
+     * @param array $orderData
+     * @return array
+     * @throws \Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function beforeSubmit(
+        QuoteManagement $subject,
+        Quote $quote,
+        $orderData = []
+    ) {
+        if ($quote->getPayment()->getMethod() == 'braintree_paypal' &&
+            $quote->getCheckoutMethod() == CartManagementInterface::METHOD_GUEST) {
+            $billingAddress = $quote->getBillingAddress();
+            $billingAddress->setShouldIgnoreValidation(true);
+            $quote->setBillingAddress($billingAddress);
+        }
+        return [$quote, $orderData];
+    }
+}

app/code/Magento/Braintree/etc/di.xml

@@ -627,4 +627,7 @@
     <type name="Magento\Quote\Api\CartManagementInterface">
         <plugin name="order_cancellation" type="Magento\Braintree\Plugin\OrderCancellation"/>
     </type>
+    <type name="Magento\Quote\Model\QuoteManagement">
+        <plugin name="disable_quote_address_validation" type="Magento\Braintree\Plugin\DisableQuoteAddressValidation"/>
+    </type>
 </config>

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -187,17 +187,17 @@ define([
          */
         setBillingAddress: function (customer, address) {
             var billingAddress = {
-                street: [address.streetAddress],
-                city: address.locality,
+                street: [address.line1],
+                city: address.city,
                 postcode: address.postalCode,
-                countryId: address.countryCodeAlpha2,
+                countryId: address.countryCode,
                 email: customer.email,
                 firstname: customer.firstName,
                 lastname: customer.lastName,
-                telephone: customer.phone
+                telephone: customer.phone,
+                regionCode: address.state
             };
 
-            billingAddress['region_code'] = address.region;
             billingAddress = createBillingAddress(billingAddress);
             quote.billingAddress(billingAddress);
         },
@@ -209,10 +209,12 @@ define([
         beforePlaceOrder: function (payload) {
             this.setPaymentPayload(payload);
 
-            if ((this.isRequiredBillingAddress() || quote.billingAddress() === null) &&
-                typeof payload.details.billingAddress !== 'undefined'
-            ) {
-                this.setBillingAddress(payload.details, payload.details.billingAddress);
+            if (this.isRequiredBillingAddress() || quote.billingAddress() === null)  {
+                if (typeof payload.details.billingAddress !== 'undefined') {
+                    this.setBillingAddress(payload.details, payload.details.billingAddress);
+                } else {
+                    this.setBillingAddress(payload.details, payload.details.shippingAddress);
+                }
             }
 
             if (this.isSkipOrderReview()) {

app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontPayPalPaymentActionGroup.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="LoginToPayPalPaymentAccount">
+        <arguments>
+            <argument name="userName" type="string" defaultValue="{{Payer.buyerEmail}}"/>
+            <argument name="password" type="string" defaultValue="{{Payer.buyerPassword}"/>
+        </arguments>
+        <fillField selector="{{PayPalPaymentSection.email}}" userInput="{{userName}}" stepKey="fillEmail"/>
+        <click selector="{{PayPalPaymentSection.nextButton}}" stepKey="clickNext"/>
+        <waitForElementVisible selector="{{PayPalPaymentSection.password}}" stepKey="waitForPasswordField"/>
+        <fillField selector="{{PayPalPaymentSection.password}}" userInput="{{password}}" stepKey="fillPassword"/>
+        <click selector="{{PayPalPaymentSection.loginBtn}}" stepKey="clickLogin"/>
+        <waitForPageLoad stepKey="waitForLoginPageLoad"/>
+        <click selector="{{PayPalPaymentSection.continueButton}}" stepKey="clickContinue"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Paypal/Test/Mftf/Section/PayPalExpressCheckoutConfigSection.xml

@@ -45,6 +45,9 @@
         <element name="color" type="text" selector=".paypal-button-color-{{color}}" parameterized="true"/>
     </section>
     <section name="CheckoutPaymentSection">
+        <element name="email" type="input" selector="#checkout-customer-email"/>
+        <element name="payPalPaymentBraintree" type="radio" selector="#braintree_paypal"/>
+        <element name="payPalFrame" type="iframe" selector="//iframe[contains(@class, 'zoid-component-frame zoid-visible')]" timeout="5"/>
         <element name="PayPalPaymentRadio" type="radio" selector="input#paypal_express.radio" timeout="30"/>
         <element name="PayPalBtn" type="radio" selector=".paypal-button.paypal-button-number-0" timeout="30"/>
     </section>
@@ -58,5 +61,7 @@
         <element name="cartIcon" type="text" selector="#transactionCart"/>
         <element name="itemName" type="text" selector="//span[@title='{{productName}}']" parameterized="true"/>
         <element name="PayPalSubmitBtn" type="text" selector="//input[@type='submit']"/>
+        <element name="nextButton" type="button" selector="#btnNext"/>
+        <element name="continueButton" type="button" selector=".continueButton"/>
     </section>
-</sections>
+</sections>