From 88ceb65d8b8d6d40dacfa88353304c6b3a91e4b0 Mon Sep 17 00:00:00 2001
From: Jonathan Danse <j.danse@prestaedit.com>
Date: Tue, 7 Dec 2021 15:10:09 +0100
Subject: [PATCH 01/12] Avoid warning open_basedir restriction (using fetch
 instead of display)

---
 psgdpr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/psgdpr.php b/psgdpr.php
index 4a27cac2..71805c3c 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -625,7 +625,7 @@ public function hookDisplayCustomerAccount()
             'ps_version' => $this->ps_version,
         ]);
 
-        return $this->display(dirname(__FILE__), '/views/templates/front/customerAccount.tpl');
+        return $this->fetch('module:' . $this->name . '/views/templates/front/customerAccount.tpl');
     }
 
     /**

From 412675a25938de0d75aa4bcc04f0b66db2435cec Mon Sep 17 00:00:00 2001
From: Jonathan Danse <j.danse@prestaedit.com>
Date: Tue, 1 Feb 2022 22:55:16 +0100
Subject: [PATCH 02/12] Remove extra line

---
 psgdpr.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/psgdpr.php b/psgdpr.php
index 6dc9b41d..71805c3c 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -625,7 +625,6 @@ public function hookDisplayCustomerAccount()
             'ps_version' => $this->ps_version,
         ]);
 
-
         return $this->fetch('module:' . $this->name . '/views/templates/front/customerAccount.tpl');
     }
 

From 3836320df1202542f7f930d0e89a5af8a36208ed Mon Sep 17 00:00:00 2001
From: Krystian Podemski <kpodemski@users.noreply.github.com>
Date: Mon, 25 Apr 2022 14:42:07 +0200
Subject: [PATCH 03/12] Remove id of the div to avoid duplicatons

---
 views/templates/hook/displayGDPRConsent.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/templates/hook/displayGDPRConsent.tpl b/views/templates/hook/displayGDPRConsent.tpl
index bbc1e6f7..bac5da2a 100644
--- a/views/templates/hook/displayGDPRConsent.tpl
+++ b/views/templates/hook/displayGDPRConsent.tpl
@@ -17,7 +17,7 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  *}
 
-<div id="gdpr_consent" class="gdpr_module_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
+<div class="gdpr_consent gdpr_module_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
     <span class="custom-checkbox">
         <label class="psgdpr_consent_message">
             <input id="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}" name="psgdpr_consent_checkbox" type="checkbox" value="1" class="psgdpr_consent_checkboxes_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">

From 851488e493be5c92abcc7659553c1e9188f1580a Mon Sep 17 00:00:00 2001
From: atomiix <thomas.baccelli@prestashop.com>
Date: Fri, 1 Jul 2022 11:41:52 +0200
Subject: [PATCH 04/12] Use Organization Build Release Github Action

---
 .github/workflows/build-release.yml | 61 ++---------------------------
 1 file changed, 3 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index eb166266..28ba23fe 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -2,61 +2,6 @@ name: Build
 on: [push, pull_request]
 
 jobs:
-  deploy:
-    name: build dependencies & create artifact
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.0.0
-      - name: Install composer dependencies
-        run: composer install --no-dev -o
-      - name: Clean-up project
-        uses: PrestaShopCorp/github-action-clean-before-deploy@v1.0
-      - name: Prepare auto-index tool
-        run: |
-          composer global require prestashop/autoindex
-      - name: Generate index.php
-        run: |
-          ~/.composer/vendor/bin/autoindex
-      - name: Create & upload artifact
-        uses: actions/upload-artifact@v1
-        with:
-          name: ${{ github.event.repository.name }}
-          path: ../
-  update_release_draft:
-    runs-on: ubuntu-latest
-    needs: [deploy]
-    if: github.event_name == 'push' && github.event.ref == 'refs/heads/master'
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v1
-        with:
-          name: ${{ github.event.repository.name }}
-      - id: release_info
-        uses: toolmantim/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Prepare for Release
-        run: |
-          cd ${{ github.event.repository.name }}
-          zip -r ${{ github.event.repository.name }}.zip ${{ github.event.repository.name }}
-      - name: Clean existing assets
-        shell: bash
-        run: |
-          curl -fsSL https://github.com/github/hub/raw/master/script/get | bash -s 2.14.1
-          assets=`bin/hub api -t repos/${{ github.repository }}/releases/${{ steps.release_info.outputs.id }}/assets | awk '/\].url/ { print $2 }'`
-          for asset in $assets
-          do
-              bin/hub api -X DELETE $asset
-          done
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Publish to GitHub Release
-        uses: actions/upload-release-asset@v1.0.1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.release_info.outputs.upload_url }}
-          asset_path: ./${{ github.event.repository.name }}/${{ github.event.repository.name }}.zip
-          asset_name: ${{ github.event.repository.name }}.zip
-          asset_content_type: application/zip
+  build-and-release-draft:
+    name: Build & Release draft
+    uses: PrestaShop/.github/.github/workflows/build-release.yml@master

From ec8fdb041997fe347e45713ca1ad185c355c4c5e Mon Sep 17 00:00:00 2001
From: Okom3pom <contact@okom3pom.com>
Date: Fri, 15 Jul 2022 09:10:27 +0200
Subject: [PATCH 05/12] Fix age from export customer info

---
 psgdpr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/psgdpr.php b/psgdpr.php
index 671ed579..d1f0166b 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -1145,6 +1145,6 @@ public function getAgeCustomer($id_customer)
             AND id_customer = ' . (int) $id_customer . '
             AND birthday IS NOT NULL AND birthday != "0000-00-00" ' . Shop::addSqlRestriction());
 
-        return (int) round($value / 365);
+        return (int) floor($value / 365);
     }
 }

From c245868be19517167666b637fab7474e675466d0 Mon Sep 17 00:00:00 2001
From: Okom3pom <contact@okom3pom.com>
Date: Fri, 15 Jul 2022 09:46:45 +0200
Subject: [PATCH 06/12] Optimize code

---
 psgdpr.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/psgdpr.php b/psgdpr.php
index d1f0166b..f53e5b7c 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -1139,12 +1139,10 @@ public function getCustomerNameById($id_customer)
      */
     public function getAgeCustomer($id_customer)
     {
-        $value = (int) Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->getValue('SELECT AVG(DATEDIFF("' . date('Y-m-d') . ' 00:00:00", birthday))
+        return (int) Db::getInstance((bool) _PS_USE_SQL_SLAVE_)->getValue('SELECT TIMESTAMPDIFF(YEAR, birthday, CURDATE()) AS age
             FROM `' . _DB_PREFIX_ . 'customer` c
             WHERE active = 1
             AND id_customer = ' . (int) $id_customer . '
             AND birthday IS NOT NULL AND birthday != "0000-00-00" ' . Shop::addSqlRestriction());
-
-        return (int) floor($value / 365);
     }
 }

From 4bbbc0662370cfcbb933c13b9dfc829bb97c5e01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20=C5=81ach?= <jacob.lach98@gmail.com>
Date: Wed, 10 Aug 2022 12:19:35 +0200
Subject: [PATCH 07/12] adaptation to the hummingbird theme

---
 views/templates/hook/displayGDPRConsent.tpl | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/views/templates/hook/displayGDPRConsent.tpl b/views/templates/hook/displayGDPRConsent.tpl
index bac5da2a..fb73d41a 100644
--- a/views/templates/hook/displayGDPRConsent.tpl
+++ b/views/templates/hook/displayGDPRConsent.tpl
@@ -16,16 +16,17 @@
  * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  *}
-
-<div class="gdpr_consent gdpr_module_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
-    <span class="custom-checkbox">
-        <label class="psgdpr_consent_message">
-            <input id="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}" name="psgdpr_consent_checkbox" type="checkbox" value="1" class="psgdpr_consent_checkboxes_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
-            <span><i class="material-icons rtl-no-flip checkbox-checked psgdpr_consent_icon"></i></span>
-            <span>{$psgdpr_consent_message nofilter}</span>{* html data *}
-        </label>
-    </span>
-</div>
+{block name='gdpr_checkbox'}
+    <div class="gdpr_consent gdpr_module_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
+        <span class="custom-checkbox">
+            <label class="psgdpr_consent_message">
+                <input id="psgdpr_consent_checkbox_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}" name="psgdpr_consent_checkbox" type="checkbox" value="1" class="psgdpr_consent_checkboxes_{$psgdpr_id_module|escape:'htmlall':'UTF-8'}">
+                <span><i class="material-icons rtl-no-flip checkbox-checked psgdpr_consent_icon"></i></span>
+                <span>{$psgdpr_consent_message nofilter}</span>{* html data *}
+            </label>
+        </span>
+    </div>
+{/block}
 {literal}
 <script type="text/javascript">
     var psgdpr_front_controller = "{/literal}{$psgdpr_front_controller|escape:'htmlall':'UTF-8'}{literal}";

From 63fc4b281a43909bb8010fe7bc8f81c58cda3a43 Mon Sep 17 00:00:00 2001
From: Krystian Podemski <podemski.krystian@gmail.com>
Date: Tue, 16 Aug 2022 14:05:27 +0200
Subject: [PATCH 08/12] bump version 1.4.3

---
 config.xml | 2 +-
 psgdpr.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.xml b/config.xml
index 8abe847d..019ef6f9 100644
--- a/config.xml
+++ b/config.xml
@@ -2,7 +2,7 @@
 <module>
     <name>psgdpr</name>
     <displayName><![CDATA[Official GDPR compliance]]></displayName>
-    <version><![CDATA[1.4.2]]></version>
+    <version><![CDATA[1.4.3]]></version>
     <description><![CDATA[Make your store comply with the General Data Protection Regulation (GDPR).]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>
diff --git a/psgdpr.php b/psgdpr.php
index f53e5b7c..456ef172 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -122,7 +122,7 @@ public function __construct()
         // Settings
         $this->name = 'psgdpr';
         $this->tab = 'administration';
-        $this->version = '1.4.2';
+        $this->version = '1.4.3';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
 

From 875516c49c2ae734619cf79ff9313bd4c6002ed3 Mon Sep 17 00:00:00 2001
From: Romain Soulard <romain.soulard@pro-laser.fr>
Date: Mon, 12 Sep 2022 09:27:46 +0200
Subject: [PATCH 09/12] fix registerGDPRConsent hook

---
 psgdpr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/psgdpr.php b/psgdpr.php
index 456ef172..09b85c54 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -714,7 +714,7 @@ public function getRegisteredModules()
     {
         $modulesRegister = Hook::getHookModuleExecList('registerGDPRConsent'); // get modules using the gdpr hook
 
-        if (empty($modulesRegister) || count($modulesRegister) <= 1) { // if 0 module stop (1 to exclude gdpr module)
+        if (empty($modulesRegister)) { // if 0 module stop
             return;
         }
 

From 2f374021980148c0757e48cfb8d9dec9d7f2789a Mon Sep 17 00:00:00 2001
From: Krystian Podemski <podemski.krystian@gmail.com>
Date: Fri, 9 Dec 2022 11:46:32 +0100
Subject: [PATCH 10/12] Fix hook registration if needed

cs fix
---
 upgrade/upgrade-1.4.3.php | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 upgrade/upgrade-1.4.3.php

diff --git a/upgrade/upgrade-1.4.3.php b/upgrade/upgrade-1.4.3.php
new file mode 100644
index 00000000..6d17fd80
--- /dev/null
+++ b/upgrade/upgrade-1.4.3.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * 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)
+ */
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+/**
+ * @param Psgdpr $module
+ *
+ * @return bool
+ */
+function upgrade_module_1_4_3($module)
+{
+    if (!$module->isRegisteredInHook('displayGDPRConsent')) {
+        return $module->registerHook('displayGDPRConsent');
+    }
+
+    return true;
+}

From 69d84aea91d186c9b4318effcd6ad2927e113b93 Mon Sep 17 00:00:00 2001
From: Krystian Podemski <podemski.krystian@gmail.com>
Date: Fri, 9 Dec 2022 12:04:50 +0100
Subject: [PATCH 11/12] fix PHPStan

---
 psgdpr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/psgdpr.php b/psgdpr.php
index 09b85c54..f6828693 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -904,6 +904,7 @@ public function getCustomerDataFromPrestashop(Customer $customer)
 
         // get referrers
         if (version_compare(_PS_VERSION_, '8.0.0', '<')) {
+            // @phpstan-ignore-next-line
             $data['referrer'] = Referrer::getReferrers($customer->id);
         }
 

From 26b5df4b148084723a814f34bb97a99f18c4a0cc Mon Sep 17 00:00:00 2001
From: Krystian Podemski <podemski.krystian@gmail.com>
Date: Mon, 12 Dec 2022 14:36:34 +0100
Subject: [PATCH 12/12] fix consent on the registration page

---
 psgdpr.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/psgdpr.php b/psgdpr.php
index f6828693..b98745a4 100755
--- a/psgdpr.php
+++ b/psgdpr.php
@@ -566,6 +566,7 @@ public function hookAdditionalCustomerFormFields()
                 $label = Configuration::get('PSGDPR_CUSTOMER_FORM', $id_lang);
                 break;
             case 'authentication':
+            case 'registration':
             case 'order':
             case 'order-confirmation':
                 $active = Configuration::get('PSGDPR_CREATION_FORM_SWITCH');