From 351023e4d3ca353eb916144bafb8f5a33977a7e0 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Thu, 21 Apr 2022 11:06:53 +0200 Subject: [PATCH] remove second smt transport --- .env.example | 22 +++++++++++++++----- app/Http/Controllers/Bo/OrdersController.php | 3 --- app/Http/Controllers/ContactController.php | 1 - app/Http/Controllers/CustomerController.php | 3 --- config/mail.php | 11 ---------- 5 files changed, 17 insertions(+), 23 deletions(-) diff --git a/.env.example b/.env.example index 6bf0493..dc68a7c 100644 --- a/.env.example +++ b/.env.example @@ -1,11 +1,13 @@ -APP_NAME=Laravel +APP_NAME="ENV-Boutique LDC" APP_ENV=local APP_KEY= APP_DEBUG=true -APP_URL=http://localhost -APP_THEME=basic +APP_URL= +APP_THEME= +PROJECT_UUID= +ANALYTICS_GOOGLE_ID= -LOG_CHANNEL=stack +LOG_CHANNEL=daily LOG_LEVEL=debug DB_CONNECTION=mysql @@ -31,9 +33,19 @@ MAIL_PORT=2525 MAIL_USERNAME=null MAIL_PASSWORD=null MAIL_ENCRYPTION=null -MAIL_FROM_ADDRESS=null +MAIL_FROM_ADDRESS=equipe.web@ldc.fr MAIL_FROM_NAME="${APP_NAME}" +MAIL_ADMIN=informatique.internet@ldc.fr + +MAIL_LIST_SERVICEWEB=informatique.internet@ldc.fr +MAIL_LIST_INVALIDINCO=informatique.internet@ldc.fr,vincent.pierre@ldc.fr,christelle.manceau@ldc.fr + +# CRM +CRM_ENDPOINT=https://ldcldccrm:K5cJmTsG@dev.ldc-crm.fr +# service boutique +CRM_TOKEN= + AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= AWS_DEFAULT_REGION=us-east-1 diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index e243526..411b032 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -121,7 +121,6 @@ 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 . "."); @@ -439,7 +438,6 @@ 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(); @@ -449,7 +447,6 @@ 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')) { diff --git a/app/Http/Controllers/ContactController.php b/app/Http/Controllers/ContactController.php index d4ee6f1..c68f468 100644 --- a/app/Http/Controllers/ContactController.php +++ b/app/Http/Controllers/ContactController.php @@ -35,7 +35,6 @@ class ContactController extends Controller } //envoi du mail d'alerte Mail::to($toMail)->send(new SendContactMail($request)); - Mail::mailer('smtp2')->to($toMail)->send(new SendContactMail($request)); return back()->with('status', true); } diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 6909cb8..d7db7a3 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -73,7 +73,6 @@ 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 { @@ -159,7 +158,6 @@ 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: @@ -237,7 +235,6 @@ 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 { diff --git a/config/mail.php b/config/mail.php index 7c23e8e..bda467e 100644 --- a/config/mail.php +++ b/config/mail.php @@ -45,17 +45,6 @@ return [ 'auth_mode' => null, ], - 'smtp2' => [ - 'transport' => env('MAIL_TRANSPORT2', 'array'), - 'host' => env('MAIL_HOST2'), - 'port' => env('MAIL_PORT2'), - 'encryption' => env('MAIL_ENCRYPTION2'), - 'username' => env('MAIL_USERNAME2'), - 'password' => env('MAIL_PASSWORD2'), - 'timeout' => null, - 'auth_mode' => null, - ], - 'ses' => [ 'transport' => 'ses', ],