From 63012f269c7fd3ff56ce574e2a8ca2cd13a4442e Mon Sep 17 00:00:00 2001 From: tasnim Date: Mon, 26 Aug 2024 16:06:58 +0300 Subject: [PATCH] fix Navigation.php MTD logic to make tests pass. --- app/Support/Navigation.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/Support/Navigation.php b/app/Support/Navigation.php index f048ae0f68..d51ff2cd36 100644 --- a/app/Support/Navigation.php +++ b/app/Support/Navigation.php @@ -283,13 +283,10 @@ class Navigation return $currentEnd; } if ('MTD' === $repeatFreq) { - $today = today(); - if ($today->isSameMonth($end)) { - return $today->endOfDay(); - } - - return $end->endOfMonth(); + return $end->startOfMonth()->startOfDay(); } + + $result = match ($repeatFreq) { 'last7' => $currentEnd->addDays(7)->startOfDay(),