Merge remote-tracking branch 'origin/release-1.2.3' into e2e-actions

merge release
Invertus · Aug 7, 2024 · a81cfcb · a81cfcb
2 parents c2f4e47 + 008f558
commit a81cfcb
Show file tree

Hide file tree

Showing 6 changed files with 122 additions and 116 deletions.
diff --git a/controllers/front/notify.php b/controllers/front/notify.php
@@ -66,8 +66,14 @@ public function postProcess()
             $secureKey
         ));
 
-        if (!$lockResult->isSuccessful()) {
-            die($this->module->l('Lock already exist', self::FILENAME));
+        if (!SaferPayConfig::isVersion17()) {
+            if ($lockResult > 200) {
+                die($this->module->l('Lock already exists', self::FILENAME));
+            }
+        } else {
+            if (!$lockResult->isSuccessful()) {
+                die($this->module->l('Lock already exists', self::FILENAME));
+            }
         }
 
         if ($cart->orderExists()) {
@@ -95,8 +101,8 @@ public function postProcess()
             );
 
             $checkoutData->setOrderStatus($transactionStatus);
-
             $checkoutProcessor->run($checkoutData);
+
             $orderId = $this->getOrderId($cartId);
 
             //TODO look into pipeline design pattern to use when object is modified in multiple places to avoid this issue.
@@ -147,6 +153,12 @@ public function postProcess()
             $orderId = (int) $order->id;
 
             if ($orderId) {
+                $saferPayCapturedStatus = (int) Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_PAYMENT_COMPLETED);
+
+                if ((int) $order->current_state === $saferPayCapturedStatus) {
+                    die($this->module->l('Order already created', self::FILENAME));
+                }
+
                 // assuming order transaction was declined
                 $order->setCurrentState(_SAFERPAY_PAYMENT_AUTHORIZATION_FAILED_);
             }

diff --git a/controllers/front/return.php b/controllers/front/return.php
@@ -175,10 +175,6 @@ private function executeTransaction($orderId, $selectedCard)
         );
     }
 
-    private function assertTransaction($cartId) {
-
-    }
-
     /**
      * @param int $cartId
      *
-Original file line number
+Diff line change
@@ Expand Up @@
             );
         }
-        private function assertTransaction($cartId) {
-        }
         /**
          * @param int $cartId
          *
@@ Expand Down @@