Merge branch 'fix_erp_mailer'

This commit is contained in:
Rodney Figaro 2017-05-24 10:54:49 +02:00
commit 4754304b28

View File

@ -183,20 +183,22 @@ foreach ($ids_customer as $id_customer) {
$target_emails[] = $representant_email; $target_emails[] = $representant_email;
} }
$mail = Mail::Send( if (!defined('ERP_PREPROD') || !ERP_PREPROD) {
1, $mail = Mail::Send(
'account', 1,
Mail::l('Welcome!'), 'account',
array( Mail::l('Welcome!'),
'{firstname}' => $customer->firstname, array(
'{lastname}' => $customer->lastname, '{firstname}' => $customer->firstname,
'{email}' => $customer->email, '{lastname}' => $customer->lastname,
'{passwd}' => $password_generate '{email}' => $customer->email,
), '{passwd}' => $password_generate
$target_emails, ),
$customer->firstname.' '.$customer->lastname $target_emails,
); $customer->firstname.' '.$customer->lastname
);
}
foreach ($other_addresses as $key => $other_address) { foreach ($other_addresses as $key => $other_address) {
//$other_address['phone'] = ($other_address['phone']) ? $other_address['phone'] : $record['phone']; //$other_address['phone'] = ($other_address['phone']) ? $other_address['phone'] : $record['phone'];
if (isset($other_address['phone']) && !empty($other_address['phone'])) { if (isset($other_address['phone']) && !empty($other_address['phone'])) {