From 055709a8cd1f150753babcd93feb3fed4b8d13e8 Mon Sep 17 00:00:00 2001
From: Touxten <156076965+Touxten@users.noreply.github.com>
Date: Thu, 24 Jul 2025 10:19:55 +0200
Subject: [PATCH 1/3] Fix link since migration page

---
 classes/Form/ConfigurationForm.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/classes/Form/ConfigurationForm.php b/classes/Form/ConfigurationForm.php
index 8622261..d16c97b 100644
--- a/classes/Form/ConfigurationForm.php
+++ b/classes/Form/ConfigurationForm.php
@@ -53,7 +53,7 @@ public function generate()
         $helper->module = $this->module;
         $helper->name_controller = $this->module->name;
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->currentIndex = AdminController::$currentIndex . '&configure=' . $this->module->name;
+        $helper->currentIndex = Context::getContext()->link->getAdminLink('AdminModules', true) . '&configure=' . $this->module->name . '&tab_module=' . $this->module->tab . '&module_name=' . $this->module->name;
 
         // Language
         $helper->default_form_language = $default_lang;
@@ -67,11 +67,10 @@ public function generate()
         $helper->toolbar_btn = [
             'save' => [
                 'desc' => $this->module->getTranslator()->trans('Save', [], 'Modules.Googleanalytics.Admin'),
-                'href' => AdminController::$currentIndex . '&configure=' . $this->module->name . '&save=' . $this->module->name .
-                '&token=' . $helper->token,
+                'href' => Context::getContext()->link->getAdminLink('AdminModules', true) . '&configure=' . $this->module->name . '&tab_module=' . $this->module->tab . '&module_name=' . $this->module->name . '&save=' . $this->module->name,
             ],
             'back' => [
-                'href' => AdminController::$currentIndex . '&token=' . $helper->token,
+                'href' => Context::getContext()->link->getAdminLink('AdminModules', true),
                 'desc' => $this->module->getTranslator()->trans('Back to list', [], 'Modules.Googleanalytics.Admin'),
             ],
         ];

From 768da35e4505eb56610651477e502b49c6e2becb Mon Sep 17 00:00:00 2001
From: Touxten <156076965+Touxten@users.noreply.github.com>
Date: Fri, 25 Jul 2025 10:10:55 +0200
Subject: [PATCH 2/3] Update ConfigurationForm.php

---
 classes/Form/ConfigurationForm.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/Form/ConfigurationForm.php b/classes/Form/ConfigurationForm.php
index d16c97b..7a23ed7 100644
--- a/classes/Form/ConfigurationForm.php
+++ b/classes/Form/ConfigurationForm.php
@@ -20,7 +20,6 @@
 
 namespace PrestaShop\Module\Ps_Googleanalytics\Form;
 
-use AdminController;
 use Configuration;
 use Context;
 use HelperForm;

From fde0accb6c9d79fb5967be4d76a6f19b98864f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Hlav=C3=A1=C4=8Dek?= <daniel.hlavacek@hotmail.cz>
Date: Wed, 29 Oct 2025 16:47:47 +0100
Subject: [PATCH 3/3] Update ConfigurationForm.php

---
 classes/Form/ConfigurationForm.php | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/classes/Form/ConfigurationForm.php b/classes/Form/ConfigurationForm.php
index 7a23ed7..2c50f5d 100644
--- a/classes/Form/ConfigurationForm.php
+++ b/classes/Form/ConfigurationForm.php
@@ -52,7 +52,11 @@ public function generate()
         $helper->module = $this->module;
         $helper->name_controller = $this->module->name;
         $helper->token = Tools::getAdminTokenLite('AdminModules');
-        $helper->currentIndex = Context::getContext()->link->getAdminLink('AdminModules', true) . '&configure=' . $this->module->name . '&tab_module=' . $this->module->tab . '&module_name=' . $this->module->name;
+        $helper->currentIndex = Context::getContext()->link->getAdminLink('AdminModules', true, [], [
+            'configure' => $this->module->name,
+            'tab_module' => $this->module->tab,
+            'module_name' => $this->module->name,
+        ]);
 
         // Language
         $helper->default_form_language = $default_lang;
@@ -60,13 +64,18 @@ public function generate()
 
         // Title and toolbar
         $helper->title = $this->module->displayName;
-        $helper->show_toolbar = true;        // false -> remove toolbar
-        $helper->toolbar_scroll = true;      // yes - > Toolbar is always visible on the top of the screen.
+        $helper->show_toolbar = true; // false -> remove toolbar
+        $helper->toolbar_scroll = true; // yes - > Toolbar is always visible on the top of the screen.
         $helper->submit_action = 'submit' . $this->module->name;
         $helper->toolbar_btn = [
             'save' => [
                 'desc' => $this->module->getTranslator()->trans('Save', [], 'Modules.Googleanalytics.Admin'),
-                'href' => Context::getContext()->link->getAdminLink('AdminModules', true) . '&configure=' . $this->module->name . '&tab_module=' . $this->module->tab . '&module_name=' . $this->module->name . '&save=' . $this->module->name,
+                'href' => Context::getContext()->link->getAdminLink('AdminModules', true, [], [
+                    'configure' => $this->module->name,
+                    'tab_module' => $this->module->tab,
+                    'module_name' => $this->module->name,
+                    'save' => $this->module->name,
+                ]),
             ],
             'back' => [
                 'href' => Context::getContext()->link->getAdminLink('AdminModules', true),