Merge pull request #182 from Invertus/SV-23/ps16-improvements

Sv 23/ps16 improvements
Invertus · Jul 25, 2024 · 867ec7c · 867ec7c
2 parents 781d604 + 2e3bc85
commit 867ec7c
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 115 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.

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 @@