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-04-21 12:15:31 +02:00
commit d0644b680e
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/loyalty/loyalty-program.php
View File

@ -118,7 +118,6 @@ $smarty->assign(array(
'orders' => $orders,
'displayorders' => $displayorders,
'pagination_link' => __PS_BASE_URI__.'modules/loyalty/loyalty-program.php',
'totalPoints' => (int)$customerPoints,
'voucher' => $total_discount,
'validation_id' => LoyaltyStateModule::getValidationId(),
'transformation_allowed' => $total_discount > 0,

4
modules/loyalty/loyalty.php
View File

@ -560,7 +560,7 @@ class Loyalty extends Module
$loyalty->id_customer = (int)$params['customer']->id;
$loyalty->id_order = (int)$params['order']->id;
$loyalty->discount_value = LoyaltyModule::getOrderDiscountValue($params['order']);
if (!Configuration::get('PS_LOYALTY_NONE_AWARD') AND (int)$loyalty->discount_value == 0)
if (!Configuration::get('PS_LOYALTY_NONE_AWARD') AND $loyalty->discount_value == 0)
$loyalty->id_loyalty_state = LoyaltyStateModule::getNoneAwardId();
else
$loyalty->id_loyalty_state = LoyaltyStateModule::getDefaultId();
@ -616,7 +616,7 @@ class Loyalty extends Module
die(Tools::displayError('Incorrect object Customer.'));
$details = LoyaltyModule::getAllByIdCustomer((int)$params['id_customer'], (int)$params['cookie']->id_lang);
$discount_value = (int)LoyaltyModule::getVoucherValueByPercentOfOrder($details);
$discount_value = LoyaltyModule::getVoucherValueByPercentOfOrder($details);
$html = '
<br /><h2>'.$this->l('Loyalty progam').' ('.Tools::displayPrice($discount_value, (int)Configuration::get('PS_CURRENCY_DEFAULT')).')</h2>';