Merge remote-tracking branch 'l3/ACP2E-357' into PR_L3_05_04_2022

Author: veloraven

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

@@ -180,7 +180,11 @@ protected function _applyDiscountTaxCompensationWorkaround(
     ) {
         $dataContainer = $salesEntity->getTaxContainer();
         $this->addTax((double)$dataContainer->getBaseDiscountTaxCompensationAmount());
-        $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmnt());
+        if ($dataContainer->getBaseShippingDiscountTaxCompensationAmnt() !== null) {
+            $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmnt());
+        } else {
+            $this->addTax((double)$dataContainer->getBaseShippingDiscountTaxCompensationAmount());
+        }
     }
 
     /**

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

@@ -152,12 +152,14 @@ public function invalidGetAllItemsDataProvider()
     public function testInvalidTotalsGetAllItems($values, $transferDiscount)
     {
         $expectedSubtotal = $this->_prepareInvalidModelData($values, $transferDiscount);
+        $baseShippingDiscountTaxCompensationAmount = $values['base_shipping_discount_tax_compensation_amount'] ??
+            $values['base_shipping_discount_tax_compensation_amnt'];
         $this->assertEmpty($this->_model->getAllItems());
         $this->assertEquals($expectedSubtotal, $this->_model->getSubtotal());
         $this->assertEquals(
             $values['base_tax_amount'] +
             $values['base_discount_tax_compensation_amount'] +
-            $values['base_shipping_discount_tax_compensation_amnt'],
+            $baseShippingDiscountTaxCompensationAmount,
             $this->_model->getTax()
         );
         $this->assertEquals($values['base_shipping_amount'], $this->_model->getShipping());
@@ -177,6 +179,7 @@ public function invalidTotalsGetAllItemsDataProvider()
                 [
                     'base_discount_tax_compensation_amount' => 0,
                     'base_shipping_discount_tax_compensation_amnt' => 0,
+                    'base_shipping_discount_tax_compensation_amount' => null,
                     'base_subtotal' => 0,
                     'base_tax_amount' => 0,
                     'base_shipping_amount' => 0,
@@ -188,7 +191,8 @@ public function invalidTotalsGetAllItemsDataProvider()
             [
                 [
                     'base_discount_tax_compensation_amount' => 1,
-                    'base_shipping_discount_tax_compensation_amnt' => 2,
+                    'base_shipping_discount_tax_compensation_amount' => 2,
+                    'base_shipping_discount_tax_compensation_amnt' => null,
                     'base_subtotal' => 3,
                     'base_tax_amount' => 4,
                     'base_shipping_amount' => 5,
@@ -267,8 +271,12 @@ protected function _prepareInvalidModelData($data, $transferDiscount)
     {
         $taxContainer = new DataObject(
             [
-                'base_discount_tax_compensation_amount' => $data['base_discount_tax_compensation_amount'],
-                'base_shipping_discount_tax_compensation_amnt' => $data['base_shipping_discount_tax_compensation_amnt'],
+                'base_discount_tax_compensation_amount' =>
+                    $data['base_discount_tax_compensation_amount'],
+                'base_shipping_discount_tax_compensation_amnt' =>
+                    $data['base_shipping_discount_tax_compensation_amnt'],
+                'base_shipping_discount_tax_compensation_amount' =>
+                    $data['base_shipping_discount_tax_compensation_amount']
             ]
         );
         $expectedSubtotal = $data['base_subtotal'];