antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-12643-ExportLoyalty' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-02-28 15:55:11 +01:00
commit d606bae3c0
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/ant_configurations/AdminAntConfigurations.php
View File

@ -186,7 +186,15 @@ class AdminAntConfigurations extends AdminTab
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (o.`id_address_invoice` = a.`id_address`)
WHERE o.`id_order` = l.`id_order`
) as `nationality`,
IFNULL(l.`id_discount`,"Non transforme") as `discount`,
CASE
WHEN
l.`id_discount` = 0 OR
l.`id_discount` IS NULL
THEN
"Non transforme"
ELSE
l.id_discount
END as `discount`,
l.`discount_value` as `credit`,
DATE_FORMAT(l.`date_add`,"%d/%m/%Y") as `date_generated`,
IFNULL(
@ -218,7 +226,7 @@ class AdminAntConfigurations extends AdminTab
'nationality' => 'Nationalité',
'discount' => 'Bon de réduction',
'credit' => 'Valeur crédit',
'date_generated' => 'Date de génération',
'date_generated' => 'Date de génération crédit',
'date_used_in_period' => 'Date utilisation (dans la période)',
'date_used' => 'Date utilisation',
);