Fix checking if order exists for multistore, add queue.json in zip an…

…d release 5.0.6 ISSUE: CS-4704
Adyen · Nov 9, 2023 · 59b1758 · 59b1758
1 parent 7c86de8
commit 59b1758
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 11 deletions.
diff --git a/src/adyenofficial.php b/src/adyenofficial.php
@@ -46,7 +46,7 @@ public function __construct()
     {
         $this->name = 'adyenofficial';
         $this->tab = 'payments_gateways';
-        $this->version = '5.0.5';
+        $this->version = '5.0.6';
 
         $this->author = $this->l('Adyen');
         $this->need_instance = 0;

diff --git a/src/classes/Services/Integration/OrderService.php b/src/classes/Services/Integration/OrderService.php
@@ -51,11 +51,15 @@ public function __construct(TransactionHistoryRepository $transactionLogReposito
      * @param string $merchantReference
      *
      * @return bool
+     *
+     * @throws PrestaShopDatabaseException
+     * @throws PrestaShopException
      */
     public function orderExists(string $merchantReference): bool
     {
         $cart = new Cart((int)$merchantReference);
-        $order = Order::getByCartId($merchantReference);
+        $idOrder = (int)$this->getIdByCartId((int)$merchantReference);
+        $order = new Order($idOrder);
 
         return $cart->orderExists() &&
             $order->module === 'adyenofficial' &&
@@ -126,6 +130,8 @@ public function getOrderUrl(string $merchantReference): string
     }
 
     /**
+     * This function must be used for fetching order id from cart because PrestaShop function: Order::getByCartId won't work for multistore.
+     *
      * @param int $cartId
      *
      * @return false|string|null

diff --git a/src/classes/Utility/ZipGenerator.php b/src/classes/Utility/ZipGenerator.php
@@ -46,6 +46,10 @@ public static function createZip(array $info, array $autoTestReport, string $log
             $filesNames['AUTO_TEST'],
             json_encode($autoTestReport, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
         );
+        $zip->addFromString(
+            $filesNames['QUEUE'],
+            json_encode($info['queueItems'], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)
+        );
         $zip->addFromString($filesNames['LOGS'], $logs);
 
         $zip->close();

diff --git a/src/composer.json b/src/composer.json
@@ -41,7 +41,7 @@
     "php": "^7.2|^7.4|^8.0",
     "ext-json": "*",
     "ext-zip": "*",
-    "adyen/integration-core": "1.0.4",
+    "adyen/integration-core": "1.0.5",
     "ext-simplexml": "*",
     "ext-openssl": "*"
   },

diff --git a/src/composer.lock b/src/composer.lock
diff --git a/src/controllers/admin/AdyenSystemInfoController.php b/src/controllers/admin/AdyenSystemInfoController.php
@@ -24,7 +24,8 @@ class AdyenSystemInfoController extends AdyenBaseController
         'AUTO_TEST' => 'auto-test.json',
         'CONNECTION_SETTINGS' => 'connection-settings.json',
         'WEBHOOK_VALIDATION' => 'webhook-validation.json',
-        'LOGS' => 'logs.json'
+        'LOGS' => 'logs.json',
+        'QUEUE' => 'queue.json'
     ];
 
     /**

diff --git a/src/views/js/StateController.js b/src/views/js/StateController.js
@@ -60,7 +60,7 @@ if (!window.AdyenFE) {
 
             window.addEventListener('hashchange', updateStateOnHashChange, false);
 
-            api.get(!getStoreId() ? configuration.currentStoreUrl : configuration.storesUrl, () => null, true)
+            api.get(configuration.currentStoreUrl, () => null, true)
                 .then(
                     /** @param {Store|Store[]} response */
                     (response) => {