diff --git a/app/Http/Controllers/OrderTunnelController.php b/app/Http/Controllers/OrderTunnelController.php index 54265bfe..4e1ca6cc 100644 --- a/app/Http/Controllers/OrderTunnelController.php +++ b/app/Http/Controllers/OrderTunnelController.php @@ -357,25 +357,34 @@ class OrderTunnelController extends Controller $order = Order::where('reference', '=', $reference)->firstOrFail(); // Check total price of this customer commands for a specific delivery day. - $date = CarbonImmutable::create(explode('/', $tsday)[2], explode('/', $tsday)[1], explode('/', $tsday)[0]); - $start = $date->startOfWeek(Carbon::MONDAY)->format('Y-m-d'); - $end = $date->endOfWeek(Carbon::SUNDAY)->format('Y-m-d'); - + $date = CarbonImmutable::create( + explode('/', $tsday)[2], + explode('/', $tsday)[1], + explode('/', $tsday)[0] + ); + $start = $date->startOfWeek(Carbon::MONDAY); + $end = $date->endOfWeek(Carbon::SUNDAY); $customerOrders = Order::where('customer_id', '=', $order->customer_id) ->where('status_id', '=', 3) ->get(); $totalPrice = 0; foreach ($customerOrders as $key => $customerOrder) { + $timeslot_day = Carbon::createFromFormat('d/m/Y', $customerOrder->timeslot->day); if ( - strcasecmp($customerOrder->timeslot->day, $start) > 0 && - strcasecmp($customerOrder->timeslot->day, $end) > 0 + $timeslot_day >= $start && + $timeslot_day <= $end ) { $totalPrice += $customerOrder->total; } } if ($totalPrice > 200) { return redirect()->route('account.order-detail', ['reference' => $order->reference]) - ->with('message', 'Le montant total pour cette date de livraison est dépassé (200€). + ->with('message', 'Le montant total pour cette date de livraison est dépassé (200€ maximum). + Veuillez modifier cette dernière pour la valider.'); + } + if ($order->total > 200) { + return redirect()->route('account.order-detail', ['reference' => $order->reference]) + ->with('message', 'Le montant total de cette commande est dépassé (200€ maximum). Veuillez modifier cette dernière pour la valider.'); } diff --git a/resources/views/front/sable/js/components/BasketPanel.vue b/resources/views/front/sable/js/components/BasketPanel.vue index f09e3f78..4462ebae 100644 --- a/resources/views/front/sable/js/components/BasketPanel.vue +++ b/resources/views/front/sable/js/components/BasketPanel.vue @@ -45,7 +45,7 @@

Total

-

{{currencyFormatter(cartTotals.totalTTC)}}

+

{{ currencyFormatter(cartTotals.totalTTC) }}

Commander @@ -71,7 +71,6 @@ -