wip

app/Filament/Company/Pages/Concerns/HasDeferredFiltersForm.php

@@ -4,6 +4,7 @@ namespace App\Filament\Company\Pages\Concerns;
 
 use Filament\Actions\Action;
 use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\DateTimePicker;
 use Filament\Forms\Form;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
@@ -170,9 +171,25 @@ trait HasDeferredFiltersForm
         $flatFields = $this->getFiltersForm()->getFlatFields();
 
         foreach ($this->filters as $key => $value) {
-            if (isset($flatFields[$key]) && $flatFields[$key] instanceof DatePicker) {
-                // TODO: Submit a PR to Filament to address DatePicker being dehydrated as a datetime string in filters
-                $this->filters[$key] = Carbon::parse($value)->toDateString();
+            if (! isset($flatFields[$key]) || blank($value)) {
+                continue;
+            }
+
+            $field = $flatFields[$key];
+
+            // Reproduce underlying conversion to UTC for DateTimePicker and DatePicker
+            if ($field instanceof DateTimePicker && $field->getTimezone() !== config('app.timezone')) {
+                try {
+                    $carbonValue = Carbon::parse($value, $field->getTimezone());
+
+                    // Shift back to UTC and format according to field type
+                    $this->filters[$key] = $carbonValue
+                        ->setTimezone(config('app.timezone'))
+                        ->format($field->getFormat());
+
+                } catch (\Exception $e) {
+                    continue;
+                }
             }
         }
     }

app/Filament/Company/Pages/Reports/BaseReportPage.php

@@ -9,6 +9,7 @@ use App\Filament\Company\Pages\Concerns\HasTableColumnToggleForm;
 use App\Filament\Company\Pages\Reports;
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Models\Company;
+use App\Services\CompanySettingsService;
 use App\Services\DateRangeService;
 use App\Support\Column;
 use Filament\Actions\Action;
@@ -253,6 +254,7 @@ abstract class BaseReportPage extends Page
         return DatePicker::make('startDate')
             ->label('Start date')
             ->live()
+            ->timezone(CompanySettingsService::getDefaultTimezone())
             ->afterStateUpdated(static function ($state, Set $set) {
                 $set('dateRange', 'Custom');
             });
@@ -263,6 +265,7 @@ abstract class BaseReportPage extends Page
         return DatePicker::make('endDate')
             ->label('End date')
             ->live()
+            ->timezone(CompanySettingsService::getDefaultTimezone())
             ->afterStateUpdated(static function (Set $set) {
                 $set('dateRange', 'Custom');
             });