From a87f5756b21f1453ee1e7f966de2d9aba10864c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 29 Oct 2026 18:21:22 +0100 Subject: [PATCH 01/14] fix(PickupSchedulingService): use equals method for exception ID comparison Updated the comparison of exception IDs to use the equals method for better accuracy. --- domain/Services/PickupSchedulingService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain/Services/PickupSchedulingService.php b/domain/Services/PickupSchedulingService.php index 4a316bed..5661824d 100644 --- a/domain/Services/PickupSchedulingService.php +++ b/domain/Services/PickupSchedulingService.php @@ -85,7 +85,7 @@ class PickupSchedulingService return array_map(function (PickupExceptionOnDate $pickupException) use ($shopExceptions) { $associated = null; foreach ($shopExceptions as $shopEx) { - if ($shopEx->exception->id->value === $pickupException->id->value) { + if ($shopEx->exception->id->equals($pickupException->id)) { $associated = $shopEx; break; } From cef7a4e4b093602623158aaae6f2d1e35dcc95fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 29 Oct 2026 18:22:51 +0100 Subject: [PATCH 02/14] style(pickup-exceptions): fix formatting for readability Adjusted indentation for better code clarity. --- resources/views/bo/shops/pickup-exceptions.blade.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/views/bo/shops/pickup-exceptions.blade.php b/resources/views/bo/shops/pickup-exceptions.blade.php index 0422e11f..33cfa4c7 100644 --- a/resources/views/bo/shops/pickup-exceptions.blade.php +++ b/resources/views/bo/shops/pickup-exceptions.blade.php @@ -85,8 +85,7 @@ $associatedException?->pivot?->order_deadline_at?->format('Y-m-d\TH:i'), ); - $noReplacement = - empty($associatedException?->pivot?->replacement_date); + $noReplacement = empty($associatedException?->pivot?->replacement_date); $isCritical = $dto->missingSubsitute || $dto->passedDeadline; @@ -132,10 +131,10 @@ {{ __('Replacement date :date', [ - 'date' => Date::forHumans(\Carbon\Carbon::parse($associatedException?->pivot?->replacement_date)), + 'date' => Date::forHumans(\Carbon\Carbon::parse($associatedException?->pivot?->replacement_date)), ]) }} + @endif - @endif - @if (!$last) + @if (!$isLast)