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

Merge branch 'ticket-fidelite' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-06-08 11:44:35 +02:00
commit 8fc47d1d6e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/loyalty/LoyaltyModule.php
View File

@ -180,9 +180,9 @@ class LoyaltyModule extends ObjectModel
public static function getAllByIdCustomer($id_customer, $id_lang, $onlyValidate = false, $pagination = false, $nb = 10, $page = 1)
{
$query = '
SELECT f.id_order AS id, f.date_add AS date, (o.total_paid - o.total_shipping) total_without_shipping, f.discount_value, f.id_loyalty, f.id_loyalty_state, fsl.name state
SELECT f.id_order AS id, f.date_add AS date, f.discount_value, f.id_loyalty, f.id_loyalty_state, fsl.name state
FROM `'._DB_PREFIX_.'loyalty` f
LEFT JOIN `'._DB_PREFIX_.'orders` o ON (f.id_order = o.id_order)
-- LEFT JOIN `'._DB_PREFIX_.'orders` o ON (f.id_order = o.id_order)
LEFT JOIN `'._DB_PREFIX_.'loyalty_state_lang` fsl ON (f.id_loyalty_state = fsl.id_loyalty_state AND fsl.id_lang = '.(int)($id_lang).')
WHERE f.id_customer = '.(int)($id_customer);
if ($onlyValidate === true)

6
themes/site/modules/loyalty/loyalty.tpl
View File

@ -11,14 +11,14 @@
<tr>
<th class="first_item">{l s='Order' mod='loyalty'}</th>
<th class="item">{l s='Date' mod='loyalty'}</th>
<th class="item">{l s='Total' mod='loyalty'}</th>
{*<th class="item">{l s='Total' mod='loyalty'}</th>*}
<th class="item">{l s='Discount' mod='loyalty'}</th>
<th class="last_item">{l s='Points Status' mod='loyalty'}</th>
</tr>
</thead>
<tfoot>
<tr class="alternate_item">
<td class="history_method">&nbsp;</td>
{*<td class="history_method">&nbsp;</td>*}
<td colspan="2" class="history_method bold" style="text-align:right;">{l s='Total discount available:' mod='loyalty'}</td>
<td class="history_method" style="text-align:left;"><span class='total-discount-loyalty'>{Tools::displayPrice($voucher)}</span></td>
<td class="history_method">&nbsp;</td>
@ -32,7 +32,7 @@
<tr class="alternate_item {if $smarty.foreach.orders.index % 2 == 0}odd{else}even{/if}">
<td class="history_link bold">{l s='#' mod='loyalty'}{$order.id|string_format:"%06d"}</td>
<td class="history_date">{dateFormat date=$order.date full=1}</td>
<td class="history_method">{Tools::displayPrice($order.total_without_shipping)}</td>
{*<td class="history_method">{Tools::displayPrice($order.total_without_shipping)}</td>*}
<td class="history_method">{Tools::displayPrice($order.discount_value)}</td>
<td class="history_method">{$order.state|escape:'htmlall':'UTF-8'}</td>
</tr>