Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add export feature + update translations + fix translation issue with csv and more #10

Merged
merged 20 commits into from Dec 14, 2018
Merged

Add export feature + update translations + fix translation issue with csv and more #10

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4cf1c48
Update translations
Nakahiru Jun 13, 2018
15ad397
Fix translation missing issue in csv
Nakahiru Jun 13, 2018
ffb1e90
Fix fatal error on Shops having DNI field mandatory
Nakahiru Jun 13, 2018
4c9855b
Minor text edition - removing 1 line on dataConfig.tpl
Nakahiru Jun 13, 2018
afd7b30
Change wording in my account area + some clean
Nakahiru Jun 13, 2018
f6f1418
Adding Export feature on the Customer Activity datatable
Nakahiru Jun 13, 2018
0af385d
remove commented line
Nakahiru Jul 30, 2018
20ae8c9
fix warning issue when exporting data in csv
Nakahiru Jul 30, 2018
fe909f6
Fix issue at install when optin has been set as required
Nakahiru Jul 30, 2018
d09ac62
Fix checkbox missing issue in specific some cases like popnewsletter …
Nakahiru Jul 30, 2018
41142c2
Fix override issue with front css and js files
Nakahiru Jul 30, 2018
ceda349
Add translations for preset messages
Nakahiru Jul 31, 2018
3f1fde1
Check if anonymous customer already exist before create it
Nakahiru Jul 31, 2018
781e16d
Make 'export' word translatable
Nakahiru Jul 31, 2018
5ba5e32
Change the anonymous email address when upgrading to the latest version
Nakahiru Dec 11, 2018
4213677
Replase quote to single quote + remove useless success function
Nakahiru Dec 11, 2018
27d3ebb
Remove literal tag and use js=1 flag instead
Nakahiru Dec 11, 2018
7ddc02c
Some clean
Nakahiru Dec 11, 2018
66bf2f0
Some clean + code improvements
Nakahiru Dec 12, 2018
abb8bda
Bump version to 1.1.1
Nakahiru Dec 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
122 changes: 61 additions & 61 deletions controllers/front/ExportDataToCsv.php
View file
Open in desktop
Expand Up @@ -50,22 +50,22 @@ public function exportDataToCsv($id_customer)
ob_start();

// GENERAL INFO
$line = array(Tools::strtoupper($this->module->l('General info')));
$line = array(Tools::strtoupper($this->module->l('General info', 'ExportDataToCsv')));
fputcsv($fh, $line, $delimiter);

$line = array(
$this->module->l('Gender'),
$this->module->l('Name'),
$this->module->l('Birth date'),
$this->module->l('Age'),
$this->module->l('Email'),
$this->module->l('Language'),
$this->module->l('Creation account data'),
$this->module->l('Last visit'),
$this->module->l('Siret'),
$this->module->l('Ape'),
$this->module->l('Company'),
$this->module->l('Website'),
$this->module->l('Gender', 'ExportDataToCsv'),
Nakahiru marked this conversation as resolved.
Show resolved Hide resolved
$this->module->l('Name', 'ExportDataToCsv'),
$this->module->l('Birth date', 'ExportDataToCsv'),
$this->module->l('Age', 'ExportDataToCsv'),
$this->module->l('Email', 'ExportDataToCsv'),
$this->module->l('Language', 'ExportDataToCsv'),
$this->module->l('Creation account data', 'ExportDataToCsv'),
$this->module->l('Last visit', 'ExportDataToCsv'),
$this->module->l('Siret', 'ExportDataToCsv'),
$this->module->l('Ape', 'ExportDataToCsv'),
$this->module->l('Company', 'ExportDataToCsv'),
$this->module->l('Website', 'ExportDataToCsv'),
);
fputcsv($fh, $line, $delimiter);
unset($line);
Expand Down Expand Up @@ -93,17 +93,17 @@ public function exportDataToCsv($id_customer)
fputcsv($fh, $line, $delimiter);

// ADDRESSES
$line = array(Tools::strtoupper($this->module->l('Addresses')));
$line = array(Tools::strtoupper($this->module->l('Addresses', 'ExportDataToCsv')));
fputcsv($fh, $line, $delimiter);

$line = array(
$this->module->l('Alias'),
$this->module->l('Company'),
$this->module->l('Name'),
$this->module->l('Address'),
$this->module->l('Phone(s)'),
$this->module->l('Country'),
$this->module->l('Date'),
$this->module->l('Alias', 'ExportDataToCsv'),
$this->module->l('Company', 'ExportDataToCsv'),
$this->module->l('Name', 'ExportDataToCsv'),
$this->module->l('Address', 'ExportDataToCsv'),
$this->module->l('Phone(s)', 'ExportDataToCsv'),
$this->module->l('Country', 'ExportDataToCsv'),
$this->module->l('Date', 'ExportDataToCsv'),
);
fputcsv($fh, $line, $delimiter);
unset($line);
Expand All @@ -123,7 +123,7 @@ public function exportDataToCsv($id_customer)
unset($line);
}
} else {
$line = array($this->module->l('No addresses'));
$line = array($this->module->l('No addresses', 'ExportDataToCsv'));
fputcsv($fh, $line, $delimiter);
unset($line);
}
Expand All @@ -134,15 +134,15 @@ public function exportDataToCsv($id_customer)
fputcsv($fh, $line, $delimiter);

// ORDERS
$line = array(Tools::strtoupper($this->module->l('Orders')));
$line = array(Tools::strtoupper($this->module->l('Orders', 'ExportDataToCsv')));
fputcsv($fh, $line, $delimiter);

$line = array(
$this->module->l('Reference'),
$this->module->l('Payment'),
$this->module->l('Order state'),
$this->module->l('Total paid'),
$this->module->l('Date'),
$this->module->l('Reference', 'ExportDataToCsv'),
$this->module->l('Payment', 'ExportDataToCsv'),
$this->module->l('Order state', 'ExportDataToCsv'),
$this->module->l('Total paid', 'ExportDataToCsv'),
$this->module->l('Date', 'ExportDataToCsv'),
);
fputcsv($fh, $line, $delimiter);
unset($line);
Expand All @@ -160,7 +160,7 @@ public function exportDataToCsv($id_customer)
unset($line);
}
} else {
$line = array($this->module->l('No orders'));
$line = array($this->module->l('No orders', 'ExportDataToCsv'));
fputcsv($fh, $line, $delimiter);
unset($line);
}
Expand All @@ -172,14 +172,14 @@ public function exportDataToCsv($id_customer)

// PRODUCTS IN ORDER
if (count($orders) >= 1) {
$line = array(Tools::strtoupper($this->module->l('Products bought')));
$line = array(Tools::strtoupper($this->module->l('Products bought', 'ExportDataToCsv')));
fputcsv($fh, $line, $delimiter);

$line = array(
$this->module->l('Order ref'),
$this->module->l('Product ref'),
$this->module->l('Name'),
$this->module->l('Quantity'),
$this->module->l('Order ref', 'ExportDataToCsv'),
$this->module->l('Product ref', 'ExportDataToCsv'),
$this->module->l('Name', 'ExportDataToCsv'),
$this->module->l('Quantity', 'ExportDataToCsv'),
);
fputcsv($fh, $line, $delimiter);
unset($line);
Expand All @@ -205,13 +205,13 @@ public function exportDataToCsv($id_customer)
fputcsv($fh, $line, $delimiter);

// CARTS
$line = array(Tools::strtoupper($this->module->l('Carts')));
$line = array(Tools::strtoupper($this->module->l('Carts', 'ExportDataToCsv')));
fputcsv($fh, $line, $delimiter);

$line = array(
$this->module->l('Id'),
$this->module->l('Total products'),
$this->module->l('Date'),
$this->module->l('Id', 'ExportDataToCsv'),
$this->module->l('Total products', 'ExportDataToCsv'),
$this->module->l('Date', 'ExportDataToCsv'),
);
fputcsv($fh, $line, $delimiter);
unset($line);
Expand All @@ -227,7 +227,7 @@ public function exportDataToCsv($id_customer)
unset($line);
}
} else {
$line = array($this->module->l('No carts'));
$line = array($this->module->l('No carts', 'ExportDataToCsv'));
fputcsv($fh, $line, $delimiter);
unset($line);
}
Expand All @@ -238,14 +238,14 @@ public function exportDataToCsv($id_customer)
fputcsv($fh, $line, $delimiter);

// PRODUCTS IN CART
$line = array(Tools::strtoupper($this->module->l('Product(s) still in cart')));
$line = array(Tools::strtoupper($this->module->l('Product(s) still in cart', 'ExportDataToCsv')));
fputcsv($fh, $line, $delimiter);

$line = array(
$this->module->l('Cart ID'),
$this->module->l('Product reference'),
$this->module->l('Name'),
$this->module->l('Quantity'),
$this->module->l('Cart ID', 'ExportDataToCsv'),
$this->module->l('Product reference', 'ExportDataToCsv'),
$this->module->l('Name', 'ExportDataToCsv'),
$this->module->l('Quantity', 'ExportDataToCsv'),
);
fputcsv($fh, $line, $delimiter);
unset($line);
Expand All @@ -265,13 +265,13 @@ public function exportDataToCsv($id_customer)
unset($line);
}
} else {
$line = array($this->module->l('No products'));
$line = array($this->module->l('No products', 'ExportDataToCsv'));
fputcsv($fh, $line, $delimiter);
unset($line);
}
}
} else {
$line = array($this->module->l('No carts'));
$line = array($this->module->l('No carts', 'ExportDataToCsv'));
fputcsv($fh, $line, $delimiter);
unset($line);
}
Expand All @@ -282,13 +282,13 @@ public function exportDataToCsv($id_customer)
fputcsv($fh, $line, $delimiter);

// MESSSAGES
$line = array(Tools::strtoupper($this->module->l('Messages')));
$line = array(Tools::strtoupper($this->module->l('Messages', 'ExportDataToCsv')));
fputcsv($fh, $line, $delimiter);

$line = array(
$this->module->l('IP'),
$this->module->l('Message'),
$this->module->l('Date'),
$this->module->l('IP', 'ExportDataToCsv'),
$this->module->l('Message', 'ExportDataToCsv'),
$this->module->l('Date', 'ExportDataToCsv'),
);
fputcsv($fh, $line, $delimiter);
unset($line);
Expand All @@ -304,7 +304,7 @@ public function exportDataToCsv($id_customer)
unset($line);
}
} else {
$line = array($this->module->l('No messages'));
$line = array($this->module->l('No messages', 'ExportDataToCsv'));
fputcsv($fh, $line, $delimiter);
unset($line);
}
Expand All @@ -315,17 +315,17 @@ public function exportDataToCsv($id_customer)
fputcsv($fh, $line, $delimiter);

// CONNECTIONS
$line = array(Tools::strtoupper($this->module->l('Last connections')));
$line = array(Tools::strtoupper($this->module->l('Last connections', 'ExportDataToCsv')));
fputcsv($fh, $line, $delimiter);

$line = array(
$this->module->l('Origin request'),
$this->module->l('Page viewed'),
$this->module->l('Time on the page'),
$this->module->l('IP address'),
$this->module->l('Date'),
$this->module->l('Country'),
$this->module->l('Date'),
$this->module->l('Origin request', 'ExportDataToCsv'),
$this->module->l('Page viewed', 'ExportDataToCsv'),
$this->module->l('Time on the page', 'ExportDataToCsv'),
$this->module->l('IP address', 'ExportDataToCsv'),
$this->module->l('Date', 'ExportDataToCsv'),
$this->module->l('Country', 'ExportDataToCsv'),
$this->module->l('Date', 'ExportDataToCsv'),
);
fputcsv($fh, $line, $delimiter);
unset($line);
Expand All @@ -343,7 +343,7 @@ public function exportDataToCsv($id_customer)
unset($line);
}
} else {
$line = array($this->module->l('No connections'));
$line = array($this->module->l('No connections', 'ExportDataToCsv'));
fputcsv($fh, $line, $delimiter);
unset($line);
}
Expand All @@ -359,7 +359,7 @@ public function exportDataToCsv($id_customer)
$line = array(Tools::strtoupper('Module : '.$index));
fputcsv($fh, $line, $delimiter);
unset($line);
if (count($module) >= 1 && is_array($module)) {
if (is_array($module)) {
foreach ($module as $table) {
foreach ($table as $key => $value) {
$line[] = $key;
Expand Down
10 changes: 3 additions & 7 deletions controllers/front/gdpr.php
View file
Open in desktop
Expand Up @@ -44,11 +44,7 @@ public function initContent()

$this->context->smarty->tpl_vars['page']->value['body_classes']['page-customer-account'] = true;

if ($ps_version) { // if on ps 17
$this->setTemplate('module:psgdpr/views/templates/front/customerPersonalData17.tpl');
} else { // if on ps 16
$this->setTemplate('customerPersonalData16.tpl');
}
$this->setTemplate('module:psgdpr/views/templates/front/customerPersonalData.tpl');
Nakahiru marked this conversation as resolved.
Show resolved Hide resolved
}

public function getBreadcrumbLinks()
Expand All @@ -61,8 +57,8 @@ public function getBreadcrumbLinks()

public function setMedia()
{
$js_path = _PS_MODULE_DIR_.'psgdpr/views/js/';
$css_path = _PS_MODULE_DIR_.'psgdpr/views/css/';
$js_path = $this->module->getPathUri().'/views/js/';
$css_path = $this->module->getPathUri().'/views/css/';

parent::setMedia();
$this->context->controller->addJS($js_path.'front.js');
Expand Down