add deferred filter logic

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

@@ -67,12 +67,11 @@ class AccountBalances extends BaseReportPage
         ];
     }
 
-    public function form(Form $form): Form
+    public function filtersForm(Form $form): Form
     {
         return $form
             ->inlineLabel()
             ->columns()
-            ->live()
             ->schema([
                 $this->getDateRangeFormComponent(),
                 Cluster::make([

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

@@ -18,7 +18,6 @@ use Filament\Tables\Actions\Action;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\Collection;
-use Livewire\Attributes\Url;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccountTransactions extends BaseReportPage
@@ -33,15 +32,19 @@ class AccountTransactions extends BaseReportPage
 
     protected ExportService $exportService;
 
-    #[Url]
-    public ?string $selectedAccount = 'all';
-
     public function boot(ReportService $reportService, ExportService $exportService): void
     {
         $this->reportService = $reportService;
         $this->exportService = $exportService;
     }
 
+    protected function initializeDefaultFilters(): void
+    {
+        if (! $this->getFilterState('selectedAccount')) {
+            $this->setFilterState('selectedAccount', 'all');
+        }
+    }
+
     /**
      * @return array<Column>
      */
@@ -67,7 +70,7 @@ class AccountTransactions extends BaseReportPage
         ];
     }
 
-    public function form(Form $form): Form
+    public function filtersForm(Form $form): Form
     {
         return $form
             ->columns(4)
@@ -83,10 +86,11 @@ class AccountTransactions extends BaseReportPage
                     $this->getEndDateFormComponent(),
                 ])->label("\u{200B}"), // its too bad hiddenLabel removes spacing of the label
                 Actions::make([
-                    Actions\Action::make('loadReportData')
+                    Actions\Action::make('applyFilters')
                         ->label('Update Report')
-                        ->submit('loadReportData')
-                        ->keyBindings(['mod+s']),
+                        ->action('applyFilters')
+                        ->keyBindings(['mod+s'])
+                        ->button(),
                 ])->alignEnd()->verticallyAlignEnd(),
             ]);
     }
@@ -108,7 +112,7 @@ class AccountTransactions extends BaseReportPage
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildAccountTransactionsReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns, $this->selectedAccount);
+        return $this->reportService->buildAccountTransactionsReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns, $this->getFilterState('selectedAccount'));
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport

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

@@ -6,6 +6,7 @@ use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Models\Company;
+use App\Services\DateRangeService;
 use App\Support\Column;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
@@ -39,9 +40,9 @@ abstract class BaseReportPage extends Page
      */
     public ?array $deferredFilters = null;
 
-    public string $fiscalYearStartDate = '';
+    public string $fiscalYearStartDate;
 
-    public string $fiscalYearEndDate = '';
+    public string $fiscalYearEndDate;
 
     public Company $company;
 
@@ -69,20 +70,46 @@ abstract class BaseReportPage extends Page
 
         $this->loadDefaultDateRange();
 
+        $this->initializeDefaultFilters();
+
         $this->initializeFilters();
 
         $this->loadDefaultTableColumnToggleState();
     }
 
+    protected function initializeDefaultFilters(): void
+    {
+        //
+    }
+
     public function initializeFilters(): void
     {
         if (! count($this->filters ?? [])) {
             $this->filters = null;
         }
 
-        $this->getFiltersForm()->fill($this->filters);
+        $filtersForForm = $this->filters !== null
+            ? $this->convertDatesToDateTimeString($this->filters)
+            : [];
+
+        $this->getFiltersForm()->fill($filtersForForm);
+
+        if ($this->filters !== null) {
+            $this->filters = $this->normalizeFilters($this->filters);
+        }
+    }
+
+    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();
+        }
 
-        $this->applyFilters();
+        return $filters;
     }
 
     protected function getForms(): array
@@ -123,33 +150,32 @@ abstract class BaseReportPage extends Page
 
     public function applyFilters(): void
     {
-        $normalizedFilters = $this->deferredFilters;
-
-        $this->normalizeFilters($normalizedFilters);
-
-        $this->filters = $normalizedFilters;
+        $this->filters = $this->normalizeFilters($this->deferredFilters);
 
         $this->handleFilterUpdates();
 
         $this->loadReportData();
     }
 
-    protected function normalizeFilters(array &$filters): void
+    protected function normalizeFilters(array $filters): array
     {
         foreach ($filters as $name => &$value) {
             if ($name === 'dateRange') {
                 unset($filters[$name]);
             } elseif ($this->isValidDate($value)) {
-                $filters[$name] = Carbon::parse($value)->toDateString();
+                $value = Carbon::parse($value)->toDateString();
             }
         }
+
+        return $filters;
     }
 
     public function getFiltersApplyAction(): Action
     {
         return Action::make('applyFilters')
-            ->label(__('filament-tables::table.filters.actions.apply.label'))
+            ->label('Update Report')
             ->action('applyFilters')
+            ->keyBindings(['mod+s'])
             ->button();
     }
 
@@ -182,7 +208,13 @@ abstract class BaseReportPage extends Page
 
     protected function loadDefaultDateRange(): void
     {
-        if (! $this->getDeferredFilterState('dateRange')) {
+        $startDate = $this->getFilterState('startDate');
+        $endDate = $this->getFilterState('endDate');
+
+        if ($this->isValidDate($startDate) && $this->isValidDate($endDate)) {
+            $matchingDateRange = app(DateRangeService::class)->getMatchingDateRangeOption(Carbon::parse($startDate), Carbon::parse($endDate));
+            $this->setFilterState('dateRange', $matchingDateRange);
+        } else {
             $this->setFilterState('dateRange', $this->getDefaultDateRange());
             $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
         }
@@ -191,6 +223,7 @@ abstract class BaseReportPage extends Page
     public function loadReportData(): void
     {
         unset($this->report);
+
         $this->reportLoaded = true;
     }
 
@@ -198,27 +231,21 @@ abstract class BaseReportPage extends Page
     {
         $tableColumns = $this->getTable();
 
-        if (empty($this->toggledTableColumns)) {
-            foreach ($tableColumns as $column) {
+        foreach ($tableColumns as $column) {
+            $columnName = $column->getName();
+
+            if (empty($this->toggledTableColumns)) {
                 if ($column->isToggleable()) {
-                    if ($column->isToggledHiddenByDefault()) {
-                        $this->toggledTableColumns[$column->getName()] = false;
-                    } else {
-                        $this->toggledTableColumns[$column->getName()] = true;
-                    }
+                    $this->toggledTableColumns[$columnName] = ! $column->isToggledHiddenByDefault();
                 } else {
-                    $this->toggledTableColumns[$column->getName()] = true;
+                    $this->toggledTableColumns[$columnName] = true;
                 }
             }
-        }
 
-        foreach ($tableColumns as $column) {
-            $columnName = $column->getName();
+            // Handle cases where the toggle state needs to be reset
             if (! $column->isToggleable()) {
                 $this->toggledTableColumns[$columnName] = true;
-            }
-
-            if ($column->isToggleable() && $column->isToggledHiddenByDefault() && isset($this->toggledTableColumns[$columnName]) && $this->toggledTableColumns[$columnName]) {
+            } elseif ($column->isToggleable() && $column->isToggledHiddenByDefault() && isset($this->toggledTableColumns[$columnName]) && $this->toggledTableColumns[$columnName]) {
                 $this->toggledTableColumns[$columnName] = false;
             }
         }

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

@@ -50,15 +50,11 @@ class TrialBalance extends BaseReportPage
         ];
     }
 
-    public function form(Form $form): Form
+    public function filtersForm(Form $form): Form
     {
         return $form
             ->inlineLabel()
-            ->columns([
-                'lg' => 1,
-                '2xl' => 2,
-            ])
-            ->live()
+            ->columns()
             ->schema([
                 $this->getDateRangeFormComponent(),
                 Cluster::make([

app/Filament/Forms/Components/DateRangeSelect.php

@@ -2,37 +2,35 @@
 
 namespace App\Filament\Forms\Components;
 
-use App\Facades\Accounting;
-use App\Models\Company;
-use Carbon\CarbonPeriod;
+use App\Services\DateRangeService;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Set;
 use Illuminate\Support\Carbon;
 
 class DateRangeSelect extends Select
 {
-    public string $fiscalYearStartDate = '';
+    public string $fiscalYearStartDate;
 
-    public string $fiscalYearEndDate = '';
+    public string $fiscalYearEndDate;
 
-    public string $startDateField = '';
+    public ?string $startDateField = null;
 
-    public string $endDateField = '';
-
-    public Company $company;
+    public ?string $endDateField = null;
 
     protected function setUp(): void
     {
         parent::setUp();
 
-        $this->company = auth()->user()->currentCompany;
-        $this->fiscalYearStartDate = $this->company->locale->fiscalYearStartDate();
-        $this->fiscalYearEndDate = $this->company->locale->fiscalYearEndDate();
+        $company = auth()->user()->currentCompany;
+        $this->fiscalYearStartDate = $company->locale->fiscalYearStartDate();
+        $this->fiscalYearEndDate = $company->locale->fiscalYearEndDate();
 
-        $this->options($this->getDateRangeOptions())
+        $this->options(app(DateRangeService::class)->getDateRangeOptions())
             ->live()
             ->afterStateUpdated(function ($state, Set $set) {
-                $this->updateDateRange($state, $set);
+                if ($this->startDateField && $this->endDateField) {
+                    $this->updateDateRange($state, $set);
+                }
             });
     }
 
@@ -50,54 +48,6 @@ class DateRangeSelect extends Select
         return $this;
     }
 
-    public function getDateRangeOptions(): array
-    {
-        $earliestDate = Carbon::parse(Accounting::getEarliestTransactionDate());
-        $currentDate = now();
-        $fiscalYearStartCurrent = Carbon::parse($this->fiscalYearStartDate);
-
-        $options = [
-            'Fiscal Year' => [],
-            'Fiscal Quarter' => [],
-            'Calendar Year' => [],
-            'Calendar Quarter' => [],
-            'Month' => [],
-            'Custom' => [],
-        ];
-
-        $period = CarbonPeriod::create($earliestDate, '1 month', $currentDate);
-
-        foreach ($period as $date) {
-            $options['Fiscal Year']['FY-' . $date->year] = $date->year;
-
-            $fiscalYearStart = $fiscalYearStartCurrent->copy()->subYears($currentDate->year - $date->year);
-
-            for ($i = 0; $i < 4; $i++) {
-                $quarterNumber = $i + 1;
-                $quarterStart = $fiscalYearStart->copy()->addMonths(($quarterNumber - 1) * 3);
-                $quarterEnd = $quarterStart->copy()->addMonths(3)->subDay();
-
-                if ($quarterStart->lessThanOrEqualTo($currentDate) && $quarterEnd->greaterThanOrEqualTo($earliestDate)) {
-                    $options['Fiscal Quarter']['FQ-' . $quarterNumber . '-' . $date->year] = 'Q' . $quarterNumber . ' ' . $date->year;
-                }
-            }
-
-            $options['Calendar Year']['Y-' . $date->year] = $date->year;
-            $quarterKey = 'Q-' . $date->quarter . '-' . $date->year;
-            $options['Calendar Quarter'][$quarterKey] = 'Q' . $date->quarter . ' ' . $date->year;
-            $options['Month']['M-' . $date->format('Y-m')] = $date->format('F Y');
-            $options['Custom']['Custom'] = 'Custom';
-        }
-
-        $options['Fiscal Year'] = array_reverse($options['Fiscal Year'], true);
-        $options['Fiscal Quarter'] = array_reverse($options['Fiscal Quarter'], true);
-        $options['Calendar Year'] = array_reverse($options['Calendar Year'], true);
-        $options['Calendar Quarter'] = array_reverse($options['Calendar Quarter'], true);
-        $options['Month'] = array_reverse($options['Month'], true);
-
-        return $options;
-    }
-
     public function updateDateRange($state, Set $set): void
     {
         if ($state === null) {

app/Models/Setting/Localization.php

@@ -83,19 +83,23 @@ class Localization extends Model
 
     public function fiscalYearStartDate(): string
     {
-        return Carbon::parse($this->fiscalYearEndDate())->subYear()->addDay()->toDateString();
+        return once(function () {
+            return Carbon::parse($this->fiscalYearEndDate())->subYear()->addDay()->toDateString();
+        });
     }
 
     public function fiscalYearEndDate(): string
     {
-        $today = now();
-        $fiscalYearEndThisYear = Carbon::createFromDate($today->year, $this->fiscal_year_end_month, $this->fiscal_year_end_day);
+        return once(function () {
+            $today = now();
+            $fiscalYearEndThisYear = Carbon::createFromDate($today->year, $this->fiscal_year_end_month, $this->fiscal_year_end_day);
 
-        if ($today->gt($fiscalYearEndThisYear)) {
-            return $fiscalYearEndThisYear->copy()->addYear()->toDateString();
-        }
+            if ($today->gt($fiscalYearEndThisYear)) {
+                return $fiscalYearEndThisYear->copy()->addYear()->toDateString();
+            }
 
-        return $fiscalYearEndThisYear->toDateString();
+            return $fiscalYearEndThisYear->toDateString();
+        });
     }
 
     public function getDateTimeFormatAttribute(): string

app/Providers/AppServiceProvider.php

@@ -4,6 +4,7 @@ namespace App\Providers;
 
 use App\Contracts\AccountHandler;
 use App\Services\AccountService;
+use App\Services\DateRangeService;
 use BezhanSalleh\PanelSwitch\PanelSwitch;
 use Filament\Notifications\Livewire\Notifications;
 use Filament\Support\Assets\Js;
@@ -25,7 +26,7 @@ class AppServiceProvider extends ServiceProvider
      */
     public function register(): void
     {
-        //
+        $this->app->singleton(DateRangeService::class);
     }
 
     /**

app/Services/DateRangeService.php

@@ -0,0 +1,145 @@
+<?php
+
+namespace App\Services;
+
+use App\Facades\Accounting;
+use Carbon\CarbonPeriod;
+use Illuminate\Support\Carbon;
+
+class DateRangeService
+{
+    protected string $fiscalYearStartDate = '';
+
+    protected string $fiscalYearEndDate = '';
+
+    public function __construct()
+    {
+        $company = auth()->user()->currentCompany;
+        $this->fiscalYearStartDate = $company->locale->fiscalYearStartDate();
+        $this->fiscalYearEndDate = $company->locale->fiscalYearEndDate();
+    }
+
+    public function getDateRangeOptions(): array
+    {
+        return once(function () {
+            return $this->generateDateRangeOptions();
+        });
+    }
+
+    private function generateDateRangeOptions(): array
+    {
+        $earliestDate = Carbon::parse(Accounting::getEarliestTransactionDate());
+        $currentDate = now();
+        $fiscalYearStartCurrent = Carbon::parse($this->fiscalYearStartDate);
+
+        $options = [
+            'Fiscal Year' => [],
+            'Fiscal Quarter' => [],
+            'Calendar Year' => [],
+            'Calendar Quarter' => [],
+            'Month' => [],
+            'Custom' => [],
+        ];
+
+        $period = CarbonPeriod::create($earliestDate, '1 month', $currentDate);
+
+        foreach ($period as $date) {
+            $options['Fiscal Year']['FY-' . $date->year] = $date->year;
+
+            $fiscalYearStart = $fiscalYearStartCurrent->copy()->subYears($currentDate->year - $date->year);
+
+            for ($i = 0; $i < 4; $i++) {
+                $quarterNumber = $i + 1;
+                $quarterStart = $fiscalYearStart->copy()->addMonths(($quarterNumber - 1) * 3);
+                $quarterEnd = $quarterStart->copy()->addMonths(3)->subDay();
+
+                if ($quarterStart->lessThanOrEqualTo($currentDate) && $quarterEnd->greaterThanOrEqualTo($earliestDate)) {
+                    $options['Fiscal Quarter']['FQ-' . $quarterNumber . '-' . $date->year] = 'Q' . $quarterNumber . ' ' . $date->year;
+                }
+            }
+
+            $options['Calendar Year']['Y-' . $date->year] = $date->year;
+            $quarterKey = 'Q-' . $date->quarter . '-' . $date->year;
+            $options['Calendar Quarter'][$quarterKey] = 'Q' . $date->quarter . ' ' . $date->year;
+            $options['Month']['M-' . $date->format('Y-m')] = $date->format('F Y');
+            $options['Custom']['Custom'] = 'Custom';
+        }
+
+        $options['Fiscal Year'] = array_reverse($options['Fiscal Year'], true);
+        $options['Fiscal Quarter'] = array_reverse($options['Fiscal Quarter'], true);
+        $options['Calendar Year'] = array_reverse($options['Calendar Year'], true);
+        $options['Calendar Quarter'] = array_reverse($options['Calendar Quarter'], true);
+        $options['Month'] = array_reverse($options['Month'], true);
+
+        return $options;
+    }
+
+    public function getMatchingDateRangeOption(Carbon $startDate, Carbon $endDate): string
+    {
+        $options = $this->getDateRangeOptions();
+
+        foreach ($options as $type => $ranges) {
+            foreach ($ranges as $key => $label) {
+                [$expectedStart, $expectedEnd] = $this->getExpectedDateRange($type, $key);
+
+                if ($expectedStart === null || $expectedEnd === null) {
+                    continue;
+                }
+
+                $expectedEnd = $expectedEnd->isFuture() ? now()->startOfDay() : $expectedEnd;
+
+                if ($startDate->eq($expectedStart) && $endDate->eq($expectedEnd)) {
+                    return $key; // Return the matching range key (e.g., "FY-2024")
+                }
+            }
+        }
+
+        return 'Custom'; // Return "Custom" if no matching range is found
+    }
+
+    private function getExpectedDateRange(string $type, string $key): array
+    {
+        switch ($type) {
+            case 'Fiscal Year':
+                $year = (int) substr($key, 3);
+                $start = Carbon::parse($this->fiscalYearStartDate)->subYears(now()->year - $year)->startOfDay();
+                $end = Carbon::parse($this->fiscalYearEndDate)->subYears(now()->year - $year)->startOfDay();
+
+                break;
+
+            case 'Fiscal Quarter':
+                [$quarter, $year] = explode('-', substr($key, 3));
+                $start = Carbon::parse($this->fiscalYearStartDate)->subYears(now()->year - $year)->addMonths(($quarter - 1) * 3)->startOfDay();
+                $end = $start->copy()->addMonths(3)->subDay()->startOfDay();
+
+                break;
+
+            case 'Calendar Year':
+                $year = (int) substr($key, 2);
+                $start = Carbon::createFromDate($year)->startOfYear()->startOfDay();
+                $end = Carbon::createFromDate($year)->endOfYear()->startOfDay();
+
+                break;
+
+            case 'Calendar Quarter':
+                [$quarter, $year] = explode('-', substr($key, 2));
+                $month = ($quarter - 1) * 3 + 1;
+                $start = Carbon::createFromDate($year, $month, 1)->startOfDay();
+                $end = $start->copy()->endOfQuarter()->startOfDay();
+
+                break;
+
+            case 'Month':
+                $yearMonth = substr($key, 2);
+                $start = Carbon::parse($yearMonth)->startOfMonth()->startOfDay();
+                $end = Carbon::parse($yearMonth)->endOfMonth()->startOfDay();
+
+                break;
+
+            default:
+                return [null, null];
+        }
+
+        return [$start, $end];
+    }
+}

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.321.2",
+            "version": "3.321.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "c04f8f30891cee8480c132778cd4cc486467e77a"
+                "reference": "986326efde1d0598ec9fc1b185716550be8ef522"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c04f8f30891cee8480c132778cd4cc486467e77a",
-                "reference": "c04f8f30891cee8480c132778cd4cc486467e77a",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/986326efde1d0598ec9fc1b185716550be8ef522",
+                "reference": "986326efde1d0598ec9fc1b185716550be8ef522",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.4"
             },
-            "time": "2024-08-30T18:14:40+00:00"
+            "time": "2024-09-04T18:09:31+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -1287,16 +1287,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "4.1.0",
+            "version": "4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "2377cd41609aa51bee822c8d207317a3f363a558"
+                "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/2377cd41609aa51bee822c8d207317a3f363a558",
-                "reference": "2377cd41609aa51bee822c8d207317a3f363a558",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/7a8252418689feb860ea8dfeab66d64a56a64df8",
+                "reference": "7a8252418689feb860ea8dfeab66d64a56a64df8",
                 "shasum": ""
             },
             "require": {
@@ -1309,16 +1309,16 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.2",
-                "phpstan/phpstan": "1.11.7",
+                "phpstan/phpstan": "1.12.0",
                 "phpstan/phpstan-phpunit": "1.4.0",
                 "phpstan/phpstan-strict-rules": "^1.6",
-                "phpunit/phpunit": "10.5.28",
+                "phpunit/phpunit": "10.5.30",
                 "psalm/plugin-phpunit": "0.19.0",
                 "slevomat/coding-standard": "8.13.1",
                 "squizlabs/php_codesniffer": "3.10.2",
                 "symfony/cache": "^6.3.8|^7.0",
                 "symfony/console": "^5.4|^6.3|^7.0",
-                "vimeo/psalm": "5.24.0"
+                "vimeo/psalm": "5.25.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -1375,7 +1375,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/4.1.0"
+                "source": "https://github.com/doctrine/dbal/tree/4.1.1"
             },
             "funding": [
                 {
@@ -1391,7 +1391,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-15T07:37:07+00:00"
+            "time": "2024-09-03T08:58:39+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -2981,16 +2981,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.21.0",
+            "version": "v11.22.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "9d9d36708d56665b12185493f684abce38ad2d30"
+                "reference": "868c75beacc47d0f361b919bbc155c0b619bf3d5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/9d9d36708d56665b12185493f684abce38ad2d30",
-                "reference": "9d9d36708d56665b12185493f684abce38ad2d30",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/868c75beacc47d0f361b919bbc155c0b619bf3d5",
+                "reference": "868c75beacc47d0f361b919bbc155c0b619bf3d5",
                 "shasum": ""
             },
             "require": {
@@ -3183,7 +3183,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-08-20T15:00:52+00:00"
+            "time": "2024-09-03T15:27:15+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3370,16 +3370,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.15.1",
+            "version": "v5.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "cc02625f0bd1f95dc3688eb041cce0f1e709d029"
+                "reference": "40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/cc02625f0bd1f95dc3688eb041cce0f1e709d029",
-                "reference": "cc02625f0bd1f95dc3688eb041cce0f1e709d029",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf",
+                "reference": "40a2dc98c53d9dc6d55eadb0d490d3d72b73f1bf",
                 "shasum": ""
             },
             "require": {
@@ -3438,7 +3438,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-06-28T20:09:34+00:00"
+            "time": "2024-09-03T09:46:57+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -4535,16 +4535,16 @@
         },
         {
             "name": "mtdowling/jmespath.php",
-            "version": "2.7.0",
+            "version": "2.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/jmespath/jmespath.php.git",
-                "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b"
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b",
-                "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b",
+                "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
+                "reference": "a2a865e05d5f420b50cc2f85bb78d565db12a6bc",
                 "shasum": ""
             },
             "require": {
@@ -4561,7 +4561,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.7-dev"
+                    "dev-master": "2.8-dev"
                 }
             },
             "autoload": {
@@ -4595,9 +4595,9 @@
             ],
             "support": {
                 "issues": "https://github.com/jmespath/jmespath.php/issues",
-                "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0"
+                "source": "https://github.com/jmespath/jmespath.php/tree/2.8.0"
             },
-            "time": "2023-08-25T10:54:48+00:00"
+            "time": "2024-09-04T18:46:31+00:00"
         },
         {
             "name": "mustangostang/spyc",
@@ -9488,16 +9488,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.17.2",
+            "version": "v1.17.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "e8a88130a25e3f9d4d5785e6a1afca98268ab110"
+                "reference": "9d77be916e145864f10788bb94531d03e1f7b482"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/e8a88130a25e3f9d4d5785e6a1afca98268ab110",
-                "reference": "e8a88130a25e3f9d4d5785e6a1afca98268ab110",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/9d77be916e145864f10788bb94531d03e1f7b482",
+                "reference": "9d77be916e145864f10788bb94531d03e1f7b482",
                 "shasum": ""
             },
             "require": {
@@ -9508,13 +9508,13 @@
                 "php": "^8.1.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3.61.1",
-                "illuminate/view": "^10.48.18",
+                "friendsofphp/php-cs-fixer": "^3.64.0",
+                "illuminate/view": "^10.48.20",
                 "larastan/larastan": "^2.9.8",
                 "laravel-zero/framework": "^10.4.0",
                 "mockery/mockery": "^1.6.12",
                 "nunomaduro/termwind": "^1.15.1",
-                "pestphp/pest": "^2.35.0"
+                "pestphp/pest": "^2.35.1"
             },
             "bin": [
                 "builds/pint"
@@ -9550,20 +9550,20 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2024-08-06T15:11:54+00:00"
+            "time": "2024-09-03T15:00:28+00:00"
         },
         {
             "name": "laravel/sail",
-            "version": "v1.31.1",
+            "version": "v1.31.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "3d06dd18cee8059baa7b388af00ba47f6d96bd85"
+                "reference": "0a7e2891a85eba2d448a9ffc6fc5ce367e924bc1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/3d06dd18cee8059baa7b388af00ba47f6d96bd85",
-                "reference": "3d06dd18cee8059baa7b388af00ba47f6d96bd85",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/0a7e2891a85eba2d448a9ffc6fc5ce367e924bc1",
+                "reference": "0a7e2891a85eba2d448a9ffc6fc5ce367e924bc1",
                 "shasum": ""
             },
             "require": {
@@ -9613,7 +9613,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2024-08-02T07:45:47+00:00"
+            "time": "2024-09-03T20:05:33+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -10103,16 +10103,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.12.0",
+            "version": "1.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "384af967d35b2162f69526c7276acadce534d0e1"
+                "reference": "d8ed7fffa66de1db0d2972267d8ed1d8fa0fe5a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/384af967d35b2162f69526c7276acadce534d0e1",
-                "reference": "384af967d35b2162f69526c7276acadce534d0e1",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/d8ed7fffa66de1db0d2972267d8ed1d8fa0fe5a2",
+                "reference": "d8ed7fffa66de1db0d2972267d8ed1d8fa0fe5a2",
                 "shasum": ""
             },
             "require": {
@@ -10157,7 +10157,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-27T09:18:05+00:00"
+            "time": "2024-09-03T19:55:22+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -10482,16 +10482,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.30",
+            "version": "10.5.32",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897"
+                "reference": "f069f46840445d37a4e6f0de8c5879598f9c4327"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b15524febac0153876b4ba9aab3326c2ee94c897",
-                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f069f46840445d37a4e6f0de8c5879598f9c4327",
+                "reference": "f069f46840445d37a4e6f0de8c5879598f9c4327",
                 "shasum": ""
             },
             "require": {
@@ -10505,7 +10505,7 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.1",
-                "phpunit/php-code-coverage": "^10.1.15",
+                "phpunit/php-code-coverage": "^10.1.16",
                 "phpunit/php-file-iterator": "^4.1.0",
                 "phpunit/php-invoker": "^4.0.0",
                 "phpunit/php-text-template": "^3.0.1",
@@ -10563,7 +10563,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.30"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.32"
             },
             "funding": [
                 {
@@ -10579,7 +10579,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-13T06:09:37+00:00"
+            "time": "2024-09-04T13:33:39+00:00"
         },
         {
             "name": "rector/rector",

package-lock.json

@@ -900,9 +900,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.7.6",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.6.tgz",
-            "integrity": "sha512-Ekur6XDwhnJ5RgOCaxFnXyqlPALI3rVeukZMwOdfghW7/wGz784BYKiQq+QD8NPcr91KRo30KfHOchyijwWw7g==",
+            "version": "1.7.7",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.7.tgz",
+            "integrity": "sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1275,9 +1275,9 @@
             }
         },
         "node_modules/follow-redirects": {
-            "version": "1.15.6",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz",
-            "integrity": "sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==",
+            "version": "1.15.8",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.8.tgz",
+            "integrity": "sha512-xgrmBhBToVKay1q2Tao5LI26B83UhrB/vM1avwVSDzt8rx3rO6AizBAaF46EgksTVr+rFTQaqZZ9MVBfUe4nig==",
             "dev": true,
             "funding": [
                 {
@@ -1786,9 +1786,9 @@
             }
         },
         "node_modules/picocolors": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
-            "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
+            "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
             "dev": true,
             "license": "ISC"
         },
@@ -1826,9 +1826,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.42",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.42.tgz",
-            "integrity": "sha512-hywKUQB9Ra4dR1mGhldy5Aj1X3MWDSIA1cEi+Uy0CjheLvP6Ual5RlwMCh8i/X121yEDLDIKBsrCQ8ba3FDMfQ==",
+            "version": "8.4.45",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
+            "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
             "dev": true,
             "funding": [
                 {
@@ -2550,14 +2550,14 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.4.2",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz",
-            "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==",
+            "version": "5.4.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz",
+            "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "esbuild": "^0.21.3",
-                "postcss": "^8.4.41",
+                "postcss": "^8.4.43",
                 "rollup": "^4.20.0"
             },
             "bin": {
@@ -2735,9 +2735,9 @@
             }
         },
         "node_modules/yaml": {
-            "version": "2.5.0",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz",
-            "integrity": "sha512-2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==",
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
+            "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
             "dev": true,
             "license": "ISC",
             "bin": {

resources/views/filament/company/pages/reports/account-transactions.blade.php

@@ -1,22 +1,20 @@
 <x-filament-panels::page>
     <x-filament::section>
-        <form wire:submit="loadReportData">
-            {{ $this->form }}
-        </form>
+        {{ $this->getFiltersForm() }}
     </x-filament::section>
 
     <x-filament-tables::container>
         <div class="es-table__header-ctn"></div>
         <div
             class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
-            <div wire:init="loadReportData" class="flex items-center justify-center w-full h-full absolute">
-                <div wire:loading wire:target="loadReportData">
+            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="applyFilters">
                     <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
                 </div>
             </div>
 
             @if($this->reportLoaded)
-                <div wire:loading.remove wire:target="loadReportData">
+                <div wire:loading.remove wire:target="applyFilters">
                     @if($this->report && !$this->tableHasEmptyState())
                         <x-company.tables.reports.account-transactions :report="$this->report"/>
                     @else

resources/views/filament/company/pages/reports/detailed-report.blade.php

@@ -1,38 +1,36 @@
 <x-filament-panels::page>
     <x-filament::section>
-        <form wire:submit="loadReportData">
-            <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4 md:gap-8">
-                <div class="flex-grow">
-                    {{ $this->form }}
-                </div>
+        <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4 md:gap-8">
+            <!-- Form Container -->
+            <div class="flex-grow">
+                {{ $this->getFiltersForm() }}
+            </div>
 
-                <div class="flex flex-col md:flex-row items-start md:items-center gap-4 md:gap-8 flex-shrink-0">
-                    @if($this->hasToggleableColumns())
-                        <x-filament-tables::column-toggle.dropdown
-                            :form="$this->toggleTableColumnForm"
-                            :trigger-action="$this->toggleColumnsAction"
-                        />
-                    @endif
-                    <x-filament::button type="submit" wire:target="loadReportData" class="flex-shrink-0">
-                        Update Report
-                    </x-filament::button>
-                </div>
+            <!-- Grouping Button and Column Toggle -->
+            <div class="flex flex-col md:flex-row items-start md:items-center gap-4 md:gap-8 flex-shrink-0">
+                @if($this->hasToggleableColumns())
+                    <x-filament-tables::column-toggle.dropdown
+                        :form="$this->toggleTableColumnForm"
+                        :trigger-action="$this->toggleColumnsAction"
+                    />
+                @endif
+                {{ $this->getFiltersApplyAction() }}
             </div>
-        </form>
+        </div>
     </x-filament::section>
 
     <x-filament-tables::container>
         <div class="es-table__header-ctn"></div>
         <div
             class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
-            <div wire:init="loadReportData" class="flex items-center justify-center w-full h-full absolute">
-                <div wire:loading wire:target="loadReportData">
+            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="applyFilters">
                     <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
                 </div>
             </div>
 
             @if($this->reportLoaded)
-                <div wire:loading.remove wire:target="loadReportData">
+                <div wire:loading.remove wire:target="applyFilters">
                     @if($this->report)
                         <x-company.tables.reports.detailed-report :report="$this->report"/>
                     @endif

resources/views/filament/company/pages/reports/income-statement.blade.php

@@ -59,20 +59,20 @@
 
     <x-filament-tables::container>
         <div class="es-table__header-ctn"></div>
-        <div wire:init="applyFilters"
-             class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+        <div
+            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="applyFilters">
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
+                </div>
+            </div>
+
             @if($this->reportLoaded)
                 <div wire:loading.remove wire:target="applyFilters">
                     @if($this->report)
                         <x-company.tables.reports.detailed-report :report="$this->report"/>
                     @endif
                 </div>
-            @else
-                <div class="absolute inset-0 flex items-center justify-center">
-                    <div wire:loading wire:target="applyFilters">
-                        <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
-                    </div>
-                </div>
             @endif
         </div>
         <div class="es-table__footer-ctn border-t border-gray-200"></div>