wip

app/Casts/TransactionAmountCast.php

@@ -11,13 +11,15 @@ use UnexpectedValueException;
 
 class TransactionAmountCast implements CastsAttributes
 {
+    private array $currencyCache = [];
+
     public function get(Model $model, string $key, mixed $value, array $attributes): string
     {
         // Attempt to retrieve the currency code from the related bankAccount->account model
-        $currency_code = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
+        $currencyCode = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
 
         if ($value !== null) {
-            return CurrencyConverter::prepareForMutator($value, $currency_code);
+            return CurrencyConverter::prepareForMutator($value, $currencyCode);
         }
 
         return '';
@@ -28,7 +30,7 @@ class TransactionAmountCast implements CastsAttributes
      */
     public function set(Model $model, string $key, mixed $value, array $attributes): int
     {
-        $currency_code = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
+        $currencyCode = $this->getCurrencyCodeFromBankAccountId($attributes['bank_account_id'] ?? null);
 
         if (is_numeric($value)) {
             $value = (string) $value;
@@ -36,7 +38,7 @@ class TransactionAmountCast implements CastsAttributes
             throw new UnexpectedValueException('Expected string or numeric value for money cast');
         }
 
-        return CurrencyConverter::prepareForAccessor($value, $currency_code);
+        return CurrencyConverter::prepareForAccessor($value, $currencyCode);
     }
 
     /**
@@ -49,8 +51,15 @@ class TransactionAmountCast implements CastsAttributes
             return CurrencyAccessor::getDefaultCurrency();
         }
 
+        if (isset($this->currencyCache[$bankAccountId])) {
+            return $this->currencyCache[$bankAccountId];
+        }
+
         $bankAccount = BankAccount::find($bankAccountId);
 
-        return $bankAccount?->account?->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+        $currencyCode = $bankAccount?->account?->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+        $this->currencyCache[$bankAccountId] = $currencyCode;
+
+        return $currencyCode;
     }
 }

app/Concerns/CompanyOwned.php

@@ -15,12 +15,19 @@ trait CompanyOwned
     {
         static::creating(static function ($model) {
             if (empty($model->company_id)) {
-                if (Auth::check() && Auth::user()->currentCompany) {
-                    $model->company_id = Auth::user()->currentCompany->id;
+                $companyId = session('current_company_id');
+
+                if (! $companyId && Auth::check() && Auth::user()->currentCompany) {
+                    $companyId = Auth::user()->currentCompany->id;
+                    session(['current_company_id' => $companyId]);
+                }
+
+                if ($companyId) {
+                    $model->company_id = $companyId;
                 } else {
-                    Log::info('CompanyOwned trait: No company_id set on model ' . get_class($model) . ' ' . $model->id);
+                    Log::error('CurrentCompanyScope: No company_id found for user ' . Auth::id());
 
-                    throw new ModelNotFoundException('CompanyOwned trait: No company_id set on model ' . get_class($model) . ' ' . $model->id);
+                    throw new ModelNotFoundException('CurrentCompanyScope: No company_id set in the session or on the user.');
                 }
             }
         });

app/Concerns/HandlesResourceRecordCreation.php

@@ -3,7 +3,6 @@
 namespace App\Concerns;
 
 use App\Models\User;
-use BackedEnum;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
 
@@ -11,11 +10,8 @@ trait HandlesResourceRecordCreation
 {
     protected function handleRecordCreationWithUniqueField(array $data, Model $model, User $user, ?string $uniqueField = null, ?array $evaluatedTypes = null): Model
     {
-        if (is_array($evaluatedTypes)) {
-            $evaluatedTypes = $this->ensureCreationEnumValues($evaluatedTypes);
-        }
-
-        if ($uniqueField && ! in_array($data[$uniqueField] ?? '', $evaluatedTypes ?? [], true)) {
+        // If evaluatedTypes is provided, ensure the unique field value is within the allowed types
+        if ($uniqueField && $evaluatedTypes && ! in_array($data[$uniqueField] ?? '', $evaluatedTypes, true)) {
             $data['enabled'] = false;
             $instance = $model->newInstance($data);
             $instance->save();
@@ -43,13 +39,6 @@ trait HandlesResourceRecordCreation
         return $instance;
     }
 
-    private function ensureCreationEnumValues(array $evaluatedTypes): array
-    {
-        return array_map(static function ($type) {
-            return $type instanceof BackedEnum ? $type->value : $type;
-        }, $evaluatedTypes);
-    }
-
     private function toggleRecords(Builder $query, bool &$shouldBeEnabled): void
     {
         if ($shouldBeEnabled) {

app/Filament/Company/Clusters/Settings/Pages/CompanyDefault.php

@@ -6,12 +6,12 @@ use App\Events\CompanyDefaultUpdated;
 use App\Filament\Company\Clusters\Settings;
 use App\Models\Banking\BankAccount;
 use App\Models\Setting\CompanyDefault as CompanyDefaultModel;
-use App\Models\Setting\Currency;
 use App\Models\Setting\Discount;
 use App\Models\Setting\Tax;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Component;
+use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
@@ -133,14 +133,10 @@ class CompanyDefault extends Page
                     ->selectablePlaceholder(false)
                     ->searchable()
                     ->preload(),
-                Select::make('currency_code')
-                    ->softRequired()
-                    ->localizeLabel('Currency')
-                    ->relationship('currency', 'name')
-                    ->getOptionLabelFromRecordUsing(static fn (Currency $record) => "{$record->code} {$record->symbol} - {$record->name}")
-                    ->saveRelationshipsUsing(null)
-                    ->searchable()
-                    ->preload(),
+                Placeholder::make('currency_code')
+                    ->label(translate('Currency'))
+                    ->hintIcon('heroicon-o-question-mark-circle', 'You cannot change this after your company has been created. You can still use other currencies for transactions.')
+                    ->content(static fn (CompanyDefaultModel $record) => "{$record->currency->code} {$record->currency->symbol} - {$record->currency->name}"),
             ])->columns();
     }
 

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource.php

@@ -19,7 +19,6 @@ use Filament\Support\Enums\FontWeight;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Collection;
-use Wallo\FilamentSelectify\Components\ToggleButton;
 
 class CurrencyResource extends Resource
 {
@@ -51,7 +50,6 @@ class CurrencyResource extends Resource
                             ->live()
                             ->required()
                             ->localizeLabel()
-                            ->hidden(static fn (Forms\Get $get, $state): bool => $get('enabled') && $state !== null)
                             ->afterStateUpdated(static function (Forms\Set $set, $state) {
                                 $fields = ['name', 'precision', 'symbol', 'symbol_first', 'decimal_mark', 'thousands_separator'];
 
@@ -71,12 +69,6 @@ class CurrencyResource extends Resource
 
                                 array_walk($fields, static fn ($field) => $set($field, $currencyDetails[$field] ?? null));
                             }),
-                        Forms\Components\TextInput::make('code')
-                            ->localizeLabel()
-                            ->hidden(static fn (Forms\Get $get): bool => ! ($get('enabled') && $get('code') !== null))
-                            ->disabled(static fn (Forms\Get $get): bool => $get('enabled'))
-                            ->dehydrated()
-                            ->required(),
                         Forms\Components\TextInput::make('name')
                             ->localizeLabel()
                             ->maxLength(50)
@@ -86,8 +78,6 @@ class CurrencyResource extends Resource
                             ->rule('gt:0')
                             ->live()
                             ->localizeLabel()
-                            ->disabled(static fn (?CurrencyModel $record): bool => $record?->isEnabled() ?? false)
-                            ->dehydrated()
                             ->required(),
                         Forms\Components\Select::make('precision')
                             ->localizeLabel()
@@ -123,36 +113,6 @@ class CurrencyResource extends Resource
                                 };
                             })
                             ->nullable(),
-                        ToggleButton::make('enabled')
-                            ->localizeLabel('Default')
-                            ->onLabel(CurrencyModel::enabledLabel())
-                            ->offLabel(CurrencyModel::disabledLabel())
-                            ->disabled(static fn (?CurrencyModel $record): bool => $record?->isEnabled() ?? false)
-                            ->dehydrated()
-                            ->live()
-                            ->afterStateUpdated(static function (Forms\Set $set, Forms\Get $get, $state) {
-                                $enabledState = (bool) $state;
-                                $code = $get('code');
-
-                                if (! $code) {
-                                    return;
-                                }
-
-                                if ($enabledState) {
-                                    $set('rate', 1);
-
-                                    return;
-                                }
-
-                                $forexEnabled = Forex::isEnabled();
-                                if ($forexEnabled) {
-                                    $defaultCurrencyCode = CurrencyAccessor::getDefaultCurrency();
-                                    $exchangeRate = Forex::getCachedExchangeRate($defaultCurrencyCode, $code);
-                                    if ($exchangeRate !== null) {
-                                        $set('rate', $exchangeRate);
-                                    }
-                                }
-                            }),
                     ])->columns(),
             ]);
     }
@@ -230,10 +190,7 @@ class CurrencyResource extends Resource
             ])
             ->checkIfRecordIsSelectableUsing(static function (CurrencyModel $record) {
                 return $record->isDisabled();
-            })
-            ->emptyStateActions([
-                Tables\Actions\CreateAction::make(),
-            ]);
+            });
     }
 
     public static function getPages(): array

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/CreateCurrency.php

@@ -2,43 +2,15 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\CurrencyResource\Pages;
 
-use App\Concerns\HandlesResourceRecordCreation;
 use App\Filament\Company\Clusters\Settings\Resources\CurrencyResource;
-use App\Models\Setting\Currency;
 use Filament\Resources\Pages\CreateRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Auth;
 
 class CreateCurrency extends CreateRecord
 {
-    use HandlesResourceRecordCreation;
-
     protected static string $resource = CurrencyResource::class;
 
     protected function getRedirectUrl(): string
     {
         return $this->getResource()::getUrl('index');
     }
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        $data['enabled'] = (bool) $data['enabled'];
-
-        return $data;
-    }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordCreation(array $data): Model
-    {
-        $user = Auth::user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        return $this->handleRecordCreationWithUniqueField($data, new Currency, $user);
-    }
 }

app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/EditCurrency.php

@@ -2,19 +2,12 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\CurrencyResource\Pages;
 
-use App\Concerns\HandlesResourceRecordUpdate;
 use App\Filament\Company\Clusters\Settings\Resources\CurrencyResource;
-use App\Models\Setting\Currency;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Auth;
 
 class EditCurrency extends EditRecord
 {
-    use HandlesResourceRecordUpdate;
-
     protected static string $resource = CurrencyResource::class;
 
     protected function getHeaderActions(): array
@@ -28,25 +21,4 @@ class EditCurrency extends EditRecord
     {
         return $this->getResource()::getUrl('index');
     }
-
-    protected function mutateFormDataBeforeSave(array $data): array
-    {
-        $data['enabled'] = (bool) $data['enabled'];
-
-        return $data;
-    }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordUpdate(Model | Currency $record, array $data): Model | Currency
-    {
-        $user = Auth::user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        return $this->handleRecordUpdateWithUniqueField($record, $data, $user);
-    }
 }

app/Filament/Company/Pages/Accounting/Transactions.php

@@ -217,6 +217,12 @@ class Transactions extends Page implements HasTable
         return $table
             ->query(static::getEloquentQuery())
             ->modifyQueryUsing(function (Builder $query) {
+                $query->with([
+                    'account',
+                    'bankAccount.account',
+                    'journalEntries.account',
+                ]);
+
                 if ($this->bankAccountIdFiltered !== 'all') {
                     $query->where('bank_account_id', $this->bankAccountIdFiltered);
                 }

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

@@ -0,0 +1,133 @@
+<?php
+
+namespace App\Filament\Company\Pages\Concerns;
+
+use Filament\Actions\Action;
+use Filament\Forms\Form;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Carbon;
+use Livewire\Attributes\Url;
+
+trait HasFiltersForm
+{
+    /**
+     * @var array<string, mixed> | null
+     */
+    #[Url(keep: true)]
+    public ?array $filters = null;
+
+    /**
+     * @var array<string, mixed> | null
+     */
+    public ?array $deferredFilters = null;
+
+    public function mountHasFiltersForm(): void
+    {
+        if (method_exists($this, 'loadDefaultDateRange')) {
+            $this->loadDefaultDateRange();
+        }
+
+        $this->initializeFilters();
+    }
+
+    public function initializeFilters(): void
+    {
+        if (! count($this->filters ?? [])) {
+            $this->filters = null;
+        }
+
+        $this->getFiltersForm()->fill($this->filters ?? []);
+
+        $this->applyFilters();
+    }
+
+    protected function getForms(): array
+    {
+        return [
+            'toggledTableColumnForm',
+            'filtersForm' => $this->getFiltersForm(),
+        ];
+    }
+
+    public function filtersForm(Form $form): Form
+    {
+        return $form;
+    }
+
+    public function getFiltersForm(): Form
+    {
+        return $this->filtersForm($this->makeForm()
+            ->statePath('deferredFilters'));
+    }
+
+    public function updatedFilters(): void
+    {
+        $this->deferredFilters = $this->filters;
+
+        $this->handleFilterUpdates();
+    }
+
+    protected function isValidDate($date): bool
+    {
+        return strtotime($date) !== false;
+    }
+
+    protected function handleFilterUpdates(): void
+    {
+        //
+    }
+
+    public function applyFilters(): void
+    {
+        $normalizedFilters = $this->deferredFilters;
+
+        $this->normalizeFilters($normalizedFilters);
+
+        $this->filters = $normalizedFilters;
+
+        $this->handleFilterUpdates();
+
+        if (method_exists($this, 'loadReportData')) {
+            $this->loadReportData();
+        }
+    }
+
+    protected function normalizeFilters(array &$filters): void
+    {
+        foreach ($filters as $name => &$value) {
+            if ($name === 'dateRange') {
+                unset($filters[$name]);
+            } elseif ($this->isValidDate($value)) {
+                $filters[$name] = Carbon::parse($value)->toDateString();
+            }
+        }
+    }
+
+    public function getFiltersApplyAction(): Action
+    {
+        return Action::make('applyFilters')
+            ->label(__('filament-tables::table.filters.actions.apply.label'))
+            ->action('applyFilters')
+            ->button();
+    }
+
+    public function getFilterState(string $name): mixed
+    {
+        return Arr::get($this->filters, $name);
+    }
+
+    public function setFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->filters, $name, $value);
+    }
+
+    public function getDeferredFilterState(string $name): mixed
+    {
+        return Arr::get($this->deferredFilters, $name);
+    }
+
+    public function setDeferredFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->deferredFilters, $name, $value);
+    }
+}

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

@@ -84,7 +84,7 @@ class AccountBalances extends BaseReportPage
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate, $columns);
+        return $this->reportService->buildAccountBalanceReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns);
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport
@@ -94,11 +94,11 @@ class AccountBalances extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 }

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

@@ -34,7 +34,7 @@ class AccountTransactions extends BaseReportPage
     protected ExportService $exportService;
 
     #[Url]
-    public ?string $account_id = 'all';
+    public ?string $selectedAccount = 'all';
 
     public function boot(ReportService $reportService, ExportService $exportService): void
     {
@@ -71,9 +71,8 @@ class AccountTransactions extends BaseReportPage
     {
         return $form
             ->columns(4)
-            ->live()
             ->schema([
-                Select::make('account_id')
+                Select::make('selectedAccount')
                     ->label('Account')
                     ->options($this->getAccountOptions())
                     ->selectablePlaceholder(false)
@@ -109,7 +108,7 @@ class AccountTransactions extends BaseReportPage
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildAccountTransactionsReport($this->startDate, $this->endDate, $columns, $this->account_id);
+        return $this->reportService->buildAccountTransactionsReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns, $this->selectedAccount);
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport
@@ -119,12 +118,12 @@ class AccountTransactions extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 
     public function getEmptyStateHeading(): string | Htmlable

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

@@ -19,18 +19,25 @@ use Filament\Support\Enums\ActionSize;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
 use Filament\Support\Facades\FilamentIcon;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Session;
+use Livewire\Attributes\Url;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 abstract class BaseReportPage extends Page
 {
-    public string $startDate = '';
-
-    public string $endDate = '';
+    /**
+     * @var array<string, mixed> | null
+     */
+    #[Url(keep: true)]
+    public ?array $filters = null;
 
-    public string $dateRange = '';
+    /**
+     * @var array<string, mixed> | null
+     */
+    public ?array $deferredFilters = null;
 
     public string $fiscalYearStartDate = '';
 
@@ -62,17 +69,110 @@ abstract class BaseReportPage extends Page
 
         $this->loadDefaultDateRange();
 
+        $this->initializeFilters();
+
         $this->loadDefaultTableColumnToggleState();
     }
 
+    public function initializeFilters(): void
+    {
+        if (! count($this->filters ?? [])) {
+            $this->filters = null;
+        }
+
+        $this->getFiltersForm()->fill($this->filters);
+
+        $this->applyFilters();
+    }
+
     protected function getForms(): array
     {
         return [
             'toggleTableColumnForm',
-            'form',
+            'filtersForm' => $this->getFiltersForm(),
         ];
     }
 
+    public function filtersForm(Form $form): Form
+    {
+        return $form;
+    }
+
+    public function getFiltersForm(): Form
+    {
+        return $this->filtersForm($this->makeForm()
+            ->statePath('deferredFilters'));
+    }
+
+    public function updatedFilters(): void
+    {
+        $this->deferredFilters = $this->filters;
+
+        $this->handleFilterUpdates();
+    }
+
+    protected function isValidDate($date): bool
+    {
+        return strtotime($date) !== false;
+    }
+
+    protected function handleFilterUpdates(): void
+    {
+        //
+    }
+
+    public function applyFilters(): void
+    {
+        $normalizedFilters = $this->deferredFilters;
+
+        $this->normalizeFilters($normalizedFilters);
+
+        $this->filters = $normalizedFilters;
+
+        $this->handleFilterUpdates();
+
+        $this->loadReportData();
+    }
+
+    protected function normalizeFilters(array &$filters): void
+    {
+        foreach ($filters as $name => &$value) {
+            if ($name === 'dateRange') {
+                unset($filters[$name]);
+            } elseif ($this->isValidDate($value)) {
+                $filters[$name] = Carbon::parse($value)->toDateString();
+            }
+        }
+    }
+
+    public function getFiltersApplyAction(): Action
+    {
+        return Action::make('applyFilters')
+            ->label(__('filament-tables::table.filters.actions.apply.label'))
+            ->action('applyFilters')
+            ->button();
+    }
+
+    public function getFilterState(string $name): mixed
+    {
+        return Arr::get($this->filters, $name);
+    }
+
+    public function setFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->filters, $name, $value);
+    }
+
+    public function getDeferredFilterState(string $name): mixed
+    {
+        return Arr::get($this->deferredFilters, $name);
+    }
+
+    public function setDeferredFilterState(string $name, mixed $value): void
+    {
+        Arr::set($this->deferredFilters, $name, $value);
+    }
+
     protected function initializeProperties(): void
     {
         $this->company = auth()->user()->currentCompany;
@@ -82,8 +182,8 @@ abstract class BaseReportPage extends Page
 
     protected function loadDefaultDateRange(): void
     {
-        if (empty($this->dateRange)) {
-            $this->dateRange = $this->getDefaultDateRange();
+        if (! $this->getDeferredFilterState('dateRange')) {
+            $this->setFilterState('dateRange', $this->getDefaultDateRange());
             $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
         }
     }
@@ -154,8 +254,18 @@ abstract class BaseReportPage extends Page
 
     public function setDateRange(Carbon $start, Carbon $end): void
     {
-        $this->startDate = $start->startOfDay()->toDateTimeString();
-        $this->endDate = $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString();
+        $this->setFilterState('startDate', $start->startOfDay()->toDateTimeString());
+        $this->setFilterState('endDate', $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
+    }
+
+    public function getFormattedStartDate(): string
+    {
+        return Carbon::parse($this->getFilterState('startDate'))->startOfDay()->toDateTimeString();
+    }
+
+    public function getFormattedEndDate(): string
+    {
+        return Carbon::parse($this->getFilterState('endDate'))->endOfDay()->toDateTimeString();
     }
 
     public function toggleColumnsAction(): Action
@@ -228,17 +338,12 @@ abstract class BaseReportPage extends Page
             ->endDateField('endDate');
     }
 
-    protected function resetDateRange(): void
-    {
-        $this->dateRange = $this->getDefaultDateRange();
-        $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
-    }
-
     protected function getStartDateFormComponent(): Component
     {
         return DatePicker::make('startDate')
             ->label('Start Date')
-            ->afterStateUpdated(static function (Set $set) {
+            ->live()
+            ->afterStateUpdated(static function ($state, Set $set) {
                 $set('dateRange', 'Custom');
             });
     }
@@ -247,6 +352,7 @@ abstract class BaseReportPage extends Page
     {
         return DatePicker::make('endDate')
             ->label('End Date')
+            ->live()
             ->afterStateUpdated(static function (Set $set) {
                 $set('dateRange', 'Custom');
             });

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

@@ -47,12 +47,11 @@ class IncomeStatement extends BaseReportPage
         ];
     }
 
-    public function form(Form $form): Form
+    public function filtersForm(Form $form): Form
     {
         return $form
             ->inlineLabel()
             ->columns()
-            ->live()
             ->schema([
                 $this->getDateRangeFormComponent(),
                 Cluster::make([
@@ -64,7 +63,7 @@ class IncomeStatement extends BaseReportPage
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildIncomeStatementReport($this->startDate, $this->endDate, $columns);
+        return $this->reportService->buildIncomeStatementReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns);
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport
@@ -74,11 +73,11 @@ class IncomeStatement extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 }

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

@@ -70,7 +70,7 @@ class TrialBalance extends BaseReportPage
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate, $columns);
+        return $this->reportService->buildTrialBalanceReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns);
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport
@@ -80,11 +80,11 @@ class TrialBalance extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
     }
 }

app/Filament/Company/Resources/Banking/AccountResource.php

@@ -15,6 +15,7 @@ use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\FontWeight;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\Rules\Unique;
@@ -44,6 +45,7 @@ class AccountResource extends Resource
                             ->localizeLabel()
                             ->searchable()
                             ->columnSpan(1)
+                            ->disabledOn('edit')
                             ->default(BankAccountType::DEFAULT)
                             ->live()
                             ->afterStateUpdated(static function (Forms\Set $set, $state, ?BankAccount $bankAccount, string $operation) {
@@ -64,6 +66,7 @@ class AccountResource extends Resource
                             ->schema([
                                 Forms\Components\Select::make('subtype_id')
                                     ->options(static fn (Forms\Get $get) => static::groupSubtypesBySubtypeType(BankAccountType::parse($get('data.type', true))))
+                                    ->disabledOn('edit')
                                     ->localizeLabel()
                                     ->searchable()
                                     ->live()
@@ -79,6 +82,7 @@ class AccountResource extends Resource
                                     ->localizeLabel()
                                     ->required(),
                                 CreateCurrencySelect::make('currency_code')
+                                    ->disabledOn('edit')
                                     ->relationship('currency', 'name'),
                             ]),
                         Forms\Components\Group::make()
@@ -104,6 +108,12 @@ class AccountResource extends Resource
     public static function table(Table $table): Table
     {
         return $table
+            ->modifyQueryUsing(function (Builder $query) {
+                $query->with([
+                    'account',
+                    'account.subtype',
+                ]);
+            })
             ->columns([
                 Tables\Columns\TextColumn::make('account.name')
                     ->localizeLabel('Account')
@@ -138,10 +148,7 @@ class AccountResource extends Resource
             ])
             ->checkIfRecordIsSelectableUsing(static function (BankAccount $record) {
                 return $record->isDisabled();
-            })
-            ->emptyStateActions([
-                Tables\Actions\CreateAction::make(),
-            ]);
+            });
     }
 
     public static function getPages(): array

app/Filament/Company/Resources/Banking/AccountResource/Pages/CreateAccount.php

@@ -2,11 +2,18 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
+use App\Concerns\HandlesResourceRecordCreation;
 use App\Filament\Company\Resources\Banking\AccountResource;
+use App\Models\Banking\BankAccount;
 use Filament\Resources\Pages\CreateRecord;
+use Filament\Support\Exceptions\Halt;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class CreateAccount extends CreateRecord
 {
+    use HandlesResourceRecordCreation;
+
     protected static string $resource = AccountResource::class;
 
     protected function getRedirectUrl(): string
@@ -20,4 +27,18 @@ class CreateAccount extends CreateRecord
 
         return $data;
     }
+
+    /**
+     * @throws Halt
+     */
+    protected function handleRecordCreation(array $data): Model
+    {
+        $user = Auth::user();
+
+        if (! $user) {
+            throw new Halt('No authenticated user found');
+        }
+
+        return $this->handleRecordCreationWithUniqueField($data, new BankAccount, $user);
+    }
 }

app/Filament/Company/Resources/Banking/AccountResource/Pages/EditAccount.php

@@ -5,6 +5,9 @@ namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 use App\Concerns\HandlesResourceRecordUpdate;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use Filament\Resources\Pages\EditRecord;
+use Filament\Support\Exceptions\Halt;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Auth;
 
 class EditAccount extends EditRecord
 {
@@ -30,4 +33,18 @@ class EditAccount extends EditRecord
 
         return $data;
     }
+
+    /**
+     * @throws Halt
+     */
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        $user = Auth::user();
+
+        if (! $user) {
+            throw new Halt('No authenticated user found');
+        }
+
+        return $this->handleRecordUpdateWithUniqueField($record, $data, $user);
+    }
 }

app/Filament/Forms/Components/DateRangeSelect.php

@@ -30,6 +30,7 @@ class DateRangeSelect extends Select
         $this->fiscalYearEndDate = $this->company->locale->fiscalYearEndDate();
 
         $this->options($this->getDateRangeOptions())
+            ->live()
             ->afterStateUpdated(function ($state, Set $set) {
                 $this->updateDateRange($state, $set);
             });
@@ -165,7 +166,7 @@ class DateRangeSelect extends Select
 
     public function setDateRange(Carbon $start, Carbon $end, Set $set): void
     {
-        $set($this->startDateField, $start->startOfDay()->toDateTimeString());
+        $set($this->startDateField, $start->startOfDay()->toDateString());
         $set($this->endDateField, $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
     }
 }

app/Listeners/ConfigureCompanyDefault.php

@@ -26,41 +26,46 @@ class ConfigureCompanyDefault
     public function handle(CompanyConfigured $event): void
     {
         $company = $event->company;
+
+        session([
+            'current_company_id' => $company->id,
+            'default_language' => $company->locale->language ?? config('transmatic.source_locale'),
+            'default_timezone' => $company->locale->timezone ?? config('app.timezone'),
+            'default_pagination_page_option' => $company->appearance->records_per_page->value ?? RecordsPerPage::DEFAULT,
+            'default_sort' => $company->appearance->table_sort_direction->value ?? TableSortDirection::DEFAULT,
+            'default_primary_color' => $company->appearance->primary_color->value ?? PrimaryColor::DEFAULT,
+            'default_font' => $company->appearance->font->value ?? Font::DEFAULT,
+            'default_date_format' => $company->locale->date_format->value ?? DateFormat::DEFAULT,
+            'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
+        ]);
+
+        app()->setLocale(session('default_language'));
+        locale_set_default(session('default_language'));
+        config(['app.timezone' => session('default_timezone')]);
+        date_default_timezone_set(session('default_timezone'));
+
         $paginationPageOptions = RecordsPerPage::caseValues();
-        $defaultPaginationPageOption = $company->appearance->records_per_page->value ?? RecordsPerPage::DEFAULT;
-        $defaultSort = $company->appearance->table_sort_direction->value ?? TableSortDirection::DEFAULT;
-        $defaultPrimaryColor = $company->appearance->primary_color ?? PrimaryColor::from(PrimaryColor::DEFAULT);
-        $defaultFont = $company->appearance->font->value ?? Font::DEFAULT;
-        $default_language = $company->locale->language ?? config('transmatic.source_locale');
-        $defaultTimezone = $company->locale->timezone ?? config('app.timezone');
-        $dateFormat = $company->locale->date_format->value ?? DateFormat::DEFAULT;
-        $weekStart = $company->locale->week_start->value ?? WeekStart::DEFAULT;
-
-        app()->setLocale($default_language);
-        locale_set_default($default_language);
-        config(['app.timezone' => $defaultTimezone]);
-        date_default_timezone_set($defaultTimezone);
-
-        Table::configureUsing(static function (Table $table) use ($paginationPageOptions, $defaultSort, $defaultPaginationPageOption): void {
+
+        Table::configureUsing(static function (Table $table) use ($paginationPageOptions): void {
 
             $table
                 ->paginationPageOptions($paginationPageOptions)
-                ->defaultSort(column: 'id', direction: $defaultSort)
-                ->defaultPaginationPageOption($defaultPaginationPageOption);
+                ->defaultSort(column: 'id', direction: session('default_sort'))
+                ->defaultPaginationPageOption(session('default_pagination_page_option'));
         }, isImportant: true);
 
         FilamentColor::register([
-            'primary' => $defaultPrimaryColor->getColor(),
+            'primary' => PrimaryColor::from(session('default_primary_color'))->getColor(),
         ]);
 
         Filament::getPanel('company')
-            ->font($defaultFont)
+            ->font(session('default_font'))
             ->brandName($company->name);
 
-        DatePicker::configureUsing(static function (DatePicker $component) use ($dateFormat, $weekStart) {
+        DatePicker::configureUsing(static function (DatePicker $component) {
             $component
-                ->displayFormat($dateFormat)
-                ->firstDayOfWeek($weekStart);
+                ->displayFormat(session('default_date_format'))
+                ->firstDayOfWeek(session('default_week_start'));
         });
 
         Tab::configureUsing(static function (Tab $tab) {

app/Listeners/SyncAssociatedModels.php

@@ -40,7 +40,6 @@ class SyncAssociatedModels
 
         $keyToMethodMap = [
             'bank_account_id' => 'bankAccount',
-            'currency_code' => 'currency',
             'sales_tax_id' => 'salesTax',
             'purchase_tax_id' => 'purchaseTax',
             'sales_discount_id' => 'salesDiscount',

app/Scopes/CurrentCompanyScope.php

@@ -4,8 +4,10 @@ namespace App\Scopes;
 
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Scope;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 
 class CurrentCompanyScope implements Scope
 {
@@ -14,8 +16,19 @@ class CurrentCompanyScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        if (Auth::check() && Auth::user()->currentCompany) {
-            $builder->where("{$model->getTable()}.company_id", Auth::user()->currentCompany->id);
+        $companyId = session('current_company_id');
+
+        if (! $companyId && Auth::check() && Auth::user()->currentCompany) {
+            $companyId = Auth::user()->currentCompany->id;
+            session(['current_company_id' => $companyId]);
+        }
+
+        if ($companyId) {
+            $builder->where("{$model->getTable()}.company_id", $companyId);
+        } else {
+            Log::error('CurrentCompanyScope: No company_id found for user ' . Auth::id());
+
+            throw new ModelNotFoundException('CurrentCompanyScope: No company_id set in the session or on the user.');
         }
     }
 }

app/Services/AccountService.php

@@ -73,6 +73,8 @@ class AccountService implements AccountHandler
 
     public function getAccountBalances(string $startDate, string $endDate, array $accountIds = []): Builder
     {
+        $accountIds = array_map('intval', $accountIds);
+
         $query = Account::query()
             ->select([
                 'accounts.id',

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.320.7",
+            "version": "3.321.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "702b9955160d2dacdf2cdf4d4476fcf95eae1aaf"
+                "reference": "c04f8f30891cee8480c132778cd4cc486467e77a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/702b9955160d2dacdf2cdf4d4476fcf95eae1aaf",
-                "reference": "702b9955160d2dacdf2cdf4d4476fcf95eae1aaf",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/c04f8f30891cee8480c132778cd4cc486467e77a",
+                "reference": "c04f8f30891cee8480c132778cd4cc486467e77a",
                 "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.320.7"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.321.2"
             },
-            "time": "2024-08-23T18:13:50+00:00"
+            "time": "2024-08-30T18:14:40+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -1738,16 +1738,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.107",
+            "version": "v3.2.110",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "de5ce76f20ee21af92b951dec2a5c533ecacbc79"
+                "reference": "5d6e4fe444f1ef04d373518248a445bbcc3ca272"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/de5ce76f20ee21af92b951dec2a5c533ecacbc79",
-                "reference": "de5ce76f20ee21af92b951dec2a5c533ecacbc79",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/5d6e4fe444f1ef04d373518248a445bbcc3ca272",
+                "reference": "5d6e4fe444f1ef04d373518248a445bbcc3ca272",
                 "shasum": ""
             },
             "require": {
@@ -1787,20 +1787,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-08-22T12:07:53+00:00"
+            "time": "2024-08-26T07:22:35+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.107",
+            "version": "v3.2.110",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "2675472f2bdd4e765a1f3e533231bda7750a2881"
+                "reference": "130636e90e821154e0ce60dcbc7b358d2a1a716f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/2675472f2bdd4e765a1f3e533231bda7750a2881",
-                "reference": "2675472f2bdd4e765a1f3e533231bda7750a2881",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/130636e90e821154e0ce60dcbc7b358d2a1a716f",
+                "reference": "130636e90e821154e0ce60dcbc7b358d2a1a716f",
                 "shasum": ""
             },
             "require": {
@@ -1852,20 +1852,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-08-20T08:32:50+00:00"
+            "time": "2024-08-30T01:52:09+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.107",
+            "version": "v3.2.110",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "0f80913deb90bfe9e1850ab35e80a34194cfb652"
+                "reference": "02fe2e211993f6291b719a093ed6f63e17125e9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/0f80913deb90bfe9e1850ab35e80a34194cfb652",
-                "reference": "0f80913deb90bfe9e1850ab35e80a34194cfb652",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/02fe2e211993f6291b719a093ed6f63e17125e9a",
+                "reference": "02fe2e211993f6291b719a093ed6f63e17125e9a",
                 "shasum": ""
             },
             "require": {
@@ -1908,11 +1908,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-08-22T12:07:43+00:00"
+            "time": "2024-08-30T18:04:06+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.107",
+            "version": "v3.2.110",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
@@ -1963,7 +1963,7 @@
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.107",
+            "version": "v3.2.110",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2015,16 +2015,16 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.2.107",
+            "version": "v3.2.110",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "f00b84d43d157c85837108a7eeaceabbaf6044ab"
+                "reference": "78e25428c754fcbb30c321d5dda439c760de9837"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/f00b84d43d157c85837108a7eeaceabbaf6044ab",
-                "reference": "f00b84d43d157c85837108a7eeaceabbaf6044ab",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/78e25428c754fcbb30c321d5dda439c760de9837",
+                "reference": "78e25428c754fcbb30c321d5dda439c760de9837",
                 "shasum": ""
             },
             "require": {
@@ -2070,20 +2070,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-08-22T12:08:05+00:00"
+            "time": "2024-08-26T07:22:57+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.107",
+            "version": "v3.2.110",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "5de49ef865e8788bb29d58723b88977b593a7b02"
+                "reference": "129943d1b4e6c1edeef53e804eb56ef78a932a6c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/5de49ef865e8788bb29d58723b88977b593a7b02",
-                "reference": "5de49ef865e8788bb29d58723b88977b593a7b02",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/129943d1b4e6c1edeef53e804eb56ef78a932a6c",
+                "reference": "129943d1b4e6c1edeef53e804eb56ef78a932a6c",
                 "shasum": ""
             },
             "require": {
@@ -2122,11 +2122,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-08-22T12:08:13+00:00"
+            "time": "2024-08-30T01:52:14+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.107",
+            "version": "v3.2.110",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -6411,16 +6411,16 @@
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.16.4",
+            "version": "1.16.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53"
+                "reference": "c7413972cf22ffdff97b68499c22baa04eddb6a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53",
-                "reference": "ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/c7413972cf22ffdff97b68499c22baa04eddb6a2",
+                "reference": "c7413972cf22ffdff97b68499c22baa04eddb6a2",
                 "shasum": ""
             },
             "require": {
@@ -6459,7 +6459,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.4"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.5"
             },
             "funding": [
                 {
@@ -6467,7 +6467,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-03-20T07:29:11+00:00"
+            "time": "2024-08-27T18:56:10+00:00"
         },
         {
             "name": "squirephp/model",
@@ -6654,16 +6654,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.1.3",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9"
+                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9",
-                "reference": "cb1dcb30ebc7005c29864ee78adb47b5fb7c3cd9",
+                "url": "https://api.github.com/repos/symfony/console/zipball/1eed7af6961d763e7832e874d7f9b21c3ea9c111",
+                "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111",
                 "shasum": ""
             },
             "require": {
@@ -6727,7 +6727,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.1.3"
+                "source": "https://github.com/symfony/console/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -6743,7 +6743,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T12:41:01+00:00"
+            "time": "2024-08-15T22:48:53+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -7110,16 +7110,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.1.3",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "717c6329886f32dc65e27461f80f2a465412fdca"
+                "reference": "d95bbf319f7d052082fb7af147e0f835a695e823"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/717c6329886f32dc65e27461f80f2a465412fdca",
-                "reference": "717c6329886f32dc65e27461f80f2a465412fdca",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823",
+                "reference": "d95bbf319f7d052082fb7af147e0f835a695e823",
                 "shasum": ""
             },
             "require": {
@@ -7154,7 +7154,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.1.3"
+                "source": "https://github.com/symfony/finder/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -7170,7 +7170,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-24T07:08:44+00:00"
+            "time": "2024-08-13T14:28:19+00:00"
         },
         {
             "name": "symfony/html-sanitizer",
@@ -7320,16 +7320,16 @@
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.1.3",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "db9702f3a04cc471ec8c70e881825db26ac5f186"
+                "reference": "6efcbd1b3f444f631c386504fc83eeca25963747"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/db9702f3a04cc471ec8c70e881825db26ac5f186",
-                "reference": "db9702f3a04cc471ec8c70e881825db26ac5f186",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6efcbd1b3f444f631c386504fc83eeca25963747",
+                "reference": "6efcbd1b3f444f631c386504fc83eeca25963747",
                 "shasum": ""
             },
             "require": {
@@ -7414,7 +7414,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.1.3"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -7430,7 +7430,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T14:58:15+00:00"
+            "time": "2024-08-30T17:02:28+00:00"
         },
         {
             "name": "symfony/intl",
@@ -7597,16 +7597,16 @@
         },
         {
             "name": "symfony/mime",
-            "version": "v7.1.2",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc"
+                "reference": "ccaa6c2503db867f472a587291e764d6a1e58758"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/26a00b85477e69a4bab63b66c5dce64f18b0cbfc",
-                "reference": "26a00b85477e69a4bab63b66c5dce64f18b0cbfc",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/ccaa6c2503db867f472a587291e764d6a1e58758",
+                "reference": "ccaa6c2503db867f472a587291e764d6a1e58758",
                 "shasum": ""
             },
             "require": {
@@ -7661,7 +7661,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.1.2"
+                "source": "https://github.com/symfony/mime/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -7677,7 +7677,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-28T10:03:55+00:00"
+            "time": "2024-08-13T14:28:19+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -8452,16 +8452,16 @@
         },
         {
             "name": "symfony/routing",
-            "version": "v7.1.3",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "8a908a3f22d5a1b5d297578c2ceb41b02fa916d0"
+                "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/8a908a3f22d5a1b5d297578c2ceb41b02fa916d0",
-                "reference": "8a908a3f22d5a1b5d297578c2ceb41b02fa916d0",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/1500aee0094a3ce1c92626ed8cf3c2037e86f5a7",
+                "reference": "1500aee0094a3ce1c92626ed8cf3c2037e86f5a7",
                 "shasum": ""
             },
             "require": {
@@ -8513,7 +8513,7 @@
                 "url"
             ],
             "support": {
-                "source": "https://github.com/symfony/routing/tree/v7.1.3"
+                "source": "https://github.com/symfony/routing/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -8529,7 +8529,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-17T06:10:24+00:00"
+            "time": "2024-08-29T08:16:25+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -8616,16 +8616,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.1.3",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "ea272a882be7f20cad58d5d78c215001617b7f07"
+                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/ea272a882be7f20cad58d5d78c215001617b7f07",
-                "reference": "ea272a882be7f20cad58d5d78c215001617b7f07",
+                "url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
+                "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b",
                 "shasum": ""
             },
             "require": {
@@ -8683,7 +8683,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.1.3"
+                "source": "https://github.com/symfony/string/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -8699,7 +8699,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-22T10:25:37+00:00"
+            "time": "2024-08-12T09:59:40+00:00"
         },
         {
             "name": "symfony/translation",
@@ -8875,16 +8875,16 @@
         },
         {
             "name": "symfony/uid",
-            "version": "v7.1.1",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/uid.git",
-                "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277"
+                "reference": "82177535395109075cdb45a70533aa3d7a521cdf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/uid/zipball/bb59febeecc81528ff672fad5dab7f06db8c8277",
-                "reference": "bb59febeecc81528ff672fad5dab7f06db8c8277",
+                "url": "https://api.github.com/repos/symfony/uid/zipball/82177535395109075cdb45a70533aa3d7a521cdf",
+                "reference": "82177535395109075cdb45a70533aa3d7a521cdf",
                 "shasum": ""
             },
             "require": {
@@ -8929,7 +8929,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/uid/tree/v7.1.1"
+                "source": "https://github.com/symfony/uid/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -8945,20 +8945,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-08-12T09:59:40+00:00"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.1.3",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "86af4617cca75a6e28598f49ae0690f3b9d4591f"
+                "reference": "a5fa7481b199090964d6fd5dab6294d5a870c7aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/86af4617cca75a6e28598f49ae0690f3b9d4591f",
-                "reference": "86af4617cca75a6e28598f49ae0690f3b9d4591f",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/a5fa7481b199090964d6fd5dab6294d5a870c7aa",
+                "reference": "a5fa7481b199090964d6fd5dab6294d5a870c7aa",
                 "shasum": ""
             },
             "require": {
@@ -9012,7 +9012,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.1.3"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -9028,7 +9028,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-26T12:41:01+00:00"
+            "time": "2024-08-30T16:12:47+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -10103,16 +10103,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.11.11",
+            "version": "1.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3"
+                "reference": "384af967d35b2162f69526c7276acadce534d0e1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/707c2aed5d8d0075666e673a5e71440c1d01a5a3",
-                "reference": "707c2aed5d8d0075666e673a5e71440c1d01a5a3",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/384af967d35b2162f69526c7276acadce534d0e1",
+                "reference": "384af967d35b2162f69526c7276acadce534d0e1",
                 "shasum": ""
             },
             "require": {
@@ -10157,7 +10157,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-08-19T14:37:29+00:00"
+            "time": "2024-08-27T09:18:05+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -12302,16 +12302,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v7.1.1",
+            "version": "v7.1.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "fa34c77015aa6720469db7003567b9f772492bf2"
+                "reference": "92e080b851c1c655c786a2da77f188f2dccd0f4b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/fa34c77015aa6720469db7003567b9f772492bf2",
-                "reference": "fa34c77015aa6720469db7003567b9f772492bf2",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/92e080b851c1c655c786a2da77f188f2dccd0f4b",
+                "reference": "92e080b851c1c655c786a2da77f188f2dccd0f4b",
                 "shasum": ""
             },
             "require": {
@@ -12353,7 +12353,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v7.1.1"
+                "source": "https://github.com/symfony/yaml/tree/v7.1.4"
             },
             "funding": [
                 {
@@ -12369,7 +12369,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-05-31T14:57:53+00:00"
+            "time": "2024-08-12T09:59:40+00:00"
         },
         {
             "name": "theseer/tokenizer",

package-lock.json

@@ -541,9 +541,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.0.tgz",
-            "integrity": "sha512-WTWD8PfoSAJ+qL87lE7votj3syLavxunWhzCnx3XFxFiI/BA/r3X7MUM8dVrH8rb2r4AiO8jJsr3ZjdaftmnfA==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.21.2.tgz",
+            "integrity": "sha512-fSuPrt0ZO8uXeS+xP3b+yYTCBUd05MoSp2N/MFOgjhhUhMmchXlpTQrTpI8T+YAwAQuK7MafsCOxW7VrPMrJcg==",
             "cpu": [
                 "arm"
             ],
@@ -555,9 +555,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.0.tgz",
-            "integrity": "sha512-a1sR2zSK1B4eYkiZu17ZUZhmUQcKjk2/j9Me2IDjk1GHW7LB5Z35LEzj9iJch6gtUfsnvZs1ZNyDW2oZSThrkA==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
+            "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
             "cpu": [
                 "arm64"
             ],
@@ -569,9 +569,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.0.tgz",
-            "integrity": "sha512-zOnKWLgDld/svhKO5PD9ozmL6roy5OQ5T4ThvdYZLpiOhEGY+dp2NwUmxK0Ld91LrbjrvtNAE0ERBwjqhZTRAA==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.21.2.tgz",
+            "integrity": "sha512-99AhQ3/ZMxU7jw34Sq8brzXqWH/bMnf7ZVhvLk9QU2cOepbQSVTns6qoErJmSiAvU3InRqC2RRZ5ovh1KN0d0Q==",
             "cpu": [
                 "arm64"
             ],
@@ -583,9 +583,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.0.tgz",
-            "integrity": "sha512-7doS8br0xAkg48SKE2QNtMSFPFUlRdw9+votl27MvT46vo44ATBmdZdGysOevNELmZlfd+NEa0UYOA8f01WSrg==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.21.2.tgz",
+            "integrity": "sha512-ZbRaUvw2iN/y37x6dY50D8m2BnDbBjlnMPotDi/qITMJ4sIxNY33HArjikDyakhSv0+ybdUxhWxE6kTI4oX26w==",
             "cpu": [
                 "x64"
             ],
@@ -597,9 +597,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.0.tgz",
-            "integrity": "sha512-pWJsfQjNWNGsoCq53KjMtwdJDmh/6NubwQcz52aEwLEuvx08bzcy6tOUuawAOncPnxz/3siRtd8hiQ32G1y8VA==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.21.2.tgz",
+            "integrity": "sha512-ztRJJMiE8nnU1YFcdbd9BcH6bGWG1z+jP+IPW2oDUAPxPjo9dverIOyXz76m6IPA6udEL12reYeLojzW2cYL7w==",
             "cpu": [
                 "arm"
             ],
@@ -611,9 +611,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.0.tgz",
-            "integrity": "sha512-efRIANsz3UHZrnZXuEvxS9LoCOWMGD1rweciD6uJQIx2myN3a8Im1FafZBzh7zk1RJ6oKcR16dU3UPldaKd83w==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.21.2.tgz",
+            "integrity": "sha512-flOcGHDZajGKYpLV0JNc0VFH361M7rnV1ee+NTeC/BQQ1/0pllYcFmxpagltANYt8FYf9+kL6RSk80Ziwyhr7w==",
             "cpu": [
                 "arm"
             ],
@@ -625,9 +625,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.0.tgz",
-            "integrity": "sha512-ZrPhydkTVhyeGTW94WJ8pnl1uroqVHM3j3hjdquwAcWnmivjAwOYjTEAuEDeJvGX7xv3Z9GAvrBkEzCgHq9U1w==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.21.2.tgz",
+            "integrity": "sha512-69CF19Kp3TdMopyteO/LJbWufOzqqXzkrv4L2sP8kfMaAQ6iwky7NoXTp7bD6/irKgknDKM0P9E/1l5XxVQAhw==",
             "cpu": [
                 "arm64"
             ],
@@ -639,9 +639,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.0.tgz",
-            "integrity": "sha512-cfaupqd+UEFeURmqNP2eEvXqgbSox/LHOyN9/d2pSdV8xTrjdg3NgOFJCtc1vQ/jEke1qD0IejbBfxleBPHnPw==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.21.2.tgz",
+            "integrity": "sha512-48pD/fJkTiHAZTnZwR0VzHrao70/4MlzJrq0ZsILjLW/Ab/1XlVUStYyGt7tdyIiVSlGZbnliqmult/QGA2O2w==",
             "cpu": [
                 "arm64"
             ],
@@ -653,9 +653,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.0.tgz",
-            "integrity": "sha512-ZKPan1/RvAhrUylwBXC9t7B2hXdpb/ufeu22pG2psV7RN8roOfGurEghw1ySmX/CmDDHNTDDjY3lo9hRlgtaHg==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.21.2.tgz",
+            "integrity": "sha512-cZdyuInj0ofc7mAQpKcPR2a2iu4YM4FQfuUzCVA2u4HI95lCwzjoPtdWjdpDKyHxI0UO82bLDoOaLfpZ/wviyQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -667,9 +667,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.0.tgz",
-            "integrity": "sha512-H1eRaCwd5E8eS8leiS+o/NqMdljkcb1d6r2h4fKSsCXQilLKArq6WS7XBLDu80Yz+nMqHVFDquwcVrQmGr28rg==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.21.2.tgz",
+            "integrity": "sha512-RL56JMT6NwQ0lXIQmMIWr1SW28z4E4pOhRRNqwWZeXpRlykRIlEpSWdsgNWJbYBEWD84eocjSGDu/XxbYeCmwg==",
             "cpu": [
                 "riscv64"
             ],
@@ -681,9 +681,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.0.tgz",
-            "integrity": "sha512-zJ4hA+3b5tu8u7L58CCSI0A9N1vkfwPhWd/puGXwtZlsB5bTkwDNW/+JCU84+3QYmKpLi+XvHdmrlwUwDA6kqw==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.21.2.tgz",
+            "integrity": "sha512-PMxkrWS9z38bCr3rWvDFVGD6sFeZJw4iQlhrup7ReGmfn7Oukrr/zweLhYX6v2/8J6Cep9IEA/SmjXjCmSbrMQ==",
             "cpu": [
                 "s390x"
             ],
@@ -695,9 +695,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.0.tgz",
-            "integrity": "sha512-e2hrvElFIh6kW/UNBQK/kzqMNY5mO+67YtEh9OA65RM5IJXYTWiXjX6fjIiPaqOkBthYF1EqgiZ6OXKcQsM0hg==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.21.2.tgz",
+            "integrity": "sha512-B90tYAUoLhU22olrafY3JQCFLnT3NglazdwkHyxNDYF/zAxJt5fJUB/yBoWFoIQ7SQj+KLe3iL4BhOMa9fzgpw==",
             "cpu": [
                 "x64"
             ],
@@ -709,9 +709,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.0.tgz",
-            "integrity": "sha512-1vvmgDdUSebVGXWX2lIcgRebqfQSff0hMEkLJyakQ9JQUbLDkEaMsPTLOmyccyC6IJ/l3FZuJbmrBw/u0A0uCQ==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.21.2.tgz",
+            "integrity": "sha512-7twFizNXudESmC9oneLGIUmoHiiLppz/Xs5uJQ4ShvE6234K0VB1/aJYU3f/4g7PhssLGKBVCC37uRkkOi8wjg==",
             "cpu": [
                 "x64"
             ],
@@ -723,9 +723,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.0.tgz",
-            "integrity": "sha512-s5oFkZ/hFcrlAyBTONFY1TWndfyre1wOMwU+6KCpm/iatybvrRgmZVM+vCFwxmC5ZhdlgfE0N4XorsDpi7/4XQ==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.21.2.tgz",
+            "integrity": "sha512-9rRero0E7qTeYf6+rFh3AErTNU1VCQg2mn7CQcI44vNUWM9Ze7MSRS/9RFuSsox+vstRt97+x3sOhEey024FRQ==",
             "cpu": [
                 "arm64"
             ],
@@ -737,9 +737,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.0.tgz",
-            "integrity": "sha512-G9+TEqRnAA6nbpqyUqgTiopmnfgnMkR3kMukFBDsiyy23LZvUCpiUwjTRx6ezYCjJODXrh52rBR9oXvm+Fp5wg==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.21.2.tgz",
+            "integrity": "sha512-5rA4vjlqgrpbFVVHX3qkrCo/fZTj1q0Xxpg+Z7yIo3J2AilW7t2+n6Q8Jrx+4MrYpAnjttTYF8rr7bP46BPzRw==",
             "cpu": [
                 "ia32"
             ],
@@ -751,9 +751,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.0.tgz",
-            "integrity": "sha512-2jsCDZwtQvRhejHLfZ1JY6w6kEuEtfF9nzYsZxzSlNVKDX+DpsDJ+Rbjkm74nvg2rdx0gwBS+IMdvwJuq3S9pQ==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz",
+            "integrity": "sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==",
             "cpu": [
                 "x64"
             ],
@@ -765,22 +765,22 @@
             ]
         },
         "node_modules/@tailwindcss/forms": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.7.tgz",
-            "integrity": "sha512-QE7X69iQI+ZXwldE+rzasvbJiyV/ju1FGHH0Qn2W3FKbuYtqp8LKcy6iSw79fVUT5/Vvf+0XgLCeYVG+UV6hOw==",
+            "version": "0.5.8",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/forms/-/forms-0.5.8.tgz",
+            "integrity": "sha512-DJs7B7NPD0JH7BVvdHWNviWmunlFhuEkz7FyFxE4japOWYMLl9b1D6+Z9mivJJPWr6AEbmlPqgiFRyLwFB1SgQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "mini-svg-data-uri": "^1.2.3"
             },
             "peerDependencies": {
-                "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1"
+                "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20"
             }
         },
         "node_modules/@tailwindcss/typography": {
-            "version": "0.5.14",
-            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.14.tgz",
-            "integrity": "sha512-ZvOCjUbsJBjL9CxQBn+VEnFpouzuKhxh2dH8xMIWHILL+HfOYtlAkWcyoon8LlzE53d2Yo6YO6pahKKNW3q1YQ==",
+            "version": "0.5.15",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/typography/-/typography-0.5.15.tgz",
+            "integrity": "sha512-AqhlCXl+8grUz8uqExv5OTtgpjuVIwFTSXTrh8y9/pw6q2ek7fJ+Y8ZEVw7EB2DCcuCOtEjf9w3+J3rzts01uA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -790,7 +790,7 @@
                 "postcss-selector-parser": "6.0.10"
             },
             "peerDependencies": {
-                "tailwindcss": ">=3.0.0 || insiders"
+                "tailwindcss": ">=3.0.0 || insiders || >=4.0.0-alpha.20"
             }
         },
         "node_modules/@types/estree": {
@@ -900,9 +900,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.7.5",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.5.tgz",
-            "integrity": "sha512-fZu86yCo+svH3uqJ/yTdQ0QHpQu5oL+/QE+QPSv6BZSkDAoky9vytxp7u5qk83OJFS3kEBcesWni9WTZAv3tSw==",
+            "version": "1.7.6",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.6.tgz",
+            "integrity": "sha512-Ekur6XDwhnJ5RgOCaxFnXyqlPALI3rVeukZMwOdfghW7/wGz784BYKiQq+QD8NPcr91KRo30KfHOchyijwWw7g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -998,9 +998,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001651",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz",
-            "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==",
+            "version": "1.0.30001655",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz",
+            "integrity": "sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg==",
             "dev": true,
             "funding": [
                 {
@@ -1212,9 +1212,9 @@
             }
         },
         "node_modules/escalade": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
-            "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+            "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -1826,9 +1826,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.41",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
-            "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
+            "version": "8.4.42",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.42.tgz",
+            "integrity": "sha512-hywKUQB9Ra4dR1mGhldy5Aj1X3MWDSIA1cEi+Uy0CjheLvP6Ual5RlwMCh8i/X121yEDLDIKBsrCQ8ba3FDMfQ==",
             "dev": true,
             "funding": [
                 {
@@ -2171,9 +2171,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.21.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.0.tgz",
-            "integrity": "sha512-vo+S/lfA2lMS7rZ2Qoubi6I5hwZwzXeUIctILZLbHI+laNtvhhOIon2S1JksA5UEDQ7l3vberd0fxK44lTYjbQ==",
+            "version": "4.21.2",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
+            "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2187,22 +2187,22 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.21.0",
-                "@rollup/rollup-android-arm64": "4.21.0",
-                "@rollup/rollup-darwin-arm64": "4.21.0",
-                "@rollup/rollup-darwin-x64": "4.21.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.21.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.21.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.21.0",
-                "@rollup/rollup-linux-arm64-musl": "4.21.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.21.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.21.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.21.0",
-                "@rollup/rollup-linux-x64-gnu": "4.21.0",
-                "@rollup/rollup-linux-x64-musl": "4.21.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.21.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.21.0",
-                "@rollup/rollup-win32-x64-msvc": "4.21.0",
+                "@rollup/rollup-android-arm-eabi": "4.21.2",
+                "@rollup/rollup-android-arm64": "4.21.2",
+                "@rollup/rollup-darwin-arm64": "4.21.2",
+                "@rollup/rollup-darwin-x64": "4.21.2",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.21.2",
+                "@rollup/rollup-linux-arm-musleabihf": "4.21.2",
+                "@rollup/rollup-linux-arm64-gnu": "4.21.2",
+                "@rollup/rollup-linux-arm64-musl": "4.21.2",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.21.2",
+                "@rollup/rollup-linux-riscv64-gnu": "4.21.2",
+                "@rollup/rollup-linux-s390x-gnu": "4.21.2",
+                "@rollup/rollup-linux-x64-gnu": "4.21.2",
+                "@rollup/rollup-linux-x64-musl": "4.21.2",
+                "@rollup/rollup-win32-arm64-msvc": "4.21.2",
+                "@rollup/rollup-win32-ia32-msvc": "4.21.2",
+                "@rollup/rollup-win32-x64-msvc": "4.21.2",
                 "fsevents": "~2.3.2"
             }
         },

resources/css/filament/company/theme.css

@@ -13,8 +13,7 @@
 }
 
 .choices__group {
-    color: rgba(var(--gray-900), 1);
-    font-weight: bold;
+    @apply text-gray-900 dark:text-white font-semibold;
 }
 
 .choices[data-type="select-one"] .choices__inner {
@@ -25,7 +24,7 @@
     box-sizing: border-box;
 }
 
-.choices__item {
+.choices:not(.is-disabled) .choices__item {
     cursor: pointer;
 }
 
@@ -148,13 +147,12 @@
     left: 0;
     width: 100%;
     height: 100%;
-    background-image:
-        linear-gradient(99.6deg,
-            rgba(232, 233, 235, 1) 10.6%,
-            rgba(240, 241, 243, 1) 32.9%,
-            rgba(248, 249, 251, 0.7) 50%,
-            rgba(240, 241, 243, 1) 67.1%,
-            rgba(232, 233, 235, 1) 83.4%);
+    background-image: linear-gradient(99.6deg,
+    rgba(232, 233, 235, 1) 10.6%,
+    rgba(240, 241, 243, 1) 32.9%,
+    rgba(248, 249, 251, 0.7) 50%,
+    rgba(240, 241, 243, 1) 67.1%,
+    rgba(232, 233, 235, 1) 83.4%);
     pointer-events: none;
     z-index: -1;
 }
@@ -178,7 +176,7 @@
         rgba(var(--primary-900), 0.5) 45%,
         rgba(var(--primary-950), 0.3) 60%,
         rgba(var(--primary-950), 0.1) 75%,
-        rgba(3,7,18,0) 100%
+        rgba(3, 7, 18, 0) 100%
     );
     width: 100%;
     height: 100%;

resources/views/components/company/tables/reports/detailed-report.blade.php

@@ -34,7 +34,7 @@
                                         icon="heroicon-o-arrow-top-right-on-square"
                                         :icon-position="\Filament\Support\Enums\IconPosition::After"
                                         :icon-size="\Filament\Support\Enums\IconSize::Small"
-                                        href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl(['account_id' => $cell['id']]) }}"
+                                        href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl(['selectedAccount' => $cell['id']]) }}"
                                     >
                                         {{ $cell['name'] }}
                                     </x-filament::link>

resources/views/components/panel-shift-dropdown.blade.php

@@ -11,8 +11,8 @@
     $panels = $component->getNavigationAsHierarchyArray();
 @endphp
 
-<div x-data="panelShiftDropdown">
-    <div x-on:click="toggleDropdown()" class="flex cursor-pointer">
+<div x-data="panelShiftDropdown" x-on:click.outside="closeDropdown">
+    <div x-on:click="toggleDropdown" class="flex cursor-pointer">
         <button
             type="button"
             class="fi-tenant-menu-trigger group flex w-full items-center justify-center gap-x-3 rounded-lg p-2 text-sm font-medium outline-none transition duration-75 hover:bg-gray-100 focus-visible:bg-gray-100 dark:hover:bg-white/5 dark:focus-visible:bg-white/5"
@@ -41,22 +41,25 @@
             />
         </button>
     </div>
-    <div x-show="open" class="flex flex-col transition duration-200 ease-in-out grow shrink mt-4 absolute z-10 w-screen max-w-[360px] end-8 rounded-lg bg-white shadow-lg ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10 overflow-hidden">
+    <div x-show="open"
+         class="flex flex-col transition duration-200 ease-in-out grow shrink mt-4 absolute z-10 w-screen max-w-[360px] end-8 rounded-lg bg-white shadow-lg ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10 overflow-hidden">
         @foreach($panels as $panelId => $panel)
             <x-panel-shift-dropdown.panel :panel-id="$panelId">
                 @if($panelId !== 'main' && isset($panel['label']))
-                    <x-panel-shift-dropdown.subpanel-header :label="$panel['label']" :panel-id="$panelId" />
+                    <x-panel-shift-dropdown.subpanel-header :label="$panel['label']" :panel-id="$panelId"/>
                 @endif
                 @if($panel['renderItems'])
                     @foreach($panel['items'] as $item)
-                        <x-panel-shift-dropdown.content-handler :item="$item" />
+                        <x-panel-shift-dropdown.content-handler :item="$item"/>
                     @endforeach
                 @endif
                 @if($panelId === 'company-settings')
-                    <x-panel-shift-dropdown.company-settings :current-tenant="$currentTenant" icon="heroicon-m-building-office-2" />
+                    <x-panel-shift-dropdown.company-settings :current-tenant="$currentTenant"
+                                                             icon="heroicon-m-building-office-2"/>
                 @endif
                 @if($panelId === 'company-switcher')
-                    <x-panel-shift-dropdown.company-switcher :current-tenant="$currentTenant" icon="heroicon-m-adjustments-horizontal" />
+                    <x-panel-shift-dropdown.company-switcher :current-tenant="$currentTenant"
+                                                             icon="heroicon-m-adjustments-horizontal"/>
                 @endif
                 @if($panelId === 'display-and-accessibility')
                     <x-panel-shift-dropdown.display-accessibility icon="heroicon-s-moon"/>
@@ -91,6 +94,10 @@
                 this.open = !this.open;
             },
 
+            closeDropdown() {
+                this.open = false;
+            },
+
             setActiveMenu(menu) {
                 this.transitionPanel(menu, 'forward');
             },

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

@@ -4,7 +4,7 @@
             {{ $this->form }}
         </form>
     </x-filament::section>
-    
+
     <x-filament-tables::container>
         <div class="es-table__header-ctn"></div>
         <div

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

@@ -1,26 +1,22 @@
 <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">
-                <!-- Form Container -->
-                <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>
 
-                <!-- 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
-                    <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>
 
 
@@ -63,17 +59,17 @@
 
     <x-filament-tables::container>
         <div class="es-table__header-ctn"></div>
-        <div wire:init="loadReportData"
+        <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">
             @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
                 </div>
             @else
                 <div class="absolute inset-0 flex items-center justify-center">
-                    <div wire:loading wire:target="loadReportData">
+                    <div wire:loading wire:target="applyFilters">
                         <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
                     </div>
                 </div>