From e83a93648c2fed6245e2d430e9da2463f234b0cb Mon Sep 17 00:00:00 2001
From: Daniel Kerr <webmaster@opencart.com>
Date: Tue, 26 Mar 2019 01:17:22 +0800
Subject: [PATCH] more gdpr work

---
 upload/admin/controller/mail/gdpr.php          | 12 +++++++++---
 .../admin/language/en-gb/mail/gdpr_export.php  | 10 +++-------
 .../admin/view/template/mail/gdpr_export.twig  | 18 +++++-------------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/upload/admin/controller/mail/gdpr.php b/upload/admin/controller/mail/gdpr.php
index 028bda17d95..4200b924c13 100644
--- a/upload/admin/controller/mail/gdpr.php
+++ b/upload/admin/controller/mail/gdpr.php
@@ -3,7 +3,7 @@ class ControllerMailGdpr extends Controller {
 	// admin/model/customer/gdpr/editStatus
 	//public function index(&$route, &$args, &$output) {
 	public function index() {
-		$args[0] = 8664;
+		$args[0] = 8666;
 
 		$this->load->model('customer/gdpr');
 
@@ -58,7 +58,7 @@ public function export($gdpr_info) {
 			$data['logo'] = '';
 		}
 
-		$data['text_gdpr'] = $language->get('text_gdpr');
+		$data['text_request'] = $language->get('text_request');
 
 		$this->load->model('customer/customer');
 
@@ -76,9 +76,15 @@ public function export($gdpr_info) {
 		$data['text_telephone'] = $language->get('text_telephone');
 		$data['text_addresses'] = $language->get('text_addresses');
 		$data['text_address'] = $language->get('text_address');
+		$data['text_firstname'] = $language->get('text_firstname');
+		$data['text_lastname'] = $language->get('text_lastname');
+		$data['text_address_1'] = $language->get('text_address_1');
+		$data['text_address_2'] = $language->get('text_address_2');
+		$data['text_city'] = $language->get('text_city');
+		$data['text_zone'] = $language->get('text_zone');
+		$data['text_ips'] = $language->get('text_ips');
 		$data['text_ip'] = $language->get('text_ip');
 		$data['text_date_added'] = $language->get('text_date_added');
-
 		$data['text_thanks'] = $language->get('text_thanks');
 
 		$data['button_contact'] = $language->get('button_contact');
diff --git a/upload/admin/language/en-gb/mail/gdpr_export.php b/upload/admin/language/en-gb/mail/gdpr_export.php
index 0f351c83684..809dfd39df0 100644
--- a/upload/admin/language/en-gb/mail/gdpr_export.php
+++ b/upload/admin/language/en-gb/mail/gdpr_export.php
@@ -4,14 +4,11 @@
 $_['text_request']    = 'Export Personal Data';
 $_['text_hello']      = 'Hello <strong>%s</strong>,';
 $_['text_user']       = 'User';
-
 $_['text_gdpr']       = 'Export Personal Data';
-
 $_['text_account']    = 'Account';
 $_['text_customer']   = 'Personal Information';
 $_['text_address']    = 'Address';
 $_['text_addresses']  = 'Addresses';
-
 $_['text_name']       = 'Name';
 $_['text_email']      = 'E-Mail';
 $_['text_telephone']  = 'Telephone';
@@ -22,9 +19,8 @@
 $_['text_city']       = 'City';
 $_['text_country']    = 'Country';
 $_['text_zone']       = 'Region / State';
-
-$_['text_history']    = 'Login History';
-$_['text_ip']         = 'IP\'s';
+$_['text_ips']        = 'IP\'s';
+$_['text_ip']         = 'IP';
 $_['text_date_added'] = 'Date Added';
-
+$_['text_contact']    = 'You will receive a email informing you when your account has been deleted.';
 $_['text_thanks']     = 'Thanks,';
\ No newline at end of file
diff --git a/upload/admin/view/template/mail/gdpr_export.twig b/upload/admin/view/template/mail/gdpr_export.twig
index 7552a39554f..e19d34eb87e 100644
--- a/upload/admin/view/template/mail/gdpr_export.twig
+++ b/upload/admin/view/template/mail/gdpr_export.twig
@@ -17,20 +17,21 @@
       </tr>
       <tr>
         <td style="line-height: 1.8;">
+
           <p>{{ text_hello }}</p>
 
           {% if customer_id %}
             <h4>{{ text_account }}</h4>
-            <table class="table table-bordered">
+            <table style="width: 100%;" class="table table-bordered">
               <thead>
-                <tr class="table-light">
+                <tr>
                   <th colspan="2">{{ text_customer }}</th>
                 </tr>
               </thead>
               <tbody>
                 <tr>
                   <td class="w-25">{{ text_name }}</td>
-                  <td>{{ customer }}</td>
+                  <td>{{ firstname }} {{ lastname }}</td>
                 </tr>
                 <tr>
                   <td>{{ text_email }}</td>
@@ -48,12 +49,8 @@
             <h4>{{ text_addresses }}</h4>
             {% set address_row = 1 %}
             {% for address in addresses %}
+              <p>{{ text_address }} {{ address_row }}</p>
               <table class="table table-bordered">
-                <thead>
-                  <tr>
-                    <th colspan="2">{{ text_address }} {{ address_row }}</th>
-                  </tr>
-                </thead>
                 <tbody>
                   <tr>
                     <td class="w-25">{{ text_firstname }}</td>
@@ -108,11 +105,6 @@
           {% if ips %}
             <h4>{{ text_ip }}</h4>
             <table class="table table-bordered">
-              <thead>
-                <tr class="table-light">
-                  <th colspan="3">{{ text_history }}</th>
-                </tr>
-              </thead>
               <thead>
                 <tr>
                   <th class="w-25">{{ text_ip }}</th>