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 18:06:50 +02:00
commit b05ebd8a38
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/loyalty/LoyaltyModule.php
View File

@ -156,7 +156,7 @@ class LoyaltyModule extends ObjectModel
if ($currency->conversion_rate)
$price = $price / $currency->conversion_rate;
}
$discount_value = (float)(Configuration::get('PS_LOYALTY_PERCENT_VALUE') * $price) / 100;
$discount_value = (float)(((float)Configuration::get('PS_LOYALTY_PERCENT_VALUE') * $price) / 100);
return $discount_value;
}
@ -195,7 +195,7 @@ class LoyaltyModule extends ObjectModel
public static function getAllByIdCustomerCustom($id_customer, $id_lang, $onlyValidate = false, $pagination = false, $nb = 10, $page = 1, $onlyDefault = false)
{
$percent = (float)(1.75 / 100);
$percent = (float)(Configuration::get('PS_LOYALTY_PERCENT_VALUE') / 100);
$query = '
SELECT f.id_order AS id, f.date_add AS date,