Merge branch 'ticket-fidelite' into develop
This commit is contained in:
Marion Muszynski
commit
6926224b43
@ -504,7 +504,7 @@ class Loyalty extends Module
|
||||
{
|
||||
include_once(dirname(__FILE__).'/LoyaltyStateModule.php');
|
||||
include_once(dirname(__FILE__).'/LoyaltyModule.php');
|
||||
|
||||
|
||||
$totalPrice = 0;
|
||||
$details = OrderReturn::getOrdersReturnDetail((int)($params['orderReturn']->id));
|
||||
foreach ($details AS $detail)
|
||||
@ -521,11 +521,9 @@ class Loyalty extends Module
|
||||
$product_price = $price - $reduction;
|
||||
}
|
||||
$totalPrice += ($product_price * $detail['product_quantity']);
|
||||
if (!isset($id_order)) {
|
||||
$id_order = (int) $orderDetail['id_order'];
|
||||
}
|
||||
}
|
||||
$id_loyalty = LoyaltyModule::getByOrderId((int)$id_order);
|
||||
|
||||
$id_loyalty = LoyaltyModule::getByOrderId((int)$params['orderReturn']->id_order);
|
||||
if ($id_loyalty) {
|
||||
$loyalty = new LoyaltyModule((int)$id_loyalty);
|
||||
$totalPrice = LoyaltyModule::getDiscountValueByPrice($totalPrice);;
|
||||
|
||||
@ -5726,7 +5726,18 @@ div#giftvoucher_ask_infos_block .gv_customization > .gv_param input {
|
||||
}
|
||||
|
||||
/** Module loyalty **/
|
||||
|
||||
#block-history{
|
||||
background: #fff;
|
||||
padding: 20px;
|
||||
-moz-box-shadow: 2px 2px 5px #cccccc;
|
||||
-webkit-box-shadow: 2px 2px 5px #CCC;
|
||||
-ms-box-shadow: 2px 2px 5px #cccccc;
|
||||
-o-box-shadow: 2px 2px 5px #cccccc;
|
||||
box-shadow: 2px 2px 5px #CCC;
|
||||
}
|
||||
#block-history .alternate_item.even{
|
||||
background: #F3F3F3;
|
||||
}
|
||||
a.loyalty-transform, .history_method span.total-discount-loyalty{
|
||||
text-align: center;
|
||||
text-transform: none;
|
||||
@ -5745,6 +5756,45 @@ a.loyalty-transform, .history_method span.total-discount-loyalty{
|
||||
font-style: italic;
|
||||
font-size: 13px;
|
||||
}
|
||||
#module-loyalty-loyalty-program ul.pagination {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
#module-loyalty-loyalty-program ul.pagination li{
|
||||
float: left;
|
||||
position: relative;
|
||||
margin-right: 10px;
|
||||
background: #fff;
|
||||
-moz-border-radius: 50%;
|
||||
-webkit-border-radius: 50%;
|
||||
border-radius: 50%;
|
||||
font-family: georgia, times new roman, serif;
|
||||
font-style: italic;
|
||||
color: #504d8b;
|
||||
min-width: 22px;
|
||||
text-align: center;
|
||||
font-size: 16px;
|
||||
}
|
||||
#module-loyalty-loyalty-program ul.pagination li.current,
|
||||
#module-loyalty-loyalty-program ul.pagination li#pagination_previous,
|
||||
#module-loyalty-loyalty-program ul.pagination li#pagination_next {
|
||||
background: #504d8b;
|
||||
color: #fff;
|
||||
}
|
||||
#module-loyalty-loyalty-program ul.pagination li span{
|
||||
font-size: 16px;
|
||||
color: #fff;
|
||||
width: 100%;
|
||||
}
|
||||
#module-loyalty-loyalty-program ul.pagination li#pagination_previous.disabled,
|
||||
#module-loyalty-loyalty-program ul.pagination li#pagination_next.disabled {
|
||||
background: #fff;
|
||||
}
|
||||
#module-loyalty-loyalty-program ul.pagination:after{
|
||||
content: '';
|
||||
clear: both;
|
||||
display: block;
|
||||
}
|
||||
|
||||
@keyframes slideInDown {
|
||||
0% {
|
||||
|
||||
@ -25,11 +25,11 @@
|
||||
</tr>
|
||||
</tfoot>
|
||||
<tbody>
|
||||
{foreach from=$displayorders item='order'}
|
||||
{foreach from=$displayorders item='order' name=orders}
|
||||
{if $order.id_loyalty_state == 3}
|
||||
{continue}
|
||||
{/if}
|
||||
<tr class="alternate_item">
|
||||
<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>
|
||||
@ -50,9 +50,9 @@
|
||||
{if $page != 1}
|
||||
{assign var='p_previous' value=$page-1}
|
||||
<li id="pagination_previous"><a href="{$pagination_link}?p={$p_previous}&n={$nbpagination}">
|
||||
« {l s='Previous' mod='loyalty'}</a></li>
|
||||
« </a></li>
|
||||
{else}
|
||||
<li id="pagination_previous" class="disabled"><span>« {l s='Previous' mod='loyalty'}</span></li>
|
||||
<li id="pagination_previous" class="disabled"><span>« </span></li>
|
||||
{/if}
|
||||
{if $page > 2}
|
||||
<li><a href="{$pagination_link}?p=1&n={$nbpagination}">1</a></li>
|
||||
@ -75,9 +75,9 @@
|
||||
{/if}
|
||||
{if $displayorders|@count > $page * $nbpagination}
|
||||
{assign var='p_next' value=$page+1}
|
||||
<li id="pagination_next"><a href="{$pagination_link}?p={$p_next}&n={$nbpagination}">{l s='Next' mod='loyalty'} »</a></li>
|
||||
<li id="pagination_next"><a href="{$pagination_link}?p={$p_next}&n={$nbpagination}"> »</a></li>
|
||||
{else}
|
||||
<li id="pagination_next" class="disabled"><span>{l s='Next' mod='loyalty'} »</span></li>
|
||||
<li id="pagination_next" class="disabled"><span> »</span></li>
|
||||
{/if}
|
||||
</ul>
|
||||
{/if}
|
||||
|
||||
@ -49,11 +49,11 @@
|
||||
</tr>
|
||||
</tfoot>
|
||||
<tbody>
|
||||
{foreach from=$displayorders item='order'}
|
||||
{foreach from=$displayorders item='order' name=orders}
|
||||
{if $order.id_loyalty_state == 3}
|
||||
{continue}
|
||||
{/if}
|
||||
<tr class="alternate_item">
|
||||
<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}</td>
|
||||
<td class="history_method">{Tools::displayPrice($order.discount_value)}</td>
|
||||
@ -73,9 +73,9 @@
|
||||
{if $page != 1}
|
||||
{assign var='p_previous' value=$page-1}
|
||||
<li id="pagination_previous"><a href="{$pagination_link}?p={$p_previous}&n={$nbpagination}">
|
||||
« {l s='Previous' mod='loyalty'}</a></li>
|
||||
« </a></li>
|
||||
{else}
|
||||
<li id="pagination_previous" class="disabled"><span>« {l s='Previous' mod='loyalty'}</span></li>
|
||||
<li id="pagination_previous" class="disabled"><span>« </span></li>
|
||||
{/if}
|
||||
{if $page > 2}
|
||||
<li><a href="{$pagination_link}?p=1&n={$nbpagination}">1</a></li>
|
||||
@ -98,9 +98,9 @@
|
||||
{/if}
|
||||
{if $displayorders|@count > $page * $nbpagination}
|
||||
{assign var='p_next' value=$page+1}
|
||||
<li id="pagination_next"><a href="{$pagination_link}?p={$p_next}&n={$nbpagination}">{l s='Next' mod='loyalty'} »</a></li>
|
||||
<li id="pagination_next"><a href="{$pagination_link}?p={$p_next}&n={$nbpagination}"> »</a></li>
|
||||
{else}
|
||||
<li id="pagination_next" class="disabled"><span>{l s='Next' mod='loyalty'} »</span></li>
|
||||
<li id="pagination_next" class="disabled"><span> »</span></li>
|
||||
{/if}
|
||||
</ul>
|
||||
{/if}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user