Merge branch 'ticket-12754-MailAlert' into develop
This commit is contained in:
commit
80a4945e20
@ -67,7 +67,7 @@ class AdminPrivateSaleMailDelay extends AdminTab {
|
|||||||
$contenu_mail = str_replace("%discount%", $discount->name , $contenu_mail);
|
$contenu_mail = str_replace("%discount%", $discount->name , $contenu_mail);
|
||||||
}
|
}
|
||||||
|
|
||||||
$customer = new Customer($discount->id_customer);
|
$customer = new Customer($data->id_customer);
|
||||||
$send = Mail::Send(
|
$send = Mail::Send(
|
||||||
$cookie->id_lang,
|
$cookie->id_lang,
|
||||||
'ps_delay',
|
'ps_delay',
|
||||||
@ -83,10 +83,10 @@ class AdminPrivateSaleMailDelay extends AdminTab {
|
|||||||
NULL,
|
NULL,
|
||||||
dirname(__FILE__).'/mails/'
|
dirname(__FILE__).'/mails/'
|
||||||
);
|
);
|
||||||
$send = true;
|
//$send = true;
|
||||||
|
|
||||||
if(!$send){
|
if(!$send){
|
||||||
$mails_errors[] = $order->id;
|
$mails_errors[] = $data->id;
|
||||||
}
|
}
|
||||||
|
|
||||||
$mail++;
|
$mail++;
|
||||||
|
Loading…
Reference in New Issue
Block a user