Merge remote-tracking branch 'mpi/MAGETWO-53211' into MPI-PR-3005

Author: oshmyheliuk

app/code/Magento/Paypal/Model/Report/Settlement.php

@@ -170,6 +170,13 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
      */
     private $dateTimeColumns = ['transaction_initiation_date', 'transaction_completion_date'];
 
+    /**
+     * Columns with amount type
+     *
+     * @var array
+     */
+    private $amountColumns = ['gross_transaction_amount', 'fee_amount'];
+
     /**
     * @param \Magento\Framework\Model\Context $context
     * @param \Magento\Framework\Registry $registry
@@ -406,6 +413,9 @@ private function getBodyItems(array $line, array $sectionColumns, array $rowMap)
                 if (in_array($rowMap[$sectionColumns[$i]], $this->dateTimeColumns)) {
                     $line[$i] = $this->formatDateTimeColumns($line[$i]);
                 }
+                if (in_array($rowMap[$sectionColumns[$i]], $this->amountColumns)) {
+                    $line[$i] = $this->formatAmountColumn($line[$i]);
+                }
                 $bodyItem[$rowMap[$sectionColumns[$i]]] = $line[$i];
             }
         }
@@ -425,6 +435,19 @@ private function formatDateTimeColumns($lineItem)
         return $date->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
     }
 
+    /**
+     * Format amount columns
+     *
+     * PayPal api returns amounts in cents, hence the values need to be divided by 100
+     *
+     * @param string $lineItem
+     * @return float
+     */
+    private function formatAmountColumn($lineItem)
+    {
+        return intval($lineItem) / 100;
+    }
+
     /**
      * Load report by unique key (accoutn + report date)
      *

app/code/Magento/Paypal/Model/Report/Settlement/Row.php

@@ -122,8 +122,7 @@ public function getDebitCreditText($code)
     /**
      * Cast amounts of the specified keys
      *
-     * PayPal settlement reports contain amounts in cents, hence the values need to be divided by 100
-     * Also if the "credit" value is detected, it will be casted to negative amount
+     * If the "credit" value is detected, it will be casted to negative amount
      *
      * @param string $key
      * @return float|null
@@ -137,7 +136,7 @@ public function getCastedAmount($key)
             return null;
         }
 
-        $amount = $this->_data[$key] / 100;
+        $amount = $this->_data[$key];
         if ('CR' == $this->_data[$this->castAmountRelation[$key]]) {
             $amount = -1 * $amount;
         }

app/code/Magento/Paypal/Test/Unit/Model/Report/Settlement/RowTest.php

@@ -107,8 +107,8 @@ public function getDebitCreditTextDataProvider()
     public function getCastedAmountDataProvider()
     {
         return [
-            ['fee_amount', ['fee_amount' => 100, 'fee_debit_or_credit' => 'CR'], -1],
-            ['fee_amount', ['fee_amount' => 100, 'fee_debit_or_credit' => 'DB'], 1]
+            ['fee_amount', ['fee_amount' => 1, 'fee_debit_or_credit' => 'CR'], -1],
+            ['fee_amount', ['fee_amount' => 1, 'fee_debit_or_credit' => 'DB'], 1]
         ];
     }
 }