dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// fix loyalty module

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7968 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-08-09 14:54:17 +00:00
parent f48b1ffc45
commit decbcc7246
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/loyalty/LoyaltyModule.php
+6 -6
View File
@@ -104,8 +104,8 @@ class LoyaltyModule extends ObjectModel
{
if (!(int)(Configuration::get('PS_LOYALTY_NONE_AWARD')) AND Product::isDiscounted((int)$product['id_product']))
{
if (isset($this->context->smarty) AND is_object($newProduct) AND $product['id_product'] == $newProduct->id)
$this->context->smarty->assign('no_pts_discounted', 1);
if (isset(Context::getContext()->smarty) AND is_object($newProduct) AND $product['id_product'] == $newProduct->id)
Context::getContext()->smarty->assign('no_pts_discounted', 1);
continue;
}
$total += ($taxesEnabled == PS_TAX_EXC ? $product['price'] : $product['price_wt'])* (int)($product['cart_quantity']);
@@ -119,17 +119,17 @@ class LoyaltyModule extends ObjectModel
public static function getVoucherValue($nbPoints, $id_currency = NULL)
{
$currency = $id_currency ? new Currency($id_currency) : $this->context->currency->id;
$currency = $id_currency ? new Currency($id_currency) : Context::getContext()->currency->id;
return (int)$nbPoints * (float)Tools::convertPrice(Configuration::get('PS_LOYALTY_POINT_VALUE'), $currency);
}
public static function getNbPointsByPrice($price)
{
if (Configuration::get('PS_CURRENCY_DEFAULT') != $this->context->currency->id)
if (Configuration::get('PS_CURRENCY_DEFAULT') != Context::getContext()->currency->id)
{
if ($this->context->currency->conversion_rate)
$price = $price / $this->context->currency->conversion_rate;
if (Context::getContext()->currency->conversion_rate)
$price = $price / Context::getContext()->currency->conversion_rate;
}
/* Prevent division by zero */