From b3d16a06b0e45eb38612357b939a4b405ebfcdb5 Mon Sep 17 00:00:00 2001 From: Ludovic CANDELLIER Date: Mon, 27 Feb 2023 23:15:16 +0100 Subject: [PATCH] adapt to laravel 9 --- app/Mail/Acheminement.php | 32 ++++++++----------------------- app/Mail/Bienvenue.php | 18 ----------------- app/Mail/ConfirmationCommande.php | 32 +++++++------------------------ app/Mail/Preparation.php | 31 +++++++----------------------- 4 files changed, 22 insertions(+), 91 deletions(-) diff --git a/app/Mail/Acheminement.php b/app/Mail/Acheminement.php index 8a61deb3..6547b423 100644 --- a/app/Mail/Acheminement.php +++ b/app/Mail/Acheminement.php @@ -4,11 +4,12 @@ namespace App\Mail; use App\Models\Core\Mail\MailTemplate; use App\Repositories\Core\DateTime; +use App\Repositories\Shop\Customers; use Illuminate\Bus\Queueable; +use Illuminate\Mail\Mailables\Address; +use Illuminate\Mail\Mailables\Envelope; use Illuminate\Queue\SerializesModels; use Spatie\MailTemplates\TemplateMailable; -use App\Repositories\Shop\Customers; - class Acheminement extends TemplateMailable { @@ -29,30 +30,13 @@ class Acheminement extends TemplateMailable $this->user = $user; $this->male = $user->gender == 1; $this->subject = $subject; - $this->from[] = ['address' => 'boutique@jardinenvie.com','name' => 'Boutique JardinEnVie']; - $this->reply_to = ['address' => 'boutique@jardinenvie.com','name' => 'Boutique JardinEnVie']; } - public static function getDataByUser($user_id) + public function envelope() { - $user = self::getUser($user_id); - - return $user ? [ - 'user' => $user->toArray(), - 'male' => $user->gender == 1, - ] : false; + return new Envelope( + from: new Address('boutique@jardinenvie.com', 'Boutique Jardin\'Envie'), + subject: $this->subject, + ); } - - public static function getUser($id) - { - return Customers::get($id); - } - - public function build() - { - $data = ['user' => $this->user]; - $template = $this->getTemplate(); - return $this->view($template, $data); - } - } diff --git a/app/Mail/Bienvenue.php b/app/Mail/Bienvenue.php index 3e6630a6..860616d8 100644 --- a/app/Mail/Bienvenue.php +++ b/app/Mail/Bienvenue.php @@ -3,15 +3,12 @@ namespace App\Mail; use App\Models\Core\Mail\MailTemplate; -use App\Repositories\Core\DateTime; -use App\Repositories\Shop\Customers; use Illuminate\Bus\Queueable; use Illuminate\Mail\Mailables\Address; use Illuminate\Mail\Mailables\Envelope; use Illuminate\Queue\SerializesModels; use Spatie\MailTemplates\TemplateMailable; - class Bienvenue extends TemplateMailable { use Queueable, SerializesModels; @@ -33,21 +30,6 @@ class Bienvenue extends TemplateMailable $this->subject = $subject; } - public static function getDataByUser($user_id) - { - $user = self::getUser($user_id); - - return $user ? [ - 'user' => $user->toArray(), - 'male' => $user->gender == 1, - ] : false; - } - - public static function getUser($id) - { - return Customers::get($id); - } - public function envelope() { return new Envelope( diff --git a/app/Mail/ConfirmationCommande.php b/app/Mail/ConfirmationCommande.php index 0a85b3f3..ab6052ce 100644 --- a/app/Mail/ConfirmationCommande.php +++ b/app/Mail/ConfirmationCommande.php @@ -3,12 +3,11 @@ namespace App\Mail; use App\Models\Core\Mail\MailTemplate; -use App\Repositories\Core\DateTime; use Illuminate\Bus\Queueable; +use Illuminate\Mail\Mailables\Address; +use Illuminate\Mail\Mailables\Envelope; use Illuminate\Queue\SerializesModels; use Spatie\MailTemplates\TemplateMailable; -use App\Repositories\Shop\Customers; - class ConfirmationCommande extends TemplateMailable { @@ -29,30 +28,13 @@ class ConfirmationCommande extends TemplateMailable $this->user = $user; $this->male = $user->gender == 1; $this->subject = $subject; - $this->from[] = ['address' => 'boutique@jardinenvie.com','name' => 'Boutique JardinEnVie']; - $this->reply_to = ['address' => 'boutique@jardinenvie.com','name' => 'Boutique JardinEnVie']; } - public static function getDataByUser($user_id) + public function envelope() { - $user = self::getUser($user_id); - - return $user ? [ - 'user' => $user->toArray(), - 'male' => $user->gender == 1, - ] : false; + return new Envelope( + from: new Address('boutique@jardinenvie.com', 'Boutique Jardin\'Envie'), + subject: $this->subject, + ); } - - public static function getUser($id) - { - return Customers::get($id); - } - - public function build() - { - $data = ['user' => $this->user]; - $template = $this->getTemplate(); - return $this->view($template, $data); - } - } diff --git a/app/Mail/Preparation.php b/app/Mail/Preparation.php index f1a5a1e6..1a51cc08 100644 --- a/app/Mail/Preparation.php +++ b/app/Mail/Preparation.php @@ -3,11 +3,11 @@ namespace App\Mail; use App\Models\Core\Mail\MailTemplate; -use App\Repositories\Core\DateTime; use Illuminate\Bus\Queueable; +use Illuminate\Mail\Mailables\Address; +use Illuminate\Mail\Mailables\Envelope; use Illuminate\Queue\SerializesModels; use Spatie\MailTemplates\TemplateMailable; -use App\Repositories\Shop\Customers; class Preparation extends TemplateMailable @@ -29,30 +29,13 @@ class Preparation extends TemplateMailable $this->user = $user; $this->male = $user->gender == 1; $this->subject = $subject; - $this->from[] = ['address' => 'boutique@jardinenvie.com','name' => 'Boutique JardinEnVie']; - $this->reply_to = ['address' => 'boutique@jardinenvie.com','name' => 'Boutique JardinEnVie']; } - public static function getDataByUser($user_id) + public function envelope() { - $user = self::getUser($user_id); - - return $user ? [ - 'user' => $user->toArray(), - 'male' => $user->gender == 1, - ] : false; + return new Envelope( + from: new Address('boutique@jardinenvie.com', 'Boutique Jardin\'Envie'), + subject: $this->subject, + ); } - - public static function getUser($id) - { - return Customers::get($id); - } - - public function build() - { - $data = ['user' => $this->user]; - $template = $this->getTemplate(); - return $this->view($template, $data); - } - }