#36947 Added timezone parsing to creditmemo, invoice, shipment comments dates

Author: Bartlomiejsz

app/code/Magento/SalesGraphQl/Model/Resolver/CreditMemo/CreditMemoComments.php

@@ -7,17 +7,27 @@
 
 namespace Magento\SalesGraphQl\Model\Resolver\CreditMemo;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Sales\Api\Data\CreditmemoInterface;
 
 /**
  * Resolve credit memo comments
  */
 class CreditMemoComments implements ResolverInterface
 {
+    private TimezoneInterface $timezone;
+
+    public function __construct(
+        TimezoneInterface $timezone = null
+    ) {
+        $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
+    }
+
     /**
      * @inheritDoc
      */
@@ -40,7 +50,7 @@ public function resolve(
             if ($comment->getIsVisibleOnFront()) {
                 $comments[] = [
                     'message' => $comment->getComment(),
-                    'timestamp' => $comment->getCreatedAt()
+                    'timestamp' => $this->timezone->date($comment->getCreatedAt())
                 ];
             }
         }

app/code/Magento/SalesGraphQl/Model/Resolver/Invoices.php

@@ -7,10 +7,12 @@
 
 namespace Magento\SalesGraphQl\Model\Resolver;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\InvoiceInterface;
 
@@ -19,6 +21,14 @@
  */
 class Invoices implements ResolverInterface
 {
+    private TimezoneInterface $timezone;
+
+    public function __construct(
+        TimezoneInterface $timezone = null
+    ) {
+        $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
+    }
+
     /**
      * @inheritDoc
      */
@@ -61,7 +71,7 @@ private function getInvoiceComments(InvoiceInterface $invoice): array
         foreach ($invoice->getComments() as $comment) {
             if ($comment->getIsVisibleOnFront()) {
                 $comments[] = [
-                    'timestamp' => $comment->getCreatedAt(),
+                    'timestamp' => $this->timezone->date($comment->getCreatedAt()),
                     'message' => $comment->getComment()
                 ];
             }

app/code/Magento/SalesGraphQl/Model/Resolver/Shipments.php

@@ -7,10 +7,12 @@
 
 namespace Magento\SalesGraphQl\Model\Resolver;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Sales\Api\Data\ShipmentInterface;
 use Magento\Sales\Model\Order;
 
@@ -19,6 +21,14 @@
  */
 class Shipments implements ResolverInterface
 {
+    private TimezoneInterface $timezone;
+
+    public function __construct(
+        TimezoneInterface $timezone = null
+    ) {
+        $this->timezone = $timezone ?: ObjectManager::getInstance()->get(TimezoneInterface::class);
+    }
+
     /**
      * @inheritDoc
      */
@@ -62,7 +72,7 @@ private function getShipmentComments(ShipmentInterface $shipment): array
         foreach ($shipment->getComments() as $comment) {
             if ($comment->getIsVisibleOnFront()) {
                 $comments[] = [
-                    'timestamp' => $comment->getCreatedAt(),
+                    'timestamp' => $this->timezone->date($comment->getCreatedAt()),
                     'message' => $comment->getComment()
                 ];
             }