Merge branch 'MAGETWO-99035' of https://github.com/magento-mpi/magento2ce into PR-05-29-2019

Author: Spandana Chittimala

app/code/Magento/Paypal/Model/Cart.php

@@ -9,6 +9,7 @@
 
 /**
  * PayPal-specific model for shopping cart items and totals
+ *
  * The main idea is to accommodate all possible totals into PayPal-compatible 4 totals and line items
  */
 class Cart extends \Magento\Payment\Model\Cart
@@ -179,7 +180,7 @@ protected function _applyDiscountTaxCompensationWorkaround(
     ) {
         $dataContainer = $salesEntity->getTaxContainer();
         $this->addTax((double)$dataContainer->getBaseDiscountTaxCompensationAmount());
-        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmount());
+        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmnt());
     }
 
     /**

app/code/Magento/Paypal/Model/Payflow/Transparent.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Paypal\Model\Payflow;
 
@@ -59,6 +60,11 @@ class Transparent extends Payflowpro implements TransparentInterface
      */
     private $paymentExtensionFactory;
 
+    /**
+     * @var \Magento\Paypal\Model\CartFactory
+     */
+    private $payPalCartFactory;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -76,6 +82,7 @@ class Transparent extends Payflowpro implements TransparentInterface
      * @param ResponseValidator $responseValidator
      * @param PaymentTokenInterfaceFactory $paymentTokenFactory
      * @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
+     * @param \Magento\Paypal\Model\CartFactory $payPalCartFactory
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
      * @param array $data
@@ -98,6 +105,7 @@ public function __construct(
         ResponseValidator $responseValidator,
         PaymentTokenInterfaceFactory $paymentTokenFactory,
         OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
+        \Magento\Paypal\Model\CartFactory $payPalCartFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
         array $data = []
@@ -123,9 +131,12 @@ public function __construct(
         $this->responseValidator = $responseValidator;
         $this->paymentTokenFactory = $paymentTokenFactory;
         $this->paymentExtensionFactory = $paymentExtensionFactory;
+        $this->payPalCartFactory = $payPalCartFactory;
     }
 
     /**
+     * Gets response validator instance.
+     *
      * @return ResponseValidator
      */
     public function getResponceValidator()
@@ -162,13 +173,19 @@ public function authorize(InfoInterface $payment, $amount)
         $this->addRequestOrderInfo($request, $order);
         $request = $this->fillCustomerContacts($order, $request);
 
+        /** @var \Magento\Paypal\Model\Cart $payPalCart */
+        $payPalCart = $this->payPalCartFactory->create(['salesModel' => $order]);
+        $payPalCart->getAmounts();
+
         $token = $payment->getAdditionalInformation(self::PNREF);
         $request->setData('trxtype', self::TRXTYPE_AUTH_ONLY);
         $request->setData('origid', $token);
         $request->setData('amt', $this->formatPrice($amount));
         $request->setData('currency', $order->getBaseCurrencyCode());
-        $request->setData('taxamt', $this->formatPrice($order->getBaseTaxAmount()));
-        $request->setData('freightamt', $this->formatPrice($order->getBaseShippingAmount()));
+        $request->setData('itemamt', $this->formatPrice($payPalCart->getSubtotal()));
+        $request->setData('taxamt', $this->formatPrice($payPalCart->getTax()));
+        $request->setData('freightamt', $this->formatPrice($payPalCart->getShipping()));
+        $request->setData('discount', $this->formatPrice($payPalCart->getDiscount()));
 
         $response = $this->postRequest($request, $this->getConfig());
         $this->processErrors($response);
@@ -178,6 +195,7 @@ public function authorize(InfoInterface $payment, $amount)
         } catch (LocalizedException $exception) {
             $payment->setParentTransactionId($response->getData(self::PNREF));
             $this->void($payment);
+            // phpcs:ignore Magento2.Exceptions.DirectThrow
             throw new LocalizedException(__("The payment couldn't be processed at this time. Please try again later."));
         }
 
@@ -200,10 +218,12 @@ public function getConfigInterface()
     }
 
     /**
+     * Creates vault payment token.
+     *
      * @param Payment $payment
      * @param string $token
-     * @throws LocalizedException
      * @return void
+     * @throws \Exception
      */
     protected function createPaymentToken(Payment $payment, $token)
     {
@@ -222,8 +242,11 @@ protected function createPaymentToken(Payment $payment, $token)
     }
 
     /**
+     * Generates CC expiration date by year and month provided in payment.
+     *
      * @param Payment $payment
      * @return string
+     * @throws \Exception
      */
     private function getExpirationDate(Payment $payment)
     {
@@ -242,6 +265,8 @@ private function getExpirationDate(Payment $payment)
     }
 
     /**
+     * Returns payment extension attributes instance.
+     *
      * @param Payment $payment
      * @return \Magento\Sales\Api\Data\OrderPaymentExtensionInterface
      */

app/code/Magento/Paypal/Test/Unit/Model/CartTest.php

@@ -7,6 +7,9 @@
 
 use Magento\Paypal\Model\Cart;
 
+/**
+ * @see \Magento\Paypal\Model\Cart
+ */
 class CartTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -70,7 +73,7 @@ protected function setUp()
     public function testInvalidGetAllItems($items)
     {
         $taxContainer = new \Magento\Framework\DataObject(
-            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amount' => 0.1]
+            ['base_discount_tax_compensation_amount' => 0.2, 'base_shipping_discount_tax_compensation_amnt' => 0.1]
         );
         $this->_salesModel->expects($this->once())->method('getTaxContainer')->will($this->returnValue($taxContainer));
         $this->_salesModel->expects($this->once())->method('getAllItems')->will($this->returnValue($items));
@@ -146,7 +149,7 @@ public function testInvalidTotalsGetAllItems($values, $transferDiscount)
         $this->assertEquals(
             $values['base_tax_amount'] +
             $values['base_discount_tax_compensation_amount'] +
-            $values['base_shipping_discount_tax_compensation_amount'],
+            $values['base_shipping_discount_tax_compensation_amnt'],
             $this->_model->getTax()
         );
         $this->assertEquals($values['base_shipping_amount'], $this->_model->getShipping());
@@ -162,7 +165,7 @@ public function invalidTotalsGetAllItemsDataProvider()
             [
                 [
                     'base_discount_tax_compensation_amount' => 0,
-                    'base_shipping_discount_tax_compensation_amount' => 0,
+                    'base_shipping_discount_tax_compensation_amnt' => 0,
                     'base_subtotal' => 0,
                     'base_tax_amount' => 0,
                     'base_shipping_amount' => 0,
@@ -174,7 +177,7 @@ public function invalidTotalsGetAllItemsDataProvider()
             [
                 [
                     'base_discount_tax_compensation_amount' => 1,
-                    'base_shipping_discount_tax_compensation_amount' => 2,
+                    'base_shipping_discount_tax_compensation_amnt' => 2,
                     'base_subtotal' => 3,
                     'base_tax_amount' => 4,
                     'base_shipping_amount' => 5,
@@ -255,8 +258,8 @@ protected function _prepareInvalidModelData($values, $transferDiscount)
             [
                 'base_discount_tax_compensation_amount' =>
                     $values['base_discount_tax_compensation_amount'],
-                'base_shipping_discount_tax_compensation_amount' =>
-                    $values['base_shipping_discount_tax_compensation_amount'],
+                'base_shipping_discount_tax_compensation_amnt' =>
+                    $values['base_shipping_discount_tax_compensation_amnt'],
             ]
         );
         $expectedSubtotal = $values['base_subtotal'];