NTR: fix webhook too early

mollie · Dec 16, 2024 · e15eb8f · e15eb8f
1 parent 3f36a44
commit e15eb8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Controller/Storefront/Webhook/NotificationFacade.php b/src/Controller/Storefront/Webhook/NotificationFacade.php
@@ -154,13 +154,16 @@ public function onNotify(string $swTransactionId, Context $context): void
         }
 
         $now = new \DateTime('now', new DateTimeZone('UTC'));
+
         /** @var ?\DateTimeImmutable $orderCreatedAt */
         $orderCreatedAt = $swOrder->getCreatedAt();
+
         if ($orderCreatedAt !== null) {
             $createdAt = \DateTime::createFromImmutable($orderCreatedAt);
             $createdAt->modify('+2 minutes');
-            if ($now < $orderCreatedAt) {
-                throw new WebhookIsTooEarlyException((string)$swOrder->getOrderNumber(), $now, $orderCreatedAt);
+
+            if ($now < $createdAt) {
+                throw new WebhookIsTooEarlyException((string)$swOrder->getOrderNumber(), $now, $createdAt);
             }
         }
 

diff --git a/src/Exception/WebhookIsTooEarlyException.php b/src/Exception/WebhookIsTooEarlyException.php
@@ -11,7 +11,7 @@ class WebhookIsTooEarlyException extends ShopwareHttpException
     public const MOLLIE_PAYMENTS__WEBHOOK_TOO_EARLY = 'MOLLIE_PAYMENTS__WEBHOOK_TOO_EARLY';
     public function __construct(string $oderNumber, \DateTimeInterface $now, \DateTimeInterface $updatedTime)
     {
-        $message = 'Webhook is too early for order: {{orderNumber}}. Request will be accepted after: {{lastUpdateTime}}';
+        $message = 'Webhook is too early for order: {{orderNumber}}. Request will be accepted after: {{lastUpdateTime}}. Current Time is :{{now}}';
         $parameters =[
             'orderNumber' => $oderNumber,
             'lastUpdateTime' => $updatedTime->format('Y-m-d H:i:s'),