Merge branch '2.4-develop' into 2.4-develop-prs

Author: ishakhsuvarov

app/code/Magento/Checkout/view/frontend/web/js/action/redirect-on-success.js

@@ -22,6 +22,13 @@ define(
              */
             execute: function () {
                 fullScreenLoader.startLoader();
+                this.reloadPage();
+            },
+
+            /**
+             * Method to reload page
+             */
+            reloadPage: function () {
                 window.location.replace(url.build(this.redirectUrl));
             }
         };

app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js

@@ -24,7 +24,7 @@ define([
             messageContainer = messageContainer || globalMessageList;
 
             if (response.status == 401) { //eslint-disable-line eqeqeq
-                window.location.replace(url.build('customer/account/login/'));
+                this.reloadPage(url.build('customer/account/login/'));
             } else {
                 try {
                     error = JSON.parse(response.responseText);
@@ -35,6 +35,13 @@ define([
                 }
                 messageContainer.addErrorMessage(error);
             }
+        },
+
+        /**
+         * Method to reload page
+         */
+        reloadPage: function (redirectUrl) {
+            window.location.replace(redirectUrl);
         }
     };
 });

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

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()) {

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

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>

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;
+    }
+}

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>

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>

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>