Merge pull request #69 from andrewdwallo/development-3.x

Development 3.x

README.md

@@ -213,6 +213,30 @@ After integrating Plaid, you can connect your account on the "Connected Accounts
 php artisan queue:work --queue=transactions
 ```
 
+## Testing
+
+This project includes testing using [Pest](https://pestphp.com/). The current
+test suite covers some reporting features and other core functionality. While it's not yet a fully comprehensive test
+suite, it provides a foundation for testing critical features.
+
+### Setting Up the Testing Environment
+
+#### Create a testing database
+
+Ensure that you create a separate testing database named `erpsaas_test` in your database management system (e.g.,
+MySQL).
+
+```bash
+CREATE DATABASE erpsaas_test;
+```
+
+### Running Tests
+
+The testing process automatically handles refreshing and seeding the test database with each test run, so no manual
+migration is required. For more information on how to write and run tests using
+Pest, refer to the official documentation: [Pest Documentation](https://pestphp.com/docs).
+
+
 ## Dependencies
 
 - [filamentphp/filament](https://github.com/filamentphp/filament) - A collection of beautiful full-stack components

app/Contracts/AccountHandler.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-use App\Models\Accounting\Account;
-use App\ValueObjects\Money;
-
-interface AccountHandler
-{
-    public function getDebitBalance(Account $account, string $startDate, string $endDate): Money;
-
-    public function getCreditBalance(Account $account, string $startDate, string $endDate): Money;
-
-    public function getNetMovement(Account $account, string $startDate, string $endDate): Money;
-
-    public function getStartingBalance(Account $account, string $startDate): ?Money;
-
-    public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money;
-
-    public function getBalances(Account $account, string $startDate, string $endDate, array $fields): array;
-
-    public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money;
-
-    public function getEarliestTransactionDate(): string;
-}

app/Contracts/DocumentNumber.php

@@ -1,12 +0,0 @@
-<?php
-
-namespace App\Contracts;
-
-use Illuminate\Database\Eloquent\Model;
-
-interface DocumentNumber
-{
-    public function getNextNumber(?Model $model, ?string $type, int | string $number, string $prefix, int | string $digits, ?bool $padded = true): string;
-
-    public function incrementNumber(Model $model, string $type): void;
-}

app/DTO/ReportDTO.php

@@ -11,5 +11,6 @@ class ReportDTO
         public array $categories,
         public ?AccountBalanceDTO $overallTotal = null,
         public array $fields = [],
+        public ?string $reportType = null,
     ) {}
 }

app/Enums/Accounting/AccountCategory.php

@@ -75,7 +75,7 @@ enum AccountCategory: string implements HasLabel
     /**
      * Determines if the account is a real account.
      *
-     * In accounting, real accounts are permanent accounts that retain their balances across accounting periods.
+     * In accounting, assets, liabilities, and equity are real accounts which are permanent accounts that retain their balances across accounting periods.
      * They are not closed at the end of each accounting period.
      */
     public function isReal(): bool

app/Enums/Accounting/TransactionType.php

@@ -12,6 +12,7 @@ enum TransactionType: string implements HasLabel
     case Deposit = 'deposit';
     case Withdrawal = 'withdrawal';
     case Journal = 'journal';
+    case Transfer = 'transfer';
 
     public function getLabel(): ?string
     {
@@ -32,4 +33,14 @@ enum TransactionType: string implements HasLabel
     {
         return $this === self::Journal;
     }
+
+    public function isTransfer(): bool
+    {
+        return $this === self::Transfer;
+    }
+
+    public function isStandard(): bool
+    {
+        return in_array($this, [self::Deposit, self::Withdrawal]);
+    }
 }

app/Facades/Accounting.php

@@ -2,28 +2,13 @@
 
 namespace App\Facades;
 
-use App\Contracts\AccountHandler;
-use App\Models\Accounting\Account;
-use App\ValueObjects\Money;
+use App\Services\AccountService;
 use Illuminate\Support\Facades\Facade;
 
-/**
- * @method static Money getDebitBalance(Account $account, string $startDate, string $endDate)
- * @method static Money getCreditBalance(Account $account, string $startDate, string $endDate)
- * @method static Money getNetMovement(Account $account, string $startDate, string $endDate)
- * @method static Money|null getStartingBalance(Account $account, string $startDate)
- * @method static Money|null getEndingBalance(Account $account, string $startDate, string $endDate)
- * @method static array getBalances(Account $account, string $startDate, string $endDate)
- * @method static Money getTotalBalanceForAllBankAccounts(string $startDate, string $endDate)
- * @method static array getAccountCategoryOrder()
- * @method static string getEarliestTransactionDate()
- *
- * @see AccountHandler
- */
 class Accounting extends Facade
 {
     protected static function getFacadeAccessor(): string
     {
-        return AccountHandler::class;
+        return AccountService::class;
     }
 }

app/Facades/Reporting.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Facades;
+
+use App\Services\ReportService;
+use Illuminate\Support\Facades\Facade;
+
+class Reporting extends Facade
+{
+    protected static function getFacadeAccessor(): string
+    {
+        return ReportService::class;
+    }
+}

app/Factories/ReportDateFactory.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Factories;
+
+use App\Models\Company;
+use Illuminate\Support\Carbon;
+
+class ReportDateFactory
+{
+    public Carbon $fiscalYearStartDate;
+
+    public Carbon $fiscalYearEndDate;
+
+    public string $defaultDateRange;
+
+    public Carbon $defaultStartDate;
+
+    public Carbon $defaultEndDate;
+
+    public Carbon $earliestTransactionDate;
+
+    protected Company $company;
+
+    public function __construct(Company $company)
+    {
+        $this->company = $company;
+        $this->buildReportDates();
+    }
+
+    protected function buildReportDates(): void
+    {
+        $fiscalYearStartDate = Carbon::parse($this->company->locale->fiscalYearStartDate())->startOfDay();
+        $fiscalYearEndDate = Carbon::parse($this->company->locale->fiscalYearEndDate())->endOfDay();
+        $defaultDateRange = 'FY-' . now()->year;
+        $defaultStartDate = $fiscalYearStartDate->startOfDay();
+        $defaultEndDate = $fiscalYearEndDate->isFuture() ? now()->endOfDay() : $fiscalYearEndDate->endOfDay();
+
+        // Calculate the earliest transaction date based on the company's transactions
+        $earliestTransactionDate = $this->company->transactions()->min('posted_at')
+            ? Carbon::parse($this->company->transactions()->min('posted_at'))->startOfDay()
+            : $defaultStartDate;
+
+        // Assign values to properties
+        $this->fiscalYearStartDate = $fiscalYearStartDate;
+        $this->fiscalYearEndDate = $fiscalYearEndDate;
+        $this->defaultDateRange = $defaultDateRange;
+        $this->defaultStartDate = $defaultStartDate;
+        $this->defaultEndDate = $defaultEndDate;
+        $this->earliestTransactionDate = $earliestTransactionDate;
+    }
+
+    public function refresh(): self
+    {
+        $this->buildReportDates();
+
+        return $this;
+    }
+
+    public static function create(Company $company): self
+    {
+        return new static($company);
+    }
+}

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

@@ -49,7 +49,7 @@ class Appearance extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }

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

@@ -59,7 +59,7 @@ class CompanyDefault extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }

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

@@ -62,7 +62,7 @@ class CompanyProfile extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }
@@ -183,7 +183,7 @@ class CompanyProfile extends Page
                     ->imageResizeMode('contain')
                     ->imageCropAspectRatio('1:1')
                     ->panelAspectRatio('1:1')
-                    ->panelLayout('compact')
+                    ->panelLayout('integrated')
                     ->removeUploadedFileButtonPosition('center bottom')
                     ->uploadButtonPosition('center bottom')
                     ->uploadProgressIndicatorPosition('center bottom')

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

@@ -63,7 +63,7 @@ class Invoice extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }
@@ -137,13 +137,15 @@ class Invoice extends Page
                 TextInput::make('number_next')
                     ->softRequired()
                     ->localizeLabel()
-                    ->maxLength(static fn (Get $get) => $get('number_digits'))
-                    ->hint(static function (Get $get, $state) {
+                    ->mask(static function (Get $get) {
+                        return str_repeat('9', $get('number_digits'));
+                    })
+                    ->hint(function (Get $get, $state) {
                         $number_prefix = $get('number_prefix');
                         $number_digits = $get('number_digits');
                         $number_next = $state;
 
-                        return InvoiceModel::getNumberNext(true, true, $number_prefix, $number_digits, $number_next);
+                        return $this->record->getNumberNext(true, true, $number_prefix, $number_digits, $number_next);
                     }),
                 Select::make('payment_terms')
                     ->softRequired()

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

@@ -60,7 +60,7 @@ class Localization extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }

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

@@ -63,12 +63,8 @@ class Transactions extends Page implements HasTable
 
     protected static ?string $model = Transaction::class;
 
-    protected static ?string $navigationParentItem = 'Chart of Accounts';
-
     protected static ?string $navigationGroup = 'Accounting';
 
-    public ?string $bankAccountIdFiltered = 'all';
-
     public string $fiscalYearStartDate = '';
 
     public string $fiscalYearEndDate = '';
@@ -96,6 +92,15 @@ class Transactions extends Page implements HasTable
         return [
             $this->buildTransactionAction('addIncome', 'Add Income', TransactionType::Deposit),
             $this->buildTransactionAction('addExpense', 'Add Expense', TransactionType::Withdrawal),
+            Actions\CreateAction::make('addTransfer')
+                ->label('Add Transfer')
+                ->modalHeading('Add Transfer')
+                ->modalWidth(MaxWidth::ThreeExtraLarge)
+                ->model(static::getModel())
+                ->fillForm(fn (): array => $this->getFormDefaultsForType(TransactionType::Transfer))
+                ->form(fn (Form $form) => $this->transferForm($form))
+                ->button()
+                ->outlined(),
             Actions\ActionGroup::make([
                 Actions\CreateAction::make('addJournalTransaction')
                     ->label('Add Journal Transaction')
@@ -124,21 +129,57 @@ class Transactions extends Page implements HasTable
         ];
     }
 
-    public function form(Form $form): Form
+    public function transferForm(Form $form): Form
     {
         return $form
             ->schema([
-                Forms\Components\Select::make('bankAccountIdFiltered')
+                Forms\Components\DatePicker::make('posted_at')
+                    ->label('Date')
+                    ->required(),
+                Forms\Components\TextInput::make('description')
+                    ->label('Description'),
+                Forms\Components\Select::make('bank_account_id')
+                    ->label('From Account')
+                    ->options(fn (Get $get, ?Transaction $transaction) => $this->getBankAccountOptions(excludedAccountId: $get('account_id'), currentBankAccountId: $transaction?->bank_account_id))
                     ->live()
-                    ->allowHtml()
-                    ->hiddenLabel()
-                    ->columnSpan(2)
-                    ->label('Account')
-                    ->selectablePlaceholder(false)
-                    ->extraAttributes(['wire:key' => Str::random()])
-                    ->options(fn () => $this->getBankAccountOptions(true, true)),
+                    ->searchable()
+                    ->afterStateUpdated(function (Set $set, $state, $old, Get $get) {
+                        $amount = CurrencyConverter::convertAndSet(
+                            BankAccount::find($state)->account->currency_code,
+                            BankAccount::find($old)->account->currency_code ?? CurrencyAccessor::getDefaultCurrency(),
+                            $get('amount')
+                        );
+
+                        if ($amount !== null) {
+                            $set('amount', $amount);
+                        }
+                    })
+                    ->required(),
+                Forms\Components\Select::make('type')
+                    ->label('Type')
+                    ->options([
+                        TransactionType::Transfer->value => TransactionType::Transfer->getLabel(),
+                    ])
+                    ->disabled()
+                    ->dehydrated()
+                    ->required(),
+                Forms\Components\TextInput::make('amount')
+                    ->label('Amount')
+                    ->money(static fn (Forms\Get $get) => BankAccount::find($get('bank_account_id'))?->account?->currency_code ?? CurrencyAccessor::getDefaultCurrency())
+                    ->required(),
+                Forms\Components\Select::make('account_id')
+                    ->label('To Account')
+                    ->live()
+                    ->options(fn (Get $get, ?Transaction $transaction) => $this->getBankAccountAccountOptions(excludedBankAccountId: $get('bank_account_id'), currentAccountId: $transaction?->account_id))
+                    ->searchable()
+                    ->required(),
+                Forms\Components\Textarea::make('notes')
+                    ->label('Notes')
+                    ->autosize()
+                    ->rows(10)
+                    ->columnSpanFull(),
             ])
-            ->columns(7);
+            ->columns();
     }
 
     public function transactionForm(Form $form): Form
@@ -222,16 +263,16 @@ class Transactions extends Page implements HasTable
                     'bankAccount.account',
                     'journalEntries.account',
                 ]);
-
-                if ($this->bankAccountIdFiltered !== 'all') {
-                    $query->where('bank_account_id', $this->bankAccountIdFiltered);
-                }
             })
             ->columns([
                 Tables\Columns\TextColumn::make('posted_at')
                     ->label('Date')
                     ->sortable()
                     ->defaultDateFormat(),
+                Tables\Columns\TextColumn::make('type')
+                    ->label('Type')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
                 Tables\Columns\TextColumn::make('description')
                     ->label('Description')
                     ->limit(30)
@@ -241,6 +282,7 @@ class Transactions extends Page implements HasTable
                     ->toggleable(),
                 Tables\Columns\TextColumn::make('account.name')
                     ->label('Category')
+                    ->prefix(static fn (Transaction $transaction) => $transaction->type->isTransfer() ? 'Transfer to ' : null)
                     ->toggleable()
                     ->state(static fn (Transaction $transaction) => $transaction->account->name ?? 'Journal Entry'),
                 Tables\Columns\TextColumn::make('amount')
@@ -253,68 +295,51 @@ class Transactions extends Page implements HasTable
                             default => null,
                         }
                     )
+                    ->sortable()
                     ->currency(static fn (Transaction $transaction) => $transaction->bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency(), true),
             ])
             ->recordClasses(static fn (Transaction $transaction) => $transaction->reviewed ? 'bg-primary-300/10' : null)
             ->defaultSort('posted_at', 'desc')
             ->filters([
-                Tables\Filters\Filter::make('filters')
-                    ->columnSpanFull()
-                    ->form([
-                        Grid::make()
-                            ->schema([
-                                Select::make('account_id')
-                                    ->label('Category')
-                                    ->options(fn () => $this->getChartAccountOptions(nominalAccountsOnly: true))
-                                    ->multiple()
-                                    ->searchable(),
-                                Select::make('reviewed')
-                                    ->label('Status')
-                                    ->native(false)
-                                    ->options([
-                                        '1' => 'Reviewed',
-                                        '0' => 'Not Reviewed',
-                                    ]),
-                                Select::make('type')
-                                    ->label('Type')
-                                    ->options(TransactionType::class)
-                                    ->multiple(),
-                            ])
-                            ->extraAttributes([
-                                'class' => 'border-b border-gray-200 dark:border-white/10 pb-8',
-                            ]),
-                    ])->query(function (Builder $query, array $data): Builder {
-                        if (filled($data['reviewed'])) {
-                            $reviewedStatus = $data['reviewed'] === '1';
-                            $query->where('reviewed', $reviewedStatus);
-                        }
-
-                        $query
-                            ->when($data['account_id'], fn (Builder $query, $accountIds) => $query->whereIn('account_id', $accountIds))
-                            ->when($data['type'], fn (Builder $query, $types) => $query->whereIn('type', $types));
-
-                        return $query;
-                    })
-                    ->indicateUsing(function (array $data): array {
-                        $indicators = [];
-
-                        $this->addIndicatorForSingleSelection($data, 'reviewed', $data['reviewed'] === '1' ? 'Reviewed' : 'Not Reviewed', $indicators);
-                        $this->addMultipleSelectionIndicator($data, 'account_id', fn ($accountId) => Account::find($accountId)->name, 'account_id', $indicators);
-                        $this->addMultipleSelectionIndicator($data, 'type', fn ($type) => TransactionType::parse($type)->getLabel(), 'type', $indicators);
-
-                        return $indicators;
-                    }),
+                Tables\Filters\SelectFilter::make('bank_account_id')
+                    ->label('Account')
+                    ->searchable()
+                    ->options(fn () => $this->getBankAccountOptions(false)),
+                Tables\Filters\SelectFilter::make('account_id')
+                    ->label('Category')
+                    ->multiple()
+                    ->options(fn () => $this->getChartAccountOptions(nominalAccountsOnly: false)),
+                Tables\Filters\TernaryFilter::make('reviewed')
+                    ->label('Status')
+                    ->native(false)
+                    ->trueLabel('Reviewed')
+                    ->falseLabel('Not Reviewed'),
+                Tables\Filters\SelectFilter::make('type')
+                    ->label('Type')
+                    ->native(false)
+                    ->options(TransactionType::class),
                 $this->buildDateRangeFilter('posted_at', 'Posted', true),
                 $this->buildDateRangeFilter('updated_at', 'Last Modified'),
             ], layout: Tables\Enums\FiltersLayout::Modal)
+            ->filtersFormSchema(fn (array $filters): array => [
+                Grid::make()
+                    ->schema([
+                        $filters['bank_account_id'],
+                        $filters['account_id'],
+                        $filters['reviewed'],
+                        $filters['type'],
+                    ])
+                    ->columnSpanFull()
+                    ->extraAttributes(['class' => 'border-b border-gray-200 dark:border-white/10 pb-8']),
+                $filters['posted_at'],
+                $filters['updated_at'],
+            ])
             ->deferFilters()
             ->deferLoading()
-            ->filtersFormColumns(2)
+            ->filtersFormWidth(MaxWidth::ThreeExtraLarge)
             ->filtersTriggerAction(
                 fn (Tables\Actions\Action $action) => $action
-                    ->stickyModalHeader()
-                    ->stickyModalFooter()
-                    ->modalWidth(MaxWidth::ThreeExtraLarge)
+                    ->slideOver()
                     ->modalFooterActionsAlignment(Alignment::End)
                     ->modalCancelAction(false)
                     ->extraModalFooterActions(function (Table $table) use ($action) {
@@ -360,7 +385,13 @@ class Transactions extends Page implements HasTable
                         ->modalHeading('Edit Transaction')
                         ->modalWidth(MaxWidth::ThreeExtraLarge)
                         ->form(fn (Form $form) => $this->transactionForm($form))
-                        ->hidden(static fn (Transaction $transaction) => $transaction->type->isJournal()),
+                        ->visible(static fn (Transaction $transaction) => $transaction->type->isStandard()),
+                    Tables\Actions\EditAction::make('updateTransfer')
+                        ->label('Edit Transfer')
+                        ->modalHeading('Edit Transfer')
+                        ->modalWidth(MaxWidth::ThreeExtraLarge)
+                        ->form(fn (Form $form) => $this->transferForm($form))
+                        ->visible(static fn (Transaction $transaction) => $transaction->type->isTransfer()),
                     Tables\Actions\EditAction::make('updateJournalTransaction')
                         ->label('Edit Journal Transaction')
                         ->modalHeading('Journal Entry')
@@ -392,9 +423,7 @@ class Transactions extends Page implements HasTable
                                 ])->save();
                             });
                         }),
-                ])
-                    ->dropdownPlacement('bottom-start')
-                    ->dropdownWidth('max-w-fit'),
+                ]),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
@@ -434,7 +463,7 @@ class Transactions extends Page implements HasTable
         ];
 
         return match ($type) {
-            TransactionType::Deposit, TransactionType::Withdrawal => array_merge($commonDefaults, $this->transactionDefaults($type)),
+            TransactionType::Deposit, TransactionType::Withdrawal, TransactionType::Transfer => array_merge($commonDefaults, $this->transactionDefaults($type)),
             TransactionType::Journal => array_merge($commonDefaults, $this->journalEntryDefaults()),
         };
     }
@@ -464,7 +493,7 @@ class Transactions extends Page implements HasTable
             'type' => $type,
             'bank_account_id' => BankAccount::where('enabled', true)->first()?->id,
             'amount' => '0.00',
-            'account_id' => static::getUncategorizedAccountByType($type)?->id,
+            'account_id' => ! $type->isTransfer() ? static::getUncategorizedAccountByType($type)->id : null,
         ];
     }
 
@@ -739,6 +768,46 @@ class Transactions extends Page implements HasTable
         return 'uncategorized';
     }
 
+    protected function getBankAccountOptions(?int $excludedAccountId = null, ?int $currentBankAccountId = null): array
+    {
+        return BankAccount::join('accounts', 'accounts.bank_account_id', '=', 'bank_accounts.id')
+            ->where('accounts.archived', false)
+            ->select(['bank_accounts.id', 'accounts.name', 'accounts.subtype_id'])
+            ->with(['account.subtype' => static function ($query) {
+                $query->select(['id', 'name']);
+            }])
+            ->when($excludedAccountId, function (Builder $query) use ($excludedAccountId) {
+                $query->whereNot('accounts.id', $excludedAccountId);
+            })
+            ->when($currentBankAccountId, function (Builder $query) use ($currentBankAccountId) {
+                // Ensure the current bank account is included even if archived
+                $query->orWhere('bank_accounts.id', $currentBankAccountId);
+            })
+            ->get()
+            ->groupBy('account.subtype.name')
+            ->map(fn (Collection $bankAccounts, string $subtype) => $bankAccounts->pluck('account.name', 'id'))
+            ->toArray();
+    }
+
+    protected function getBankAccountAccountOptions(?int $excludedBankAccountId = null, ?int $currentAccountId = null): array
+    {
+        return Account::query()
+            ->whereHas('bankAccount', function (Builder $query) use ($excludedBankAccountId) {
+                // Exclude the specific bank account if provided
+                if ($excludedBankAccountId) {
+                    $query->whereNot('id', $excludedBankAccountId);
+                }
+            })
+            ->where(function (Builder $query) use ($currentAccountId) {
+                $query->where('archived', false)
+                    ->orWhere('id', $currentAccountId);
+            })
+            ->get()
+            ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
+            ->map(fn (Collection $accounts, string $category) => $accounts->pluck('name', 'id'))
+            ->toArray();
+    }
+
     protected function getChartAccountOptions(?TransactionType $type = null, ?bool $nominalAccountsOnly = null, ?int $currentAccountId = null): array
     {
         $nominalAccountsOnly ??= false;
@@ -762,46 +831,6 @@ class Transactions extends Page implements HasTable
             ->toArray();
     }
 
-    protected function getBankAccountOptions(?bool $onlyWithTransactions = null, ?bool $isFilter = null, ?int $currentBankAccountId = null): array
-    {
-        $isFilter ??= false;
-        $onlyWithTransactions ??= false;
-
-        $options = $isFilter ? [
-            '' => ['all' => "All Accounts <span class='float-right'>{$this->getBalanceForAllAccounts()}</span>"],
-        ] : [];
-
-        $bankAccountOptions = BankAccount::with('account.subtype')
-            ->whereHas('account', function (Builder $query) use ($isFilter, $currentBankAccountId) {
-                if ($isFilter === false) {
-                    $query->where('archived', false);
-                }
-
-                if ($currentBankAccountId) {
-                    $query->orWhereHas('bankAccount', function (Builder $query) use ($currentBankAccountId) {
-                        $query->where('id', $currentBankAccountId);
-                    });
-                }
-            })
-            ->when($onlyWithTransactions, fn (Builder $query) => $query->has('transactions'))
-            ->get()
-            ->groupBy('account.subtype.name')
-            ->mapWithKeys(function (Collection $bankAccounts, string $subtype) use ($isFilter) {
-                return [$subtype => $bankAccounts->mapWithKeys(static function (BankAccount $bankAccount) use ($isFilter) {
-                    $label = $bankAccount->account->name;
-                    if ($isFilter) {
-                        $balance = $bankAccount->account->ending_balance->convert()->formatWithCode(true);
-                        $label .= "<span class='float-right'>{$balance}</span>";
-                    }
-
-                    return [$bankAccount->id => $label];
-                })];
-            })
-            ->toArray();
-
-        return array_merge($options, $bankAccountOptions);
-    }
-
     protected function getBalanceForAllAccounts(): string
     {
         return Accounting::getTotalBalanceForAllBankAccounts($this->fiscalYearStartDate, $this->fiscalYearEndDate)->format();

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

@@ -0,0 +1,117 @@
+<?php
+
+namespace App\Filament\Company\Pages\Concerns;
+
+use App\Support\Column;
+use Filament\Actions\Action;
+use Filament\Forms\Components\Checkbox;
+use Filament\Forms\Form;
+use Filament\Support\Enums\ActionSize;
+use Filament\Support\Facades\FilamentIcon;
+use Illuminate\Support\Arr;
+
+trait HasTableColumnToggleForm
+{
+    public array $toggledTableColumns = [];
+
+    public function mountHasTableColumnToggleForm(): void
+    {
+        if (! count($this->toggledTableColumns ?? [])) {
+            $this->getTableColumnToggleForm()->fill(session()->get(
+                $this->getTableColumnToggleFormStateSessionKey(),
+                $this->getDefaultTableColumnToggleState()
+            ));
+        }
+    }
+
+    protected function getDefaultTableColumnToggleState(): array
+    {
+        $state = [];
+
+        foreach ($this->getTable() as $column) {
+            if (! $column->isToggleable()) {
+                continue;
+            }
+
+            data_set($state, $column->getName(), ! $column->isToggledHiddenByDefault());
+        }
+
+        return $state;
+    }
+
+    public function updatedToggledTableColumns(): void
+    {
+        session()->put([
+            $this->getTableColumnToggleFormStateSessionKey() => $this->toggledTableColumns,
+        ]);
+    }
+
+    public function getTableColumnToggleForm(): Form
+    {
+        if ((! $this->isCachingForms) && $this->hasCachedForm('toggleTableColumnForm')) {
+            return $this->getForm('toggleTableColumnForm');
+        }
+
+        return $this->makeForm()
+            ->schema($this->getTableColumnToggleFormSchema())
+            ->statePath('toggledTableColumns')
+            ->live();
+    }
+
+    protected function hasToggleableColumns(): bool
+    {
+        return ! empty($this->getTableColumnToggleFormSchema());
+    }
+
+    /**
+     * @return array<Checkbox>
+     */
+    protected function getTableColumnToggleFormSchema(): array
+    {
+        $schema = [];
+
+        foreach ($this->getTable() as $column) {
+            if (! $column->isToggleable()) {
+                continue;
+            }
+
+            $schema[] = Checkbox::make($column->getName())
+                ->label($column->getLabel());
+        }
+
+        return $schema;
+    }
+
+    public function isTableColumnToggledHidden(string $name): bool
+    {
+        return Arr::has($this->toggledTableColumns, $name) && ! data_get($this->toggledTableColumns, $name);
+    }
+
+    public function getTableColumnToggleFormStateSessionKey(): string
+    {
+        $table = class_basename($this::class);
+
+        return "tables.{$table}_toggled_columns";
+    }
+
+    public function getToggleColumnsTriggerAction(): Action
+    {
+        return Action::make('toggleColumns')
+            ->label(__('filament-tables::table.actions.toggle_columns.label'))
+            ->iconButton()
+            ->size(ActionSize::Large)
+            ->icon(FilamentIcon::resolve('tables::actions.toggle-columns') ?? 'heroicon-m-view-columns')
+            ->color('gray')
+            ->livewireClickHandlerEnabled(false);
+    }
+
+    protected function getToggledColumns(): array
+    {
+        return array_values(
+            array_filter(
+                $this->getTable(),
+                fn (Column $column) => ! $column->isToggleable() || ($this->toggledTableColumns[$column->getName()] ?? false)
+            )
+        );
+    }
+}

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

@@ -1,106 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Pages\Concerns;
-
-use App\Support\Column;
-use Filament\Actions\Action;
-use Filament\Forms\Components\Checkbox;
-use Filament\Forms\Form;
-use Filament\Support\Enums\ActionSize;
-use Filament\Support\Facades\FilamentIcon;
-use Livewire\Attributes\Session;
-
-trait HasToggleTableColumnForm
-{
-    #[Session]
-    public array $toggledTableColumns = [];
-
-    public function mountHasToggleTableColumnForm(): void
-    {
-        $this->loadDefaultTableColumnToggleState();
-    }
-
-    protected function getHasToggleTableColumnFormForms(): array
-    {
-        return [
-            'toggleTableColumnForm' => $this->getToggleTableColumnForm(),
-        ];
-    }
-
-    public function getToggleTableColumnForm(): Form
-    {
-        return $this->toggleTableColumnForm($this->makeForm()
-            ->statePath('toggledTableColumns'));
-    }
-
-    public function toggleTableColumnForm(Form $form): Form
-    {
-        return $form;
-    }
-
-    protected function hasToggleableColumns(): bool
-    {
-        return ! empty($this->getTableColumnToggleFormSchema());
-    }
-
-    /**
-     * @return array<Checkbox>
-     */
-    protected function getTableColumnToggleFormSchema(): array
-    {
-        $schema = [];
-
-        foreach ($this->getTable() as $column) {
-            if ($column->isToggleable()) {
-                $schema[] = Checkbox::make($column->getName())
-                    ->label($column->getLabel());
-            }
-        }
-
-        return $schema;
-    }
-
-    public function toggleColumnsAction(): Action
-    {
-        return Action::make('toggleColumns')
-            ->label(__('filament-tables::table.actions.toggle_columns.label'))
-            ->iconButton()
-            ->size(ActionSize::Large)
-            ->icon(FilamentIcon::resolve('tables::actions.toggle-columns') ?? 'heroicon-m-view-columns')
-            ->color('gray');
-    }
-
-    protected function loadDefaultTableColumnToggleState(): void
-    {
-        $tableColumns = $this->getTable();
-
-        foreach ($tableColumns as $column) {
-            $columnName = $column->getName();
-
-            if (empty($this->toggledTableColumns)) {
-                if ($column->isToggleable()) {
-                    $this->toggledTableColumns[$columnName] = ! $column->isToggledHiddenByDefault();
-                } else {
-                    $this->toggledTableColumns[$columnName] = true;
-                }
-            }
-
-            // Handle cases where the toggle state needs to be reset
-            if (! $column->isToggleable()) {
-                $this->toggledTableColumns[$columnName] = true;
-            } elseif ($column->isToggleable() && $column->isToggledHiddenByDefault() && isset($this->toggledTableColumns[$columnName]) && $this->toggledTableColumns[$columnName]) {
-                $this->toggledTableColumns[$columnName] = false;
-            }
-        }
-    }
-
-    protected function getToggledColumns(): array
-    {
-        return array_values(
-            array_filter(
-                $this->getTable(),
-                fn (Column $column) => $this->toggledTableColumns[$column->getName()] ?? false,
-            )
-        );
-    }
-}

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

@@ -90,7 +90,9 @@ class AccountTransactions extends BaseReportPage
                 Cluster::make([
                     $this->getStartDateFormComponent(),
                     $this->getEndDateFormComponent(),
-                ])->label("\u{200B}"), // its too bad hiddenLabel removes spacing of the label
+                ])->extraFieldWrapperAttributes([
+                    'class' => 'report-hidden-label',
+                ]),
                 Actions::make([
                     Actions\Action::make('applyFilters')
                         ->label('Update Report')

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

@@ -5,20 +5,19 @@ namespace App\Filament\Company\Pages\Reports;
 use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
 use App\Filament\Company\Pages\Concerns\HasDeferredFiltersForm;
-use App\Filament\Company\Pages\Concerns\HasToggleTableColumnForm;
+use App\Filament\Company\Pages\Concerns\HasTableColumnToggleForm;
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Models\Company;
 use App\Services\DateRangeService;
 use App\Support\Column;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
-use Filament\Forms\Components\Component;
 use Filament\Forms\Components\DatePicker;
-use Filament\Forms\Form;
 use Filament\Forms\Set;
 use Filament\Pages\Page;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
 use Livewire\Attributes\Computed;
 use Symfony\Component\HttpFoundation\StreamedResponse;
@@ -26,7 +25,7 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 abstract class BaseReportPage extends Page
 {
     use HasDeferredFiltersForm;
-    use HasToggleTableColumnForm;
+    use HasTableColumnToggleForm;
 
     public string $fiscalYearStartDate;
 
@@ -65,16 +64,63 @@ abstract class BaseReportPage extends Page
 
     protected function loadDefaultDateRange(): void
     {
-        $startDate = $this->getFilterState('startDate');
-        $endDate = $this->getFilterState('endDate');
+        $flatFields = $this->getFiltersForm()->getFlatFields();
 
-        if ($this->isValidDate($startDate) && $this->isValidDate($endDate)) {
-            $matchingDateRange = app(DateRangeService::class)->getMatchingDateRangeOption(Carbon::parse($startDate), Carbon::parse($endDate));
-            $this->setFilterState('dateRange', $matchingDateRange);
-        } else {
+        $dateRangeField = Arr::first($flatFields, static fn ($field) => $field instanceof DateRangeSelect);
+
+        if (! $dateRangeField) {
+            return;
+        }
+
+        $startDateField = $dateRangeField->getStartDateField();
+        $endDateField = $dateRangeField->getEndDateField();
+
+        $startDate = $startDateField ? $this->getFilterState($startDateField) : null;
+        $endDate = $endDateField ? $this->getFilterState($endDateField) : null;
+
+        $startDateCarbon = $this->isValidDate($startDate) ? Carbon::parse($startDate) : null;
+        $endDateCarbon = $this->isValidDate($endDate) ? Carbon::parse($endDate) : null;
+
+        if ($startDateCarbon && $endDateCarbon) {
+            $this->setMatchingDateRange($startDateCarbon, $endDateCarbon);
+
+            return;
+        }
+
+        if ($endDateCarbon && ! $startDateField) {
+            $this->setAsOfDateRange($endDateCarbon);
+
+            return;
+        }
+
+        if ($endDateField && ! $startDateField) {
             $this->setFilterState('dateRange', $this->getDefaultDateRange());
-            $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
+            $defaultEndDate = Carbon::parse($this->fiscalYearEndDate);
+            $this->setFilterState($endDateField, $defaultEndDate->isFuture() ? now()->endOfDay()->toDateTimeString() : $defaultEndDate->endOfDay()->toDateTimeString());
+
+            return;
         }
+
+        if ($startDateField && $endDateField) {
+            $this->setFilterState('dateRange', $this->getDefaultDateRange());
+            $defaultStartDate = Carbon::parse($this->fiscalYearStartDate);
+            $defaultEndDate = Carbon::parse($this->fiscalYearEndDate);
+            $this->setDateRange($defaultStartDate, $defaultEndDate);
+        }
+    }
+
+    protected function setMatchingDateRange($startDate, $endDate): void
+    {
+        $matchingDateRange = app(DateRangeService::class)->getMatchingDateRangeOption($startDate, $endDate);
+        $this->setFilterState('dateRange', $matchingDateRange);
+    }
+
+    protected function setAsOfDateRange($endDate): void
+    {
+        $fiscalYearStart = Carbon::parse($this->fiscalYearStartDate);
+        $asOfStartDate = $endDate->copy()->setMonth($fiscalYearStart->month)->setDay($fiscalYearStart->day);
+
+        $this->setMatchingDateRange($asOfStartDate, $endDate);
     }
 
     public function loadReportData(): void
@@ -118,10 +164,9 @@ abstract class BaseReportPage extends Page
         return Carbon::parse($this->getFilterState('endDate'))->endOfDay()->toDateTimeString();
     }
 
-    public function toggleTableColumnForm(Form $form): Form
+    public function getFormattedAsOfDate(): string
     {
-        return $form
-            ->schema($this->getTableColumnToggleFormSchema());
+        return Carbon::parse($this->getFilterState('asOfDate'))->endOfDay()->toDateTimeString();
     }
 
     protected function getHeaderActions(): array
@@ -146,7 +191,7 @@ abstract class BaseReportPage extends Page
         ];
     }
 
-    protected function getDateRangeFormComponent(): Component
+    protected function getDateRangeFormComponent(): DateRangeSelect
     {
         return DateRangeSelect::make('dateRange')
             ->label('Date Range')
@@ -155,7 +200,7 @@ abstract class BaseReportPage extends Page
             ->endDateField('endDate');
     }
 
-    protected function getStartDateFormComponent(): Component
+    protected function getStartDateFormComponent(): DatePicker
     {
         return DatePicker::make('startDate')
             ->label('Start Date')
@@ -165,7 +210,7 @@ abstract class BaseReportPage extends Page
             });
     }
 
-    protected function getEndDateFormComponent(): Component
+    protected function getEndDateFormComponent(): DatePicker
     {
         return DatePicker::make('endDate')
             ->label('End Date')
@@ -174,4 +219,17 @@ abstract class BaseReportPage extends Page
                 $set('dateRange', 'Custom');
             });
     }
+
+    protected function getAsOfDateFormComponent(): DatePicker
+    {
+        return DatePicker::make('asOfDate')
+            ->label('As of Date')
+            ->live()
+            ->afterStateUpdated(static function (Set $set) {
+                $set('dateRange', 'Custom');
+            })
+            ->extraFieldWrapperAttributes([
+                'class' => 'report-hidden-label',
+            ]);
+    }
 }

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

@@ -4,18 +4,19 @@ namespace App\Filament\Company\Pages\Reports;
 
 use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
+use App\Filament\Forms\Components\DateRangeSelect;
 use App\Services\ExportService;
 use App\Services\ReportService;
 use App\Support\Column;
 use App\Transformers\TrialBalanceReportTransformer;
+use Filament\Forms\Components\Select;
 use Filament\Forms\Form;
 use Filament\Support\Enums\Alignment;
-use Guava\FilamentClusters\Forms\Cluster;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class TrialBalance extends BaseReportPage
 {
-    protected static string $view = 'filament.company.pages.reports.detailed-report';
+    protected static string $view = 'filament.company.pages.reports.trial-balance';
 
     protected static ?string $slug = 'reports/trial-balance';
 
@@ -31,6 +32,13 @@ class TrialBalance extends BaseReportPage
         $this->exportService = $exportService;
     }
 
+    protected function initializeDefaultFilters(): void
+    {
+        if (empty($this->getFilterState('reportType'))) {
+            $this->setFilterState('reportType', 'standard');
+        }
+    }
+
     public function getTable(): array
     {
         return [
@@ -53,20 +61,26 @@ class TrialBalance extends BaseReportPage
     public function filtersForm(Form $form): Form
     {
         return $form
-            ->inlineLabel()
-            ->columns()
+            ->columns(4)
             ->schema([
-                $this->getDateRangeFormComponent(),
-                Cluster::make([
-                    $this->getStartDateFormComponent(),
-                    $this->getEndDateFormComponent(),
-                ])->hiddenLabel(),
+                Select::make('reportType')
+                    ->label('Report Type')
+                    ->options([
+                        'standard' => 'Standard',
+                        'postClosing' => 'Post-Closing',
+                    ])
+                    ->selectablePlaceholder(false),
+                DateRangeSelect::make('dateRange')
+                    ->label('As of')
+                    ->selectablePlaceholder(false)
+                    ->endDateField('asOfDate'),
+                $this->getAsOfDateFormComponent(),
             ]);
     }
 
     protected function buildReport(array $columns): ReportDTO
     {
-        return $this->reportService->buildTrialBalanceReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns);
+        return $this->reportService->buildTrialBalanceReport($this->getFilterState('reportType'), $this->getFormattedAsOfDate(), $columns);
     }
 
     protected function getTransformer(ReportDTO $reportDTO): ExportableReport
@@ -76,11 +90,11 @@ class TrialBalance extends BaseReportPage
 
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
+        return $this->exportService->exportToCsv($this->company, $this->report, endDate: $this->getFilterState('asOfDate'));
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
+        return $this->exportService->exportToPdf($this->company, $this->report, endDate: $this->getFilterState('asOfDate'));
     }
 }

app/Filament/Components/PanelShiftDropdown.php

@@ -193,7 +193,7 @@ class PanelShiftDropdown implements Plugin
             $panels['main']['items'][] = [
                 'panelId' => $companySettingsId,
                 'label' => 'Company Settings',
-                'icon' => 'heroicon-m-building-office-2',
+                'icon' => 'heroicon-s-building-office-2',
             ];
 
             $panels[$companySettingsId] = [

app/Filament/Forms/Components/DateRangeSelect.php

@@ -28,9 +28,7 @@ class DateRangeSelect extends Select
         $this->options(app(DateRangeService::class)->getDateRangeOptions())
             ->live()
             ->afterStateUpdated(function ($state, Set $set) {
-                if ($this->startDateField && $this->endDateField) {
-                    $this->updateDateRange($state, $set);
-                }
+                $this->updateDateRange($state, $set);
             });
     }
 
@@ -48,11 +46,26 @@ class DateRangeSelect extends Select
         return $this;
     }
 
+    public function getStartDateField(): ?string
+    {
+        return $this->startDateField;
+    }
+
+    public function getEndDateField(): ?string
+    {
+        return $this->endDateField;
+    }
+
     public function updateDateRange($state, Set $set): void
     {
         if ($state === null) {
-            $set($this->startDateField, null);
-            $set($this->endDateField, null);
+            if ($this->startDateField) {
+                $set($this->startDateField, null);
+            }
+
+            if ($this->endDateField) {
+                $set($this->endDateField, null);
+            }
 
             return;
         }
@@ -116,7 +129,12 @@ class DateRangeSelect extends Select
 
     public function setDateRange(Carbon $start, Carbon $end, Set $set): void
     {
-        $set($this->startDateField, $start->startOfDay()->toDateTimeString());
-        $set($this->endDateField, $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
+        if ($this->startDateField) {
+            $set($this->startDateField, $start->startOfDay()->toDateTimeString());
+        }
+
+        if ($this->endDateField) {
+            $set($this->endDateField, $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
+        }
     }
 }

app/Filament/User/Clusters/Account.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\User\Clusters;
+
+use Filament\Clusters\Cluster;
+
+class Account extends Cluster
+{
+    protected static ?string $navigationIcon = 'heroicon-s-user';
+
+    protected static ?string $navigationLabel = 'My Account';
+
+    protected static ?string $clusterBreadcrumb = 'My Account';
+
+    public static function getNavigationUrl(): string
+    {
+        return static::getUrl(panel: 'user');
+    }
+}

app/Filament/User/Clusters/Account/Pages/PersonalAccessTokens.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Filament\User\Clusters\Account\Pages;
+
+use App\Filament\User\Clusters\Account;
+use Filament\Support\Enums\MaxWidth;
+use Wallo\FilamentCompanies\Pages\User\PersonalAccessTokens as BasePersonalAccessTokens;
+
+class PersonalAccessTokens extends BasePersonalAccessTokens
+{
+    protected static ?string $cluster = Account::class;
+
+    protected static bool $shouldRegisterNavigation = true;
+
+    protected static ?int $navigationSort = 20;
+
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return MaxWidth::ScreenTwoExtraLarge;
+    }
+}

app/Filament/User/Clusters/Account/Pages/Profile.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Filament\User\Clusters\Account\Pages;
+
+use App\Filament\User\Clusters\Account;
+use Filament\Support\Enums\MaxWidth;
+use Wallo\FilamentCompanies\Pages\User\Profile as BaseProfile;
+
+class Profile extends BaseProfile
+{
+    protected static ?string $cluster = Account::class;
+
+    protected static bool $shouldRegisterNavigation = true;
+
+    protected static ?int $navigationSort = 10;
+
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return MaxWidth::ScreenTwoExtraLarge;
+    }
+}

app/Http/Responses/LoginResponse.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Responses;
+
+use Filament\Facades\Filament;
+use Illuminate\Http\RedirectResponse;
+use Livewire\Features\SupportRedirects\Redirector;
+
+class LoginResponse extends \Filament\Http\Responses\Auth\LoginResponse
+{
+    public function toResponse($request): RedirectResponse | Redirector
+    {
+        return redirect()->to(Filament::getDefaultPanel()->getUrl());
+    }
+}

app/Livewire/UpdateProfileInformation.php

@@ -132,10 +132,19 @@ class UpdateProfileInformation extends Component implements HasForms
             ->schema([
                 Forms\Components\FileUpload::make('profile_photo_path')
                     ->label('Photo')
-                    ->avatar()
                     ->extraAttributes([
                         'style' => 'width: 6rem; height: 6rem;',
                     ])
+                    ->panelLayout('compact circle')
+                    ->removeUploadedFileButtonPosition('center bottom')
+                    ->uploadButtonPosition('center bottom')
+                    ->imageResizeMode('cover')
+                    ->imageResizeUpscale(false)
+                    ->imageResizeTargetHeight('500')
+                    ->imageResizeTargetWidth('500')
+                    ->imageCropAspectRatio('1:1')
+                    ->uploadProgressIndicatorPosition('center bottom')
+                    ->loadingIndicatorPosition('center bottom')
                     ->placeholder(static function () {
                         return new HtmlString('
                             <div style="display: inline-block; cursor: pointer;">

app/Models/Setting/DocumentDefault.php

@@ -93,53 +93,32 @@ class DocumentDefault extends Model
         return array_combine(range(1, 20), range(1, 20));
     }
 
-    public static function getNumberNext(?bool $padded = null, ?bool $format = null, ?string $prefix = null, int | string | null $digits = null, int | string | null $next = null, ?string $type = null): string
+    public function getNumberNext(?bool $padded = null, ?bool $format = null, ?string $prefix = null, int | string | null $digits = null, int | string | null $next = null): string
     {
-        $initializeAttributes = new static;
+        [$number_prefix, $number_digits, $number_next] = $this->initializeAttributes($prefix, $digits, $next);
 
-        [$number_prefix, $number_digits, $number_next] = $initializeAttributes->initializeAttributes($prefix, $digits, $next, $type);
-
-        if ($format) {
-            return $number_prefix . static::getPaddedNumberNext($number_next, $number_digits);
-        }
-
-        if ($padded) {
-            return static::getPaddedNumberNext($number_next, $number_digits);
-        }
-
-        return $number_next;
+        return match (true) {
+            $format && $padded => $number_prefix . $this->getPaddedNumberNext($number_next, $number_digits),
+            $format => $number_prefix . $number_next,
+            $padded => $this->getPaddedNumberNext($number_next, $number_digits),
+            default => $number_next,
+        };
     }
 
-    public function initializeAttributes(?string $prefix, int | string | null $digits, int | string | null $next, ?string $type): array
+    public function initializeAttributes(?string $prefix, int | string | null $digits, int | string | null $next): array
     {
-        $number_prefix = $prefix ?? $this->getAttributeFromArray('number_prefix');
-        $number_digits = $digits ?? $this->getAttributeFromArray('number_digits');
-        $number_next = $next ?? $this->getAttributeFromArray('number_next');
-
-        if ($type) {
-            $attributes = static::getAttributesByType($type);
-
-            $number_prefix = $attributes['number_prefix'] ?? $number_prefix;
-            $number_digits = $attributes['number_digits'] ?? $number_digits;
-            $number_next = $attributes['number_next'] ?? $number_next;
-        }
+        $number_prefix = $prefix ?? $this->number_prefix;
+        $number_digits = $digits ?? $this->number_digits;
+        $number_next = $next ?? $this->number_next;
 
         return [$number_prefix, $number_digits, $number_next];
     }
 
-    public static function getAttributesByType(?string $type): array
-    {
-        $model = new static;
-        $attributes = $model->newQuery()->type($type)->first();
-
-        return $attributes ? $attributes->toArray() : [];
-    }
-
     /**
      * Get the next number with padding for dynamic display purposes.
      * Even if number_next is a string, it will be cast to an integer.
      */
-    public static function getPaddedNumberNext(int | string | null $number_next, int | string | null $number_digits): string
+    public function getPaddedNumberNext(int | string | null $number_next, int | string | null $number_digits): string
     {
         return str_pad($number_next, $number_digits, '0', STR_PAD_LEFT);
     }

app/Models/User.php

@@ -96,4 +96,21 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, HasDefaul
     {
         return $this->hasMany(Department::class, 'manager_id');
     }
+
+    public function switchCompany(mixed $company): bool
+    {
+        if (! $this->belongsToCompany($company)) {
+            return false;
+        }
+
+        $this->forceFill([
+            'current_company_id' => $company->id,
+        ])->save();
+
+        $this->setRelation('currentCompany', $company);
+
+        session(['current_company_id' => $company->id]);
+
+        return true;
+    }
 }

app/Observers/TransactionObserver.php

@@ -2,33 +2,31 @@
 
 namespace App\Observers;
 
-use App\Enums\Accounting\JournalEntryType;
-use App\Models\Accounting\Account;
-use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
-use App\Utilities\Currency\CurrencyAccessor;
-use App\Utilities\Currency\CurrencyConverter;
-use Illuminate\Support\Facades\DB;
+use App\Services\TransactionService;
 
 class TransactionObserver
 {
+    public function __construct(
+        protected TransactionService $transactionService,
+    ) {}
+
     /**
-     * Handle the Transaction "created" event.
+     * Handle the Transaction "saving" event.
      */
-    public function created(Transaction $transaction): void
+    public function saving(Transaction $transaction): void
     {
-        // Additional check to avoid duplication during replication
-        if ($transaction->journalEntries()->exists() || $transaction->type->isJournal() || str_starts_with($transaction->description, '(Copy of)')) {
-            return;
-        }
-
-        [$debitAccount, $creditAccount] = $this->determineAccounts($transaction);
-
-        if ($debitAccount === null || $creditAccount === null) {
-            return;
+        if ($transaction->type->isTransfer() && $transaction->description === null) {
+            $transaction->description = 'Account Transfer';
         }
+    }
 
-        $this->createJournalEntries($transaction, $debitAccount, $creditAccount);
+    /**
+     * Handle the Transaction "created" event.
+     */
+    public function created(Transaction $transaction): void
+    {
+        $this->transactionService->createJournalEntries($transaction);
     }
 
     /**
@@ -38,29 +36,7 @@ class TransactionObserver
     {
         $transaction->refresh(); // DO NOT REMOVE
 
-        if ($transaction->type->isJournal() || $this->hasRelevantChanges($transaction) === false) {
-            return;
-        }
-
-        $journalEntries = $transaction->journalEntries;
-
-        $debitEntry = $journalEntries->where('type', JournalEntryType::Debit)->first();
-        $creditEntry = $journalEntries->where('type', JournalEntryType::Credit)->first();
-
-        if ($debitEntry === null || $creditEntry === null) {
-            return;
-        }
-
-        [$debitAccount, $creditAccount] = $this->determineAccounts($transaction);
-
-        if ($debitAccount === null || $creditAccount === null) {
-            return;
-        }
-
-        $convertedTransactionAmount = $this->getConvertedTransactionAmount($transaction);
-
-        $this->updateJournalEntriesForTransaction($debitEntry, $debitAccount, $convertedTransactionAmount);
-        $this->updateJournalEntriesForTransaction($creditEntry, $creditAccount, $convertedTransactionAmount);
+        $this->transactionService->updateJournalEntries($transaction);
     }
 
     /**
@@ -68,79 +44,6 @@ class TransactionObserver
      */
     public function deleting(Transaction $transaction): void
     {
-        DB::transaction(static function () use ($transaction) {
-            $transaction->journalEntries()->each(fn (JournalEntry $entry) => $entry->delete());
-        });
-    }
-
-    private function determineAccounts(Transaction $transaction): array
-    {
-        $chartAccount = $transaction->account;
-        $bankAccount = $transaction->bankAccount?->account;
-
-        $debitAccount = $transaction->type->isWithdrawal() ? $chartAccount : $bankAccount;
-        $creditAccount = $transaction->type->isWithdrawal() ? $bankAccount : $chartAccount;
-
-        return [$debitAccount, $creditAccount];
-    }
-
-    private function createJournalEntries(Transaction $transaction, Account $debitAccount, Account $creditAccount): void
-    {
-        $convertedTransactionAmount = $this->getConvertedTransactionAmount($transaction);
-
-        $debitAccount->journalEntries()->create([
-            'company_id' => $transaction->company_id,
-            'transaction_id' => $transaction->id,
-            'type' => JournalEntryType::Debit,
-            'amount' => $convertedTransactionAmount,
-            'description' => $transaction->description,
-        ]);
-
-        $creditAccount->journalEntries()->create([
-            'company_id' => $transaction->company_id,
-            'transaction_id' => $transaction->id,
-            'type' => JournalEntryType::Credit,
-            'amount' => $convertedTransactionAmount,
-            'description' => $transaction->description,
-        ]);
-    }
-
-    private function getConvertedTransactionAmount(Transaction $transaction): string
-    {
-        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
-        $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
-        $chartAccountCurrency = $transaction->account->currency_code;
-
-        if ($bankAccountCurrency !== $defaultCurrency) {
-            return $this->convertToDefaultCurrency($transaction->amount, $bankAccountCurrency, $defaultCurrency);
-        } elseif ($chartAccountCurrency !== $defaultCurrency) {
-            return $this->convertToDefaultCurrency($transaction->amount, $chartAccountCurrency, $defaultCurrency);
-        }
-
-        return $transaction->amount;
-    }
-
-    private function convertToDefaultCurrency(string $amount, string $fromCurrency, string $toCurrency): string
-    {
-        $amountInCents = CurrencyConverter::prepareForAccessor($amount, $fromCurrency);
-
-        $convertedAmountInCents = CurrencyConverter::convertBalance($amountInCents, $fromCurrency, $toCurrency);
-
-        return CurrencyConverter::prepareForMutator($convertedAmountInCents, $toCurrency);
-    }
-
-    private function hasRelevantChanges(Transaction $transaction): bool
-    {
-        return $transaction->wasChanged(['amount', 'account_id', 'bank_account_id', 'type']);
-    }
-
-    private function updateJournalEntriesForTransaction(JournalEntry $journalEntry, Account $account, string $convertedTransactionAmount): void
-    {
-        DB::transaction(static function () use ($journalEntry, $account, $convertedTransactionAmount) {
-            $journalEntry->update([
-                'account_id' => $account->id,
-                'amount' => $convertedTransactionAmount,
-            ]);
-        });
+        $this->transactionService->deleteJournalEntries($transaction);
     }
 }

app/Providers/AppServiceProvider.php

@@ -2,10 +2,8 @@
 
 namespace App\Providers;
 
-use App\Contracts\AccountHandler;
-use App\Services\AccountService;
 use App\Services\DateRangeService;
-use BezhanSalleh\PanelSwitch\PanelSwitch;
+use Filament\Http\Responses\Auth\Contracts\LoginResponse;
 use Filament\Notifications\Livewire\Notifications;
 use Filament\Support\Assets\Js;
 use Filament\Support\Enums\Alignment;
@@ -14,19 +12,13 @@ use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
 {
-    /**
-     * All of the container bindings that should be registered.
-     */
-    public array $bindings = [
-        AccountHandler::class => AccountService::class,
-    ];
-
     /**
      * Register any application services.
      */
     public function register(): void
     {
         $this->app->singleton(DateRangeService::class);
+        $this->app->singleton(LoginResponse::class, \App\Http\Responses\LoginResponse::class);
     }
 
     /**
@@ -36,38 +28,8 @@ class AppServiceProvider extends ServiceProvider
     {
         Notifications::alignment(Alignment::Center);
 
-        $this->configurePanelSwitch();
-
         FilamentAsset::register([
             Js::make('TopNavigation', __DIR__ . '/../../resources/js/TopNavigation.js'),
         ]);
     }
-
-    /**
-     * Configure the panel switch.
-     */
-    protected function configurePanelSwitch(): void
-    {
-        PanelSwitch::configureUsing(function (PanelSwitch $panelSwitch) {
-            $panelSwitch
-                ->modalHeading('Switch Panel')
-                ->modalWidth('md')
-                ->slideOver()
-                ->excludes(['admin'])
-                ->iconSize(16)
-                ->icons(function () {
-                    if (auth()->user()?->belongsToCompany(auth()->user()?->currentCompany)) {
-                        return [
-                            'user' => 'heroicon-o-user',
-                            'company' => 'heroicon-o-building-office',
-                        ];
-                    }
-
-                    return [
-                        'user' => 'heroicon-o-user',
-                        'company' => 'icon-building-add',
-                    ];
-                });
-        });
-    }
 }

app/Providers/Filament/UserPanelProvider.php

@@ -2,17 +2,18 @@
 
 namespace App\Providers\Filament;
 
+use App\Filament\Components\PanelShiftDropdown;
+use App\Filament\User\Clusters\Account;
 use App\Http\Middleware\Authenticate;
 use Exception;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
-use Filament\Navigation\MenuItem;
+use Filament\Navigation\NavigationBuilder;
 use Filament\Navigation\NavigationItem;
 use Filament\Pages;
 use Filament\Panel;
 use Filament\PanelProvider;
 use Filament\Support\Colors\Color;
-use Filament\Widgets;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Cookie\Middleware\EncryptCookies;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
@@ -33,33 +34,36 @@ class UserPanelProvider extends PanelProvider
         return $panel
             ->id('user')
             ->path('user')
-            ->userMenuItems([
-                'profile' => MenuItem::make()
-                    ->label('Profile')
-                    ->icon('heroicon-o-user-circle')
-                    ->url(static fn () => url(Profile::getUrl())),
-            ])
-            ->navigationItems([
-                NavigationItem::make('Personal Access Tokens')
-                    ->label(static fn (): string => __('filament-companies::default.navigation.links.tokens'))
-                    ->icon('heroicon-o-key')
-                    ->url(static fn () => url(PersonalAccessTokens::getUrl())),
-            ])
+            ->plugin(
+                PanelShiftDropdown::make()
+                    ->logoutItem()
+                    ->companySettings(false)
+                    ->navigation(function (NavigationBuilder $builder): NavigationBuilder {
+                        return $builder
+                            ->items([
+                                ...Account::getNavigationItems(),
+                                NavigationItem::make('company')
+                                    ->label('Company Dashboard')
+                                    ->icon('heroicon-s-building-office-2')
+                                    ->url(static fn (): string => Pages\Dashboard::getUrl(panel: 'company', tenant: auth()->user()->personalCompany())),
+                            ]);
+                    }),
+            )
             ->colors([
                 'primary' => Color::Indigo,
             ])
+            ->navigation(false)
             ->viteTheme('resources/css/filament/user/theme.css')
             ->discoverResources(in: app_path('Filament/User/Resources'), for: 'App\\Filament\\User\\Resources')
             ->discoverPages(in: app_path('Filament/User/Pages'), for: 'App\\Filament\\User\\Pages')
+            ->discoverClusters(in: app_path('Filament/User/Clusters'), for: 'App\\Filament\\User\\Clusters')
+            ->discoverWidgets(in: app_path('Filament/User/Widgets'), for: 'App\\Filament\\User\\Widgets')
             ->pages([
-                Pages\Dashboard::class,
                 Profile::class,
                 PersonalAccessTokens::class,
             ])
-            ->discoverWidgets(in: app_path('Filament/User/Widgets'), for: 'App\\Filament\\User\\Widgets')
             ->widgets([
-                Widgets\AccountWidget::class,
-                Widgets\FilamentInfoWidget::class,
+                //
             ])
             ->middleware([
                 EncryptCookies::class,

app/Providers/FilamentCompaniesServiceProvider.php

@@ -28,6 +28,7 @@ use App\Filament\Company\Pages\Service\LiveCurrency;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use App\Filament\Company\Resources\Core\DepartmentResource;
 use App\Filament\Components\PanelShiftDropdown;
+use App\Filament\User\Clusters\Account;
 use App\Http\Middleware\ConfigureCurrentCompany;
 use App\Livewire\UpdatePassword;
 use App\Livewire\UpdateProfileInformation;
@@ -102,7 +103,11 @@ class FilamentCompaniesServiceProvider extends PanelProvider
             ->plugin(
                 PanelShiftDropdown::make()
                     ->logoutItem()
-                    ->companySettings(),
+                    ->companySettings()
+                    ->navigation(function (NavigationBuilder $builder): NavigationBuilder {
+                        return $builder
+                            ->items(Account::getNavigationItems());
+                    }),
             )
             ->colors([
                 'primary' => Color::Indigo,

app/Repositories/Accounting/JournalEntryRepository.php

@@ -4,6 +4,7 @@ namespace App\Repositories\Accounting;
 
 use App\Models\Accounting\Account;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Carbon;
 
 class JournalEntryRepository
 {
@@ -11,13 +12,16 @@ class JournalEntryRepository
     {
         $query = $account->journalEntries()->where('type', $type);
 
+        $startDateCarbon = Carbon::parse($startDate)->startOfDay();
+        $endDateCarbon = Carbon::parse($endDate)->endOfDay();
+
         if ($startDate && $endDate) {
-            $query->whereHas('transaction', static function (Builder $query) use ($startDate, $endDate) {
-                $query->whereBetween('posted_at', [$startDate, $endDate]);
+            $query->whereHas('transaction', static function (Builder $query) use ($startDateCarbon, $endDateCarbon) {
+                $query->whereBetween('posted_at', [$startDateCarbon, $endDateCarbon]);
             });
         } elseif ($startDate) {
-            $query->whereHas('transaction', static function (Builder $query) use ($startDate) {
-                $query->where('posted_at', '<=', $startDate);
+            $query->whereHas('transaction', static function (Builder $query) use ($startDateCarbon) {
+                $query->where('posted_at', '<=', $startDateCarbon);
             });
         }
 

app/Scopes/CurrentCompanyScope.php

@@ -16,12 +16,12 @@ class CurrentCompanyScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        if (app()->runningInConsole()) {
+        $companyId = session('current_company_id');
+
+        if (! $companyId && app()->runningInConsole()) {
             return;
         }
 
-        $companyId = session('current_company_id');
-
         if (! $companyId && Auth::check() && Auth::user()->currentCompany) {
             $companyId = Auth::user()->currentCompany->id;
             session(['current_company_id' => $companyId]);

app/Services/AccountService.php

@@ -2,10 +2,8 @@
 
 namespace App\Services;
 
-use App\Contracts\AccountHandler;
 use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
-use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
 use App\Repositories\Accounting\JournalEntryRepository;
 use App\Utilities\Currency\CurrencyAccessor;
@@ -15,7 +13,7 @@ use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
 use Illuminate\Support\Facades\DB;
 
-class AccountService implements AccountHandler
+class AccountService
 {
     public function __construct(
         protected JournalEntryRepository $journalEntryRepository
@@ -23,34 +21,94 @@ class AccountService implements AccountHandler
 
     public function getDebitBalance(Account $account, string $startDate, string $endDate): Money
     {
-        $amount = $this->journalEntryRepository->sumDebitAmounts($account, $startDate, $endDate);
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
 
-        return new Money($amount, $account->currency_code);
+        return new Money($query->total_debit, $account->currency_code);
     }
 
     public function getCreditBalance(Account $account, string $startDate, string $endDate): Money
     {
-        $amount = $this->journalEntryRepository->sumCreditAmounts($account, $startDate, $endDate);
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
 
-        return new Money($amount, $account->currency_code);
+        return new Money($query->total_credit, $account->currency_code);
     }
 
     public function getNetMovement(Account $account, string $startDate, string $endDate): Money
     {
-        $balances = $this->calculateBalances($account, $startDate, $endDate);
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
 
-        return new Money($balances['net_movement'], $account->currency_code);
+        $netMovement = $this->calculateNetMovementByCategory(
+            $account->category,
+            $query->total_debit ?? 0,
+            $query->total_credit ?? 0
+        );
+
+        return new Money($netMovement, $account->currency_code);
     }
 
     public function getStartingBalance(Account $account, string $startDate, bool $override = false): ?Money
     {
-        if ($override === false && in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
+        if ($override === false && $account->category->isNominal()) {
             return null;
         }
 
-        $balances = $this->calculateStartingBalances($account, $startDate);
+        $query = $this->getAccountBalances($startDate, $startDate, [$account->id])->first();
+
+        return new Money($query->starting_balance ?? 0, $account->currency_code);
+    }
 
-        return new Money($balances['starting_balance'], $account->currency_code);
+    public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money
+    {
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
+
+        $netMovement = $this->calculateNetMovementByCategory(
+            $account->category,
+            $query->total_debit ?? 0,
+            $query->total_credit ?? 0
+        );
+
+        if ($account->category->isNominal()) {
+            return new Money($netMovement, $account->currency_code);
+        }
+
+        $endingBalance = ($query->starting_balance ?? 0) + $netMovement;
+
+        return new Money($endingBalance, $account->currency_code);
+    }
+
+    private function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int
+    {
+        if ($category->isNormalDebitBalance()) {
+            return $debitBalance - $creditBalance;
+        } else {
+            return $creditBalance - $debitBalance;
+        }
+    }
+
+    public function getBalances(Account $account, string $startDate, string $endDate): array
+    {
+        $query = $this->getAccountBalances($startDate, $endDate, [$account->id])->first();
+
+        $needStartingBalances = $account->category->isReal();
+
+        $netMovement = $this->calculateNetMovementByCategory(
+            $account->category,
+            $query->total_debit ?? 0,
+            $query->total_credit ?? 0
+        );
+
+        $balances = [
+            'debit_balance' => $query->total_debit,
+            'credit_balance' => $query->total_credit,
+            'net_movement' => $netMovement,
+            'starting_balance' => $needStartingBalances ? ($query->starting_balance ?? 0) : null,
+            'ending_balance' => $needStartingBalances
+                ? ($query->starting_balance ?? 0) + $netMovement
+                : $netMovement, // For nominal accounts, ending balance is just the net movement
+        ];
+
+        // Return balances, filtering out any null values
+        return array_filter($balances, static fn ($value) => $value !== null);
     }
 
     public function getTransactionDetailsSubquery(string $startDate, string $endDate): Closure
@@ -165,110 +223,10 @@ class AccountService implements AccountHandler
         return new Money($totalBalance, CurrencyAccessor::getDefaultCurrency());
     }
 
-    public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money
-    {
-        $calculatedBalances = $this->calculateBalances($account, $startDate, $endDate);
-        $startingBalances = $this->calculateStartingBalances($account, $startDate);
-
-        $netMovement = $calculatedBalances['net_movement'];
-
-        if (in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
-            return new Money($netMovement, $account->currency_code);
-        }
-
-        $endingBalance = $startingBalances['starting_balance'] + $netMovement;
-
-        return new Money($endingBalance, $account->currency_code);
-    }
-
-    public function getRetainedEarnings(string $startDate): Money
-    {
-        $revenue = JournalEntry::whereHas('account', static function ($query) {
-            $query->where('category', AccountCategory::Revenue);
-        })
-            ->where('type', 'credit')
-            ->whereHas('transaction', static function ($query) use ($startDate) {
-                $query->where('posted_at', '<', $startDate);
-            })
-            ->sum('amount');
-
-        $expense = JournalEntry::whereHas('account', static function ($query) {
-            $query->where('category', AccountCategory::Expense);
-        })
-            ->where('type', 'debit')
-            ->whereHas('transaction', static function ($query) use ($startDate) {
-                $query->where('posted_at', '<', $startDate);
-            })
-            ->sum('amount');
-
-        $retainedEarnings = $revenue - $expense;
-
-        return new Money($retainedEarnings, CurrencyAccessor::getDefaultCurrency());
-    }
-
-    private function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int
-    {
-        return match ($category) {
-            AccountCategory::Asset, AccountCategory::Expense => $debitBalance - $creditBalance,
-            AccountCategory::Liability, AccountCategory::Equity, AccountCategory::Revenue => $creditBalance - $debitBalance,
-        };
-    }
-
-    private function calculateBalances(Account $account, string $startDate, string $endDate): array
-    {
-        $debitBalance = $this->journalEntryRepository->sumDebitAmounts($account, $startDate, $endDate);
-        $creditBalance = $this->journalEntryRepository->sumCreditAmounts($account, $startDate, $endDate);
-
-        return [
-            'debit_balance' => $debitBalance,
-            'credit_balance' => $creditBalance,
-            'net_movement' => $this->calculateNetMovementByCategory($account->category, $debitBalance, $creditBalance),
-        ];
-    }
-
-    private function calculateStartingBalances(Account $account, string $startDate): array
-    {
-        $debitBalanceBefore = $this->journalEntryRepository->sumDebitAmounts($account, $startDate);
-        $creditBalanceBefore = $this->journalEntryRepository->sumCreditAmounts($account, $startDate);
-
-        return [
-            'debit_balance_before' => $debitBalanceBefore,
-            'credit_balance_before' => $creditBalanceBefore,
-            'starting_balance' => $this->calculateNetMovementByCategory($account->category, $debitBalanceBefore, $creditBalanceBefore),
-        ];
-    }
-
-    public function getBalances(Account $account, string $startDate, string $endDate, array $fields): array
-    {
-        $balances = [];
-        $calculatedBalances = $this->calculateBalances($account, $startDate, $endDate);
-
-        // Calculate starting balances only if needed
-        $startingBalances = null;
-        $needStartingBalances = ! in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)
-                                && (in_array('starting_balance', $fields) || in_array('ending_balance', $fields));
-
-        if ($needStartingBalances) {
-            $startingBalances = $this->calculateStartingBalances($account, $startDate);
-        }
-
-        foreach ($fields as $field) {
-            $balances[$field] = match ($field) {
-                'debit_balance', 'credit_balance', 'net_movement' => $calculatedBalances[$field],
-                'starting_balance' => $needStartingBalances ? $startingBalances['starting_balance'] : null,
-                'ending_balance' => $needStartingBalances ? $startingBalances['starting_balance'] + $calculatedBalances['net_movement'] : null,
-                default => null,
-            };
-        }
-
-        return array_filter($balances, static fn ($value) => $value !== null);
-    }
-
     public function getEarliestTransactionDate(): string
     {
-        $earliestDate = Transaction::oldest('posted_at')
-            ->value('posted_at');
+        $earliestDate = Transaction::min('posted_at');
 
-        return $earliestDate ?? now()->format('Y-m-d');
+        return $earliestDate ?? now()->toDateTimeString();
     }
 }

app/Services/ExportService.php

@@ -12,14 +12,20 @@ use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ExportService
 {
-    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
+    public function exportToCsv(Company $company, ExportableReport $report, ?string $startDate = null, ?string $endDate = null): StreamedResponse
     {
-        $formattedStartDate = Carbon::parse($startDate)->toDateString();
-        $formattedEndDate = Carbon::parse($endDate)->toDateString();
+        if ($startDate && $endDate) {
+            $formattedStartDate = Carbon::parse($startDate)->toDateString();
+            $formattedEndDate = Carbon::parse($endDate)->toDateString();
+            $dateLabel = $formattedStartDate . ' to ' . $formattedEndDate;
+        } else {
+            $formattedAsOfDate = Carbon::parse($endDate)->toDateString();
+            $dateLabel = $formattedAsOfDate;
+        }
 
         $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
 
-        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.csv';
+        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $dateLabel . ' ' . $timestamp . '.csv';
 
         $headers = [
             'Content-Type' => 'text/csv',
@@ -29,12 +35,17 @@ class ExportService
         $callback = function () use ($startDate, $endDate, $report, $company) {
             $file = fopen('php://output', 'wb');
 
-            $defaultStartDateFormat = Carbon::parse($startDate)->toDefaultDateFormat();
-            $defaultEndDateFormat = Carbon::parse($endDate)->toDefaultDateFormat();
+            if ($startDate && $endDate) {
+                $defaultStartDateFormat = Carbon::parse($startDate)->toDefaultDateFormat();
+                $defaultEndDateFormat = Carbon::parse($endDate)->toDefaultDateFormat();
+                $dateLabel = 'Date Range: ' . $defaultStartDateFormat . ' to ' . $defaultEndDateFormat;
+            } else {
+                $dateLabel = 'As of ' . Carbon::parse($endDate)->toDefaultDateFormat();
+            }
 
             fputcsv($file, [$report->getTitle()]);
             fputcsv($file, [$company->name]);
-            fputcsv($file, ['Date Range: ' . $defaultStartDateFormat . ' to ' . $defaultEndDateFormat]);
+            fputcsv($file, [$dateLabel]);
             fputcsv($file, []);
 
             fputcsv($file, $report->getHeaders());
@@ -92,20 +103,26 @@ class ExportService
         return response()->streamDownload($callback, $filename, $headers);
     }
 
-    public function exportToPdf(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
+    public function exportToPdf(Company $company, ExportableReport $report, ?string $startDate = null, ?string $endDate = null): StreamedResponse
     {
-        $formattedStartDate = Carbon::parse($startDate)->toDateString();
-        $formattedEndDate = Carbon::parse($endDate)->toDateString();
+        if ($startDate && $endDate) {
+            $formattedStartDate = Carbon::parse($startDate)->toDateString();
+            $formattedEndDate = Carbon::parse($endDate)->toDateString();
+            $dateLabel = $formattedStartDate . ' to ' . $formattedEndDate;
+        } else {
+            $formattedAsOfDate = Carbon::parse($endDate)->toDateString();
+            $dateLabel = $formattedAsOfDate;
+        }
 
         $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
 
-        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.pdf';
+        $filename = $company->name . ' ' . $report->getTitle() . ' ' . $dateLabel . ' ' . $timestamp . '.pdf';
 
         $pdf = SnappyPdf::loadView($report->getPdfView(), [
             'company' => $company,
             'report' => $report,
-            'startDate' => Carbon::parse($startDate)->toDefaultDateFormat(),
-            'endDate' => Carbon::parse($endDate)->toDefaultDateFormat(),
+            'startDate' => $startDate ? Carbon::parse($startDate)->toDefaultDateFormat() : null,
+            'endDate' => $endDate ? Carbon::parse($endDate)->toDefaultDateFormat() : null,
         ]);
 
         return response()->streamDownload(function () use ($pdf) {

app/Services/ReportService.php

@@ -12,6 +12,7 @@ use App\Models\Accounting\Account;
 use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\ValueObjects\Money;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
 
 class ReportService
@@ -95,7 +96,7 @@ class ReportService
         return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
     }
 
-    private function calculateAccountBalances(Account $account, AccountCategory $category): array
+    public function calculateAccountBalances(Account $account, AccountCategory $category): array
     {
         $balances = [
             'debit_balance' => $account->total_debit ?? 0,
@@ -116,14 +117,12 @@ class ReportService
         return $balances;
     }
 
-    public function calculateRetainedEarnings(string $startDate): Money
+    public function calculateRetainedEarnings(?string $startDate, string $endDate): Money
     {
-        $modifiedStartDate = Carbon::parse($this->accountService->getEarliestTransactionDate())->startOfYear()->toDateTimeString();
-        $endDate = Carbon::parse($startDate)->subYear()->endOfYear()->toDateTimeString();
+        $startDate ??= Carbon::parse($this->accountService->getEarliestTransactionDate())->toDateTimeString();
+        $revenueAccounts = $this->accountService->getAccountBalances($startDate, $endDate)->where('category', AccountCategory::Revenue)->get();
 
-        $revenueAccounts = $this->accountService->getAccountBalances($modifiedStartDate, $endDate)->where('category', AccountCategory::Revenue)->get();
-
-        $expenseAccounts = $this->accountService->getAccountBalances($modifiedStartDate, $endDate)->where('category', AccountCategory::Expense)->get();
+        $expenseAccounts = $this->accountService->getAccountBalances($startDate, $endDate)->where('category', AccountCategory::Expense)->get();
 
         $revenueTotal = 0;
         $expenseTotal = 0;
@@ -230,11 +229,18 @@ class ReportService
         return new ReportDTO(categories: $reportCategories, fields: $columns);
     }
 
-    public function buildTrialBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    public function buildTrialBalanceReport(string $trialBalanceType, string $asOfDate, array $columns = []): ReportDTO
     {
+        $asOfDateCarbon = Carbon::parse($asOfDate);
+        $startDateCarbon = Carbon::parse($this->accountService->getEarliestTransactionDate());
+
         $orderedCategories = AccountCategory::getOrderedCategories();
 
-        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
+        $isPostClosingTrialBalance = $trialBalanceType === 'postClosing';
+
+        $accounts = $this->accountService->getAccountBalances($startDateCarbon->toDateTimeString(), $asOfDateCarbon->toDateTimeString())
+            ->when($isPostClosingTrialBalance, fn (Builder $query) => $query->whereNotIn('category', [AccountCategory::Revenue, AccountCategory::Expense]))
+            ->get();
 
         $balanceFields = ['debit_balance', 'credit_balance'];
 
@@ -255,7 +261,7 @@ class ReportService
 
                 $endingBalance = $accountBalances['ending_balance'] ?? $accountBalances['net_movement'];
 
-                $trialBalance = $this->calculateTrialBalance($account->category, $endingBalance);
+                $trialBalance = $this->calculateTrialBalances($account->category, $endingBalance);
 
                 foreach ($trialBalance as $balanceType => $balance) {
                     $categorySummaryBalances[$balanceType] += $balance;
@@ -268,16 +274,13 @@ class ReportService
                     $account->code,
                     $account->id,
                     $formattedAccountBalances,
-                    Carbon::parse($startDate)->toDateString(),
-                    Carbon::parse($endDate)->toDateString(),
+                    startDate: $startDateCarbon->toDateString(),
+                    endDate: $asOfDateCarbon->toDateString(),
                 );
             }
 
-            if ($category === AccountCategory::Equity) {
-                $modifiedStartDate = Carbon::parse($this->accountService->getEarliestTransactionDate())->startOfYear()->toDateString();
-                $modifiedEndDate = Carbon::parse($startDate)->subYear()->endOfYear()->toDateString();
-
-                $retainedEarningsAmount = $this->calculateRetainedEarnings($startDate)->getAmount();
+            if ($category === AccountCategory::Equity && $isPostClosingTrialBalance) {
+                $retainedEarningsAmount = $this->calculateRetainedEarnings($startDateCarbon->toDateTimeString(), $asOfDateCarbon->toDateTimeString())->getAmount();
                 $isCredit = $retainedEarningsAmount >= 0;
 
                 $categorySummaryBalances[$isCredit ? 'credit_balance' : 'debit_balance'] += abs($retainedEarningsAmount);
@@ -290,8 +293,8 @@ class ReportService
                         'debit_balance' => $isCredit ? 0 : abs($retainedEarningsAmount),
                         'credit_balance' => $isCredit ? $retainedEarningsAmount : 0,
                     ]),
-                    $modifiedStartDate,
-                    $modifiedEndDate,
+                    startDate: $startDateCarbon->toDateString(),
+                    endDate: $asOfDateCarbon->toDateString(),
                 );
             }
 
@@ -309,10 +312,24 @@ class ReportService
 
         $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns, $trialBalanceType);
     }
 
-    private function calculateTrialBalance(AccountCategory $category, int $endingBalance): array
+    public function getRetainedEarningsBalances(string $startDate, string $endDate): AccountBalanceDTO
+    {
+        $retainedEarningsAmount = $this->calculateRetainedEarnings($startDate, $endDate)->getAmount();
+
+        $isCredit = $retainedEarningsAmount >= 0;
+        $retainedEarningsDebitAmount = $isCredit ? 0 : abs($retainedEarningsAmount);
+        $retainedEarningsCreditAmount = $isCredit ? $retainedEarningsAmount : 0;
+
+        return $this->formatBalances([
+            'debit_balance' => $retainedEarningsDebitAmount,
+            'credit_balance' => $retainedEarningsCreditAmount,
+        ]);
+    }
+
+    public function calculateTrialBalances(AccountCategory $category, int $endingBalance): array
     {
         if ($category->isNormalDebitBalance()) {
             if ($endingBalance >= 0) {
@@ -331,43 +348,56 @@ class ReportService
 
     public function buildIncomeStatementReport(string $startDate, string $endDate, array $columns = []): ReportDTO
     {
-        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
+        // Query only relevant accounts and sort them at the query level
+        $revenueAccounts = $this->accountService->getAccountBalances($startDate, $endDate)
+            ->where('category', AccountCategory::Revenue)
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
+
+        $cogsAccounts = $this->accountService->getAccountBalances($startDate, $endDate)
+            ->whereRelation('subtype', 'name', 'Cost of Goods Sold')
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
+
+        $expenseAccounts = $this->accountService->getAccountBalances($startDate, $endDate)
+            ->where('category', AccountCategory::Expense)
+            ->whereRelation('subtype', 'name', '!=', 'Cost of Goods Sold')
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
 
         $accountCategories = [];
         $totalRevenue = 0;
-        $cogs = 0;
+        $totalCogs = 0;
         $totalExpenses = 0;
 
+        // Define category groups
         $categoryGroups = [
-            'Revenue' => [
-                'accounts' => $accounts->where('category', AccountCategory::Revenue),
+            AccountCategory::Revenue->getPluralLabel() => [
+                'accounts' => $revenueAccounts,
                 'total' => &$totalRevenue,
             ],
             'Cost of Goods Sold' => [
-                'accounts' => $accounts->where('subtype.name', 'Cost of Goods Sold'),
-                'total' => &$cogs,
+                'accounts' => $cogsAccounts,
+                'total' => &$totalCogs,
             ],
-            'Expenses' => [
-                'accounts' => $accounts->where('category', AccountCategory::Expense)->where('subtype.name', '!=', 'Cost of Goods Sold'),
+            AccountCategory::Expense->getPluralLabel() => [
+                'accounts' => $expenseAccounts,
                 'total' => &$totalExpenses,
             ],
         ];
 
+        // Process each category group
         foreach ($categoryGroups as $label => $group) {
             $categoryAccounts = [];
             $netMovement = 0;
 
-            foreach ($group['accounts']->sortBy('code', SORT_NATURAL) as $account) {
-                $category = null;
-
-                if ($label === 'Revenue') {
-                    $category = AccountCategory::Revenue;
-                } elseif ($label === 'Expenses') {
-                    $category = AccountCategory::Expense;
-                } elseif ($label === 'Cost of Goods Sold') {
-                    // COGS is treated as part of Expenses, so we use AccountCategory::Expense
-                    $category = AccountCategory::Expense;
-                }
+            foreach ($group['accounts'] as $account) {
+                // Use the category type based on label
+                $category = match ($label) {
+                    AccountCategory::Revenue->getPluralLabel() => AccountCategory::Revenue,
+                    AccountCategory::Expense->getPluralLabel(), 'Cost of Goods Sold' => AccountCategory::Expense,
+                    default => null
+                };
 
                 if ($category !== null) {
                     $accountBalances = $this->calculateAccountBalances($account, $category);
@@ -388,11 +418,12 @@ class ReportService
 
             $accountCategories[$label] = new AccountCategoryDTO(
                 $categoryAccounts,
-                $this->formatBalances(['net_movement' => $netMovement]),
+                $this->formatBalances(['net_movement' => $netMovement])
             );
         }
 
-        $grossProfit = $totalRevenue - $cogs;
+        // Calculate gross and net profit
+        $grossProfit = $totalRevenue - $totalCogs;
         $netProfit = $grossProfit - $totalExpenses;
         $formattedReportTotalBalances = $this->formatBalances(['net_movement' => $netProfit]);
 

app/Services/TransactionService.php

@@ -4,12 +4,17 @@ namespace App\Services;
 
 use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
+use App\Enums\Accounting\JournalEntryType;
 use App\Enums\Accounting\TransactionType;
 use App\Models\Accounting\Account;
+use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
 use App\Models\Company;
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
 
 class TransactionService
 {
@@ -142,4 +147,136 @@ class TransactionService
             ->where('name', $name)
             ->firstOrFail();
     }
+
+    public function createJournalEntries(Transaction $transaction): void
+    {
+        // Additional check to avoid duplication during replication
+        if ($transaction->journalEntries()->exists() || $transaction->type->isJournal() || str_starts_with($transaction->description, '(Copy of)')) {
+            return;
+        }
+
+        [$debitAccount, $creditAccount] = $this->determineAccounts($transaction);
+
+        if ($debitAccount === null || $creditAccount === null) {
+            return;
+        }
+
+        $this->createJournalEntriesForTransaction($transaction, $debitAccount, $creditAccount);
+    }
+
+    public function updateJournalEntries(Transaction $transaction): void
+    {
+        if ($transaction->type->isJournal() || $this->hasRelevantChanges($transaction) === false) {
+            return;
+        }
+
+        $journalEntries = $transaction->journalEntries;
+
+        $debitEntry = $journalEntries->where('type', JournalEntryType::Debit)->first();
+        $creditEntry = $journalEntries->where('type', JournalEntryType::Credit)->first();
+
+        if ($debitEntry === null || $creditEntry === null) {
+            return;
+        }
+
+        [$debitAccount, $creditAccount] = $this->determineAccounts($transaction);
+
+        if ($debitAccount === null || $creditAccount === null) {
+            return;
+        }
+
+        $convertedTransactionAmount = $this->getConvertedTransactionAmount($transaction);
+
+        DB::transaction(function () use ($debitEntry, $debitAccount, $convertedTransactionAmount, $creditEntry, $creditAccount) {
+            $this->updateJournalEntryForTransaction($debitEntry, $debitAccount, $convertedTransactionAmount);
+            $this->updateJournalEntryForTransaction($creditEntry, $creditAccount, $convertedTransactionAmount);
+        });
+    }
+
+    public function deleteJournalEntries(Transaction $transaction): void
+    {
+        DB::transaction(static function () use ($transaction) {
+            $transaction->journalEntries()->each(fn (JournalEntry $entry) => $entry->delete());
+        });
+    }
+
+    private function determineAccounts(Transaction $transaction): array
+    {
+        $chartAccount = $transaction->account;
+        $bankAccount = $transaction->bankAccount?->account;
+
+        if ($transaction->type->isTransfer()) {
+            // Essentially a withdrawal from the bank account and a deposit to the chart account (which is a bank account)
+            // Credit: bankAccount (source of funds, money is being withdrawn)
+            // Debit: chartAccount (destination of funds, money is being deposited)
+            return [$chartAccount, $bankAccount];
+        }
+
+        $debitAccount = $transaction->type->isWithdrawal() ? $chartAccount : $bankAccount;
+        $creditAccount = $transaction->type->isWithdrawal() ? $bankAccount : $chartAccount;
+
+        return [$debitAccount, $creditAccount];
+    }
+
+    private function createJournalEntriesForTransaction(Transaction $transaction, Account $debitAccount, Account $creditAccount): void
+    {
+        $convertedTransactionAmount = $this->getConvertedTransactionAmount($transaction);
+
+        DB::transaction(function () use ($debitAccount, $transaction, $convertedTransactionAmount, $creditAccount) {
+            $debitAccount->journalEntries()->create([
+                'company_id' => $transaction->company_id,
+                'transaction_id' => $transaction->id,
+                'type' => JournalEntryType::Debit,
+                'amount' => $convertedTransactionAmount,
+                'description' => $transaction->description,
+            ]);
+
+            $creditAccount->journalEntries()->create([
+                'company_id' => $transaction->company_id,
+                'transaction_id' => $transaction->id,
+                'type' => JournalEntryType::Credit,
+                'amount' => $convertedTransactionAmount,
+                'description' => $transaction->description,
+            ]);
+        });
+    }
+
+    private function getConvertedTransactionAmount(Transaction $transaction): string
+    {
+        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
+        $bankAccountCurrency = $transaction->bankAccount->account->currency_code;
+        $chartAccountCurrency = $transaction->account->currency_code;
+
+        if ($bankAccountCurrency !== $defaultCurrency) {
+            return $this->convertToDefaultCurrency($transaction->amount, $bankAccountCurrency, $defaultCurrency);
+        } elseif ($chartAccountCurrency !== $defaultCurrency) {
+            return $this->convertToDefaultCurrency($transaction->amount, $chartAccountCurrency, $defaultCurrency);
+        }
+
+        return $transaction->amount;
+    }
+
+    private function convertToDefaultCurrency(string $amount, string $fromCurrency, string $toCurrency): string
+    {
+        $amountInCents = CurrencyConverter::prepareForAccessor($amount, $fromCurrency);
+
+        $convertedAmountInCents = CurrencyConverter::convertBalance($amountInCents, $fromCurrency, $toCurrency);
+
+        return CurrencyConverter::prepareForMutator($convertedAmountInCents, $toCurrency);
+    }
+
+    private function hasRelevantChanges(Transaction $transaction): bool
+    {
+        return $transaction->wasChanged(['amount', 'account_id', 'bank_account_id', 'type']);
+    }
+
+    private function updateJournalEntryForTransaction(JournalEntry $journalEntry, Account $account, string $convertedTransactionAmount): void
+    {
+        DB::transaction(static function () use ($journalEntry, $account, $convertedTransactionAmount) {
+            $journalEntry->update([
+                'account_id' => $account->id,
+                'amount' => $convertedTransactionAmount,
+            ]);
+        });
+    }
 }

app/Testing/TestsReport.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Testing;
+
+use App\Contracts\ExportableReport;
+use Closure;
+use Livewire\Features\SupportTesting\Testable;
+
+/**
+ * @mixin Testable
+ */
+class TestsReport
+{
+    /**
+     * Asserts the report table data.
+     */
+    public function assertReportTableData(): Closure
+    {
+        return function (): static {
+            /** @var ExportableReport $report */
+            $report = $this->get('report');
+
+            // Assert headers
+            $this->assertSeeTextInOrder($report->getHeaders());
+
+            // Assert categories, headers, data, and summaries
+            $categories = $report->getCategories();
+            foreach ($categories as $category) {
+                $header = $category->header;
+                $data = $category->data;
+                $summary = $category->summary;
+
+                // Assert header
+                $this->assertSeeTextInOrder($header);
+
+                // Assert data rows
+                foreach ($data as $row) {
+                    $flatRow = [];
+
+                    foreach ($row as $value) {
+                        if (is_array($value)) {
+                            $flatRow[] = $value['name'];
+                        } else {
+                            $flatRow[] = $value;
+                        }
+                    }
+
+                    $this->assertSeeTextInOrder($flatRow);
+                }
+
+                // Assert summary
+                $this->assertSeeTextInOrder($summary);
+            }
+
+            // Assert overall totals
+            $this->assertSeeTextInOrder($report->getOverallTotals());
+
+            return $this;
+        };
+    }
+}

app/Transformers/TrialBalanceReportTransformer.php

@@ -10,7 +10,10 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
 {
     public function getTitle(): string
     {
-        return 'Trial Balance';
+        return match ($this->report->reportType) {
+            'postClosing' => 'Post-Closing Trial Balance',
+            default => 'Standard Trial Balance',
+        };
     }
 
     public function getHeaders(): array

app/Utilities/DocumentNumber.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace App\Utilities;
-
-use App\Contracts\DocumentNumber as DocumentNumberInterface;
-use Illuminate\Database\Eloquent\Model;
-
-class DocumentNumber implements DocumentNumberInterface
-{
-    public function getNextNumber(?Model $model, ?string $type, int | string $number, string $prefix, int | string $digits, ?bool $padded = false): string
-    {
-        if ($model) {
-            $numberNext = $model?->newQuery()
-                ->where('type', $type)
-                ->value($number);
-        } else {
-            $numberNext = $number;
-        }
-
-        if ($padded) {
-            return $prefix . str_pad($numberNext, $digits, '0', STR_PAD_LEFT);
-        }
-
-        return $numberNext;
-    }
-
-    public function incrementNumber(Model $model, string $type): void
-    {
-        $model->newQuery()
-            ->where('type', $type)
-            ->increment('number_next');
-    }
-}

app/View/Models/InvoiceViewModel.php

@@ -80,7 +80,7 @@ class InvoiceViewModel
 
     public function invoice_number(): string
     {
-        return DocumentDefault::getNumberNext(padded: true, format: true, prefix: $this->number_prefix(), digits: $this->number_digits(), next: $this->number_next());
+        return $this->invoice->getNumberNext(padded: true, format: true, prefix: $this->number_prefix(), digits: $this->number_digits(), next: $this->number_next());
     }
 
     // Invoice date related methods

composer.json

@@ -17,8 +17,7 @@
         "andrewdwallo/transmatic": "^1.1",
         "awcodes/filament-table-repeater": "^3.0",
         "barryvdh/laravel-snappy": "^1.0",
-        "bezhansalleh/filament-panel-switch": "^1.0",
-        "filament/filament": "^3.2.29",
+        "filament/filament": "^3.2.115",
         "guava/filament-clusters": "^1.1",
         "guzzlehttp/guzzle": "^7.8",
         "laravel/framework": "^11.0",
@@ -34,7 +33,8 @@
         "laravel/sail": "^1.26",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.0",
-        "phpunit/phpunit": "^10.5",
+        "pestphp/pest": "^3.0",
+        "pestphp/pest-plugin-livewire": "^3.0",
         "spatie/laravel-ignition": "^2.4",
         "spatie/laravel-ray": "^1.36"
     },

database/factories/Accounting/TransactionFactory.php

@@ -2,13 +2,16 @@
 
 namespace Database\Factories\Accounting;
 
-use App\Enums\Accounting\JournalEntryType;
+use App\Enums\Accounting\AccountType;
 use App\Enums\Accounting\TransactionType;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
 use App\Models\Company;
+use App\Models\Setting\CompanyDefault;
+use App\Services\TransactionService;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\DB;
 
 /**
  * @extends Factory<Transaction>
@@ -45,35 +48,9 @@ class TransactionFactory extends Factory
     public function configure(): static
     {
         return $this->afterCreating(function (Transaction $transaction) {
-            $chartAccount = $transaction->account;
-            $bankAccount = $transaction->bankAccount->account;
-
-            $debitAccount = $transaction->type->isWithdrawal() ? $chartAccount : $bankAccount;
-            $creditAccount = $transaction->type->isWithdrawal() ? $bankAccount : $chartAccount;
-
-            if ($debitAccount === null || $creditAccount === null) {
-                return;
+            if (DB::getDefaultConnection() === 'sqlite') {
+                app(TransactionService::class)->createJournalEntries($transaction);
             }
-
-            $debitAccount->journalEntries()->create([
-                'company_id' => $transaction->company_id,
-                'transaction_id' => $transaction->id,
-                'type' => JournalEntryType::Debit,
-                'amount' => $transaction->amount,
-                'description' => $transaction->description,
-                'created_by' => $transaction->created_by,
-                'updated_by' => $transaction->updated_by,
-            ]);
-
-            $creditAccount->journalEntries()->create([
-                'company_id' => $transaction->company_id,
-                'transaction_id' => $transaction->id,
-                'type' => JournalEntryType::Credit,
-                'amount' => $transaction->amount,
-                'description' => $transaction->description,
-                'created_by' => $transaction->created_by,
-                'updated_by' => $transaction->updated_by,
-            ]);
         });
     }
 
@@ -93,7 +70,15 @@ class TransactionFactory extends Factory
                 ->where('company_id', $company->id)
                 ->where('id', '<>', $accountIdForBankAccount)
                 ->inRandomOrder()
-                ->firstOrFail();
+                ->first();
+
+            // If no matching account is found, use a fallback
+            if (! $account) {
+                $account = Account::where('company_id', $company->id)
+                    ->where('id', '<>', $accountIdForBankAccount)
+                    ->inRandomOrder()
+                    ->firstOrFail(); // Ensure there is at least some account
+            }
 
             return [
                 'company_id' => $company->id,
@@ -103,4 +88,57 @@ class TransactionFactory extends Factory
             ];
         });
     }
+
+    public function forDefaultBankAccount(): static
+    {
+        return $this->state(function (array $attributes) {
+            $defaultBankAccount = CompanyDefault::first()->bankAccount;
+
+            return [
+                'bank_account_id' => $defaultBankAccount->id,
+            ];
+        });
+    }
+
+    public function forUncategorizedRevenue(): static
+    {
+        return $this->state(function (array $attributes) {
+            $account = Account::where('type', AccountType::UncategorizedRevenue)->firstOrFail();
+
+            return [
+                'account_id' => $account->id,
+            ];
+        });
+    }
+
+    public function forUncategorizedExpense(): static
+    {
+        return $this->state(function (array $attributes) {
+            $account = Account::where('type', AccountType::UncategorizedExpense)->firstOrFail();
+
+            return [
+                'account_id' => $account->id,
+            ];
+        });
+    }
+
+    public function asDeposit(int $amount): static
+    {
+        return $this->state(function () use ($amount) {
+            return [
+                'type' => TransactionType::Deposit,
+                'amount' => $amount,
+            ];
+        });
+    }
+
+    public function asWithdrawal(int $amount): static
+    {
+        return $this->state(function () use ($amount) {
+            return [
+                'type' => TransactionType::Withdrawal,
+                'amount' => $amount,
+            ];
+        });
+    }
 }

database/factories/CompanyFactory.php

@@ -3,8 +3,12 @@
 namespace Database\Factories;
 
 use App\Models\Company;
+use App\Models\Setting\CompanyProfile;
 use App\Models\User;
+use App\Services\CompanyDefaultService;
+use Database\Factories\Accounting\TransactionFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\DB;
 
 class CompanyFactory extends Factory
 {
@@ -28,4 +32,40 @@ class CompanyFactory extends Factory
             'personal_company' => true,
         ];
     }
+
+    public function withCompanyProfile(): self
+    {
+        return $this->afterCreating(function (Company $company) {
+            CompanyProfile::factory()->forCompany($company)->create();
+        });
+    }
+
+    /**
+     * Set up default settings for the company after creation.
+     */
+    public function withCompanyDefaults(): self
+    {
+        return $this->afterCreating(function (Company $company) {
+            DB::transaction(function () use ($company) {
+                $countryCode = $company->profile->country;
+                $companyDefaultService = app(CompanyDefaultService::class);
+                $companyDefaultService->createCompanyDefaults($company, $company->owner, 'USD', $countryCode, 'en');
+            });
+        });
+    }
+
+    public function withTransactions(int $count = 2000): self
+    {
+        return $this->afterCreating(function (Company $company) use ($count) {
+            $defaultBankAccount = $company->default->bankAccount;
+
+            TransactionFactory::new()
+                ->forCompanyAndBankAccount($company, $defaultBankAccount)
+                ->count($count)
+                ->createQuietly([
+                    'created_by' => $company->user_id,
+                    'updated_by' => $company->user_id,
+                ]);
+        });
+    }
 }

database/factories/Setting/CompanyProfileFactory.php

@@ -3,8 +3,8 @@
 namespace Database\Factories\Setting;
 
 use App\Enums\Setting\EntityType;
-use App\Faker\PhoneNumber;
 use App\Faker\State;
+use App\Models\Company;
 use App\Models\Setting\CompanyProfile;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -25,26 +25,34 @@ class CompanyProfileFactory extends Factory
      */
     public function definition(): array
     {
+        $countryCode = $this->faker->countryCode;
+
         return [
             'address' => $this->faker->streetAddress,
             'zip_code' => $this->faker->postcode,
+            'state_id' => $this->faker->state($countryCode),
+            'country' => $countryCode,
+            'phone_number' => $this->faker->phoneNumberForCountryCode($countryCode),
             'email' => $this->faker->email,
             'entity_type' => $this->faker->randomElement(EntityType::class),
         ];
     }
 
-    public function withCountry(string $code): static
+    public function withCountry(string $code): self
     {
-        /** @var PhoneNumber $phoneFaker */
-        $phoneFaker = $this->faker;
-
-        /** @var State $stateFaker */
-        $stateFaker = $this->faker;
-
         return $this->state([
             'country' => $code,
-            'state_id' => $stateFaker->state($code),
-            'phone_number' => $phoneFaker->phoneNumberForCountryCode($code),
+            'state_id' => $this->faker->state($code),
+            'phone_number' => $this->faker->phoneNumberForCountryCode($code),
+        ]);
+    }
+
+    public function forCompany(Company $company): self
+    {
+        return $this->state([
+            'company_id' => $company->id,
+            'created_by' => $company->owner->id,
+            'updated_by' => $company->owner->id,
         ]);
     }
 }

database/factories/UserFactory.php

@@ -3,12 +3,8 @@
 namespace Database\Factories;
 
 use App\Models\Company;
-use App\Models\Setting\CompanyProfile;
 use App\Models\User;
-use App\Services\CompanyDefaultService;
-use Database\Factories\Accounting\TransactionFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 use Wallo\FilamentCompanies\FilamentCompanies;
@@ -58,46 +54,23 @@ class UserFactory extends Factory
     /**
      * Indicate that the user should have a personal company.
      */
-    public function withPersonalCompany(): static
+    public function withPersonalCompany(?callable $callback = null): static
     {
         if (! FilamentCompanies::hasCompanyFeatures()) {
             return $this->state([]);
         }
 
-        $countryCode = $this->faker->countryCode;
-
-        return $this->afterCreating(function (User $user) use ($countryCode) {
+        return $this->has(
             Company::factory()
-                ->has(
-                    CompanyProfile::factory()
-                        ->withCountry($countryCode)
-                        ->state([
-                            'created_by' => $user->id,
-                            'updated_by' => $user->id,
-                        ]),
-                    'profile'
-                )
-                ->afterCreating(function (Company $company) use ($user, $countryCode) {
-                    DB::transaction(function () use ($company, $user, $countryCode) {
-                        $companyDefaultService = app()->make(CompanyDefaultService::class);
-                        $companyDefaultService->createCompanyDefaults($company, $user, 'USD', $countryCode, 'en');
-
-                        $defaultBankAccount = $company->default->bankAccount;
-
-                        TransactionFactory::new()
-                            ->forCompanyAndBankAccount($company, $defaultBankAccount)
-                            ->count(2000)
-                            ->createQuietly([
-                                'created_by' => $user->id,
-                                'updated_by' => $user->id,
-                            ]);
-                    });
-                })
-                ->create([
+                ->withCompanyProfile()
+                ->withCompanyDefaults()
+                ->state(fn (array $attributes, User $user) => [
                     'name' => $user->name . '\'s Company',
                     'user_id' => $user->id,
                     'personal_company' => true,
-                ]);
-        });
+                ])
+                ->when(is_callable($callback), $callback),
+            'ownedCompanies'
+        );
     }
 }

database/seeders/DatabaseSeeder.php

@@ -3,6 +3,7 @@
 namespace Database\Seeders;
 
 use App\Models\User;
+use Database\Factories\CompanyFactory;
 use Illuminate\Database\Seeder;
 
 class DatabaseSeeder extends Seeder
@@ -14,7 +15,9 @@ class DatabaseSeeder extends Seeder
     {
         // Create a single admin user and their personal company
         $adminUser = User::factory()
-            ->withPersonalCompany()  // Ensures the user has a personal company created alongside
+            ->withPersonalCompany(function (CompanyFactory $factory) {
+                return $factory->withTransactions();
+            })
             ->create([
                 'name' => 'Admin',
                 'email' => 'admin@gmail.com',

database/seeders/TestDatabaseSeeder.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Database\Seeders;
+
+use App\Models\User;
+use Illuminate\Database\Seeder;
+
+class TestDatabaseSeeder extends Seeder
+{
+    public function run(): void
+    {
+        User::factory()
+            ->withPersonalCompany()
+            ->createQuietly([
+                'name' => 'Test Company Owner',
+                'email' => 'test@gmail.com',
+                'password' => bcrypt('password'),
+                'current_company_id' => 1,
+            ]);
+    }
+}

package-lock.json

@@ -5,15 +5,15 @@
     "packages": {
         "": {
             "devDependencies": {
-                "@tailwindcss/forms": "^0.5.7",
-                "@tailwindcss/typography": "^0.5.13",
-                "autoprefixer": "^10.4.19",
-                "axios": "^1.7.2",
+                "@tailwindcss/forms": "^0.5.9",
+                "@tailwindcss/typography": "^0.5.15",
+                "autoprefixer": "^10.4.20",
+                "axios": "^1.7.7",
                 "laravel-vite-plugin": "^1.0",
-                "postcss": "^8.4.38",
-                "postcss-nesting": "^12.1.5",
-                "tailwindcss": "^3.4.4",
-                "vite": "^5.3"
+                "postcss": "^8.4.47",
+                "postcss-nesting": "^13.0.0",
+                "tailwindcss": "^3.4.13",
+                "vite": "^5.4"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -541,9 +541,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.5.tgz",
+            "integrity": "sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==",
             "cpu": [
                 "arm"
             ],
@@ -555,9 +555,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.21.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.21.2.tgz",
-            "integrity": "sha512-xGU5ZQmPlsjQS6tzTTGwMsnKUtu0WVbl0hYpTPauvbRAnmIvpInhJtgjj3mcuJpEiuUw4v1s4BimkdfDWlh7gA==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.5.tgz",
+            "integrity": "sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==",
             "cpu": [
                 "arm64"
             ],
@@ -569,9 +569,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.5.tgz",
+            "integrity": "sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==",
             "cpu": [
                 "arm64"
             ],
@@ -583,9 +583,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.5.tgz",
+            "integrity": "sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==",
             "cpu": [
                 "x64"
             ],
@@ -597,9 +597,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.5.tgz",
+            "integrity": "sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==",
             "cpu": [
                 "arm"
             ],
@@ -611,9 +611,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.5.tgz",
+            "integrity": "sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==",
             "cpu": [
                 "arm"
             ],
@@ -625,9 +625,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.5.tgz",
+            "integrity": "sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==",
             "cpu": [
                 "arm64"
             ],
@@ -639,9 +639,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.5.tgz",
+            "integrity": "sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==",
             "cpu": [
                 "arm64"
             ],
@@ -653,9 +653,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.5.tgz",
+            "integrity": "sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==",
             "cpu": [
                 "ppc64"
             ],
@@ -667,9 +667,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.5.tgz",
+            "integrity": "sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==",
             "cpu": [
                 "riscv64"
             ],
@@ -681,9 +681,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.5.tgz",
+            "integrity": "sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==",
             "cpu": [
                 "s390x"
             ],
@@ -695,9 +695,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.5.tgz",
+            "integrity": "sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==",
             "cpu": [
                 "x64"
             ],
@@ -709,9 +709,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.5.tgz",
+            "integrity": "sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==",
             "cpu": [
                 "x64"
             ],
@@ -723,9 +723,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.5.tgz",
+            "integrity": "sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==",
             "cpu": [
                 "arm64"
             ],
@@ -737,9 +737,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.5.tgz",
+            "integrity": "sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==",
             "cpu": [
                 "ia32"
             ],
@@ -751,9 +751,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "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==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.5.tgz",
+            "integrity": "sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==",
             "cpu": [
                 "x64"
             ],
@@ -794,9 +794,9 @@
             }
         },
         "node_modules/@types/estree": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
-            "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==",
+            "version": "1.0.6",
+            "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+            "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
             "dev": true,
             "license": "MIT"
         },
@@ -955,9 +955,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.23.3",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
-            "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
+            "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
             "dev": true,
             "funding": [
                 {
@@ -975,8 +975,8 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001646",
-                "electron-to-chromium": "^1.5.4",
+                "caniuse-lite": "^1.0.30001663",
+                "electron-to-chromium": "^1.5.28",
                 "node-releases": "^2.0.18",
                 "update-browserslist-db": "^1.1.0"
             },
@@ -998,9 +998,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001659",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001659.tgz",
-            "integrity": "sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==",
+            "version": "1.0.30001664",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
+            "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
             "dev": true,
             "funding": [
                 {
@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.18",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.18.tgz",
-            "integrity": "sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==",
+            "version": "1.5.30",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.30.tgz",
+            "integrity": "sha512-sXI35EBN4lYxzc/pIGorlymYNzDBOqkSlVRe6MkgBsW/hW1tpC/HDJ2fjG7XnjakzfLEuvdmux0Mjs6jHq4UOA==",
             "dev": true,
             "license": "ISC"
         },
@@ -1745,9 +1745,9 @@
             }
         },
         "node_modules/package-json-from-dist": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
-            "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
             "dev": true,
             "license": "BlueOak-1.0.0"
         },
@@ -1826,9 +1826,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.45",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.45.tgz",
-            "integrity": "sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==",
+            "version": "8.4.47",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
+            "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
             "dev": true,
             "funding": [
                 {
@@ -1847,8 +1847,8 @@
             "license": "MIT",
             "dependencies": {
                 "nanoid": "^3.3.7",
-                "picocolors": "^1.0.1",
-                "source-map-js": "^1.2.0"
+                "picocolors": "^1.1.0",
+                "source-map-js": "^1.2.1"
             },
             "engines": {
                 "node": "^10 || ^12 || >=14"
@@ -1982,9 +1982,9 @@
             }
         },
         "node_modules/postcss-nesting": {
-            "version": "12.1.5",
-            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-12.1.5.tgz",
-            "integrity": "sha512-N1NgI1PDCiAGWPTYrwqm8wpjv0bgDmkYHH72pNsqTCv9CObxjxftdYu6AKtGN+pnJa7FQjMm3v4sp8QJbFsYdQ==",
+            "version": "13.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.0.tgz",
+            "integrity": "sha512-TCGQOizyqvEkdeTPM+t6NYwJ3EJszYE/8t8ILxw/YoeUvz2rz7aM8XTAmBWh9/DJjfaaabL88fWrsVHSPF2zgA==",
             "dev": true,
             "funding": [
                 {
@@ -1998,21 +1998,21 @@
             ],
             "license": "MIT-0",
             "dependencies": {
-                "@csstools/selector-resolve-nested": "^1.1.0",
-                "@csstools/selector-specificity": "^3.1.1",
+                "@csstools/selector-resolve-nested": "^2.0.0",
+                "@csstools/selector-specificity": "^4.0.0",
                 "postcss-selector-parser": "^6.1.0"
             },
             "engines": {
-                "node": "^14 || ^16 || >=18"
+                "node": ">=18"
             },
             "peerDependencies": {
                 "postcss": "^8.4"
             }
         },
         "node_modules/postcss-nesting/node_modules/@csstools/selector-resolve-nested": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-1.1.0.tgz",
-            "integrity": "sha512-uWvSaeRcHyeNenKg8tp17EVDRkpflmdyvbE0DHo6D/GdBb6PDnCYYU6gRpXhtICMGMcahQmj2zGxwFM/WC8hCg==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-2.0.0.tgz",
+            "integrity": "sha512-oklSrRvOxNeeOW1yARd4WNCs/D09cQjunGZUgSq6vM8GpzFswN+8rBZyJA29YFZhOTQ6GFzxgLDNtVbt9wPZMA==",
             "dev": true,
             "funding": [
                 {
@@ -2026,16 +2026,16 @@
             ],
             "license": "MIT-0",
             "engines": {
-                "node": "^14 || ^16 || >=18"
+                "node": ">=18"
             },
             "peerDependencies": {
-                "postcss-selector-parser": "^6.0.13"
+                "postcss-selector-parser": "^6.1.0"
             }
         },
         "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
-            "version": "3.1.1",
-            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.1.1.tgz",
-            "integrity": "sha512-a7cxGcJ2wIlMFLlh8z2ONm+715QkPHiyJcxwQlKOz/03GPw1COpfhcmC9wm4xlZfp//jWHNNMwzjtqHXVWU9KA==",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz",
+            "integrity": "sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==",
             "dev": true,
             "funding": [
                 {
@@ -2049,10 +2049,10 @@
             ],
             "license": "MIT-0",
             "engines": {
-                "node": "^14 || ^16 || >=18"
+                "node": ">=18"
             },
             "peerDependencies": {
-                "postcss-selector-parser": "^6.0.13"
+                "postcss-selector-parser": "^6.1.0"
             }
         },
         "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
@@ -2171,13 +2171,13 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.21.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.21.2.tgz",
-            "integrity": "sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==",
+            "version": "4.22.5",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz",
+            "integrity": "sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@types/estree": "1.0.5"
+                "@types/estree": "1.0.6"
             },
             "bin": {
                 "rollup": "dist/bin/rollup"
@@ -2187,22 +2187,22 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@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",
+                "@rollup/rollup-android-arm-eabi": "4.22.5",
+                "@rollup/rollup-android-arm64": "4.22.5",
+                "@rollup/rollup-darwin-arm64": "4.22.5",
+                "@rollup/rollup-darwin-x64": "4.22.5",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.22.5",
+                "@rollup/rollup-linux-arm-musleabihf": "4.22.5",
+                "@rollup/rollup-linux-arm64-gnu": "4.22.5",
+                "@rollup/rollup-linux-arm64-musl": "4.22.5",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.22.5",
+                "@rollup/rollup-linux-riscv64-gnu": "4.22.5",
+                "@rollup/rollup-linux-s390x-gnu": "4.22.5",
+                "@rollup/rollup-linux-x64-gnu": "4.22.5",
+                "@rollup/rollup-linux-x64-musl": "4.22.5",
+                "@rollup/rollup-win32-arm64-msvc": "4.22.5",
+                "@rollup/rollup-win32-ia32-msvc": "4.22.5",
+                "@rollup/rollup-win32-x64-msvc": "4.22.5",
                 "fsevents": "~2.3.2"
             }
         },
@@ -2417,9 +2417,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.10",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.10.tgz",
-            "integrity": "sha512-KWZkVPm7yJRhdu4SRSl9d4AK2wM3a50UsvgHZO7xY77NQr2V+fIrEuoDGQcbvswWvFGbS2f6e+jC/6WJm1Dl0w==",
+            "version": "3.4.13",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.13.tgz",
+            "integrity": "sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2512,9 +2512,9 @@
             "license": "Apache-2.0"
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
-            "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+            "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
             "dev": true,
             "funding": [
                 {
@@ -2532,8 +2532,8 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "escalade": "^3.1.2",
-                "picocolors": "^1.0.1"
+                "escalade": "^3.2.0",
+                "picocolors": "^1.1.0"
             },
             "bin": {
                 "update-browserslist-db": "cli.js"
@@ -2550,9 +2550,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.4.3",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.3.tgz",
-            "integrity": "sha512-IH+nl64eq9lJjFqU+/yrRnrHPVTlgy42/+IzbOdaFDVlyLgI/wDlf+FCobXLX1cT0X5+7LMyH1mIy2xJdLfo8Q==",
+            "version": "5.4.8",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",
+            "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

package.json

@@ -6,14 +6,14 @@
         "build": "vite build"
     },
     "devDependencies": {
-        "@tailwindcss/forms": "^0.5.7",
-        "@tailwindcss/typography": "^0.5.13",
-        "autoprefixer": "^10.4.19",
-        "axios": "^1.7.2",
+        "@tailwindcss/forms": "^0.5.9",
+        "@tailwindcss/typography": "^0.5.15",
+        "autoprefixer": "^10.4.20",
+        "axios": "^1.7.7",
         "laravel-vite-plugin": "^1.0",
-        "postcss": "^8.4.38",
-        "postcss-nesting": "^12.1.5",
-        "tailwindcss": "^3.4.4",
-        "vite": "^5.3"
+        "postcss": "^8.4.47",
+        "postcss-nesting": "^13.0.0",
+        "tailwindcss": "^3.4.13",
+        "vite": "^5.4"
     }
 }

phpunit.xml

@@ -22,8 +22,8 @@
         <env name="APP_MAINTENANCE_DRIVER" value="file"/>
         <env name="BCRYPT_ROUNDS" value="4"/>
         <env name="CACHE_STORE" value="array"/>
-        <!-- <env name="DB_CONNECTION" value="sqlite"/> -->
-        <!-- <env name="DB_DATABASE" value=":memory:"/> -->
+        <env name="DB_CONNECTION" value="mysql"/>
+        <env name="DB_DATABASE" value="erpsaas_test"/>
         <env name="MAIL_MAILER" value="array"/>
         <env name="PULSE_ENABLED" value="false"/>
         <env name="QUEUE_CONNECTION" value="sync"/>

resources/css/filament/company/theme.css

@@ -4,6 +4,14 @@
 
 @config './tailwind.config.js';
 
+.fi-fo-field-wrp.report-hidden-label > div.grid.gap-y-2 > div.flex.items-center {
+    @apply hidden;
+}
+
+.fi-fo-field-wrp.report-hidden-label {
+    @apply lg:mt-8;
+}
+
 .choices__list.choices__list--single {
     @apply w-full;
 }

resources/css/filament/user/tailwind.config.js

@@ -5,6 +5,7 @@ export default {
     content: [
         './app/Filament/User/**/*.php',
         './resources/views/filament/user/**/*.blade.php',
+        './resources/views/components/**/*.blade.php',
         './vendor/filament/**/*.blade.php',
         './vendor/andrewdwallo/filament-companies/resources/views/**/*.blade.php',
         './vendor/bezhansalleh/filament-panel-switch/resources/views/panel-switch-menu.blade.php',

resources/js/TopNavigation.js

@@ -1,6 +1,5 @@
 document.addEventListener('DOMContentLoaded', () => {
     handleTopbarAndSidebarHover();
-
     handleScroll();
 });
 
@@ -10,18 +9,25 @@ const handleTopbarAndSidebarHover = () => {
 
     const addHoveredClass = () => {
         topbarNav.classList.add('topbar-hovered');
-        sidebarHeader.classList.add('topbar-hovered');
+        if (sidebarHeader) {
+            sidebarHeader.classList.add('topbar-hovered');
+        }
     };
 
     const removeHoveredClass = () => {
         topbarNav.classList.remove('topbar-hovered');
-        sidebarHeader.classList.remove('topbar-hovered');
+        if (sidebarHeader) {
+            sidebarHeader.classList.remove('topbar-hovered');
+        }
     };
 
     topbarNav.addEventListener('mouseenter', addHoveredClass);
-    sidebarHeader.addEventListener('mouseenter', addHoveredClass);
     topbarNav.addEventListener('mouseleave', removeHoveredClass);
-    sidebarHeader.addEventListener('mouseleave', removeHoveredClass);
+
+    if (sidebarHeader) {
+        sidebarHeader.addEventListener('mouseenter', addHoveredClass);
+        sidebarHeader.addEventListener('mouseleave', removeHoveredClass);
+    }
 };
 
 const handleScroll = () => {
@@ -31,11 +37,16 @@ const handleScroll = () => {
     window.addEventListener('scroll', () => {
         if (window.scrollY > 0) {
             topbarNav.classList.add('topbar-scrolled');
-            sidebarHeader.classList.add('topbar-scrolled');
+            if (sidebarHeader) {
+                sidebarHeader.classList.add('topbar-scrolled');
+            }
         } else {
             topbarNav.classList.remove('topbar-scrolled');
-            sidebarHeader.classList.remove('topbar-scrolled');
+            if (sidebarHeader) {
+                sidebarHeader.classList.remove('topbar-scrolled');
+            }
         }
     });
-}
+};
+
 

resources/views/components/company/reports/report-pdf.blade.php

@@ -93,7 +93,11 @@
 <div class="header">
     <div class="title">{{ $report->getTitle() }}</div>
     <div class="company-name">{{ $company->name }}</div>
-    <div class="date-range">Date Range: {{ $startDate }} to {{ $endDate }}</div>
+    @if($startDate && $endDate)
+        <div class="date-range">Date Range: {{ $startDate }} to {{ $endDate }}</div>
+    @else
+        <div class="date-range">As of {{ $endDate }}</div>
+    @endif
 </div>
 <table class="table-class">
     <thead class="table-head">

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

@@ -1,4 +1,5 @@
 @php
+    $user = filament()->auth()->user();
     $items = filament()->getUserMenuItems();
     $logoutItem = $items['logout'] ?? null;
     $currentTenant = filament()->getTenant();
@@ -15,12 +16,19 @@
     <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"
+            class="flex 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"
         >
-            <x-filament-panels::avatar.tenant
-                :tenant="$currentTenant"
-                class="shrink-0"
-            />
+            @if($currentTenant)
+                <x-filament-panels::avatar.tenant
+                    :tenant="$currentTenant"
+                    class="shrink-0"
+                />
+            @else
+                <x-filament-panels::avatar.user
+                    :user="$user"
+                    class="shrink-0"
+                />
+            @endif
 
             <span class="grid justify-items-start text-start">
                 @if ($currentTenant instanceof \Filament\Models\Contracts\HasCurrentTenantLabel)
@@ -30,7 +38,7 @@
                 @endif
 
                 <span class="text-gray-950 dark:text-white">
-                    {{ $currentTenantName }}
+                    {{ $currentTenantName ?? filament()->getUserName($user) }}
                 </span>
             </span>
 

resources/views/filament/company/pages/accounting/transactions.blade.php

@@ -1,4 +1,3 @@
 <x-filament-panels::page>
-    {{ $this->form }}
     {{ $this->table }}
 </x-filament-panels::page>

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

@@ -9,8 +9,8 @@
             <!-- Grouping Button and Column Toggle -->
             @if($this->hasToggleableColumns())
                 <x-filament-tables::column-toggle.dropdown
-                    :form="$this->toggleTableColumnForm"
-                    :trigger-action="$this->toggleColumnsAction"
+                    :form="$this->getTableColumnToggleForm()"
+                    :trigger-action="$this->getToggleColumnsTriggerAction()"
                 />
             @endif
 

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

@@ -9,8 +9,8 @@
             <!-- Grouping Button and Column Toggle -->
             @if($this->hasToggleableColumns())
                 <x-filament-tables::column-toggle.dropdown
-                    :form="$this->toggleTableColumnForm"
-                    :trigger-action="$this->toggleColumnsAction"
+                    :form="$this->getTableColumnToggleForm()"
+                    :trigger-action="$this->getToggleColumnsTriggerAction()"
                 />
             @endif
 

resources/views/filament/company/pages/reports/trial-balance.blade.php

@@ -0,0 +1,45 @@
+<x-filament-panels::page>
+    <x-filament::section>
+        <div class="flex flex-col lg:flex-row items-start lg:items-end justify-between gap-4">
+            <!-- Form Container -->
+            @if(method_exists($this, 'filtersForm'))
+                {{ $this->filtersForm }}
+            @endif
+
+            <!-- Grouping Button and Column Toggle -->
+            @if($this->hasToggleableColumns())
+                <div class="lg:mb-1">
+                    <x-filament-tables::column-toggle.dropdown
+                        :form="$this->getTableColumnToggleForm()"
+                        :trigger-action="$this->getToggleColumnsTriggerAction()"
+                    />
+                </div>
+            @endif
+
+            <div class="inline-flex items-center min-w-0 lg:min-w-[9.5rem] justify-end">
+                {{ $this->applyFiltersAction }}
+            </div>
+        </div>
+    </x-filament::section>
+
+    <x-filament-tables::container>
+        <div class="es-table__header-ctn"></div>
+        <div
+            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
+                <div wire:loading wire:target="applyFilters">
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
+                </div>
+            </div>
+
+            @if($this->reportLoaded)
+                <div wire:loading.remove wire:target="applyFilters">
+                    @if($this->report)
+                        <x-company.tables.reports.detailed-report :report="$this->report"/>
+                    @endif
+                </div>
+            @endif
+        </div>
+        <div class="es-table__footer-ctn border-t border-gray-200"></div>
+    </x-filament-tables::container>
+</x-filament-panels::page>

resources/views/vendor/filament-panel-switch/panel-switch-menu.blade.php

@@ -1,107 +0,0 @@
-@php
-    $getUrlScheme = (string) app()->environment('production') ? 'https://' : 'http://';
-
-    $getPanelPath = fn (\Filament\Panel $panel): string => filled($domains = $panel->getDomains())
-            ? str(collect($domains)->first())->prepend($getUrlScheme)->toString()
-            : str($panel->getPath())->prepend('/')->toString();
-
-    $getHref = fn (\Filament\Panel $panel): ?string => $canSwitchPanels && $panel->getId() !== $currentPanel->getId()
-            ? $getPanelPath($panel)
-            : null;
-@endphp
-
-@if ($isSimple)
-    <x-filament::dropdown teleport placement="bottom-end">
-        <x-slot name="trigger">
-            <div x-data="{ open: false }" @click.outside="open = false">
-                <button type="button" @click="open = !open" class="flex items-center justify-center gap-x-2 rounded-lg px-3 py-2 text-sm font-semibold outline-none transition duration-75 hover:bg-gray-50 focus-visible:bg-gray-50 dark:hover:bg-white/5 dark:focus-visible:bg-white/5 text-gray-700 dark:text-gray-200">
-                    <span class="ml-4">{{  $labels[$currentPanel->getId()] ?? str($currentPanel->getId())->ucfirst() }}</span>
-                    <x-heroicon-m-chevron-down x-show="!open" class="w-5 h-5 text-gray-400 dark:text-gray-500" />
-                    <x-heroicon-m-chevron-up x-show="open" x-cloak class="w-5 h-5 text-gray-400 dark:text-gray-500" />
-                </button>
-            </div>
-        </x-slot>
-
-        <x-filament::dropdown.list>
-            @foreach ($panels as $panel)
-                <x-filament::dropdown.list.item
-                    :href="$getHref($panel)"
-                    :icon="$icons[$panel->getId()] ?? 'heroicon-s-square-2-stack'"
-                    tag="a"
-                >
-                    {{ $labels[$panel->getId()] ?? str($panel->getId())->ucfirst() }}
-                </x-filament::dropdown.list.item>
-            @endforeach
-        </x-filament::dropdown.list>
-    </x-filament::dropdown>
-@else
-    <style>
-        .panel-switch-modal .fi-modal-content {
-            align-items: center !important;
-            justify-content: center !important;
-        }
-    </style>
-    <x-filament::icon-button
-        x-data="{}"
-        icon="heroicon-o-square-3-stack-3d"
-        icon-alias="panels::panel-switch-modern-icon"
-        icon-size="lg"
-        @click="$dispatch('open-modal', { id: 'panel-switch' })"
-        label="Switch Panels"
-        class="text-gray-700 dark:text-primary-500"
-    />
-
-    <x-filament::modal
-        id="panel-switch"
-        :width="$modalWidth"
-        alignment="center"
-        display-classes="block"
-        :slide-over="$isSlideOver"
-        :sticky-header="$isSlideOver"
-        :heading="$heading"
-        class="panel-switch-modal"
-    >
-        <div
-            class="flex flex-wrap items-center justify-center gap-4 md:gap-6"
-        >
-            @foreach ($panels as $panel)
-                <!-- x-on:click="location.href = '{{ $getHref($panel) }}'" -->
-                <a
-                    href="{{ $getHref($panel) }}"
-                    class="flex flex-col items-center justify-center flex-1 hover:cursor-pointer group panel-switch-card"
-                >
-                    <div
-                        @class([
-                            "p-2 bg-white rounded-lg shadow-md dark:bg-gray-800 panel-switch-card-section",
-                            "group-hover:ring-2 group-hover:ring-primary-600" => $panel->getId() !== $currentPanel->getId(),
-                            "ring-2 ring-primary-600" => $panel->getId() === $currentPanel->getId(),
-                        ])
-                    >
-                        @if ($renderIconAsImage)
-                            <img
-                                class="rounded-lg panel-switch-card-image"
-                                style="width: {{ $iconSize * 4 }}px; height: {{ $iconSize * 4 }}px;"
-                                src="{{ $icons[$panel->getId()] ?? 'https://raw.githubusercontent.com/bezhanSalleh/filament-panel-switch/3.x/art/banner.jpg' }}"
-                                alt="Panel Image"
-                            >
-                        @else
-                            @php
-                                $iconName = $icons[$panel->getId()] ?? 'heroicon-s-square-2-stack' ;
-                            @endphp
-                            @svg($iconName, 'text-primary-600 panel-switch-card-icon', ['style' => 'width: ' . ($iconSize * 4) . 'px; height: ' . ($iconSize * 4). 'px;'])
-                        @endif
-                    </div>
-                    <span
-                        @class([
-                            "mt-2 text-sm font-medium text-center text-gray-400 dark:text-gray-200 break-words panel-switch-card-title",
-                            "text-gray-400 dark:text-gray-200 group-hover:text-primary-600 group-hover:dark:text-primary-400" => $panel->getId() !== $currentPanel->getId(),
-                            "text-primary-600 dark:text-primary-400" => $panel->getId() === $currentPanel->getId(),
-                        ])
-                    >
-                        {{ $labels[$panel->getId()] ?? str($panel->getId())->ucfirst()}}
-                    </span>
-                </a>
-            @endforeach
-        </div>
-    </x-filament::modal>
-@endif

resources/views/vendor/filament-panels/components/user-menu.blade.php

@@ -12,11 +12,10 @@
     $items = \Illuminate\Support\Arr::except($items, ['account', 'logout', 'profile']);
 
     $hasPanelShiftDropdown = filament()->hasPlugin('panel-shift-dropdown');
-    $hasTenant = filament()->getTenant() !== null;
 @endphp
 
 
-@if($hasTenant)
+@if($hasPanelShiftDropdown)
     {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::USER_MENU_BEFORE) }}
 @endif
 
@@ -35,7 +34,7 @@
                 type="button"
                 class="shrink-0"
             >
-                <x-filament-panels::avatar.user :user="$user" />
+                <x-filament-panels::avatar.user :user="$user"/>
             </button>
         </x-slot>
 
@@ -68,7 +67,7 @@
 
         @if (filament()->hasDarkMode() && (! filament()->hasDarkModeForced()))
             <x-filament::dropdown.list>
-                <x-filament-panels::theme-switcher />
+                <x-filament-panels::theme-switcher/>
             </x-filament::dropdown.list>
         @endif
 

tests/Feature/CompanySetupAndBehaviorTest.php

@@ -0,0 +1,64 @@
+<?php
+
+use App\Models\Accounting\Transaction;
+
+it('initially assigns a personal company to the test user', function () {
+    $testUser = $this->testUser;
+    $testCompany = $this->testCompany;
+
+    expect($testUser)->not->toBeNull()
+        ->and($testCompany)->not->toBeNull()
+        ->and($testCompany->personal_company)->toBeTrue()
+        ->and($testUser->currentCompany->id)->toBe($testCompany->id);
+});
+
+it('can create a new company and switches to it automatically', function () {
+    $testUser = $this->testUser;
+    $testCompany = $this->testCompany;
+
+    $newCompany = createCompany('New Company');
+
+    expect($newCompany)->not->toBeNull()
+        ->and($newCompany->name)->toBe('New Company')
+        ->and($newCompany->personal_company)->toBeFalse()
+        ->and($testUser->currentCompany->id)->toBe($newCompany->id)
+        ->and($newCompany->id)->not->toBe($testCompany->id);
+});
+
+it('returns data for the current company based on the CurrentCompanyScope', function () {
+    $testUser = $this->testUser;
+    $testCompany = $this->testCompany;
+
+    Transaction::factory()
+        ->forCompanyAndBankAccount($testCompany, $testCompany->default->bankAccount)
+        ->count(10)
+        ->create();
+
+    $newCompany = createCompany('New Company');
+
+    expect($testUser->currentCompany->id)
+        ->toBe($newCompany->id)
+        ->not->toBe($testCompany->id);
+
+    Transaction::factory()
+        ->forCompanyAndBankAccount($newCompany, $newCompany->default->bankAccount)
+        ->count(5)
+        ->create();
+
+    expect(Transaction::count())->toBe(5);
+
+    $testUser->switchCompany($testCompany);
+
+    expect($testUser->currentCompany->id)->toBe($testCompany->id)
+        ->and(Transaction::count())->toBe(10);
+});
+
+it('validates that company default settings are non-null', function () {
+    $testCompany = $this->testCompany;
+
+    expect($testCompany->profile->country)->not->toBeNull()
+        ->and($testCompany->profile->email)->not->toBeNull()
+        ->and($testCompany->default->currency_code)->toBe('USD')
+        ->and($testCompany->locale->language)->toBe('en')
+        ->and($testCompany->default->bankAccount->account->name)->toBe('Cash on Hand');
+});

tests/Feature/ExampleTest.php

@@ -1,19 +1,7 @@
 <?php
 
-namespace Tests\Feature;
+it('returns a successful response', function () {
+    $response = $this->get('/');
 
-// use Illuminate\Foundation\Testing\RefreshDatabase;
-use Tests\TestCase;
-
-class ExampleTest extends TestCase
-{
-    /**
-     * A basic test example.
-     */
-    public function test_the_application_returns_a_successful_response(): void
-    {
-        $response = $this->get('/');
-
-        $response->assertStatus(200);
-    }
-}
+    $response->assertStatus(200);
+});

tests/Feature/Reports/AccountBalancesReportTest.php

@@ -0,0 +1,145 @@
+<?php
+
+use App\Facades\Accounting;
+use App\Facades\Reporting;
+use App\Factories\ReportDateFactory;
+use App\Filament\Company\Pages\Reports\AccountBalances;
+use App\Models\Accounting\Transaction;
+
+use function Pest\Livewire\livewire;
+
+it('correctly builds an account balances report for the current fiscal year', function () {
+    $testCompany = $this->testCompany;
+
+    $reportDates = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDates->defaultDateRange;
+    $defaultStartDate = $reportDates->defaultStartDate->toImmutable();
+    $defaultEndDate = $reportDates->defaultEndDate->toImmutable();
+
+    $depositAmount = 1000;
+    $withdrawalAmount = 1000;
+    $depositCount = 10;
+    $withdrawalCount = 10;
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedRevenue()
+        ->asDeposit($depositAmount)
+        ->count($depositCount)
+        ->state([
+            'posted_at' => $defaultStartDate->subWeek(),
+        ])
+        ->create();
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedExpense()
+        ->asWithdrawal($withdrawalAmount)
+        ->count($withdrawalCount)
+        ->state([
+            'posted_at' => $defaultEndDate,
+        ])
+        ->create();
+
+    $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
+
+    $expectedBalances = Accounting::getBalances(
+        $defaultBankAccountAccount,
+        $defaultStartDate->toDateString(),
+        $defaultEndDate->toDateString(),
+    );
+
+    $formattedExpectedBalances = Reporting::formatBalances($expectedBalances);
+
+    livewire(AccountBalances::class)
+        ->assertFormSet([
+            'deferredFilters.dateRange' => $defaultDateRange,
+            'deferredFilters.startDate' => $defaultStartDate->toDateTimeString(),
+            'deferredFilters.endDate' => $defaultEndDate->toDateTimeString(),
+        ])
+        ->assertSet('filters', [
+            'dateRange' => $defaultDateRange,
+            'startDate' => $defaultStartDate->toDateString(),
+            'endDate' => $defaultEndDate->toDateString(),
+        ])
+        ->call('applyFilters')
+        ->assertSeeTextInOrder([
+            $defaultBankAccountAccount->name,
+            $formattedExpectedBalances->startingBalance,
+            $formattedExpectedBalances->debitBalance,
+            $formattedExpectedBalances->creditBalance,
+            $formattedExpectedBalances->netMovement,
+            $formattedExpectedBalances->endingBalance,
+        ])
+        ->assertReportTableData();
+});
+
+it('correctly builds an account balances report for the previous fiscal year', function () {
+    $testCompany = $this->testCompany;
+
+    $reportDatesDTO = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDatesDTO->defaultDateRange;
+    $defaultStartDate = $reportDatesDTO->defaultStartDate->toImmutable();
+    $defaultEndDate = $reportDatesDTO->defaultEndDate->toImmutable();
+
+    $depositAmount = 1000;
+    $withdrawalAmount = 1000;
+    $depositCount = 10;
+    $withdrawalCount = 10;
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedRevenue()
+        ->asDeposit($depositAmount)
+        ->count($depositCount)
+        ->state([
+            'posted_at' => $defaultStartDate->subWeek(),
+        ])
+        ->create();
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedExpense()
+        ->asWithdrawal($withdrawalAmount)
+        ->count($withdrawalCount)
+        ->state([
+            'posted_at' => $defaultEndDate,
+        ])
+        ->create();
+
+    $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
+
+    $expectedBalancesSubYear = Accounting::getBalances(
+        $defaultBankAccountAccount,
+        $defaultStartDate->subYear()->startOfYear()->toDateString(),
+        $defaultEndDate->subYear()->endOfYear()->toDateString(),
+    );
+
+    $formattedExpectedBalancesSubYear = Reporting::formatBalances($expectedBalancesSubYear);
+
+    livewire(AccountBalances::class)
+        ->assertFormSet([
+            'deferredFilters.dateRange' => $defaultDateRange,
+            'deferredFilters.startDate' => $defaultStartDate->toDateTimeString(),
+            'deferredFilters.endDate' => $defaultEndDate->toDateTimeString(),
+        ])
+        ->assertSet('filters', [
+            'dateRange' => $defaultDateRange,
+            'startDate' => $defaultStartDate->toDateString(),
+            'endDate' => $defaultEndDate->toDateString(),
+        ])
+        ->set('deferredFilters', [
+            'startDate' => $defaultStartDate->subYear()->startOfYear()->toDateTimeString(),
+            'endDate' => $defaultEndDate->subYear()->endOfYear()->toDateTimeString(),
+        ])
+        ->call('applyFilters')
+        ->assertSeeTextInOrder([
+            $defaultBankAccountAccount->name,
+            $formattedExpectedBalancesSubYear->startingBalance,
+            $formattedExpectedBalancesSubYear->debitBalance,
+            $formattedExpectedBalancesSubYear->creditBalance,
+            $formattedExpectedBalancesSubYear->netMovement,
+            $formattedExpectedBalancesSubYear->endingBalance,
+        ])
+        ->assertReportTableData();
+});

tests/Feature/Reports/TrialBalanceReportTest.php

@@ -0,0 +1,169 @@
+<?php
+
+use App\Facades\Accounting;
+use App\Facades\Reporting;
+use App\Factories\ReportDateFactory;
+use App\Filament\Company\Pages\Reports\TrialBalance;
+use App\Models\Accounting\Transaction;
+
+use function Pest\Livewire\livewire;
+
+it('correctly builds a standard trial balance report', function () {
+    $testCompany = $this->testCompany;
+
+    $reportDates = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDates->defaultDateRange;
+    $defaultStartDate = $reportDates->defaultStartDate->toImmutable();
+    $defaultEndDate = $reportDates->defaultEndDate->toImmutable();
+
+    $defaultReportType = 'standard';
+
+    $depositAmount = 1000;
+    $withdrawalAmount = 1000;
+    $depositCount = 10;
+    $withdrawalCount = 10;
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedRevenue()
+        ->asDeposit($depositAmount)
+        ->count($depositCount)
+        ->state([
+            'posted_at' => $defaultStartDate->subWeek(),
+        ])
+        ->create();
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedExpense()
+        ->asWithdrawal($withdrawalAmount)
+        ->count($withdrawalCount)
+        ->state([
+            'posted_at' => now()->subWeek(),
+        ])
+        ->create();
+
+    $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
+    $earliestTransactionDate = $reportDates->refresh()->earliestTransactionDate;
+
+    $expectedBalances = Accounting::getBalances(
+        $defaultBankAccountAccount,
+        $earliestTransactionDate->toDateString(),
+        $defaultEndDate->toDateString(),
+    );
+
+    $calculatedTrialBalances = Reporting::calculateTrialBalances($defaultBankAccountAccount->category, $expectedBalances['ending_balance']);
+
+    $formattedExpectedBalances = Reporting::formatBalances($calculatedTrialBalances);
+
+    livewire(TrialBalance::class)
+        ->assertFormSet([
+            'deferredFilters.reportType' => $defaultReportType,
+            'deferredFilters.dateRange' => $defaultDateRange,
+            'deferredFilters.asOfDate' => $defaultEndDate->toDateTimeString(),
+        ])
+        ->assertSet('filters', [
+            'reportType' => $defaultReportType,
+            'dateRange' => $defaultDateRange,
+            'asOfDate' => $defaultEndDate->toDateString(),
+        ])
+        ->call('applyFilters')
+        ->assertDontSeeText('Retained Earnings')
+        ->assertSeeTextInOrder([
+            $defaultBankAccountAccount->code,
+            $defaultBankAccountAccount->name,
+            $formattedExpectedBalances->debitBalance,
+            $formattedExpectedBalances->creditBalance,
+        ])
+        ->assertReportTableData();
+});
+
+it('correctly builds a post-closing trial balance report', function () {
+    $testCompany = $this->testCompany;
+
+    $reportDates = ReportDateFactory::create($testCompany);
+    $defaultDateRange = $reportDates->defaultDateRange;
+    $defaultStartDate = $reportDates->defaultStartDate->toImmutable();
+    $defaultEndDate = $reportDates->defaultEndDate->toImmutable();
+
+    $defaultReportType = 'postClosing';
+
+    $depositAmount = 2000;
+    $withdrawalAmount = 1000;
+    $depositCount = 5;
+    $withdrawalCount = 5;
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedRevenue()
+        ->asDeposit($depositAmount)
+        ->count($depositCount)
+        ->state([
+            'posted_at' => $defaultStartDate->subWeek(),
+        ])
+        ->create();
+
+    Transaction::factory()
+        ->forDefaultBankAccount()
+        ->forUncategorizedExpense()
+        ->asWithdrawal($withdrawalAmount)
+        ->count($withdrawalCount)
+        ->state([
+            'posted_at' => now()->subWeek(),
+        ])
+        ->create();
+
+    $defaultBankAccountAccount = $testCompany->default->bankAccount->account;
+    $earliestTransactionDate = $reportDates->refresh()->earliestTransactionDate;
+
+    $expectedBalances = Accounting::getBalances(
+        $defaultBankAccountAccount,
+        $earliestTransactionDate->toDateString(),
+        $defaultEndDate->toDateString(),
+    );
+
+    $calculatedTrialBalances = Reporting::calculateTrialBalances($defaultBankAccountAccount->category, $expectedBalances['ending_balance']);
+
+    $formattedExpectedBalances = Reporting::formatBalances($calculatedTrialBalances);
+
+    $formattedRetainedEarningsBalances = Reporting::getRetainedEarningsBalances($earliestTransactionDate->toDateTimeString(), $defaultEndDate->toDateTimeString());
+
+    // Use Livewire to assert the report's filters and displayed data
+    livewire(TrialBalance::class)
+        ->set('deferredFilters.reportType', $defaultReportType)
+        ->assertFormSet([
+            'deferredFilters.reportType' => $defaultReportType,
+            'deferredFilters.dateRange' => $defaultDateRange,
+            'deferredFilters.asOfDate' => $defaultEndDate->toDateTimeString(),
+        ])
+        ->call('applyFilters')
+        ->assertSet('filters', [
+            'reportType' => $defaultReportType,
+            'dateRange' => $defaultDateRange,
+            'asOfDate' => $defaultEndDate->toDateString(),
+        ])
+        ->assertSeeTextInOrder([
+            $defaultBankAccountAccount->code,
+            $defaultBankAccountAccount->name,
+            $formattedExpectedBalances->debitBalance,
+            $formattedExpectedBalances->creditBalance,
+        ])
+        ->assertSeeText('Retained Earnings')
+        ->assertSeeTextInOrder([
+            'RE',
+            'Retained Earnings',
+            $formattedRetainedEarningsBalances->debitBalance,
+            $formattedRetainedEarningsBalances->creditBalance,
+        ])
+        ->assertSeeTextInOrder([
+            'Total Revenue',
+            '$0.00',
+            '$0.00',
+        ])
+        ->assertSeeTextInOrder([
+            'Total Expenses',
+            '$0.00',
+            '$0.00',
+        ])
+        ->assertReportTableData();
+});

tests/Helpers/helpers.php

@@ -0,0 +1,24 @@
+<?php
+
+use App\Enums\Setting\EntityType;
+use App\Filament\Company\Pages\CreateCompany;
+use App\Models\Company;
+
+use function Pest\Livewire\livewire;
+
+function createCompany(string $name): Company
+{
+    livewire(CreateCompany::class)
+        ->fillForm([
+            'name' => $name,
+            'profile.email' => 'company@gmail.com',
+            'profile.entity_type' => EntityType::LimitedLiabilityCompany,
+            'profile.country' => 'US',
+            'locale.language' => 'en',
+            'currencies.code' => 'USD',
+        ])
+        ->call('register')
+        ->assertHasNoErrors();
+
+    return auth()->user()->currentCompany;
+}

tests/Pest.php

@@ -0,0 +1,35 @@
+<?php
+
+uses(Tests\TestCase::class)
+    ->in('Feature', 'Unit');
+
+/*
+|--------------------------------------------------------------------------
+| Expectations
+|--------------------------------------------------------------------------
+|
+| When you're writing tests, you often need to check that values meet certain conditions. The
+| "expect()" function gives you access to a set of "expectations" methods that you can use
+| to assert different things. Of course, you may extend the Expectation API at any time.
+|
+*/
+
+expect()->extend('toBeOne', function () {
+    return $this->toBe(1);
+});
+
+/*
+|--------------------------------------------------------------------------
+| Functions
+|--------------------------------------------------------------------------
+|
+| While Pest is very powerful out-of-the-box, you may have some testing code specific to your
+| project that you don't want to repeat in every file. Here you can also expose helpers as
+| global functions to help you to reduce the number of lines of code in your test files.
+|
+*/
+
+function something()
+{
+    // ..
+}

tests/TestCase.php

@@ -2,9 +2,47 @@
 
 namespace Tests;
 
+use App\Models\Company;
+use App\Models\User;
+use App\Testing\TestsReport;
+use Database\Seeders\TestDatabaseSeeder;
+use Filament\Facades\Filament;
+use Illuminate\Foundation\Testing\RefreshDatabase;
 use Illuminate\Foundation\Testing\TestCase as BaseTestCase;
+use Livewire\Features\SupportTesting\Testable;
 
 abstract class TestCase extends BaseTestCase
 {
-    //
+    use RefreshDatabase;
+
+    /**
+     * Indicates whether the default seeder should run before each test.
+     */
+    protected bool $seed = true;
+
+    /**
+     * Run a specific seeder before each test.
+     */
+    protected string $seeder = TestDatabaseSeeder::class;
+
+    protected User $testUser;
+
+    protected ?Company $testCompany;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        Testable::mixin(new TestsReport);
+
+        $this->testUser = User::first();
+
+        $this->testCompany = $this->testUser->ownedCompanies->first();
+
+        $this->testUser->switchCompany($this->testCompany);
+
+        $this->actingAs($this->testUser);
+
+        Filament::setTenant($this->testCompany);
+    }
 }

tests/Unit/ExampleTest.php

@@ -1,16 +1,5 @@
 <?php
 
-namespace Tests\Unit;
-
-use PHPUnit\Framework\TestCase;
-
-class ExampleTest extends TestCase
-{
-    /**
-     * A basic test example.
-     */
-    public function test_that_true_is_true(): void
-    {
-        $this->assertTrue(true);
-    }
-}
+test('true is true', function () {
+    expect(true)->toBeTrue();
+});