// Retro compatibility and updater improved for Discount/CartRules

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9798 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger committed 2011-11-02 14:23:44 +00:00
1 parent 71b77471de
commit 17a8dbc05b
21 files changed
+238 -275

No files matched your search

+4 -4
View File
@@ -239,8 +239,8 @@ class Blocknewsletter extends Module
else
return $this->error = $this->l('Error during subscription');
if ($discount = Configuration::get('NW_VOUCHER_CODE'))
$this->sendVoucher($email, $discount);
if ($code = Configuration::get('NW_VOUCHER_CODE'))
$this->sendVoucher($email, $code);
if (Configuration::get('NW_CONFIRMATION_EMAIL'))
$this->sendConfirmationEmail($email);
@@ -427,9 +427,9 @@ class Blocknewsletter extends Module
* @param string $discount
* @return bool
*/
protected function sendVoucher($email, $discount)
protected function sendVoucher($email, $code)
{
return Mail::Send($this->context->language->id, 'newsletter_voucher', Mail::l('Newsletter voucher'), array('{discount}' => $discount), $email, null, null, null, null, null, dirname(__FILE__).'/mails/');
return Mail::Send($this->context->language->id, 'newsletter_voucher', Mail::l('Newsletter voucher'), array('{discount}' => $code), $email, null, null, null, null, null, dirname(__FILE__).'/mails/');
}
/**