From 79b9b9b8082d9ccf352427c08f9ad9ca3a20f749 Mon Sep 17 00:00:00 2001 From: Corentin Huet Date: Thu, 29 Jan 2026 17:56:51 +0100 Subject: [PATCH 1/3] feat: :sparkles: adding multiple brands --- app/Enums/ProductBrand.php | 24 +++++++++++++++++------- package-lock.json | 1 - 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/Enums/ProductBrand.php b/app/Enums/ProductBrand.php index 3a834463..88d3278b 100644 --- a/app/Enums/ProductBrand.php +++ b/app/Enums/ProductBrand.php @@ -15,6 +15,11 @@ use Kwaadpepper\Enum\BaseEnumRoutable; * @method static self marie() * @method static self tregalette() * @method static self esprirestauration() + * @method static self lepetitmarchedeloue() + * @method static self lesaccessibles() + * @method static self legauloisvegetal() + * @method static self natureandrespect() + * @method static self reghalal() * */ class ProductBrand extends BaseEnumRoutable @@ -27,13 +32,18 @@ class ProductBrand extends BaseEnumRoutable public static function labels() { return [ - 'none' => 'Sans marque', - 'loue' => 'Loué', - 'legaulois' => 'Le Gaulois', - 'legauloispro' => 'Le Gaulois Professionnel', - 'marie' => 'Marie', - 'tregalette' => 'Trégalette', - 'esprirestauration' => 'Espri Restauration', + 'none' => 'Sans marque', + 'loue' => 'Loué', + 'legaulois' => 'Le Gaulois', + 'legauloispro' => 'Le Gaulois Professionnel', + 'marie' => 'Marie', + 'tregalette' => 'Trégalette', + 'esprirestauration' => 'Espri Restauration', + 'lepetitmarchedeloue' => 'Le petit marché de Loué', + 'lesaccessibles' => 'Les Accessibles', + 'legauloisvegetal' => 'Le Gaulois végétal', + 'natureandrespect' => 'Nature & Respect', + 'reghalal' => 'Réghalal' ]; } } diff --git a/package-lock.json b/package-lock.json index 701a4aaa..d7993fb2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,7 +4,6 @@ "requires": true, "packages": { "": { - "name": "srcs", "devDependencies": { "@fancyapps/fancybox": "^3.5.7", "@fortawesome/fontawesome-free": "^6.2.0", From b3d4d6945ed852048cad4ae55e209d0face7d070 Mon Sep 17 00:00:00 2001 From: Corentin Huet Date: Fri, 30 Jan 2026 11:38:54 +0100 Subject: [PATCH 2/3] feat: :sparkles: send an order reminder email --- app/Console/Kernel.php | 2 +- app/Jobs/SendReminderMail.php | 2 +- app/Mail/OrderTodayReminderMail.php | 2 +- .../views/emails/order-reminder.blade.php | 115 ++++++++++++------ 4 files changed, 78 insertions(+), 43 deletions(-) diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 11e45973..b2d71b57 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -26,7 +26,7 @@ class Kernel extends ConsoleKernel protected function schedule(Schedule $schedule) { $schedule->job(JobsXmlIncoReader::class)->name('xml-inco-reader')->onOneServer()->dailyAt('15:00'); - $schedule->job(SendReminderMail::class)->onOneServer()->dailyAt('7:00'); + $schedule->job(SendReminderMail::class)->onOneServer()->dailyAt('10:00'); $schedule->job(GetPublicHolidayForNextYear::class)->onOneServer()->yearlyOn(11, 1, '7:30'); } diff --git a/app/Jobs/SendReminderMail.php b/app/Jobs/SendReminderMail.php index 4bfc4bb3..9dc8c81e 100644 --- a/app/Jobs/SendReminderMail.php +++ b/app/Jobs/SendReminderMail.php @@ -27,7 +27,7 @@ class SendReminderMail implements ShouldQueue public function handle() { $orders = Order::whereHas('timeslot', function (Builder $query) { - $query->where('day', now()->format('d/m/Y')); + $query->where('day', now()->format('Y-m-d')); })->get(); foreach ($orders as $order) { diff --git a/app/Mail/OrderTodayReminderMail.php b/app/Mail/OrderTodayReminderMail.php index 00a66e13..c4b6d65d 100644 --- a/app/Mail/OrderTodayReminderMail.php +++ b/app/Mail/OrderTodayReminderMail.php @@ -42,7 +42,7 @@ class OrderTodayReminderMail extends Mailable $magasin = Magasin::find($order->timeslot->magasin->id); return $this->subject( - "Votre commande est prête - " . config('theme.site_name') + "Vous avez une commande à retirer aujourd'hui - " . config('theme.site_name') )->view('emails.order-reminder', compact('order', 'magasin')); } } diff --git a/resources/views/emails/order-reminder.blade.php b/resources/views/emails/order-reminder.blade.php index eb9e5180..c864858b 100644 --- a/resources/views/emails/order-reminder.blade.php +++ b/resources/views/emails/order-reminder.blade.php @@ -2,46 +2,49 @@ - - - - - - - - + p { + display: block; + margin: 13px 0; + } + + .tbl-line { + padding-bottom: 8px; + } +