Merge branch 'ticket-fidelite' into develop

This commit is contained in:
Marion Muszynski 2016-04-22 15:07:52 +02:00
commit 87829ac8c3

View File

@ -470,12 +470,11 @@ class Loyalty extends Module
$discountValue = 0;
$smarty->assign('no_pts_discounted', 1);
} else {
$discountValue = (int)(LoyaltyModule::getDiscountValueByPrice($product->getPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? false : true, (int)($product->getIdProductAttributeMostExpensive()))));
$discountValue = (float)(LoyaltyModule::getDiscountValueByPrice($product->getPrice(Product::getTaxCalculationMethod() == PS_TAX_EXC ? false : true, (int)($product->getIdProductAttributeMostExpensive()))));
}
$discountValueAfter = $discountValue;
$discountValueBefore = 0;
}
$smarty->assign(array(
'discountValue' => $discountValue,
'total_discounts' => $discountValueAfter,