Merge branch 'ticket-fidelite' into develop

This commit is contained in:
Marion Muszynski 2016-05-10 15:45:01 +02:00
commit 4fdccad3d5
2 changed files with 3 additions and 1 deletions

View File

@ -1357,7 +1357,8 @@ RewriteRule ^invite/(.*)$ '.__PS_BASE_URI__.'modules/invite/sponsor.php?sponsor=
} elseif($format === 2) {
return rtrim(rtrim(sprintf('%.02f', $credit), '0'), '.');
} else {
return $value.' '.$currency->sign;
return Tools::displayPrice($value,$currency);
//return $value.' '.$currency->sign;
}
} else {
return array($credit, $value, $currency->sign);

View File

@ -33,6 +33,7 @@ require_once(dirname(__FILE__).'/../../init.php');
include_once(dirname(__FILE__).'/LoyaltyModule.php');
include_once(dirname(__FILE__).'/LoyaltyStateModule.php');
$controller->preProcess();
if (!$cookie->isLogged())
Tools::redirect('authentication.php?back=modules/loyalty/loyalty-program.php');