AC2093:Added payment funding source on review page for paypal

Author: abhattGlo

app/code/Magento/Paypal/Block/Express/Review.php

@@ -306,4 +306,12 @@ protected function _beforeToHtml()
 
         return parent::_beforeToHtml();
     }
+
+    public function getPaypalFundingSource()
+    {
+        if ($this->_quote->getPayment()->getPaypalFundingSource()) {
+            return ucfirst($this->_quote->getPayment()->getPaypalFundingSource());
+        }
+        return null;
+    }
 }

app/code/Magento/Paypal/Controller/Express/OnAuthorization.php

@@ -116,6 +116,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();
@@ -128,7 +129,7 @@ public function execute(): ResultInterface
             /** Populate checkout object with new data */
             $this->_initCheckout($quote);
             /**  Populate quote  with information about billing and shipping addresses*/
-            $this->_checkout->returnFromPaypal($tokenId, $payerId);
+            $this->_checkout->returnFromPaypal($tokenId, $payerId, $fundingSource);
             if ($this->_checkout->canSkipOrderReviewStep()) {
                 $this->_checkout->place($tokenId);
                 $order = $this->_checkout->getOrder();

app/code/Magento/Paypal/Model/Express/Checkout.php

@@ -614,7 +614,7 @@ public function canSkipOrderReviewStep()
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function returnFromPaypal($token, string $payerIdentifier = null)
+    public function returnFromPaypal($token, string $payerIdentifier = null, $fundingSource = null)
     {
         $this->_getApi()
             ->setToken($token)
@@ -689,6 +689,9 @@ public function returnFromPaypal($token, string $payerIdentifier = null)
         $payment = $quote->getPayment();
         $payment->setMethod($this->_methodType);
         $this->_paypalInfo->importToPayment($this->_getApi(), $payment);
+        if ($fundingSource) {
+            $payment->setPaypalFundingSource($fundingSource);
+        }
         $payerId = $payerIdentifier ? : $this->_getApi()->getPayerId();
         $payment->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_PAYER_ID, $payerId)
             ->setAdditionalInformation(self::PAYMENT_INFO_TRANSPORT_TOKEN, $token);

app/code/Magento/Paypal/view/frontend/templates/express/review.phtml

@@ -101,7 +101,7 @@ 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($block->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')) ?>"/>

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();
                 },

app/code/Magento/Quote/etc/db_schema.xml

@@ -456,6 +456,7 @@
         <column xsi:type="text" name="additional_data" nullable="true" comment="Additional Data"/>
         <column xsi:type="varchar" name="cc_ss_issue" nullable="true" length="255" comment="Cc Ss Issue"/>
         <column xsi:type="text" name="additional_information" nullable="true" comment="Additional Information"/>
+        <column xsi:type="varchar" name="paypal_funding_source" nullable="true" length="255" comment="Funding source"/>
         <constraint xsi:type="primary" referenceId="PRIMARY">
             <column name="payment_id"/>
         </constraint>