From d9d5cff98939ecc2ca09edf6632b1d397b3475f9 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Wed, 19 Apr 2023 23:31:54 +0200
Subject: [PATCH 01/12] Update FrontAjaxGdpr.php

---
 controllers/front/FrontAjaxGdpr.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/controllers/front/FrontAjaxGdpr.php b/controllers/front/FrontAjaxGdpr.php
index be623951..7d894793 100644
--- a/controllers/front/FrontAjaxGdpr.php
+++ b/controllers/front/FrontAjaxGdpr.php
@@ -20,7 +20,7 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  */
-class psgdprFrontAjaxGdprModuleFrontController extends FrontController
+class psgdprFrontAjaxGdprModuleFrontController extends ModuleFrontController
 {
     /**
      * Store if the client consented or not to GDPR on a specific module for statistic purpose only
@@ -28,17 +28,11 @@ class psgdprFrontAjaxGdprModuleFrontController extends FrontController
      * @throws PrestaShopDatabaseException
      * @throws PrestaShopException
      */
-    public function display()
+    public function displayAjaxAddlog()
     {
         /** @var LoggerService $loggerService */
         $loggerService = $this->get('PrestaShop\Module\Psgdpr\Service\LoggerService');
 
-        if (Tools::getValue('action') !== 'AddLog') {
-            $this->ajaxRender();
-
-            return false;
-        }
-
         $customerId = (int) Tools::getValue('id_customer');
         $customerToken = (string) Tools::getValue('customer_token');
 

From 43dab4e2a51aa9571f617f0d76280fbc0d6dc4bb Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Wed, 19 Apr 2023 23:32:42 +0200
Subject: [PATCH 02/12] Update gdpr.php

---
 controllers/front/gdpr.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/controllers/front/gdpr.php b/controllers/front/gdpr.php
index c81ca023..b3a77b36 100644
--- a/controllers/front/gdpr.php
+++ b/controllers/front/gdpr.php
@@ -101,7 +101,6 @@ public function setMedia(): bool
 
         parent::setMedia();
 
-        $this->context->controller->addJS($js_path . 'front.js');
         $this->context->controller->addCSS($css_path . 'account-gdpr-page.css');
 
         return true;

From afd7334870a09d425bff5d06f42a50b44eccf6f1 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Wed, 19 Apr 2023 23:34:17 +0200
Subject: [PATCH 03/12] Update psgdpr.php

---
 psgdpr.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/psgdpr.php b/psgdpr.php
index 885423ac..7ec30837 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -748,7 +748,6 @@ public function hookDisplayGDPRConsent(array $params): string
         }
 
         $message = $consentRepository->findModuleConsentMessage($moduleId, $this->context->language->id);
-        $url = $this->context->link->getModuleLink($this->name, 'FrontAjaxGdpr', [], true);
 
         $customerId = $this->context->customer->id;
         $guestId = 0;
@@ -765,7 +764,6 @@ public function hookDisplayGDPRConsent(array $params): string
             'psgdpr_guest_token' => sha1('psgdpr' . $guestId . $_SERVER['REMOTE_ADDR'] . date('Y-m-d')),
             'psgdpr_id_module' => $moduleId,
             'psgdpr_consent_message' => $message,
-            'psgdpr_front_controller' => $url,
         ]);
 
         return $this->fetch('module:' . $this->name . '/views/templates/hook/display_rgpd_consent.tpl');

From aee7e0f220631e7940fc161a25352b547b3d932c Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Wed, 19 Apr 2023 23:36:20 +0200
Subject: [PATCH 04/12] Update display_rgpd_consent.tpl

---
 views/templates/hook/display_rgpd_consent.tpl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/templates/hook/display_rgpd_consent.tpl b/views/templates/hook/display_rgpd_consent.tpl
index fb73d41a..48da0f18 100644
--- a/views/templates/hook/display_rgpd_consent.tpl
+++ b/views/templates/hook/display_rgpd_consent.tpl
@@ -29,8 +29,6 @@
 {/block}
 {literal}
 <script type="text/javascript">
-    var psgdpr_front_controller = "{/literal}{$psgdpr_front_controller|escape:'htmlall':'UTF-8'}{literal}";
-    psgdpr_front_controller = psgdpr_front_controller.replace(/\amp;/g,'');
     var psgdpr_id_customer = "{/literal}{$psgdpr_id_customer|escape:'htmlall':'UTF-8'}{literal}";
     var psgdpr_customer_token = "{/literal}{$psgdpr_customer_token|escape:'htmlall':'UTF-8'}{literal}";
     var psgdpr_id_guest = "{/literal}{$psgdpr_id_guest|escape:'htmlall':'UTF-8'}{literal}";
@@ -63,10 +61,12 @@
         // Triggered on page loading
         toggleFormActive();
 
-        $(document).on('submit', parentForm, function(event) {
+        parentForm.on('submit', function(event) {
             $.ajax({
                 type: 'POST',
-                url: psgdpr_front_controller,
+                url: "{/literal}{$link->getModuleLink('psgdpr','FrontAjaxGdpr',['ajax' => 1], true)}{literal}",
+                async: false,
+                dataType : 'text',
                 data: {
                     ajax: true,
                     action: 'AddLog',

From 851fed2fa3a2694e99072eee3911683c0902b9b3 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Wed, 19 Apr 2023 23:43:50 +0200
Subject: [PATCH 05/12] Delete front.js

---
 views/js/front.js | 41 -----------------------------------------
 1 file changed, 41 deletions(-)
 delete mode 100755 views/js/front.js

diff --git a/views/js/front.js b/views/js/front.js
deleted file mode 100755
index 6e494304..00000000
--- a/views/js/front.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Copyright since 2007 PrestaShop SA and Contributors
- * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
- *
- * NOTICE OF LICENSE
- *
- * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
- * that is bundled with this package in the file LICENSE.md.
- * It is also available through the world-wide-web at this URL:
- * https://opensource.org/licenses/AFL-3.0
- * If you did not receive a copy of the license and are unable to
- * obtain it through the world-wide-web, please send an email
- * to license@prestashop.com so we can send you a copy immediately.
- *
- * @author    PrestaShop SA <contact@prestashop.com>
- * @copyright Since 2007 PrestaShop SA and Contributors
- * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- */
-
-$(document).ready(function() {
-    psgdpr_front_controller = psgdpr_front_controller.replace(/\amp;/g,'');
-
-    $(document).on('click', '#exportPersonalData', function (e) {
-        $.ajax({
-            data: 'POST',
-            dataType: 'JSON',
-            url: psgdpr_front_controller,
-            data: {
-                ajax: true,
-                action: test,
-                id_customer: psgdpr_id_customer
-            },
-            success: function (data) {
-
-            },
-            error: function (err) {
-                console.log(err);
-            }
-        });
-    });
-});

From 2ec2807df5ee615afc71f40b9cd4272bfeb5d163 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Thu, 20 Apr 2023 14:34:37 +0200
Subject: [PATCH 06/12] Update ExportService.php

---
 src/Service/ExportService.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Service/ExportService.php b/src/Service/ExportService.php
index 69e673eb..f4de98e6 100644
--- a/src/Service/ExportService.php
+++ b/src/Service/ExportService.php
@@ -135,6 +135,14 @@ public function getThirdPartyModulesInformations($customer): array
                 $moduleData = $this->translator->trans('No data available', [], 'Modules.Psgdpr.Admin');
             }
 
+            if (isset($moduleData->template)) {
+                $thirdPartyModuleData[$moduleInfos->name]['template'] = _PS_CORE_DIR_.$moduleData->template;
+                $moduleData = $moduleData->data;
+
+            }else {
+                $thirdPartyModuleData[$moduleInfos->name]['template'] ='';
+            }
+            
             if (!is_array($moduleData)) {
                 $thirdPartyModuleData[$moduleInfos->name]['name'] = $entryName;
                 $thirdPartyModuleData[$moduleInfos->name]['headers'][] = $this->translator->trans('Information', [], 'Modules.Psgdpr.Admin');

From c6f4319ca2a2a8b60b8d186dcb9dfed3a4bf3b06 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Thu, 20 Apr 2023 14:36:54 +0200
Subject: [PATCH 07/12] Update modules.tpl

---
 .../templates/front/pdf/sections/modules.tpl  | 37 ++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/views/templates/front/pdf/sections/modules.tpl b/views/templates/front/pdf/sections/modules.tpl
index 7b6eddab..7c38184c 100644
--- a/views/templates/front/pdf/sections/modules.tpl
+++ b/views/templates/front/pdf/sections/modules.tpl
@@ -18,22 +18,25 @@
  *}
 
 {foreach from=$modules item=module key=key}
-<h2>{$module['name']}</h2>
-<br>
+    <h2>{$module['name']}</h2>
+    <br>
+    {if $module.template!=''}
+        {include file=$module.template}
+    {else}    
+        <table id="summary-tab" width="100%">
+            <tr>
+                {foreach from=$module['headers'] item=data key=index}
+                <th class="header" valign="middle">{$data}</th>
+                {/foreach}
+            </tr>
 
-<table id="summary-tab" width="100%">
-    <tr>
-        {foreach from=$module['headers'] item=data key=index}
-        <th class="header" valign="middle">{$data}</th>
-        {/foreach}
-    </tr>
-
-    <tr>
-        {foreach from=$module['data'] item=entry key=index}
-            {foreach from=$entry item=value key=index}
-                <td class="center white">{$value}</td>
-            {/foreach}
-        {/foreach}
-    </tr>
-</table>
+            <tr>
+                {foreach from=$module['data'] item=entry key=index}
+                    {foreach from=$entry item=value key=index}
+                        <td class="center white">{$value}</td>
+                    {/foreach}
+                {/foreach}
+            </tr>
+        </table>
+    {/if}
 {/foreach}

From 4b12550d4d99640433c21bb630015bbb910e1981 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Wed, 10 May 2023 11:42:30 +0200
Subject: [PATCH 08/12] Update ExportService.php

---
 src/Service/ExportService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Service/ExportService.php b/src/Service/ExportService.php
index f4de98e6..29ce6150 100644
--- a/src/Service/ExportService.php
+++ b/src/Service/ExportService.php
@@ -135,8 +135,8 @@ public function getThirdPartyModulesInformations($customer): array
                 $moduleData = $this->translator->trans('No data available', [], 'Modules.Psgdpr.Admin');
             }
 
-            if (isset($moduleData->template)) {
-                $thirdPartyModuleData[$moduleInfos->name]['template'] = _PS_CORE_DIR_.$moduleData->template;
+            if (is_object($moduleData) && isset($moduleData->template)) {
+                $thirdPartyModuleData[$moduleInfos->name]['template'] = _PS_CORE_DIR_ . $moduleData->template;
                 $moduleData = $moduleData->data;
 
             }else {

From 707a44b3bd13aaf3175f643c4990c9422fdfcce0 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Fri, 12 May 2023 11:34:32 +0200
Subject: [PATCH 09/12] Update ExportService.php

---
 src/Service/ExportService.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Service/ExportService.php b/src/Service/ExportService.php
index 29ce6150..40b4a844 100644
--- a/src/Service/ExportService.php
+++ b/src/Service/ExportService.php
@@ -129,15 +129,15 @@ public function getThirdPartyModulesInformations($customer): array
             }
 
             /** @var array $moduleData */
-            $moduleData = json_decode($dataFromModule);
+            $moduleData = json_decode($dataFromModule, true);
 
             if (empty($moduleData)) {
                 $moduleData = $this->translator->trans('No data available', [], 'Modules.Psgdpr.Admin');
             }
 
-            if (is_object($moduleData) && isset($moduleData->template)) {
-                $thirdPartyModuleData[$moduleInfos->name]['template'] = _PS_CORE_DIR_ . $moduleData->template;
-                $moduleData = $moduleData->data;
+            if (isset($moduleData['template'])) {
+                $thirdPartyModuleData[$moduleInfos->name]['template'] = _PS_CORE_DIR_ . $moduleData['template'];
+                $moduleData = $moduleData['data'];
 
             }else {
                 $thirdPartyModuleData[$moduleInfos->name]['template'] ='';

From b062f58745bd495f34f705e2d5a59c441440a138 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Fri, 26 May 2023 11:02:20 +0200
Subject: [PATCH 10/12] Update ExportService.php

---
 src/Service/ExportService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Service/ExportService.php b/src/Service/ExportService.php
index 40b4a844..315e7bfb 100644
--- a/src/Service/ExportService.php
+++ b/src/Service/ExportService.php
@@ -140,7 +140,7 @@ public function getThirdPartyModulesInformations($customer): array
                 $moduleData = $moduleData['data'];
 
             }else {
-                $thirdPartyModuleData[$moduleInfos->name]['template'] ='';
+                $thirdPartyModuleData[$moduleInfos->name]['template'] = '';
             }
             
             if (!is_array($moduleData)) {

From 1015c4e86f8ef2dcb1990ba2fa2d3eec0b3fd937 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Fri, 26 May 2023 11:04:15 +0200
Subject: [PATCH 11/12] Update ExportService.php

---
 src/Service/ExportService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Service/ExportService.php b/src/Service/ExportService.php
index 315e7bfb..24e95321 100644
--- a/src/Service/ExportService.php
+++ b/src/Service/ExportService.php
@@ -139,7 +139,7 @@ public function getThirdPartyModulesInformations($customer): array
                 $thirdPartyModuleData[$moduleInfos->name]['template'] = _PS_CORE_DIR_ . $moduleData['template'];
                 $moduleData = $moduleData['data'];
 
-            }else {
+            } else {
                 $thirdPartyModuleData[$moduleInfos->name]['template'] = '';
             }
             

From 0348e0b5c8ba6492f6e1575845365d41dcd176a8 Mon Sep 17 00:00:00 2001
From: Nicolas CADOR <96910631+NicolasCador@users.noreply.github.com>
Date: Fri, 26 May 2023 11:13:40 +0200
Subject: [PATCH 12/12] Update ExportService.php

---
 src/Service/ExportService.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Service/ExportService.php b/src/Service/ExportService.php
index 24e95321..6fd0c706 100644
--- a/src/Service/ExportService.php
+++ b/src/Service/ExportService.php
@@ -138,11 +138,10 @@ public function getThirdPartyModulesInformations($customer): array
             if (isset($moduleData['template'])) {
                 $thirdPartyModuleData[$moduleInfos->name]['template'] = _PS_CORE_DIR_ . $moduleData['template'];
                 $moduleData = $moduleData['data'];
-
             } else {
                 $thirdPartyModuleData[$moduleInfos->name]['template'] = '';
             }
-            
+
             if (!is_array($moduleData)) {
                 $thirdPartyModuleData[$moduleInfos->name]['name'] = $entryName;
                 $thirdPartyModuleData[$moduleInfos->name]['headers'][] = $this->translator->trans('Information', [], 'Modules.Psgdpr.Admin');