Merge remote-tracking branch 'origin/MAGETWO-51789' into MPI-BUGFIXES

Author: Viktor Tymchynskyi

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

@@ -8,6 +8,7 @@
 
 namespace Magento\Paypal\Model\Report;
 
+use DateTime;
 use Magento\Framework\Filesystem;
 use Magento\Framework\Filesystem\DirectoryList;
 
@@ -162,6 +163,13 @@ class Settlement extends \Magento\Framework\Model\AbstractModel
      */
     protected $_scopeConfig;
 
+    /**
+     * Columns with DateTime data type
+     * 
+     * @var array
+     */
+    private $dateTimeColumns = ['transaction_initiation_date', 'transaction_completion_date'];
+
     /**
     * @param \Magento\Framework\Model\Context $context
     * @param \Magento\Framework\Registry $registry
@@ -249,7 +257,8 @@ public function fetchAndSave(\Magento\Framework\Filesystem\Io\Sftp $connection)
 
                 // Set last modified date, this value will be overwritten during parsing
                 if (isset($attributes['mtime'])) {
-                    $lastModified = new \DateTime($attributes['mtime']);
+                    $date = new \DateTime();
+                    $lastModified = $date->setTimestamp($attributes['mtime']);
                     $this->setReportLastModified(
                         $lastModified->format('Y-m-d H:i:s')
                     );
@@ -324,7 +333,7 @@ public function parseCsv($localCsv, $format = 'new')
         $rowMap = $this->_csvColumns[$format]['rowmap'];
 
         $flippedSectionColumns = array_flip($sectionColumns);
-        $stream = $this->_tmpDirectory->openFile($localCsv);
+        $stream = $this->_tmpDirectory->openFile($localCsv, 'r');
         while ($line = $stream->readCsv()) {
             if (empty($line)) {
                 // The line was empty, so skip it.
@@ -360,11 +369,7 @@ public function parseCsv($localCsv, $format = 'new')
                     break;
                 case 'SB':
                     // Section body.
-                    $bodyItem = [];
-                    for ($i = 1; $i < count($line); $i++) {
-                        $bodyItem[$rowMap[$flippedSectionColumns[$i]]] = $line[$i];
-                    }
-                    $this->_rows[] = $bodyItem;
+                    $this->_rows[] = $this->getBodyItems($line, $flippedSectionColumns, $rowMap);
                     break;
                 case 'SC':
                     // Section records count.
@@ -385,6 +390,41 @@ public function parseCsv($localCsv, $format = 'new')
         return $this;
     }
 
+    /**
+     * Parse columns from line of csv file
+     *
+     * @param array $line
+     * @param array $sectionColumns
+     * @param array $rowMap
+     * @return array
+     */
+    private function getBodyItems(array $line, array $sectionColumns, array $rowMap)
+    {
+        $bodyItem = [];
+        for ($i = 1, $count = count($line); $i < $count; $i++) {
+            if(isset($rowMap[$sectionColumns[$i]])) {
+                if (in_array($rowMap[$sectionColumns[$i]], $this->dateTimeColumns)) {
+                    $line[$i] = $this->formatDateTimeColumns($line[$i]);
+                }
+                $bodyItem[$rowMap[$sectionColumns[$i]]] = $line[$i];
+            }
+        }
+        return $bodyItem;
+    }
+
+    /**
+     * Format date columns in UTC
+     * 
+     * @param string $lineItem
+     * @return string
+     */
+    private function formatDateTimeColumns($lineItem)
+    {
+        /** @var DateTime $date */
+        $date = new DateTime($lineItem, new \DateTimeZone('UTC'));
+        return $date->format(\Magento\Framework\Stdlib\DateTime::DATETIME_PHP_FORMAT);
+    }
+
     /**
      * Load report by unique key (accoutn + report date)
      *