Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into L3-PR-2022-04-19

alzota · alzota · commit e2f90ec7248b · 2022-05-03T18:52:52.000+03:00
diff --git a/app/code/Magento/Paypal/Block/Adminhtml/System/Config/PayLaterLink.php b/app/code/Magento/Paypal/Block/Adminhtml/System/Config/PayLaterLink.php
@@ -29,7 +29,7 @@ class PayLaterLink extends Field
     /**
      * @var array.
      */
-    private const ARRAY_PAYLATER_SUPPORTED_COUNTRIES = ['US','GB','DE','FR','AU'];
+    private const ARRAY_PAYLATER_SUPPORTED_COUNTRIES = ['US','GB','DE','FR','AU','IT','ES'];
 
     /**
      * @var ScopeConfigInterface
diff --git a/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php b/app/code/Magento/Paypal/Controller/Express/OnAuthorization.php
@@ -33,16 +33,19 @@
 class OnAuthorization extends AbstractExpress implements HttpPostActionInterface
 {
     /**
+     * @var PayPalConfig
      * @inheritdoc
      */
     protected $_configType = PayPalConfig::class;
 
     /**
+     * @var PayPalConfig
      * @inheritdoc
      */
     protected $_configMethod = PayPalConfig::METHOD_WPP_EXPRESS;
 
     /**
+     * @var PayPalCheckout
      * @inheritdoc
      */
     protected $_checkoutType = PayPalCheckout::class;
@@ -53,8 +56,6 @@ class OnAuthorization extends AbstractExpress implements HttpPostActionInterface
     private $cartRepository;
 
     /**
-     * Url Builder
-     *
      * @var UrlInterface
      */
     private $urlBuilder;
@@ -116,6 +117,7 @@ public function execute(): ResultInterface
         $controllerResult = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         $payerId = $this->getRequest()->getParam('payerId');
         $tokenId = $this->getRequest()->getParam('paymentToken');
+        $fundingSource = $this->getRequest()->getParam('paypalFundingSource');
 
         try {
             $quote = $this->_getQuote();
@@ -127,6 +129,7 @@ public function execute(): ResultInterface
 
             /** Populate checkout object with new data */
             $this->_initCheckout($quote);
+            $quote->getPayment()->setAdditionalInformation(PayPalCheckout::PAYMENT_INFO_FUNDING_SOURCE, $fundingSource);
             /**  Populate quote  with information about billing and shipping addresses*/
             $this->_checkout->returnFromPaypal($tokenId, $payerId);
             if ($this->_checkout->canSkipOrderReviewStep()) {
diff --git a/app/code/Magento/Paypal/Model/Express/Checkout.php b/app/code/Magento/Paypal/Model/Express/Checkout.php
@@ -42,6 +42,7 @@ class Checkout
     public const PAYMENT_INFO_TRANSPORT_PAYER_ID = 'paypal_express_checkout_payer_id';
     public const PAYMENT_INFO_TRANSPORT_REDIRECT = 'paypal_express_checkout_redirect_required';
     public const PAYMENT_INFO_TRANSPORT_BILLING_AGREEMENT = 'paypal_ec_create_ba';
+    public const PAYMENT_INFO_FUNDING_SOURCE = 'paypal_funding_source';
 
     /**
      * Flag which says that was used PayPal Express Checkout button for checkout
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/AdminRegionalLinkForPayLaterTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/AdminRegionalLinkForPayLaterTest.xml
@@ -44,5 +44,12 @@
             <argument name="enabledOption" value="Yes"/>
             <argument name="countryCode" value="us"/>
         </actionGroup>
+        <selectOption selector="{{PaymentsConfigSection.merchantCountry}}" userInput="Italy" stepKey="setMerchantCountry4"/>
+        <waitForPageLoad stepKey="waitForPageLoa4"/>
+        <actionGroup ref="AdminPayPalRegionalLinkOtherActionGroup" stepKey="verifyPayPalCommentCommentLink4">
+            <argument name="payPalConfigType" value="PayPalExpressCheckoutOtherCountryConfigSection"/>
+            <argument name="enabledOption" value="Yes"/>
+            <argument name="countryCode" value="it"/>
+        </actionGroup>
     </test>
 </tests>
diff --git a/app/code/Magento/Paypal/ViewModel/PaypalFundingSourceDataProvider.php b/app/code/Magento/Paypal/ViewModel/PaypalFundingSourceDataProvider.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\ViewModel;
+
+use Magento\Checkout\Model\Session;
+use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Paypal\Model\Express\Checkout;
+
+/**
+ * Provides Paypal funding source data
+ *
+ */
+class PaypalFundingSourceDataProvider implements ArgumentInterface
+{
+    /**
+     * @var Session
+     */
+    private $checkoutSession;
+
+    /**
+     * @param Session $checkoutSession
+     */
+    public function __construct(
+        Session $checkoutSession
+    ) {
+        $this->checkoutSession = $checkoutSession;
+    }
+
+    /**
+     * Return paypal funding source
+     *
+     * @return string|null
+     */
+    public function getPaypalFundingSource()
+    {
+        $quote = $this->checkoutSession->getQuote();
+        if ($quote->getPayment()->getAdditionalInformation(Checkout::PAYMENT_INFO_FUNDING_SOURCE)) {
+            return ucfirst($quote->getPayment()->getAdditionalInformation(
+                Checkout::PAYMENT_INFO_FUNDING_SOURCE
+            ));
+        }
+        return null;
+    }
+}
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml b/app/code/Magento/Paypal/etc/adminhtml/system/express_checkout.xml
@@ -108,6 +108,7 @@
                     <config_path>payment/paypal_express/buyer_country</config_path>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
                     <attribute type="shared">1</attribute>
+                    <tooltip>The buyer country determines which funding sources are eligible for a given buyer during testing.</tooltip>
                     <depends>
                         <field id="sandbox_flag">1</field>
                     </depends>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_advanced.xml
@@ -60,6 +60,7 @@
                     <config_path>payment/payflow_advanced/buyer_country</config_path>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
                     <attribute type="shared">1</attribute>
+                    <tooltip>The buyer country determines which funding sources are eligible for a given buyer during testing.</tooltip>
                     <depends>
                         <field id="sandbox_flag">1</field>
                     </depends>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml b/app/code/Magento/Paypal/etc/adminhtml/system/payflow_link.xml
@@ -60,6 +60,7 @@
                     <label>Buyer Country</label>
                     <config_path>payment/payflow_link/buyer_country</config_path>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <tooltip>The buyer country determines which funding sources are eligible for a given buyer during testing.</tooltip>
                     <attribute type="shared">1</attribute>
                     <depends>
                         <field id="sandbox_flag">1</field>
diff --git a/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml b/app/code/Magento/Paypal/etc/adminhtml/system/paypal_payflowpro.xml
@@ -55,6 +55,7 @@
                     <label>Buyer Country</label>
                     <config_path>payment/payflowpro/buyer_country</config_path>
                     <source_model>Magento\Directory\Model\Config\Source\Country</source_model>
+                    <tooltip>The buyer country determines which funding sources are eligible for a given buyer during testing.</tooltip>
                     <attribute type="shared">1</attribute>
                     <depends>
                         <field id="sandbox_flag">1</field>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_express_review.xml
@@ -20,6 +20,9 @@
         </referenceContainer>
         <referenceContainer name="content">
             <block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review" template="Magento_Paypal::express/review.phtml">
+                <arguments>
+                    <argument name="PaypalFundingSourceDataProvider" xsi:type="object">Magento\Paypal\ViewModel\PaypalFundingSourceDataProvider</argument>
+                </arguments>
                 <block class="Magento\Paypal\Block\Express\Review" name="express.review.shipping.method" as="shipping_method" template="Magento_Paypal::express/review/shipping/method.phtml"/>
                 <block class="Magento\Framework\View\Element\Text\ListText" name="paypal.additional.actions">
                     <block class="Magento\Checkout\Block\Cart\Coupon" name="paypal.cart.coupon" as="coupon" template="Magento_Checkout::cart/coupon.phtml"/>
diff --git a/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml b/app/code/Magento/Paypal/view/frontend/layout/paypal_payflowexpress_review.xml
@@ -20,6 +20,9 @@
         </referenceContainer>
         <referenceContainer name="content">
             <block class="Magento\Paypal\Block\Express\Review" name="paypal.express.review" template="Magento_Paypal::express/review.phtml">
+                <arguments>
+                    <argument name="PaypalFundingSourceDataProvider" xsi:type="object">Magento\Paypal\ViewModel\PaypalFundingSourceDataProvider</argument>
+                </arguments>
                 <action method="setControllerPath">
                     <argument name="prefix" xsi:type="string">paypal/payflowexpress</argument>
                 </action>
diff --git a/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml b/app/code/Magento/Paypal/view/frontend/templates/express/review.phtml
@@ -13,6 +13,9 @@ use Magento\Paypal\Block\Express\Review;
  * @var Escaper $escaper
  * @var SecureHtmlRenderer $secureRenderer
  */
+
+/** @var \Magento\Paypal\ViewModel\PaypalFundingSourceDataProvider $paypalFundingSourceDataProvider */
+$paypalFundingSourceDataProvider = $block->getData('PaypalFundingSourceDataProvider');
 ?>
 <div class="paypal-review view">
     <div class="block block-order-details-view">
@@ -101,7 +104,8 @@ use Magento\Paypal\Block\Express\Review;
             <div class="box box-order-billing-address">
                 <strong class="box-title"><span><?= $escaper->escapeHtml(__('Payment Method')) ?></span></strong>
                 <div class="box-content">
-                    <?= $escaper->escapeHtml($block->getPaymentMethodTitle()) ?><br>
+                    <?= $escaper->escapeHtml($paypalFundingSourceDataProvider->getPaypalFundingSource()
+                        ?? $block->getPaymentMethodTitle()) ?><br>
                     <?= $escaper->escapeHtml($block->getEmail()) ?> <br>
                     <img src="https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-medium.png"
                          alt="<?= $block->escapeHtml(__('Buy now with PayPal')) ?>"/>
@@ -150,6 +154,7 @@ use Magento\Paypal\Block\Express\Review;
         </form>
     </div>
 </div>
+<?php // phpcs:ignore Magento2.Legacy.PhtmlTemplate ?>
 <script type="text/x-magento-init">
     {
         "#order-review-form": {
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js b/app/code/Magento/Paypal/view/frontend/web/js/in-context/express-checkout-smart-buttons.js
@@ -7,8 +7,9 @@ define([
     'underscore',
     'jquery',
     'Magento_Paypal/js/in-context/paypal-sdk',
+    'Magento_Customer/js/customer-data',
     'domReady!'
-], function (_, $, paypalSdk) {
+], function (_, $, paypalSdk, customerData) {
     'use strict';
 
     /**
@@ -47,6 +48,7 @@ define([
         var params = {
             paymentToken: data.orderID,
             payerId: data.payerID,
+            paypalFundingSource: customerData.get('paypal-funding-source'),
             'form_key': clientConfig.formKey
         };
 
@@ -56,8 +58,10 @@ define([
                     $.post(clientConfig.onAuthorizeUrl, params).done(function (res) {
                         clientConfig.rendererComponent
                             .afterOnAuthorize(res, deferred.resolve, deferred.reject, actions);
+                        customerData.set('paypal-funding-source', '');
                     }).fail(function (jqXHR, textStatus, err) {
                         clientConfig.rendererComponent.catchOnAuthorize(err, deferred.resolve, deferred.reject);
+                        customerData.set('paypal-funding-source', '');
                     });
                 });
         }).promise();
@@ -97,7 +101,8 @@ define([
                 /**
                  * Execute logic on Paypal button click
                  */
-                onClick: function () {
+                onClick: function (data) {
+                    customerData.set('paypal-funding-source', data.fundingSource);
                     clientConfig.rendererComponent.validate();
                     clientConfig.rendererComponent.onClick();
                 },
