Release 2.0.6

Author: Radosław Karkut

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## [2.0.6] - 2025-11-12
+### Fix
+- Fixed: Handle TimeZone during orders processing
+
 ## [2.0.5] - 2025-10-07
 ### Fix
 - Fixed: cart handling for disabled WebConnect

classes/WebserviceSpecificManagementGetresponseModule.php

@@ -192,7 +192,7 @@ private function getPluginDetails()
 
         return json_encode(
             [
-                'plugin_version' => '2.0.5',
+                'plugin_version' => '2.0.6',
                 'prestashop_version' => _PS_VERSION_,
                 'php_version' => phpversion(),
                 'shops' => $shops,

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>grprestashop</name>
     <displayName><![CDATA[GetResponse]]></displayName>
-    <version><![CDATA[2.0.5]]></version>
+    <version><![CDATA[2.0.6]]></version>
     <description><![CDATA[Add your Prestashop contacts to GetResponse.]]></description>
     <author><![CDATA[GetResponse]]></author>
     <tab><![CDATA[emailing]]></tab>

grprestashop.php

@@ -42,7 +42,7 @@ public function __construct()
     {
         $this->name = 'grprestashop';
         $this->tab = 'emailing';
-        $this->version = '2.0.5';
+        $this->version = '2.0.6';
         $this->author = 'GetResponse';
         $this->need_instance = 0;
         $this->module_key = '311ef191c3135b237511d18c4bc27369';

src/Ecommerce/Application/Adapter/CartAdapter.php

@@ -24,13 +24,16 @@
 use GetResponse\Ecommerce\DomainModel\Cart;
 use GetResponse\Ecommerce\DomainModel\Line;
 use GetResponse\SharedKernel\CartRecoveryHelper;
+use GetResponse\SharedKernel\DateTimeNormalizer;
 
 if (!defined('_PS_VERSION_')) {
     exit;
 }
 
 class CartAdapter
 {
+    use DateTimeNormalizer;
+
     /**
      * @param int $cartId
      * @param string|null $visitorUuid
@@ -77,8 +80,8 @@ public function getCartById(int $cartId, ?string $visitorUuid): Cart
             $prestashopCart->getOrderTotal(true),
             $currency->iso_code,
             $cartRecoveryUrl,
-            $prestashopCart->date_add,
-            $prestashopCart->date_upd
+            $this->getDateWithTimeZone($prestashopCart->date_add),
+            $this->getDateWithTimeZone($prestashopCart->date_upd)
         );
     }
 }

src/Ecommerce/Application/Adapter/OrderAdapter.php

@@ -24,13 +24,16 @@
 use GetResponse\Ecommerce\DomainModel\Address;
 use GetResponse\Ecommerce\DomainModel\Line;
 use GetResponse\Ecommerce\DomainModel\Order;
+use GetResponse\SharedKernel\DateTimeNormalizer;
 
 if (!defined('_PS_VERSION_')) {
     exit;
 }
 
 class OrderAdapter
 {
+    use DateTimeNormalizer;
+
     public function getOrderById(int $orderId): Order
     {
         $customerAdapter = new CustomerAdapter();
@@ -101,8 +104,8 @@ public function getOrderById(int $orderId): Order
             $this->getOrderStatus($prestashopOrder),
             $shippingAddress,
             $billingAddress,
-            $prestashopOrder->date_add,
-            $prestashopOrder->date_upd
+            $this->getDateWithTimeZone($prestashopOrder->date_add),
+            $this->getDateWithTimeZone($prestashopOrder->date_upd)
         );
     }
 

src/Ecommerce/Application/Adapter/ProductAdapter.php

@@ -23,13 +23,16 @@
 use GetResponse\Ecommerce\DomainModel\Category;
 use GetResponse\Ecommerce\DomainModel\Product;
 use GetResponse\Ecommerce\DomainModel\Variant;
+use GetResponse\SharedKernel\DateTimeNormalizer;
 
 if (!defined('_PS_VERSION_')) {
     exit;
 }
 
 class ProductAdapter
 {
+    use DateTimeNormalizer;
+
     const PRODUCT_STATUS_PUBLISH = 'publish';
     const PRODUCT_STATUS_DRAFT = 'draft';
     const SKU_PREFIX = 'sku_';
@@ -125,8 +128,8 @@ public function getProductById(int $productId, int $languageId): Product
             $manufacture->name,
             $categories,
             $variants,
-            $product->date_add,
-            $product->date_upd,
+            $this->getDateWithTimeZone($product->date_add),
+            $this->getDateWithTimeZone($product->date_upd),
             $product->active === '1' ? self::PRODUCT_STATUS_PUBLISH : self::PRODUCT_STATUS_DRAFT
         );
     }

src/MessageSender/Infrastructure/HttpClient.php

@@ -63,14 +63,14 @@ private function sendRequest(string $url, \JsonSerializable $object, string $met
         $options = [
             CURLOPT_URL => $url,
             CURLOPT_ENCODING => 'gzip,deflate',
-            CURLOPT_FRESH_CONNECT => 1,
-            CURLOPT_RETURNTRANSFER => 1,
+            CURLOPT_FRESH_CONNECT => true,
+            CURLOPT_RETURNTRANSFER => true,
             CURLOPT_TIMEOUT => self::TIMEOUT,
             CURLOPT_HTTPHEADER => $headers,
         ];
 
         if ($method === self::POST) {
-            $options[CURLOPT_POST] = 1;
+            $options[CURLOPT_POST] = true;
             $options[CURLOPT_POSTFIELDS] = json_encode($object->jsonSerialize());
         }
 

src/SharedKernel/DateTimeNormalizer.php

@@ -0,0 +1,39 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License version 3.0
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA and Contributors <[email protected]>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License version 3.0
+ */
+
+namespace GetResponse\SharedKernel;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+trait DateTimeNormalizer
+{
+    private function getDateWithTimeZone(string $date): string
+    {
+        try {
+            $dateTimeZone = new \DateTimeZone(\Configuration::get('PS_TIMEZONE'));
+        } catch (\Exception $e) {
+            $dateTimeZone = new \DateTimeZone('UTC');
+        }
+
+        return (new \DateTime($date, $dateTimeZone))->format('c');
+    }
+}