AC2093: Fixed code review changes

Author: Chetan.s.patil

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

@@ -7,6 +7,7 @@
 namespace Magento\Paypal\Block\Express;
 
 use Magento\Framework\Pricing\PriceCurrencyInterface;
+use Magento\Paypal\Model\Express\Checkout;
 use Magento\Quote\Model\Quote\Address\Rate;
 
 /**
@@ -314,8 +315,8 @@ protected function _beforeToHtml()
      */
     public function getPaypalFundingSource()
     {
-        if ($this->_quote->getPayment()->getPaypalFundingSource()) {
-            return ucfirst($this->_quote->getPayment()->getPaypalFundingSource());
+        if ($this->_quote->getPayment()->getAdditionalInformation(Checkout::PAYMENT_INFO_FUNDING_SOURCE)) {
+            return ucfirst($this->_quote->getPayment()->getAdditionalInformation(Checkout::PAYMENT_INFO_FUNDING_SOURCE));
         }
         return null;
     }

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

@@ -129,8 +129,9 @@ 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, $fundingSource);
+            $this->_checkout->returnFromPaypal($tokenId, $payerId);
             if ($this->_checkout->canSkipOrderReviewStep()) {
                 $this->_checkout->place($tokenId);
                 $order = $this->_checkout->getOrder();

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
@@ -602,12 +603,11 @@ public function canSkipOrderReviewStep()
      *
      * @param string $token
      * @param string|null $payerIdentifier
-     * @param string|null $fundingSource
      * @return void
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    public function returnFromPaypal($token, string $payerIdentifier = null, $fundingSource = null)
+    public function returnFromPaypal($token, string $payerIdentifier = null)
     {
         $this->_getApi()
             ->setToken($token)
@@ -682,9 +682,6 @@ public function returnFromPaypal($token, string $payerIdentifier = null, $fundin
         $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/Quote/etc/db_schema.xml

@@ -456,7 +456,6 @@
         <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>