Merge branch 'develop' into trunk

This commit is contained in:
Olivier Legat 2021-09-27 15:19:21 +02:00
commit ddc5d3d680
4 changed files with 9 additions and 4 deletions

View file

@ -120,6 +120,7 @@ class OrdersController extends Controller
//send confirm mail
Mail::to($order->customer->email)->send(new OrderStatusMail($order));
Mail::mailer('smtp2')->to($order->customer->email)->send(new OrderStatusMail($order));
//return redirect()->route('bo.orders')->with('success', "Changement de status enregistré pour la commande " . $order->reference . ".");
return back()->with('success', "Changement de status enregistré pour la commande " . $order->reference . ".");
@ -437,7 +438,7 @@ class OrdersController extends Controller
//send confirm mail
Mail::to($order->customer->email)->queue(new OrderConfirmMail($order));
Mail::mailer('smtp2')->to($order->customer->email)->queue(new OrderConfirmMail($order));
//envoi du mail de confirmation aux admins site
$toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first();
@ -447,6 +448,7 @@ class OrdersController extends Controller
$toMail = $toMailSetting->value;
}
Mail::to($toMail)->queue(new OrderConfirmAdminMail($order));
Mail::mailer('smtp2')->to($toMail)->queue(new OrderConfirmAdminMail($order));
//export commande
if (config('bosettings.regate_orders')) {

View file

@ -34,8 +34,8 @@ class ContactController extends Controller
$toMail = $toMailSetting->value;
}
//envoi du mail d'alerte
Mail::to($toMail)
->send(new SendContactMail($request));
Mail::to($toMail)->send(new SendContactMail($request));
Mail::mailer('smtp2')->to($toMail)->send(new SendContactMail($request));
return back()->with('status', true);
}

View file

@ -73,6 +73,7 @@ class CustomerController extends Controller
}
Mail::to($request->email)->send(new RegisterConfirmMail($customer, $request->firstname));
Mail::mailer('smtp2')->to($request->email)->send(new RegisterConfirmMail($customer, $request->firstname));
return view('auth.register-success', ['mail' => $request->email]);
} else {
@ -158,6 +159,7 @@ class CustomerController extends Controller
case 116:
$customer = Customers::where('email', $email)->first();
Mail::to($email)->send(new RegisterConfirmMail($customer, null));
Mail::mailer('smtp2')->to($email)->send(new RegisterConfirmMail($customer, null));
// @phpcs:ignore Generic.Files.LineLength
return back()->withErrors("Votre compte n'est pas activé, vérifier dans vos emails pour y trouver le mail de confirmation. Un lien d'activation vous a été renvoyer.");
case 117 || 118 || 119:
@ -235,6 +237,7 @@ class CustomerController extends Controller
$passwordReset->save();
Mail::to($email)->send(new PasswordResetMail($token));
Mail::mailer('smtp2')->to($email)->send(new PasswordResetMail($token));
// @phpcs:ignore Generic.Files.LineLength
return back()->with('success', __("La procédure pour changer votre mot de passe a été envoyé sur votre email."));
} else {

View file

@ -46,7 +46,7 @@ return [
],
'smtp2' => [
'transport' => 'smtp',
'transport' => env('MAIL_TRANSPORT2', 'array'),
'host' => env('MAIL_HOST2', 'smtp.mailgun.org'),
'port' => env('MAIL_PORT2', 587),
'encryption' => env('MAIL_ENCRYPTION2', 'tls'),