wip

app/Providers/MacroServiceProvider.php

@@ -485,9 +485,13 @@ class MacroServiceProvider extends ServiceProvider
         Carbon::macro('toDefaultDateFormat', function () {
             $dateFormat = CompanySettingsService::getDefaultDateFormat();
 
-            $this->format($dateFormat);
+            return $this->format($dateFormat);
+        });
 
-            return $this;
+        Carbon::macro('inCompanyTimezone', function () {
+            $timezone = CompanySettingsService::getDefaultTimezone();
+
+            return $this->setTimezone($timezone);
         });
 
         ExportColumn::macro('money', function () {

app/Services/DateRangeService.php

@@ -89,7 +89,7 @@ class DateRangeService
 
                 $expectedEnd = $expectedEnd->isFuture() ? company_today() : $expectedEnd;
 
-                if ($startDate->eq($expectedStart) && $endDate->eq($expectedEnd)) {
+                if ($startDate->isSameDay($expectedStart) && $endDate->isSameDay($expectedEnd)) {
                     return $key; // Return the matching range key (e.g., "FY-2024")
                 }
             }