Merge branch 'ticket-12754-MailAlert' into develop

This commit is contained in:
Marion Muszynski 2017-03-31 10:06:10 +02:00
commit 80a4945e20

View File

@ -67,7 +67,7 @@ class AdminPrivateSaleMailDelay extends AdminTab {
$contenu_mail = str_replace("%discount%", $discount->name , $contenu_mail);
}
$customer = new Customer($discount->id_customer);
$customer = new Customer($data->id_customer);
$send = Mail::Send(
$cookie->id_lang,
'ps_delay',
@ -83,10 +83,10 @@ class AdminPrivateSaleMailDelay extends AdminTab {
NULL,
dirname(__FILE__).'/mails/'
);
$send = true;
//$send = true;
if(!$send){
$mails_errors[] = $order->id;
$mails_errors[] = $data->id;
}
$mail++;