Merge pull request #94 from PierreRambaud/fix/pdf

Fix pdf generation bug
PrestaShop · Jul 15, 2020 · a32fbb7 · a32fbb7
2 parents c4834ac + a4f6394
commit a32fbb7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/classes/HTMLTemplatePSGDPRModule.php b/classes/HTMLTemplatePSGDPRModule.php
@@ -88,14 +88,19 @@ public function getFooter()
      */
     public function getContent()
     {
+        // Generate smarty data
         $this->smarty->assign([
             'customerInfo' => $this->personalData['prestashopData']['customerInfo'],
             'addresses' => $this->personalData['prestashopData']['addresses'],
             'orders' => $this->personalData['prestashopData']['orders'],
             'carts' => $this->personalData['prestashopData']['carts'],
             'messages' => $this->personalData['prestashopData']['messages'],
             'connections' => $this->personalData['prestashopData']['connections'],
-            'modules' => $this->personalData['modulesData'],
+            'modules' => $this->personalData['modulesData']
+        ]);
+
+        // Generate templates after, to be able to reuse data above
+        $this->smarty->assign([
             'style_tab' => $this->smarty->fetch($this->getGDPRTemplate('personalData.style-tab')),
             'generalInfo_tab' => $this->smarty->fetch($this->getGDPRTemplate('personalData.generalInfo-tab')),
             'orders_tab' => $this->smarty->fetch($this->getGDPRTemplate('personalData.orders-tab')),

diff --git a/controllers/admin/AdminAjaxPsgdprController.php b/controllers/admin/AdminAjaxPsgdprController.php
@@ -101,7 +101,7 @@ public function ajaxProcessDownloadInvoicesByCustomer()
     {
         $id_customer = Tools::getValue('id_customer');
 
-        $order_invoice_list = (int) Db::getInstance()->executeS('SELECT COUNT(*)
+        $order_invoice_list = (int) Db::getInstance()->getValue('SELECT COUNT(1)
             FROM `' . _DB_PREFIX_ . 'order_invoice` oi
             LEFT JOIN `' . _DB_PREFIX_ . 'orders` o ON (o.`id_order` = oi.`id_order`)
             WHERE o.id_customer =' . (int) $id_customer . '