From a2473c802ecd51ad2c3f579fd2c61fd4a7be4655 Mon Sep 17 00:00:00 2001 From: lartist Date: Fri, 31 Mar 2023 11:18:59 +0200 Subject: [PATCH] fixes after review and migrate every domain to Modules.Psgdpr.Shop or Modules.Psgdpr.Admin ony --- controllers/front/gdpr.php | 2 +- psgdpr.php | 44 +++--- src/Service/ExportService.php | 130 +++++++++--------- views/templates/admin/menu.tpl | 32 ++--- .../templates/admin/tabs/customerActivity.tpl | 18 +-- views/templates/admin/tabs/dataConfig.tpl | 16 +-- views/templates/admin/tabs/dataConsent.tpl | 38 ++--- views/templates/admin/tabs/getStarted.tpl | 44 +++--- views/templates/admin/tabs/help.tpl | 20 +-- views/templates/front/account_gdpr_box.tpl | 2 +- views/templates/front/account_gdpr_page.tpl | 14 +- .../front/pdf/sections/addresses.tpl | 4 +- views/templates/front/pdf/sections/carts.tpl | 12 +- .../front/pdf/sections/discounts.tpl | 4 +- .../pdf/sections/general_informations.tpl | 2 +- views/templates/front/pdf/sections/groups.tpl | 4 +- .../front/pdf/sections/last_connections.tpl | 4 +- .../front/pdf/sections/last_sent_emails.tpl | 4 +- .../templates/front/pdf/sections/messages.tpl | 4 +- views/templates/front/pdf/sections/orders.tpl | 12 +- 20 files changed, 205 insertions(+), 205 deletions(-) diff --git a/controllers/front/gdpr.php b/controllers/front/gdpr.php index 36ecfa32..c81ca023 100644 --- a/controllers/front/gdpr.php +++ b/controllers/front/gdpr.php @@ -82,7 +82,7 @@ public function getBreadcrumbLinks() $breadcrumb = parent::getBreadcrumbLinks(); $breadcrumb['links'][] = $this->addMyAccountToBreadcrumb(); $breadcrumb['links'][] = [ - 'title' => $this->trans('GDPR - Personal data', [], 'Modules.Psgdpr.CustomerAccount'), + 'title' => $this->trans('GDPR - Personal data', [], 'Modules.Psgdpr.Shop'), 'url' => $this->context->link->getModuleLink($this->module->name, 'gdpr', [], true), ]; diff --git a/psgdpr.php b/psgdpr.php index d98f1845..7f7cb3c5 100755 --- a/psgdpr.php +++ b/psgdpr.php @@ -99,10 +99,10 @@ public function __construct() $this->output = ''; - $this->displayName = $this->trans('Official GDPR compliance', [], 'Modules.Psgdpr.General'); - $this->description = $this->trans('Make your store comply with the General Data Protection Regulation (GDPR).', [], 'Modules.Psgdpr.General'); + $this->displayName = $this->trans('Official GDPR compliance', [], 'Modules.Psgdpr.Shop'); + $this->description = $this->trans('Make your store comply with the General Data Protection Regulation (GDPR).', [], 'Modules.Psgdpr.Shop'); - $this->confirmUninstall = $this->trans('Are you sure you want to uninstall this module?', [], 'Modules.Psgdpr.General'); + $this->confirmUninstall = $this->trans('Are you sure you want to uninstall this module?', [], 'Modules.Psgdpr.Shop'); $this->ps_versions_compliancy = ['min' => '8.0.0', 'max' => _PS_VERSION_]; require_once __DIR__ . '/vendor/autoload.php'; @@ -162,7 +162,7 @@ public function install(): bool 'file' => $e->getFile(), 'line' => $e->getLine(), ]); - $this->_errors[] = $this->trans('There was an error during install. Please contact us through Addons website. (for developers, consult shop logs)', [], 'Modules.Psgdpr.General'); + $this->_errors[] = $this->trans('There was an error during install. Please contact us through Addons website. (for developers, consult shop logs)', [], 'Modules.Psgdpr.Shop'); } return empty($this->_errors); @@ -190,7 +190,7 @@ public function uninstall(): bool 'file' => $e->getFile(), 'line' => $e->getLine(), ]); - $this->_errors[] = $this->_errors[] = $this->trans('There was an error during uninstall. Please contact us through Addons website. (for developers, consult shop logs)', [], 'Modules.Psgdpr.General'); + $this->_errors[] = $this->_errors[] = $this->trans('There was an error during uninstall. Please contact us through Addons website. (for developers, consult shop logs)', [], 'Modules.Psgdpr.Shop'); } return empty($this->_errors); @@ -203,41 +203,41 @@ public function loadFaq() { return [ [ - 'title' => $this->trans('Data accessibility', [], 'Modules.Psgdpr.Faq'), + 'title' => $this->trans('Data accessibility', [], 'Modules.Psgdpr.Admin'), 'blocks' => [ [ - 'question' => $this->trans('How can a customer retrieve all of their personal data?', [], 'Modules.Psgdpr.Faq'), - 'answer' => $this->trans('From their customer account, a new tab called "My Personal Data" is available and your customer can retrieve all of their personal data collected by your store and installed modules, in PDF or CSV format.', [], 'Modules.Psgdpr.Faq'), + 'question' => $this->trans('How can a customer retrieve all of their personal data?', [], 'Modules.Psgdpr.Admin'), + 'answer' => $this->trans('From their customer account, a new tab called "My Personal Data" is available and your customer can retrieve all of their personal data collected by your store and installed modules, in PDF or CSV format.', [], 'Modules.Psgdpr.Admin'), ], ], ], [ - 'title' => $this->trans('Customer consent', [], 'Modules.Psgdpr.Faq'), + 'title' => $this->trans('Customer consent', [], 'Modules.Psgdpr.Admin'), 'blocks' => [ [ - 'question' => $this->trans('There is no consent confirmation checkbox in the contact form. Isn\'t this a requirement?', [], 'Modules.Psgdpr.Faq'), - 'answer' => $this->trans('No, it is not a requirement as the customer gives consent by clicking on the Submit message button. Only a message is required to give your customers more information about the use of personal data on your website. We are currently working on a new version of the contact form, it will be available really soon for your online store.', [], 'Modules.Psgdpr.Faq'), + 'question' => $this->trans('There is no consent confirmation checkbox in the contact form. Isn\'t this a requirement?', [], 'Modules.Psgdpr.Admin'), + 'answer' => $this->trans('No, it is not a requirement as the customer gives consent by clicking on the Submit message button. Only a message is required to give your customers more information about the use of personal data on your website. We are currently working on a new version of the contact form, it will be available really soon for your online store.', [], 'Modules.Psgdpr.Admin'), ], ], ], [ - 'title' => $this->trans('Data erasure', [], 'Modules.Psgdpr.Faq'), + 'title' => $this->trans('Data erasure', [], 'Modules.Psgdpr.Admin'), 'blocks' => [ [ - 'question' => $this->trans('How can a customer ask for all of their personal data to be deleted?', [], 'Modules.Psgdpr.Faq'), - 'answer' => $this->trans('The customer will send a message through the contact form for any rectification and erasure requests, justifying their request.', [], 'Modules.Psgdpr.Faq'), + 'question' => $this->trans('How can a customer ask for all of their personal data to be deleted?', [], 'Modules.Psgdpr.Admin'), + 'answer' => $this->trans('The customer will send a message through the contact form for any rectification and erasure requests, justifying their request.', [], 'Modules.Psgdpr.Admin'), ], [ - 'question' => $this->trans('There is no "Remove Data" button in the customer account. Isn\'t this a requirement?', [], 'Modules.Psgdpr.Faq'), - 'answer' => $this->trans('No, the "Remove Data" button in the customer account is not mandatory. For data erasure requests, your customers can request data removal only under certain circumstances, that is the reason why we decided not to include an automatic "Remove Data" button in their customer account.\n\nThey can, however, contact you anytime via your contact form, in this case, you can review their request and once you accept it, you will be able to remove their personal data directly in the configuration page of the GDPR Compliance module.', [], 'Modules.Psgdpr.Faq'), + 'question' => $this->trans('There is no "Remove Data" button in the customer account. Isn\'t this a requirement?', [], 'Modules.Psgdpr.Admin'), + 'answer' => $this->trans('No, the "Remove Data" button in the customer account is not mandatory. For data erasure requests, your customers can request data removal only under certain circumstances, that is the reason why we decided not to include an automatic "Remove Data" button in their customer account.\n\nThey can, however, contact you anytime via your contact form, in this case, you can review their request and once you accept it, you will be able to remove their personal data directly from the configuration page of the Official GDPR Compliance module.', [], 'Modules.Psgdpr.Admin'), ], [ - 'question' => $this->trans('How to remove the personal data of a customer?', [], 'Modules.Psgdpr.Faq'), - 'answer' => $this->trans("If the request is valid, from the Personal Data Management tab of this module, any customer can be found by typing the first few letters of their name or email address in the search bar.\nBefore deleting any data, we recommend downloading all the invoices of the involved customer. After deleting the data with the “Remove data” button, the customer’s orders can’t be legally deleted, they just won’t be linked to any account anymore. This allows you to keep precise statistics of your store.", [], 'Modules.Psgdpr.Faq'), + 'question' => $this->trans('How to remove the personal data of a customer?', [], 'Modules.Psgdpr.Admin'), + 'answer' => $this->trans("If the request is valid, from the Personal Data Management tab of this module, any customer can be found by typing the first few letters of their name or email address in the search bar.\nBefore deleting any data, we recommend downloading all the invoices of the involved customer. After deleting the data with the “Remove data” button, the customer’s orders can’t be legally deleted, they just won’t be linked to any account anymore. This allows you to keep precise statistics of your store.", [], 'Modules.Psgdpr.Admin'), ], [ - 'question' => $this->trans('After removing all personal data of a customer from my database, what will happen to their orders?', [], 'Modules.Psgdpr.Faq'), - 'answer' => $this->trans("Due to other legal obligations, their orders will still be stored but they are no longer associated with the customer.\nOnly the name, shipping, and billing information must be kept in the order details page for legal reasons, invoicing, and accounting.\nAccording to the Rec.30;Art.7(1)(c)", [], 'Modules.Psgdpr.Faq'), + 'question' => $this->trans('After removing all personal data of a customer from my database, what will happen to their orders?', [], 'Modules.Psgdpr.Admin'), + 'answer' => $this->trans("Due to other legal obligations, their orders will still be stored but they are no longer associated with the customer.\nOnly the name, shipping, and billing information must be kept in the order details page for legal reasons, invoicing, and accounting.\nAccording to the Rec.30;Art.7(1)(c)", [], 'Modules.Psgdpr.Admin'), ], ], ], @@ -477,7 +477,7 @@ private function submitDataConsent() $consentRepository->createOrUpdateConsent($psgdprConsent); } - $this->output .= $this->displayConfirmation($this->getTranslator()->trans('Saved with success !', [], 'Modules.Psgdpr.General')); + $this->output .= $this->displayConfirmation($this->getTranslator()->trans('Saved with success !', [], 'Modules.Psgdpr.Shop')); } } @@ -643,7 +643,7 @@ public function hookActionAdminControllerSetMedia() return false; } - Media::addJsDefL('psgdprNoAddresses', $this->trans('Customer data deleted by the GDPR module.', [], 'Modules.Psgdpr.General')); + Media::addJsDefL('psgdprNoAddresses', $this->trans('Customer data deleted by the Official GDPR module.', [], 'Modules.Psgdpr.Shop')); $this->context->controller->addCSS($this->getPathUri() . '/views/css/overrideAddress.css'); $this->context->controller->addJS($this->getPathUri() . '/views/js/overrideAddress.js'); diff --git a/src/Service/ExportService.php b/src/Service/ExportService.php index d75f6dbf..69e673eb 100644 --- a/src/Service/ExportService.php +++ b/src/Service/ExportService.php @@ -120,10 +120,10 @@ public function getThirdPartyModulesInformations($customer): array try { $dataFromModule = Hook::exec('actionExportGDPRData', (array) $customer, $module['id_module']); } catch (Exception|Error $e) { - $errorMessage = $this->translator->trans('An error occurred while retrieving data, please contact the module author.', [], 'Modules.Psgdpr.Export'); + $errorMessage = $this->translator->trans('An error occurred while retrieving data, please contact the module author.', [], 'Modules.Psgdpr.Admin'); $thirdPartyModuleData[$moduleInfos->name]['name'] = $entryName; - $thirdPartyModuleData[$moduleInfos->name]['headers'][] = $this->translator->trans('Error', [], 'Modules.Psgdpr.Export'); + $thirdPartyModuleData[$moduleInfos->name]['headers'][] = $this->translator->trans('Error', [], 'Modules.Psgdpr.Admin'); $thirdPartyModuleData[$moduleInfos->name]['data'][] = [$errorMessage]; continue; } @@ -132,12 +132,12 @@ public function getThirdPartyModulesInformations($customer): array $moduleData = json_decode($dataFromModule); if (empty($moduleData)) { - $moduleData = $this->translator->trans('No data available', [], 'Modules.Psgdpr.Export'); + $moduleData = $this->translator->trans('No data available', [], 'Modules.Psgdpr.Admin'); } if (!is_array($moduleData)) { $thirdPartyModuleData[$moduleInfos->name]['name'] = $entryName; - $thirdPartyModuleData[$moduleInfos->name]['headers'][] = $this->translator->trans('Information', [], 'Modules.Psgdpr.Export'); + $thirdPartyModuleData[$moduleInfos->name]['headers'][] = $this->translator->trans('Information', [], 'Modules.Psgdpr.Admin'); $thirdPartyModuleData[$moduleInfos->name]['data'][] = [$moduleData]; continue; } @@ -175,24 +175,24 @@ private function getPersonalInformations(Customer $customer): array return [ 'name' => 'personal informations', 'headers' => [ - $this->translator->trans('Id', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Social title', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('First name', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Last name', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Birthday', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Age', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Email', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Language', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Registration date', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Last visit date', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Is guest', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Company', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Is newsletter subscribed', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Is partner offers subscribed', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Siret', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Ape', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Website', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Personal note', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Id', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Social title', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('First name', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Last name', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Birthday', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Age', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Email', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Language', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Registration date', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Last visit date', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Is guest', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Company', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Is newsletter subscribed', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Is partner offers subscribed', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Siret', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Ape', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Website', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Personal note', [], 'Modules.Psgdpr.Admin'), ], 'data' => [ [ @@ -233,14 +233,14 @@ private function getAddressesInformations(Customer $customer): array return [ 'name' => 'addresses', 'headers' => [ - $this->translator->trans('Alias', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Company', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Full name', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Full address', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Phone', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Phone mobile', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Country name', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Date add', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Alias', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Company', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Full name', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Full address', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Phone', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Phone mobile', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Country name', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Date add', [], 'Modules.Psgdpr.Admin'), ], 'data' => array_map(function ($address) { $fullName = "{$address['firstname']} {$address['lastname']}"; @@ -274,11 +274,11 @@ private function getOrdersInformations(Customer $customer): array return [ 'name' => 'orders', 'headers' => [ - $this->translator->trans('Reference', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Payment', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('status', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Total paid with taxes', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Date of order', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Reference', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Payment', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('status', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Total paid with taxes', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Date of order', [], 'Modules.Psgdpr.Admin'), ], 'data' => array_map(function ($order) { $currency = Currency::getCurrency($order['id_currency']); @@ -324,10 +324,10 @@ private function getProductsOrderedInformations(Customer $customer): array return [ 'name' => 'products ordered', 'headers' => [ - $this->translator->trans('Order reference', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Reference', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Name', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Quantity', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Order reference', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Reference', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Name', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Quantity', [], 'Modules.Psgdpr.Admin'), ], 'data' => $productsOrdered, ]; @@ -347,9 +347,9 @@ private function getCartsInformations(Customer $customer): array return [ 'name' => 'carts', 'headers' => [ - $this->translator->trans('Id', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Total', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Creation date', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Id', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Total', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Creation date', [], 'Modules.Psgdpr.Admin'), ], 'data' => array_map(function ($cart) { $currentCart = new Cart($cart['id_cart']); @@ -393,10 +393,10 @@ private function getProductsInCartInformation(Customer $customer): array return [ 'name' => 'products in cart', 'headers' => [ - $this->translator->trans('Cart id', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Reference', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Name', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Quantity', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Cart id', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Reference', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Name', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Quantity', [], 'Modules.Psgdpr.Admin'), ], 'data' => $productsInCart, ]; @@ -416,9 +416,9 @@ private function getMessagesInformations(Customer $customer): array return [ 'name' => 'messages', 'headers' => [ - $this->translator->trans('Ip address', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Message', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Creation date', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Ip address', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Message', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Creation date', [], 'Modules.Psgdpr.Admin'), ], 'data' => array_map(function ($message) { $ipAddress = $message['ip_address']; @@ -450,12 +450,12 @@ private function getLastConnectionsInformations(Customer $customer): array return [ 'name' => 'last connections', 'headers' => [ - $this->translator->trans('id', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Http referer', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Pages viewed', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Total time', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Ip address', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Date', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('id', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Http referer', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Pages viewed', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Total time', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Ip address', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Date', [], 'Modules.Psgdpr.Admin'), ], 'data' => array_map(function ($connection) { $ipAddress = $connection['ipaddress']; @@ -490,10 +490,10 @@ private function getDiscountsInformations(Customer $customer): array return [ 'name' => 'discounts', 'headers' => [ - $this->translator->trans('Id', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Code', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Name', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Description', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Id', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Code', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Name', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Description', [], 'Modules.Psgdpr.Admin'), ], 'data' => array_map(function ($discount) { return [ @@ -520,10 +520,10 @@ private function getLastSentEmailsInformations(Customer $customer): array return [ 'name' => 'last sent emails', 'headers' => [ - $this->translator->trans('Date', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Language', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Subject', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Template', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Date', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Language', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Subject', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Template', [], 'Modules.Psgdpr.Admin'), ], 'data' => array_map(function ($email) { return [ @@ -550,8 +550,8 @@ private function getGroupsInformations(Customer $customer): array return [ 'name' => 'groups', 'headers' => [ - $this->translator->trans('Id', [], 'Modules.Psgdpr.Export'), - $this->translator->trans('Name', [], 'Modules.Psgdpr.Export'), + $this->translator->trans('Id', [], 'Modules.Psgdpr.Admin'), + $this->translator->trans('Name', [], 'Modules.Psgdpr.Admin'), ], 'data' => array_map(function ($groupId) { $currentGroup = new Group($groupId); diff --git a/views/templates/admin/menu.tpl b/views/templates/admin/menu.tpl index 75ab9e80..cc83c9e0 100644 --- a/views/templates/admin/menu.tpl +++ b/views/templates/admin/menu.tpl @@ -21,14 +21,14 @@
- {l s='Get started' d='Modules.Psgdpr.Menu'} - {l s='Personal data management' d='Modules.Psgdpr.Menu'} - {l s='Consent checkbox customization' d='Modules.Psgdpr.Menu'} - {l s='Customer activity tracking' d='Modules.Psgdpr.Menu'} - {l s='Help' d='Modules.Psgdpr.Menu'} + {l s='Get started' d='Modules.Psgdpr.Admin'} + {l s='Personal data management' d='Modules.Psgdpr.Admin'} + {l s='Consent checkbox customization' d='Modules.Psgdpr.Admin'} + {l s='Customer activity tracking' d='Modules.Psgdpr.Admin'} + {l s='Help' d='Modules.Psgdpr.Admin'}
- {l s='Version' d='Modules.Psgdpr.Menu'} {$module_version|escape:'htmlall':'UTF-8'} | PrestaShop {$ps_version|escape:'htmlall':'UTF-8'} + {l s='Version' d='Modules.Psgdpr.Admin'} {$module_version|escape:'htmlall':'UTF-8'} | PrestaShop {$ps_version|escape:'htmlall':'UTF-8'}
@@ -66,14 +66,14 @@ var adminToken = "{$admin_token|escape:'htmlall':'UTF-8'}"; var customerLink = "{$customerLink|escape:'htmlall':'UTF-8'}"; - var messageSuccessCopy = "{l s='Url has been copied to the clipboard!' d='Modules.Psgdpr.Menu' js=1}"; - var messageSuccessInvoices = "{l s='Invoices have been successfully downloaded.' d='Modules.Psgdpr.Menu' js=1}"; - var messageErrorInvoices = "{l s='No invoices available for this customer.' d='Modules.Psgdpr.Menu' js=1}"; - var messageDeleteTitle = "{l s='Are you sure?' d='Modules.Psgdpr.Menu' js=1}"; - var messageDeleteText = "{l s='Attention! This action is irreversible. Please make sure you have downloaded all of the customer’s invoices (if he has any) before clicking on Confirm erasure.' d='Modules.Psgdpr.Menu' js=1}"; - var messageDeleteCancelText = "{l s='Cancel action' d='Modules.Psgdpr.Menu' js=1}"; - var messageDeleteConfirmText = "{l s='Confirm Erasure' d='Modules.Psgdpr.Menu' js=1}"; - var messageDeleteSuccess = "{l s='The customer\'s data has been successfully deleted!' d='Modules.Psgdpr.Menu' js=1}"; - var messageDeleteError = "{l s='An error occurred while deleting the customer !' d='Modules.Psgdpr.Menu' js=1}"; - var datatableExport = "{l s='Export' d='Modules.Psgdpr.Menu' js=1}"; + var messageSuccessCopy = "{l s='Url has been copied to the clipboard!' d='Modules.Psgdpr.Admin' js=1}"; + var messageSuccessInvoices = "{l s='Invoices have been successfully downloaded.' d='Modules.Psgdpr.Admin' js=1}"; + var messageErrorInvoices = "{l s='No invoices available for this customer.' d='Modules.Psgdpr.Admin' js=1}"; + var messageDeleteTitle = "{l s='Are you sure?' d='Modules.Psgdpr.Admin' js=1}"; + var messageDeleteText = "{l s='Attention! This action is irreversible. Please make sure you have downloaded all of the customer’s invoices (if he has any) before clicking on Confirm erasure.' d='Modules.Psgdpr.Admin' js=1}"; + var messageDeleteCancelText = "{l s='Cancel action' d='Modules.Psgdpr.Admin' js=1}"; + var messageDeleteConfirmText = "{l s='Confirm Erasure' d='Modules.Psgdpr.Admin' js=1}"; + var messageDeleteSuccess = "{l s='The customer\'s data has been successfully deleted!' d='Modules.Psgdpr.Admin' js=1}"; + var messageDeleteError = "{l s='An error occurred while deleting the customer !' d='Modules.Psgdpr.Admin' js=1}"; + var datatableExport = "{l s='Export' d='Modules.Psgdpr.Admin' js=1}"; diff --git a/views/templates/admin/tabs/customerActivity.tpl b/views/templates/admin/tabs/customerActivity.tpl index 34bd1599..c4075404 100644 --- a/views/templates/admin/tabs/customerActivity.tpl +++ b/views/templates/admin/tabs/customerActivity.tpl @@ -18,19 +18,19 @@ *}

- {l s='Customer activity list' d='Modules.Psgdpr.CustomerActivity'} {$module_display|escape:'htmlall':'UTF-8'} + {l s='Customer activity list' d='Modules.Psgdpr.Admin'} {$module_display|escape:'htmlall':'UTF-8'}

- {l s='Keep track of your customer activity related to data accessibility, consent and erasure.' d='Modules.Psgdpr.CustomerActivity'} + {l s='Keep track of your customer activity related to data accessibility, consent and erasure.' d='Modules.Psgdpr.Admin'}


- - - + + + @@ -38,16 +38,16 @@ {if $log.request_type eq 1} - + {/if} {if $log.request_type eq 2} - + {/if} {if $log.request_type eq 3} - + {/if} {if $log.request_type eq 4} - + {/if} diff --git a/views/templates/admin/tabs/dataConfig.tpl b/views/templates/admin/tabs/dataConfig.tpl index 84ec44a4..cec185f4 100755 --- a/views/templates/admin/tabs/dataConfig.tpl +++ b/views/templates/admin/tabs/dataConfig.tpl @@ -19,23 +19,23 @@

- {l s='Data visualization and automatic actions' d='Modules.Psgdpr.PersonalDataManagement'} {$module_display|escape:'htmlall':'UTF-8'} + {l s='Data visualization and automatic actions' d='Modules.Psgdpr.Admin'} {$module_display|escape:'htmlall':'UTF-8'}

-

{l s='Find here listed all personal data collected by PrestaShop and your installed modules.' d='Modules.Psgdpr.PersonalDataManagement'}

-

{l s='These data will be used at 2 different levels :' d='Modules.Psgdpr.PersonalDataManagement'}

+

{l s='Find here listed all personal data collected by PrestaShop and your installed modules.' d='Modules.Psgdpr.Admin'}

+

{l s='These data will be used at 2 different levels :' d='Modules.Psgdpr.Admin'}

    -
  • {l s='When a customer requests access to his data: he gets a copy of his personal data collected on your store.' d='Modules.Psgdpr.PersonalDataManagement'}
    • -
  • {l s='When a customer requests data erasure: if you accept his request, his data will be removed permanently.' d='Modules.Psgdpr.PersonalDataManagement'}
    • +
  • {l s='When a customer requests access to his data: he gets a copy of his personal data collected on your store.' d='Modules.Psgdpr.Admin'}
    • +
  • {l s='When a customer requests data erasure: if you accept his request, his data will be removed permanently.' d='Modules.Psgdpr.Admin'}

- {l s='Compliant module list' d='Modules.Psgdpr.PersonalDataManagement'} {$module_display|escape:'htmlall':'UTF-8'} + {l s='Compliant module list' d='Modules.Psgdpr.Admin'} {$module_display|escape:'htmlall':'UTF-8'}

-

{l s='Find here listed all the elements that are GDPR compliant.' d='Modules.Psgdpr.PersonalDataManagement'}

+

{l s='Find here listed all the elements that are GDPR compliant.' d='Modules.Psgdpr.Admin'}

@@ -44,7 +44,7 @@
- {l s='PrestaShop data' d='Modules.Psgdpr.PersonalDataManagement'} + {l s='PrestaShop data' d='Modules.Psgdpr.Admin'}
diff --git a/views/templates/admin/tabs/dataConsent.tpl b/views/templates/admin/tabs/dataConsent.tpl index 76669950..ecab4469 100755 --- a/views/templates/admin/tabs/dataConsent.tpl +++ b/views/templates/admin/tabs/dataConsent.tpl @@ -18,29 +18,29 @@ *}

- {l s='Configure your checkboxes' d='Modules.Psgdpr.ConsentCheckbox'} {$module_display|escape:'htmlall':'UTF-8'} + {l s='Configure your checkboxes' d='Modules.Psgdpr.Admin'} {$module_display|escape:'htmlall':'UTF-8'}

-

{l s='Please customize your consent request messages in the dedicated fields below :' d='Modules.Psgdpr.ConsentCheckbox'}

+

{l s='Please customize your consent request messages in the dedicated fields below :' d='Modules.Psgdpr.Admin'}



{* SWITCH CREATION ACCOUNT MESSAGE *}
- +
- + - +
@@ -60,14 +60,14 @@
-

{l s='This message will be displayed on the customer creation form' d='Modules.Psgdpr.ConsentCheckbox'}

+

{l s='This message will be displayed on the customer creation form' d='Modules.Psgdpr.Admin'}

{if $languages|count > 1} @@ -95,16 +95,16 @@
- +
- + - +
@@ -124,14 +124,14 @@
-

{l s='This message will be displayed in the My personal information tab in the customer account' d='Modules.Psgdpr.ConsentCheckbox'}

+

{l s='This message will be displayed in the My personal information tab in the customer account' d='Modules.Psgdpr.Admin'}

{if $languages|count > 1} @@ -167,10 +167,10 @@
- + - +
@@ -190,7 +190,7 @@
@@ -198,7 +198,7 @@
-

{l s='This message will be accomplanied by a checkbox' d='Modules.Psgdpr.ConsentCheckbox'}

+

{l s='This message will be accomplanied by a checkbox' d='Modules.Psgdpr.Admin'}

{if $languages|count > 1} @@ -226,11 +226,11 @@
diff --git a/views/templates/admin/tabs/getStarted.tpl b/views/templates/admin/tabs/getStarted.tpl index 03945b63..ef5cf84c 100644 --- a/views/templates/admin/tabs/getStarted.tpl +++ b/views/templates/admin/tabs/getStarted.tpl @@ -18,49 +18,49 @@ *}

- {l s='Get started' d='Modules.Psgdpr.GetStarted'} {$module_display|escape:'htmlall':'UTF-8'} + {l s='Get started' d='Modules.Psgdpr.Admin'} {$module_display|escape:'htmlall':'UTF-8'}

-

{l s='Welcome to your GDPR module' d='Modules.Psgdpr.GetStarted'}

+

{l s='Welcome to your GDPR module' d='Modules.Psgdpr.Admin'}


-

{l s='This interface will help you to become familiar with the GDPR and give you some guidance to help you become compliant with this regulation.' d='Modules.Psgdpr.GetStarted'}

-

{l s='This module meets the main regulation\'s requirements concerning personal data of your customers including :' d='Modules.Psgdpr.GetStarted'}

+

{l s='This interface will help you to become familiar with the GDPR and give you some guidance to help you become compliant with this regulation.' d='Modules.Psgdpr.Admin'}

+

{l s='This module meets the main regulation\'s requirements concerning personal data of your customers including :' d='Modules.Psgdpr.Admin'}

    -
  1. {l s='The right to access their personal data and data portability' d='Modules.Psgdpr.GetStarted'}
    2. -
  2. {l s='The right to obtain rectification and/or erasure of their personal data' d='Modules.Psgdpr.GetStarted'}
    3. -
  3. {l s='The right to give and withdraw consent' d='Modules.Psgdpr.GetStarted'}
    4. +
  4. {l s='The right to access their personal data and data portability' d='Modules.Psgdpr.Admin'}
    5. +
  5. {l s='The right to obtain rectification and/or erasure of their personal data' d='Modules.Psgdpr.Admin'}
    6. +
  6. {l s='The right to give and withdraw consent' d='Modules.Psgdpr.Admin'}
-

{l s='It also allows you to keep a record of processing activities (especially for access, consent and erasure).' d='Modules.Psgdpr.GetStarted'}

-

{l s='Follow our 3 steps to configure your module and help you to become GDPR compliant!' d='Modules.Psgdpr.GetStarted'}

+

{l s='It also allows you to keep a record of processing activities (especially for access, consent and erasure).' d='Modules.Psgdpr.Admin'}

+

{l s='Follow our 3 steps to configure your module and help you to become GDPR compliant!' d='Modules.Psgdpr.Admin'}

-

{l s='Manage' d='Modules.Psgdpr.GetStarted'}

+

{l s='Manage' d='Modules.Psgdpr.Admin'}

-

{l s='See our Personal data management tab to visualize the data collected by PrestaShop and community modules and manage your customers’ personal data.' d='Modules.Psgdpr.GetStarted'}

+

{l s='See our Personal data management tab to visualize the data collected by PrestaShop and community modules and manage your customers’ personal data.' d='Modules.Psgdpr.Admin'}

-

{l s='Customize' d='Modules.Psgdpr.GetStarted'}

+

{l s='Customize' d='Modules.Psgdpr.Admin'}

-

{l s='Customize the consent confirmation checkboxes and consent request message on the different forms of your store, especially for account creation and newsletter subscription.' d='Modules.Psgdpr.GetStarted'}

+

{l s='Customize the consent confirmation checkboxes and consent request message on the different forms of your store, especially for account creation and newsletter subscription.' d='Modules.Psgdpr.Admin'}

-

{l s='Keep track' d='Modules.Psgdpr.GetStarted'}

+

{l s='Keep track' d='Modules.Psgdpr.Admin'}

-

{l s='Visualize all of your customers’ actions related to their data and manage the erasure requests.' d='Modules.Psgdpr.GetStarted'}

+

{l s='Visualize all of your customers’ actions related to their data and manage the erasure requests.' d='Modules.Psgdpr.Admin'}

@@ -69,12 +69,12 @@

-

{l s='More information about GDPR' d='Modules.Psgdpr.GetStarted'}

+

{l s='More information about GDPR' d='Modules.Psgdpr.Admin'}

@@ -82,7 +82,7 @@
-

{l s='Data protection authorities websites' d='Modules.Psgdpr.GetStarted'}

+

{l s='Data protection authorities websites' d='Modules.Psgdpr.Admin'}

@@ -90,7 +90,7 @@
-

{l s='Module\'s documentation' d='Modules.Psgdpr.GetStarted'}

+

{l s='Module\'s documentation' d='Modules.Psgdpr.Admin'}

@@ -98,7 +98,7 @@
-

{l s='Video' d='Modules.Psgdpr.GetStarted'}

+

{l s='Video' d='Modules.Psgdpr.Admin'}

@@ -106,7 +106,7 @@
-

{l s='Build article' d='Modules.Psgdpr.GetStarted'}

+

{l s='Build article' d='Modules.Psgdpr.Admin'}

@@ -114,6 +114,6 @@
diff --git a/views/templates/admin/tabs/help.tpl b/views/templates/admin/tabs/help.tpl index 5dfbefd1..5c8973aa 100755 --- a/views/templates/admin/tabs/help.tpl +++ b/views/templates/admin/tabs/help.tpl @@ -19,7 +19,7 @@

- {l s='Help & contact' d='Modules.Psgdpr.Help'} {$module_display|escape:'htmlall':'UTF-8'} + {l s='Admin & contact' d='Modules.Psgdpr.Admin'} {$module_display|escape:'htmlall':'UTF-8'}

@@ -27,13 +27,13 @@
-

{l s='This module allows you to :' d='Modules.Psgdpr.Help'}

+

{l s='This module allows you to :' d='Modules.Psgdpr.Admin'}


1

- {l s='Erase any customer account with his/her personal data collected by your shop if requested by the customer' d='Modules.Psgdpr.Help'} + {l s='Erase any customer account with his/her personal data collected by your shop if requested by the customer' d='Modules.Psgdpr.Admin'}

@@ -41,7 +41,7 @@
2

- {l s='Add a consent confirmation checkbox in a module form that collects personal data and customize it' d='Modules.Psgdpr.Help'} + {l s='Add a consent confirmation checkbox in a module form that collects personal data and customize it' d='Modules.Psgdpr.Admin'}

@@ -49,7 +49,7 @@
3

- {l s='Allow your customer to consult and export their personal data collected by your shop on their customer account' d='Modules.Psgdpr.Help'} + {l s='Allow your customer to consult and export their personal data collected by your shop on their customer account' d='Modules.Psgdpr.Admin'}

@@ -57,7 +57,7 @@
4

- {l s='View all your customers’ actions related to their personal data' d='Modules.Psgdpr.Help'} + {l s='View all your customers’ actions related to their personal data' d='Modules.Psgdpr.Admin'}

@@ -65,14 +65,14 @@
- {l s='Need help ?' d='Modules.Psgdpr.Help'}
- {l s='Find here the documentation of this module' d='Modules.Psgdpr.Help'} + {l s='Need help ?' d='Modules.Psgdpr.Admin'}
+ {l s='Find here the documentation of this module' d='Modules.Psgdpr.Admin'} -  {l s='Documentation' d='Modules.Psgdpr.Help'} +  {l s='Documentation' d='Modules.Psgdpr.Admin'}

-
{l s='FAQ' d='Modules.Psgdpr.Help'}
+
{l s='FAQ' d='Modules.Psgdpr.Admin'}
{foreach from=$faq item=category name='faq'} {$category.title|escape:'htmlall':'UTF-8'}
    diff --git a/views/templates/front/account_gdpr_box.tpl b/views/templates/front/account_gdpr_box.tpl index 12691ade..0e6d9a13 100644 --- a/views/templates/front/account_gdpr_box.tpl +++ b/views/templates/front/account_gdpr_box.tpl @@ -19,6 +19,6 @@ - account_box {l s='GDPR - Personal data' d='Modules.Psgdpr.CustomerAccount'} + account_box {l s='GDPR - Personal data' d='Modules.Psgdpr.Shop'} diff --git a/views/templates/front/account_gdpr_page.tpl b/views/templates/front/account_gdpr_page.tpl index 2fcbe013..e1104433 100644 --- a/views/templates/front/account_gdpr_page.tpl +++ b/views/templates/front/account_gdpr_page.tpl @@ -19,21 +19,21 @@ {extends file='customer/page.tpl'} {block name='page_title'} - {l s='GDPR - Personal data' d='Modules.Psgdpr.CustomerAccount'} + {l s='GDPR - Personal data' d='Modules.Psgdpr.Shop'} {/block} {block name='page_content'}
    -

    {l s='Access to my data' d='Modules.Psgdpr.CustomerAccount'}

    -

    {l s='At any time, you have the right to retrieve the data you have provided to our site. Click on "Get my data" to automatically download a copy of your personal data on a pdf or csv file.' d='Modules.Psgdpr.CustomerAccount'}

    - {l s='GET MY DATA TO CSV' d='Modules.Psgdpr.CustomerAccount'} - {l s='GET MY DATA TO PDF' d='Modules.Psgdpr.CustomerAccount'} +

    {l s='Access to my data' d='Modules.Psgdpr.Shop'}

    +

    {l s='At any time, you have the right to retrieve the data you have provided to our site. Click on "Get my data" to automatically download a copy of your personal data on a pdf or csv file.' d='Modules.Psgdpr.Shop'}

    + {l s='GET MY DATA TO CSV' d='Modules.Psgdpr.Shop'} + {l s='GET MY DATA TO PDF' d='Modules.Psgdpr.Shop'}
    -

    {l s='Rectification & Erasure requests' d='Modules.Psgdpr.CustomerAccount'}

    -

    {l s='You have the right to modify all the personal information found in the "My Account" page. For any other request you might have regarding the rectification and/or erasure of your personal data, please contact us through our' d='Modules.Psgdpr.CustomerAccount'} {l s='contact page' d='Modules.Psgdpr.CustomerAccount'}. {l s='We will review your request and reply as soon as possible.' d='Modules.Psgdpr.CustomerAccount'}

    +

    {l s='Rectification & Erasure requests' d='Modules.Psgdpr.Shop'}

    +

    {l s='You have the right to modify all the personal information found in the "My Account" page. For any other request you might have regarding the rectification and/or erasure of your personal data, please contact us through our' d='Modules.Psgdpr.Shop'} {l s='contact page' d='Modules.Psgdpr.CustomerAccount'}. {l s='We will review your request and reply as soon as possible.' d='Modules.Psgdpr.CustomerAccount'}

    diff --git a/views/templates/front/pdf/sections/addresses.tpl b/views/templates/front/pdf/sections/addresses.tpl index 5c86d8f3..9fd4135c 100644 --- a/views/templates/front/pdf/sections/addresses.tpl +++ b/views/templates/front/pdf/sections/addresses.tpl @@ -17,7 +17,7 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) *} -

    {l s='Addresses' d='Modules.Psgdpr.Export'}

    +

    {l s='Addresses' d='Modules.Psgdpr.Shop'}


{l s='Client name/ID' d='Modules.Psgdpr.CustomerActivity'}{l s='Type of request' d='Modules.Psgdpr.CustomerActivity'}{l s='Submission date' d='Modules.Psgdpr.CustomerActivity'}{l s='Client name/ID' d='Modules.Psgdpr.Admin'}{l s='Type of request' d='Modules.Psgdpr.Admin'}{l s='Submission date' d='Modules.Psgdpr.Admin'}
{$log.client_name|escape:'htmlall':'UTF-8'}{l s='Consent confirmation' d='Modules.Psgdpr.CustomerActivity'}{l s='Consent confirmation' d='Modules.Psgdpr.Admin'}{l s='Accessibility' d='Modules.Psgdpr.CustomerActivity'} (pdf){l s='Accessibility' d='Modules.Psgdpr.Admin'} (pdf){l s='Accessibility' d='Modules.Psgdpr.CustomerActivity'} (csv){l s='Accessibility' d='Modules.Psgdpr.Admin'} (csv){l s='Erasure' d='Modules.Psgdpr.CustomerActivity'}{l s='Erasure' d='Modules.Psgdpr.Admin'}{$log.date_add|escape:'htmlall':'UTF-8'}
@@ -40,7 +40,7 @@ {/foreach} {else} - + {/if}
{l s='No addresses' d='Modules.Psgdpr.Export'}{l s='No addresses' d='Modules.Psgdpr.Shop'}
diff --git a/views/templates/front/pdf/sections/carts.tpl b/views/templates/front/pdf/sections/carts.tpl index 4b4971bb..0d2033ba 100644 --- a/views/templates/front/pdf/sections/carts.tpl +++ b/views/templates/front/pdf/sections/carts.tpl @@ -20,7 +20,7 @@ {$data = $carts['data']} {$headers = $carts['headers']} -

{l s='Carts' d='Modules.Psgdpr.Export'}

+

{l s='Carts' d='Modules.Psgdpr.Shop'}


@@ -37,7 +37,7 @@ {if count($cart['products']) >= 1} - + @@ -45,9 +45,9 @@
{l s='Product(s) in the cart' d='Modules.Psgdpr.Export'} :{l s='Product(s) in the cart' d='Modules.Psgdpr.Shop'} :
- - - + + + {foreach from=$cart['products'] item=product} @@ -63,7 +63,7 @@ {/foreach} {else} - + {/if}
{l s='Reference' d='Modules.Psgdpr.Export'}{l s='Name' d='Modules.Psgdpr.Export'}{l s='Quantity' d='Modules.Psgdpr.Export'}{l s='Reference' d='Modules.Psgdpr.Shop'}{l s='Name' d='Modules.Psgdpr.Shop'}{l s='Quantity' d='Modules.Psgdpr.Shop'}
{l s='No carts' d='Modules.Psgdpr.Export'}{l s='No carts' d='Modules.Psgdpr.Shop'}
diff --git a/views/templates/front/pdf/sections/discounts.tpl b/views/templates/front/pdf/sections/discounts.tpl index ca45a17d..e603b1b3 100644 --- a/views/templates/front/pdf/sections/discounts.tpl +++ b/views/templates/front/pdf/sections/discounts.tpl @@ -17,7 +17,7 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) *} -

{l s='Discounts' d='Modules.Psgdpr.Export'}

+

{l s='Discounts' d='Modules.Psgdpr.Shop'}


@@ -37,7 +37,7 @@ {/foreach} {else} - + {/if}
{l s='No discount' d='Modules.Psgdpr.Export'}{l s='No discount' d='Modules.Psgdpr.Shop'}
diff --git a/views/templates/front/pdf/sections/general_informations.tpl b/views/templates/front/pdf/sections/general_informations.tpl index f82620c5..f4ab0336 100644 --- a/views/templates/front/pdf/sections/general_informations.tpl +++ b/views/templates/front/pdf/sections/general_informations.tpl @@ -41,7 +41,7 @@ {$customerData = $customerInfo['data'][0]} {$customerHeader = $customerInfo['headers']} -

{l s='General info' d='Modules.Psgdpr.Export'}

+

{l s='General info' d='Modules.Psgdpr.Shop'}


diff --git a/views/templates/front/pdf/sections/groups.tpl b/views/templates/front/pdf/sections/groups.tpl index ea48d5df..6ec5983c 100644 --- a/views/templates/front/pdf/sections/groups.tpl +++ b/views/templates/front/pdf/sections/groups.tpl @@ -17,7 +17,7 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) *} -

{l s='Groups' d='Modules.Psgdpr.Export'}

+

{l s='Groups' d='Modules.Psgdpr.Shop'}


@@ -35,7 +35,7 @@ {/foreach} {else} - + {/if}
{l s='No groups' d='Modules.Psgdpr.Export'}{l s='No groups' d='Modules.Psgdpr.Shop'}
diff --git a/views/templates/front/pdf/sections/last_connections.tpl b/views/templates/front/pdf/sections/last_connections.tpl index fce18ee4..904207c7 100644 --- a/views/templates/front/pdf/sections/last_connections.tpl +++ b/views/templates/front/pdf/sections/last_connections.tpl @@ -17,7 +17,7 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) *} -

{l s='Last connections' d='Modules.Psgdpr.Export'}

+

{l s='Last connections' d='Modules.Psgdpr.Shop'}


@@ -39,7 +39,7 @@ {/foreach} {else} - + {/if}
{l s='No connections' d='Modules.Psgdpr.Export'}{l s='No connections' d='Modules.Psgdpr.Shop'}
diff --git a/views/templates/front/pdf/sections/last_sent_emails.tpl b/views/templates/front/pdf/sections/last_sent_emails.tpl index cb001723..8363587c 100644 --- a/views/templates/front/pdf/sections/last_sent_emails.tpl +++ b/views/templates/front/pdf/sections/last_sent_emails.tpl @@ -17,7 +17,7 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) *} -

{l s='Last sent emails' d='Modules.Psgdpr.Export'}

+

{l s='Last sent emails' d='Modules.Psgdpr.Shop'}


@@ -37,7 +37,7 @@ {/foreach} {else} - + {/if}
{l s='No emails' d='Modules.Psgdpr.Export'}{l s='No emails' d='Modules.Psgdpr.Shop'}
diff --git a/views/templates/front/pdf/sections/messages.tpl b/views/templates/front/pdf/sections/messages.tpl index 40c7eb85..33e59169 100644 --- a/views/templates/front/pdf/sections/messages.tpl +++ b/views/templates/front/pdf/sections/messages.tpl @@ -17,7 +17,7 @@ * @license https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0) *} -

{l s='Messages' d='Modules.Psgdpr.Export'}

+

{l s='Messages' d='Modules.Psgdpr.Shop'}


@@ -36,7 +36,7 @@ {/foreach} {else} - + {/if}
{l s='No messages' d='Modules.Psgdpr.Export'}{l s='No messages' d='Modules.Psgdpr.Shop'}
diff --git a/views/templates/front/pdf/sections/orders.tpl b/views/templates/front/pdf/sections/orders.tpl index febc4023..2be6a215 100644 --- a/views/templates/front/pdf/sections/orders.tpl +++ b/views/templates/front/pdf/sections/orders.tpl @@ -21,7 +21,7 @@ {$headers = $orders['headers']} -

{l s='Orders' d='Modules.Psgdpr.Export'}

+

{l s='Orders' d='Modules.Psgdpr.Shop'}


@@ -42,7 +42,7 @@ - + @@ -50,9 +50,9 @@
{$order['date']|escape:'html':'UTF-8'}
{l s='Product(s) in the order' d='Modules.Psgdpr.Export'} :{l s='Product(s) in the order' d='Modules.Psgdpr.Shop'} :
- - - + + + {foreach from=$order['products'] item=product} @@ -67,7 +67,7 @@ {/foreach} {else} - + {/if}
{l s='Reference' d='Modules.Psgdpr.Export'}{l s='Name' d='Modules.Psgdpr.Export'}{l s='Quantity' d='Modules.Psgdpr.Export'}{l s='Reference' d='Modules.Psgdpr.Shop'}{l s='Name' d='Modules.Psgdpr.Shop'}{l s='Quantity' d='Modules.Psgdpr.Shop'}
{l s='No orders' d='Modules.Psgdpr.Export'}{l s='No orders' d='Modules.Psgdpr.Shop'}