1.74.1 (FINAL RELEASE)

Author: m2epro

Block/Adminhtml/Amazon/Account/Edit/Tabs/Order.php

@@ -150,6 +150,14 @@ protected function _prepareForm()
 
         $formData = array_replace_recursive($defaults, $formData);
 
+        $formData['magento_orders_settings']['listing']['create_from_date'] = $this->convertGmtToLocal(
+            $formData['magento_orders_settings']['listing']['create_from_date'] ?? null
+        );
+
+        $formData['magento_orders_settings']['listing_other']['create_from_date'] = $this->convertGmtToLocal(
+            $formData['magento_orders_settings']['listing_other']['create_from_date'] ?? null
+        );
+
         if (is_array($formData['magento_orders_settings']['tax']['excluded_states'])) {
             $formData['magento_orders_settings']['tax']['excluded_states'] = implode(
                 ',',
@@ -227,8 +235,7 @@ protected function _prepareForm()
                     'Select the start date for channel orders to be created in Magento.'
                     . ' Orders purchased before this date will not be imported into Magento.'
                 ),
-                'value' => $this->getMagentoOrdersListingsCreateFromDate($amazonAccount)
-                                ->format('Y-m-d H:i:s')
+                'value' => $formData['magento_orders_settings']['listing']['create_from_date'],
             ]
         );
 
@@ -304,8 +311,7 @@ protected function _prepareForm()
                     'Select the start date for channel orders to be created in Magento.'
                     . ' Orders purchased before this date will not be imported into Magento.'
                 ),
-                'value' => $this->getMagentoOrdersListingsOtherCreateFromDate($amazonAccount)
-                                ->format('Y-m-d H:i:s'),
+                'value' => $formData['magento_orders_settings']['listing_other']['create_from_date'],
             ]
         );
 
@@ -1113,34 +1119,18 @@ protected function _prepareForm()
         return parent::_prepareForm();
     }
 
-    private function getMagentoOrdersListingsCreateFromDate(
-        ?\Ess\M2ePro\Model\Amazon\Account $amazonAccount
-    ): \DateTime {
-        if ($amazonAccount === null) {
-            return \Ess\M2ePro\Helper\Date::createCurrentInCurrentZone();
+    private function convertGmtToLocal(?string $dateTimeString): ?string
+    {
+        if (empty($dateTimeString)) {
+            return null;
         }
 
-        return $amazonAccount
-            ->getMagentoOrdersListingsCreateFromDate()
-            ->setTimezone(self::getDateTimeZone());
-    }
-
-    private function getMagentoOrdersListingsOtherCreateFromDate(
-        ?\Ess\M2ePro\Model\Amazon\Account $amazonAccount
-    ): \DateTime {
-        if ($amazonAccount === null) {
-            return \Ess\M2ePro\Helper\Date::createCurrentInCurrentZone();
+        try {
+            $date = \Ess\M2ePro\Helper\Date::createDateGmt($dateTimeString);
+        } catch (\Throwable $e) {
+            return null;
         }
 
-        return $amazonAccount
-            ->getMagentoOrdersListingsOtherCreateFromDate()
-            ->setTimezone(self::getDateTimeZone());
-    }
-
-    public static function getDateTimeZone(): \DateTimeZone
-    {
-        return new \DateTimeZone(
-            \Ess\M2ePro\Helper\Date::getTimezone()->getConfigTimezone()
-        );
+        return \Ess\M2ePro\Helper\Date::createWithLocalTimeZone($date)->format('Y-m-d H:i:s');
     }
 }

Block/Adminhtml/Ebay/Account/Edit/Tabs/Order.php

@@ -80,6 +80,14 @@ protected function _prepareForm()
 
         $formData = array_replace_recursive($defaults, $formData);
 
+        $formData['magento_orders_settings']['listing']['create_from_date'] = $this->convertGmtToLocal(
+            $formData['magento_orders_settings']['listing']['create_from_date'] ?? null
+        );
+
+        $formData['magento_orders_settings']['listing_other']['create_from_date'] = $this->convertGmtToLocal(
+            $formData['magento_orders_settings']['listing_other']['create_from_date'] ?? null
+        );
+
         $form = $this->_formFactory->create();
 
         $form->addField(
@@ -142,9 +150,7 @@ protected function _prepareForm()
                     'Select the start date for channel orders to be created in Magento.'
                     . ' Orders purchased before this date will not be imported into Magento.'
                 ),
-                'value' => $ebayAccount->getMagentoOrdersListingsCreateFromDate()
-                                       ->setTimezone(self::getDateTimeZone())
-                                       ->format('Y-m-d H:i:s'),
+                'value' => $formData['magento_orders_settings']['listing']['create_from_date'],
             ]
         );
 
@@ -219,9 +225,7 @@ protected function _prepareForm()
                     'Select the start date for channel orders to be created in Magento.'
                     . ' Orders purchased before this date will not be imported into Magento.'
                 ),
-                'value' => $ebayAccount->getMagentoOrdersListingsOtherCreateFromDate()
-                                       ->setTimezone(self::getDateTimeZone())
-                                       ->format('Y-m-d H:i:s'),
+                'value' => $formData['magento_orders_settings']['listing_other']['create_from_date'],
             ]
         );
 
@@ -861,10 +865,18 @@ protected function _prepareForm()
         return parent::_prepareForm();
     }
 
-    public static function getDateTimeZone(): \DateTimeZone
+    private function convertGmtToLocal(?string $dateTimeString): ?string
     {
-        return new \DateTimeZone(
-            \Ess\M2ePro\Helper\Date::getTimezone()->getConfigTimezone()
-        );
+        if (empty($dateTimeString)) {
+            return null;
+        }
+
+        try {
+            $date = \Ess\M2ePro\Helper\Date::createDateGmt($dateTimeString);
+        } catch (\Throwable $e) {
+            return null;
+        }
+
+        return \Ess\M2ePro\Helper\Date::createWithLocalTimeZone($date)->format('Y-m-d H:i:s');
     }
 }