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/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/app/Helpers/BladeDirectivesHelper.php b/app/Helpers/BladeDirectivesHelper.php new file mode 100644 index 00000000..ba14c2b8 --- /dev/null +++ b/app/Helpers/BladeDirectivesHelper.php @@ -0,0 +1,80 @@ +check()) + || config('bosettings.show_prices_guest') == "guest"; + } + + /** + * Format the sales unit according to configuration. + * Used for blade directive @fmt_sellunit. + * + * @param mixed $expression + * @return string + */ + public static function formatSellUnit($expression): string + { + if (config('bosettings.sell_unit_management') == "strict") { + return !empty($expression) ? sprintf('/ %s', SellUnit::make($expression)->label) : ''; + } + return !empty($expression) ? sprintf('/ %s', $expression) : ''; + } + + /** + * Extract a title produced according to the theme configuration. + * Used for blade directive @excerpt_product_title. + * + * @param string $expression + * @param int|null $limit + * @return string + */ + public static function excerptTitle(string $expression, $limit = null): string + { + $limit = $limit ?? config('theme.max_product_title_length'); + return Str::limit($expression, $limit); + } +} 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/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 02d4a4bc..1e64db1b 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -71,58 +71,21 @@ class AppServiceProvider extends ServiceProvider View::share('published_tags', $tags); } + // Use blade directives helper to prevent blade files from being cached. Blade::directive('fmt_currency_without_auth', function ($expression) { - return ""; + return ""; }); - Blade::directive('fmt_currency', function ($expression) { - // Prix transmis en fonction du setting show_prices. - if ( - (config('bosettings.show_prices_authenticated') === "authenticated" && Auth::guard('customer')->check()) - || config('bosettings.show_prices_guest') == "guest" - ) { - return ""; - } - return "-.--"; + return ""; }); - Blade::directive('fmt_currency_without_ttc', function ($expression) { - // Prix transmis en fonction du setting show_prices. - if ( - (config('bosettings.show_prices_authenticated') === "authenticated" && Auth::guard('customer')->check()) - || config('bosettings.show_prices_guest') == "guest" - ) { - return ""; - } - return "-.--"; + return ""; }); - Blade::directive('fmt_sellunit', function ($expression) { - if (config('bosettings.sell_unit_management') == "strict") { - return "label); } ?>"; - } else { - return ""; - } + return ""; }); - Blade::directive('excerpt_product_title', function ($expression) { - $limit = config('theme.max_product_title_length'); - return ""; + return ""; }); // Default paginator template for back Office. 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", 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; + } +