From 66b7eb6cfaf520bece0e2da20980346dbd514355 Mon Sep 17 00:00:00 2001 From: Olivier Legat Date: Wed, 26 May 2021 15:40:52 +0200 Subject: [PATCH] Ajout d'un setting pour la reception des confirmation de commande aux admins --- app/Http/Controllers/Bo/OrdersController.php | 10 + .../Controllers/Bo/SettingsController.php | 18 ++ app/Mail/OrderConfirmAdminMail.php | 39 +++ database/seeders/SettingsSeeder.php | 5 + resources/views/bo/settings.blade.php | 11 +- .../views/emails/order-confirm-admin.php | 284 ++++++++++++++++++ 6 files changed, 365 insertions(+), 2 deletions(-) create mode 100644 app/Mail/OrderConfirmAdminMail.php create mode 100644 resources/views/emails/order-confirm-admin.php diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index baf55a26..2b3d79aa 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -409,6 +409,16 @@ class OrdersController extends Controller //send confirm mail Mail::to($order->customer->email)->send(new OrderConfirmMail($order)); + + + //envoi du mail de confirmation aux admins site + $toMailSetting = Setting::where('key', 'send_order_confirm_mail_to')->first(); + if(empty($toMailSetting->value)) { + $toMail = config('mail.from.address'); + } else { + $toMail = $toMailSetting->value; + } + Mail::to($toMail)->send(new OrderConfirmAdminMail($order)); } //redirect to final confirmation diff --git a/app/Http/Controllers/Bo/SettingsController.php b/app/Http/Controllers/Bo/SettingsController.php index acc956d0..305c21ea 100644 --- a/app/Http/Controllers/Bo/SettingsController.php +++ b/app/Http/Controllers/Bo/SettingsController.php @@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Config; class SettingsController extends Controller { public function manage(Request $request) { + $settings = Setting::all(); $settingsToPrint = []; foreach ($settings as $setting) { @@ -17,10 +18,27 @@ class SettingsController extends Controller } if ($_SERVER["REQUEST_METHOD"] === "POST") { + $input = $request->all(); + + //comparer les settingsToPrint (en base) avec les inputs (pour trouver un nouveau) + foreach($input as $key=>$value) { + if(!isset($settingsToPrint[$key]) + && $key != "_method" + && $key != "_token") + { + //new setting + $setting = new Setting(); + $setting->key = $key; + $setting->value = $value ?? 0; + $setting->save(); + } + } + for($i = 0; $i < count($settings); $i++) { $settings[$i]->value = $request->input($settings[$i]->key) === null ? 0 : $request->input($settings[$i]->key); $settings[$i]->save(); } + return redirect()->route('bo.settings')->with('success', 'Modifications enregistrés !'); } diff --git a/app/Mail/OrderConfirmAdminMail.php b/app/Mail/OrderConfirmAdminMail.php new file mode 100644 index 00000000..3e6e28e7 --- /dev/null +++ b/app/Mail/OrderConfirmAdminMail.php @@ -0,0 +1,39 @@ +order = $order; + } + + /** + * Build the message. + * + * @return $this + */ + public function build() + { + $order = $this->order; + $magasin = Magasin::first(); + + return $this->subject("Nouvelle Commande - " . config('theme.site_name'))->view('emails.order-confirm-admin', compact('order', 'magasin')); + } +} diff --git a/database/seeders/SettingsSeeder.php b/database/seeders/SettingsSeeder.php index 119df858..1a435b95 100644 --- a/database/seeders/SettingsSeeder.php +++ b/database/seeders/SettingsSeeder.php @@ -43,5 +43,10 @@ class SettingsSeeder extends Seeder $sendContactMailTo->key = "send_contact_mail_to"; $sendContactMailTo->value = config('mail.from.address'); $sendContactMailTo->save(); + + $sendOrderMailTo = new Setting(); + $sendOrderMailTo->key = "send_order_confirm_mail_to"; + $sendOrderMailTo->value = config('mail.from.address'); + $sendOrderMailTo->save(); } } diff --git a/resources/views/bo/settings.blade.php b/resources/views/bo/settings.blade.php index 1476583e..5eada6bd 100644 --- a/resources/views/bo/settings.blade.php +++ b/resources/views/bo/settings.blade.php @@ -49,14 +49,21 @@
+
+
+
diff --git a/resources/views/emails/order-confirm-admin.php b/resources/views/emails/order-confirm-admin.php new file mode 100644 index 00000000..4c273d65 --- /dev/null +++ b/resources/views/emails/order-confirm-admin.php @@ -0,0 +1,284 @@ + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + +
+ +
+ + + + + + + +
+ + + + + + +
+ +
+
+
Nouvelle commande enregistrée !
+
+
+ +
+
+ +
+ + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
Bonjour,

La commande {{ $order->reference }} est confirmée
+
+

+

+ +
+
Détail de la Commande :

+
+ + + + + + @foreach ($order->lines as $line) + + + + @endforeach +
ProduitQuantitéTotal
{{ $line->product->name }}{{ $line->quantity }}@fmt_currency($line->total_ttc)
+
+

+

+ +
+
Total de la commande : @fmt_currency($order->total)
+
+

+

+ +
+
A retirer le {{$order->timeslot->day}} à {{$order->timeslot->time}}, à l’adresse suivante :

+ Point de retrait {{$magasin->name}}, {{$magasin->address}}, {{$magasin->postcode}} {{$magasin->city}} +
+
+


Message automatisé : {{ config('theme.site_name') }}
+
+
+ +
+
+ +
+ + +