2.1.1-release (#2)

Author: tikohov20

.gitignore

@@ -2,5 +2,4 @@
 /vendor/
 
 /mondu-logs
-.env
-.idea
+.env

Components/PluginConfig/Service/ConfigService.php

@@ -14,7 +14,6 @@
 class ConfigService {
     const API_URL = 'https://api.mondu.ai/api/v1';
     const WIDGET_URL = 'https://checkout.mondu.ai/widget.js';
-
     const SANDBOX_API_URL = 'https://api.demo.mondu.ai/api/v1';
     const SANDBOX_WIDGET_URL = 'https://checkout.demo.mondu.ai/widget.js';
 

Services/SessionService.php

@@ -44,7 +44,7 @@ private function reserveOrderNumber() {
         if($this->session->offsetExists('sOrderVariables')) {
             $variables = $this->session->offsetGet('sOrderVariables');
             if(empty($variables['sOrderNumber'])) {
-                $orderNumber = substr(md5(mt_rand()), 0, 7);
+                $orderNumber = uniqid('M_SW5_');
                 $variables['sOrderNumber'] = $orderNumber;
                 $this->session->offsetSet('sOrderVariables', $variables);
             }

Services/Webhook/Handlers/OrderConfirmed.php

@@ -30,7 +30,12 @@ public function getEventType()
     public function invoke(Webhook $webhook)
     {
         $this->paymentStatusService->updatePaymentStatus(
-            $webhook->getExternalReferenceId(),
+            $webhook->getOrderUid(),
+            Status::ORDER_STATE_IN_PROCESS,
+            Status::GROUP_STATE
+        );
+        $this->paymentStatusService->updatePaymentStatus(
+            $webhook->getOrderUid(),
             Status::PAYMENT_STATE_COMPLETELY_PAID,
             Status::GROUP_PAYMENT,
             $webhook->getOrderState()

Services/Webhook/Handlers/OrderDeclined.php

@@ -26,11 +26,13 @@ public function getEventType()
      */
     public function invoke(Webhook $webhook)
     {
-        $this->paymentStatusService->updatePaymentStatus(
-            $webhook->getExternalReferenceId(),
-            Status::ORDER_STATE_CANCELLED_REJECTED,
-            Status::GROUP_STATE,
-            $webhook->getOrderState()
-        );
+        if (!$webhook->isTemporaryExternalReferenceId()) {
+            $this->paymentStatusService->updatePaymentStatus(
+                $webhook->getOrderUid(),
+                Status::ORDER_STATE_CANCELLED_REJECTED,
+                Status::GROUP_STATE,
+                $webhook->getOrderState()
+            );
+        }
     }
 }

Services/Webhook/Handlers/OrderPending.php

@@ -31,12 +31,12 @@ public function getEventType()
     public function invoke(Webhook $webhook)
     {
         $this->paymentStatusService->updatePaymentStatus(
-            $webhook->getExternalReferenceId(),
+            $webhook->getOrderUid(),
             Status::ORDER_STATE_IN_PROCESS,
             Status::GROUP_STATE
         );
         $this->paymentStatusService->updatePaymentStatus(
-            $webhook->getExternalReferenceId(),
+            $webhook->getOrderUid(),
             Status::PAYMENT_STATE_REVIEW_NECESSARY,
             Status::GROUP_PAYMENT,
             $webhook->getOrderState()

Services/Webhook/WebhookStruct.php

@@ -147,6 +147,14 @@ public function setResource($resource)
         $this->resource = $resource;
     }
 
+    /**
+     * @return bool
+     */
+    public function isTemporaryExternalReferenceId(): bool
+    {
+        return str_starts_with($this->getExternalReferenceId(), 'M_SW5');
+    }
+
     /**
      * @return WebhookStruct
      */

plugin.xml

@@ -5,7 +5,7 @@
     <label lang="en">Mondu Payment</label>
     <label lang="de">Mondu Payment</label>
 
-    <version>2.1.0</version>
+    <version>2.1.1</version>
     <copyright>(c) Mondu GmbH</copyright>
     <author>Mondu GmbH</author>
     <link>https://mondu.ai</link>
@@ -15,6 +15,11 @@
     <description lang="en">This module offers you Mondu as a checkout option</description>
     <description lang="de">This module offers you Mondu as a checkout option</description>
 
+    <changelog version="2.1.1">
+        <changes lang="en">Bugfixes and improvements</changes>
+        <changes lang="de">Bugfixes and improvements</changes>
+    </changelog>
+
     <changelog version="2.1.0">
         <changes lang="en">Changes for pending Mondu state</changes>
         <changes lang="de">Changes for pending Mondu state</changes>
@@ -25,8 +30,8 @@
         <changes lang="de">Bugfixes and improvements</changes>
     </changelog>
     <changelog version="2.0.2">
-        <changes lang="en">Allow merchants to use custom documents for invoice</changes>
-        <changes lang="de">Allow merchants to use custom documents for invoice</changes>
+        <changes lang="en">Allow merchants to use custom documents for ivoice</changes>
+        <changes lang="de">Allow merchants to use custom documents for ivoice</changes>
     </changelog>
     <changelog version="2.0.1">
         <changes lang="en">Non existent service bugfix</changes>