wip

app/Concerns/HasTransactionAction.php

@@ -83,7 +83,6 @@ trait HasTransactionAction
             ->schema([
                 Forms\Components\DatePicker::make('posted_at')
                     ->label('Date')
-                    ->native()
                     ->required(),
                 Forms\Components\TextInput::make('description')
                     ->label('Description'),

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

@@ -4,7 +4,6 @@ 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;
@@ -106,19 +105,6 @@ trait HasDeferredFiltersForm
         Arr::set($this->deferredFilters, $name, $value);
     }
 
-    protected function convertDatesToDateTimeString(array $filters): array
-    {
-        if (isset($filters['startDate'])) {
-            $filters['startDate'] = Carbon::parse($filters['startDate'])->startOfDay()->toDateTimeString();
-        }
-
-        if (isset($filters['endDate'])) {
-            $filters['endDate'] = Carbon::parse($filters['endDate'])->endOfDay()->toDateTimeString();
-        }
-
-        return $filters;
-    }
-
     protected function queryStringHasDeferredFiltersForm(): array
     {
         // Get the filter keys dynamically from the filters form
@@ -171,25 +157,9 @@ trait HasDeferredFiltersForm
         $flatFields = $this->getFiltersForm()->getFlatFields();
 
         foreach ($this->filters as $key => $value) {
-            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;
-                }
+            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();
             }
         }
     }

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

@@ -9,7 +9,6 @@ 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;
@@ -92,6 +91,7 @@ abstract class BaseReportPage extends Page
     {
         $flatFields = $this->getFiltersForm()->getFlatFields();
 
+        /** @var DateRangeSelect|null $dateRangeField */
         $dateRangeField = Arr::first($flatFields, static fn ($field) => $field instanceof DateRangeSelect);
 
         if (! $dateRangeField) {
@@ -254,7 +254,6 @@ 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');
             });
@@ -265,7 +264,6 @@ abstract class BaseReportPage extends Page
         return DatePicker::make('endDate')
             ->label('End date')
             ->live()
-            ->timezone(CompanySettingsService::getDefaultTimezone())
             ->afterStateUpdated(static function (Set $set) {
                 $set('dateRange', 'Custom');
             });

app/Providers/Filament/CompanyPanelProvider.php

@@ -280,9 +280,6 @@ class CompanyPanelProvider extends PanelProvider
         Tables\Actions\CreateAction::configureUsing(static fn (Tables\Actions\CreateAction $action) => FilamentComponentConfigurator::configureActionModals($action));
         Tables\Actions\DeleteAction::configureUsing(static fn (Tables\Actions\DeleteAction $action) => FilamentComponentConfigurator::configureDeleteAction($action));
         Tables\Actions\DeleteBulkAction::configureUsing(static fn (Tables\Actions\DeleteBulkAction $action) => FilamentComponentConfigurator::configureDeleteAction($action));
-        Forms\Components\DateTimePicker::configureUsing(static function (Forms\Components\DateTimePicker $component) {
-            $component->native(false);
-        });
 
         Tables\Table::configureUsing(static function (Tables\Table $table): void {
             $table::$defaultDateDisplayFormat = CompanySettingsService::getDefaultDateFormat(session('current_company_id') ?? auth()->user()->current_company_id);

tests/Feature/Accounting/TransactionTest.php

@@ -267,7 +267,7 @@ it('can add a transfer transaction', function () {
     livewire(ListTransactions::class)
         ->mountAction('createTransfer')
         ->assertActionDataSet([
-            'posted_at' => today(),
+            'posted_at' => company_today()->toDateString(),
             'type' => TransactionType::Transfer,
             'bank_account_id' => $sourceBankAccount->id,
             'amount' => '0.00',
@@ -300,7 +300,7 @@ it('can add a journal transaction', function () {
     livewire(ListTransactions::class)
         ->mountAction('createJournalEntry')
         ->assertActionDataSet([
-            'posted_at' => today(),
+            'posted_at' => company_today()->toDateString(),
             'journalEntries' => [
                 ['type' => JournalEntryType::Debit, 'account_id' => $defaultDebitAccount->id, 'amount' => '0.00'],
                 ['type' => JournalEntryType::Credit, 'account_id' => $defaultCreditAccount->id, 'amount' => '0.00'],