wip

app/Contracts/AccountHandler.php

@@ -21,7 +21,5 @@ interface AccountHandler
 
     public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money;
 
-    public function getAccountCategoryOrder(): array;
-
     public function getEarliestTransactionDate(): string;
 }

app/Enums/Accounting/AccountCategory.php

@@ -38,4 +38,69 @@ enum AccountCategory: string implements HasLabel
 
         return null;
     }
+
+    /**
+     * Determines if the account typically has a normal debit balance.
+     *
+     * In accounting, assets and expenses typically have a normal debit balance.
+     * A debit increases the balance of these accounts, while a credit decreases it.
+     */
+    public function isNormalDebitBalance(): bool
+    {
+        return in_array($this, [self::Asset, self::Expense], true);
+    }
+
+    /**
+     * Determines if the account typically has a normal credit balance.
+     *
+     * In accounting, liabilities, equity, and revenue typically have a normal credit balance.
+     * A credit increases the balance of these accounts, while a debit decreases it.
+     */
+    public function isNormalCreditBalance(): bool
+    {
+        return ! $this->isNormalDebitBalance();
+    }
+
+    /**
+     * Determines if the account is a nominal account.
+     *
+     * In accounting, nominal accounts are temporary accounts that are closed at the end of each accounting period,
+     * with their net balances transferred to Retained Earnings (a real account).
+     */
+    public function isNominal(): bool
+    {
+        return in_array($this, [self::Revenue, self::Expense], true);
+    }
+
+    /**
+     * Determines if the account is a real account.
+     *
+     * In accounting, real accounts 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
+    {
+        return ! $this->isNominal();
+    }
+
+    public function getRelevantBalanceFields(): array
+    {
+        $commonFields = ['debit_balance', 'credit_balance', 'net_movement'];
+
+        return match ($this->isReal()) {
+            true => [...$commonFields, 'starting_balance', 'ending_balance'],
+            false => $commonFields,
+        };
+    }
+
+    public static function getOrderedCategories(): array
+    {
+        return [
+            self::Asset,
+            self::Liability,
+            self::Equity,
+            self::Revenue,
+            self::Expense,
+        ];
+    }
 }

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

@@ -224,7 +224,7 @@ class Transactions extends Page implements HasTable
                 Tables\Columns\TextColumn::make('posted_at')
                     ->label('Date')
                     ->sortable()
-                    ->localizeDate(),
+                    ->defaultDateFormat(),
                 Tables\Columns\TextColumn::make('description')
                     ->label('Description')
                     ->limit(30)

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

@@ -96,7 +96,7 @@ class AccountTransactions extends BaseReportPage
         $accounts = Account::query()
             ->get()
             ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
-            ->map(fn (Collection $accounts, string $category) => $accounts->pluck('name', 'id'))
+            ->map(fn (Collection $accounts) => $accounts->pluck('name', 'id'))
             ->toArray();
 
         $allAccountsOption = [

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

@@ -238,7 +238,7 @@ abstract class BaseReportPage extends Page
     {
         return DatePicker::make('startDate')
             ->label('Start Date')
-            ->displayFormat('Y-m-d')
+            ->defaultDateFormat()
             ->afterStateUpdated(static function (Set $set) {
                 $set('dateRange', 'Custom');
             });
@@ -248,7 +248,7 @@ abstract class BaseReportPage extends Page
     {
         return DatePicker::make('endDate')
             ->label('End Date')
-            ->displayFormat('Y-m-d')
+            ->defaultDateFormat()
             ->afterStateUpdated(static function (Set $set) {
                 $set('dateRange', 'Custom');
             });

app/Providers/MacroServiceProvider.php

@@ -11,6 +11,7 @@ use App\Utilities\Accounting\AccountCode;
 use App\Utilities\Currency\CurrencyAccessor;
 use BackedEnum;
 use Closure;
+use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Field;
 use Filament\Forms\Components\TextInput;
 use Filament\Tables\Columns\TextColumn;
@@ -54,7 +55,7 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
-        TextColumn::macro('localizeDate', function (): static {
+        TextColumn::macro('defaultDateFormat', function (): static {
             $localization = Localization::firstOrFail();
 
             $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
@@ -65,6 +66,18 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
+        DatePicker::macro('defaultDateFormat', function (): static {
+            $localization = Localization::firstOrFail();
+
+            $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
+            $timezone = $localization->timezone ?? Carbon::now()->timezoneName;
+
+            $this->displayFormat($dateFormat)
+                ->timezone($timezone);
+
+            return $this;
+        });
+
         TextColumn::macro('currency', function (string | Closure | null $currency = null, ?bool $convert = null): static {
             $this->formatStateUsing(static function (TextColumn $column, $state) use ($currency, $convert): ?string {
                 if (blank($state)) {
@@ -209,5 +222,14 @@ class MacroServiceProvider extends ServiceProvider
 
             return '';
         });
+
+        Carbon::macro('toDefaultDateFormat', function () {
+            $localization = Localization::firstOrFail();
+
+            $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
+            $timezone = $localization->timezone ?? Carbon::now()->timezoneName;
+
+            return $this->setTimezone($timezone)->format($dateFormat);
+        });
     }
 }

app/Services/AccountService.php

@@ -11,8 +11,9 @@ use App\Repositories\Accounting\JournalEntryRepository;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\ValueObjects\Money;
 use Closure;
-use Illuminate\Database\Query\Builder;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\JoinClause;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 class AccountService implements AccountHandler
@@ -53,53 +54,11 @@ class AccountService implements AccountHandler
         return new Money($balances['starting_balance'], $account->currency_code);
     }
 
-    public function getStartingBalanceSubquery($startDate, $accountIds = null): Builder
+    public function getTransactionDetailsSubquery(string $startDate, string $endDate): Closure
     {
-        return DB::table('journal_entries')
-            ->select('journal_entries.account_id')
-            ->selectRaw('
-                COALESCE(SUM(
-                    CASE
-                        WHEN accounts.category IN ("asset", "expense") THEN
-                            CASE WHEN journal_entries.type = "debit" THEN journal_entries.amount ELSE -journal_entries.amount END
-                        ELSE
-                            CASE WHEN journal_entries.type = "credit" THEN journal_entries.amount ELSE -journal_entries.amount END
-                    END
-                ), 0) AS starting_balance
-            ')
-            ->join('transactions', 'transactions.id', '=', 'journal_entries.transaction_id')
-            ->join('accounts', 'accounts.id', '=', 'journal_entries.account_id')
-            ->where('transactions.posted_at', '<', $startDate)
-            ->groupBy('journal_entries.account_id');
-    }
-
-    public function getTotalDebitSubquery($startDate, $endDate, $accountIds = null): Builder
-    {
-        return DB::table('journal_entries')
-            ->select('journal_entries.account_id')
-            ->selectRaw('
-                COALESCE(SUM(CASE WHEN journal_entries.type = "debit" THEN journal_entries.amount ELSE 0 END), 0) as total_debit
-            ')
-            ->join('transactions', 'transactions.id', '=', 'journal_entries.transaction_id')
-            ->whereBetween('transactions.posted_at', [$startDate, $endDate])
-            ->groupBy('journal_entries.account_id');
-    }
+        $endOfDay = Carbon::parse($endDate)->endOfDay()->toDateTimeString();
 
-    public function getTotalCreditSubquery($startDate, $endDate, $accountIds = null): Builder
-    {
-        return DB::table('journal_entries')
-            ->select('journal_entries.account_id')
-            ->selectRaw('
-                COALESCE(SUM(CASE WHEN journal_entries.type = "credit" THEN journal_entries.amount ELSE 0 END), 0) as total_credit
-            ')
-            ->join('transactions', 'transactions.id', '=', 'journal_entries.transaction_id')
-            ->whereBetween('transactions.posted_at', [$startDate, $endDate])
-            ->groupBy('journal_entries.account_id');
-    }
-
-    public function getTransactionDetailsSubquery($startDate, $endDate): Closure
-    {
-        return function ($query) use ($startDate, $endDate) {
+        return static function ($query) use ($startDate, $endOfDay) {
             $query->select(
                 'journal_entries.id',
                 'journal_entries.account_id',
@@ -108,15 +67,17 @@ class AccountService implements AccountHandler
                 'journal_entries.amount',
                 DB::raw('journal_entries.amount * IF(journal_entries.type = "debit", 1, -1) AS signed_amount')
             )
-                ->whereBetween('transactions.posted_at', [$startDate, $endDate])
+                ->whereBetween('transactions.posted_at', [$startDate, $endOfDay])
                 ->join('transactions', 'transactions.id', '=', 'journal_entries.transaction_id')
                 ->orderBy('transactions.posted_at')
                 ->with('transaction:id,type,description,posted_at');
         };
     }
 
-    public function getAccountBalances(string $startDate, string $endDate, array $accountIds = []): \Illuminate\Database\Eloquent\Builder
+    public function getAccountBalances(string $startDate, string $endDate, array $accountIds = []): Builder
     {
+        $endOfDay = Carbon::parse($endDate)->endOfDay()->toDateTimeString();
+
         $query = Account::query()
             ->select([
                 'accounts.id',
@@ -126,32 +87,89 @@ class AccountService implements AccountHandler
                 'accounts.currency_code',
                 'accounts.code',
             ])
-            ->leftJoinSub($this->getStartingBalanceSubquery($startDate), 'starting_balance', function (JoinClause $join) {
-                $join->on('accounts.id', '=', 'starting_balance.account_id');
-            })
-            ->leftJoinSub($this->getTotalDebitSubquery($startDate, $endDate), 'total_debit', function (JoinClause $join) {
-                $join->on('accounts.id', '=', 'total_debit.account_id');
-            })
-            ->leftJoinSub($this->getTotalCreditSubquery($startDate, $endDate), 'total_credit', function (JoinClause $join) {
-                $join->on('accounts.id', '=', 'total_credit.account_id');
-            })
             ->addSelect([
-                DB::raw('COALESCE(starting_balance.starting_balance, 0) as starting_balance'),
-                DB::raw('COALESCE(total_debit.total_debit, 0) as total_debit'),
-                DB::raw('COALESCE(total_credit.total_credit, 0) as total_credit'),
+                DB::raw("
+                    COALESCE(
+                        IF(accounts.category IN ('asset', 'expense'),
+                            SUM(IF(journal_entries.type = 'debit' AND transactions.posted_at < ?, journal_entries.amount, 0)) -
+                            SUM(IF(journal_entries.type = 'credit' AND transactions.posted_at < ?, journal_entries.amount, 0)),
+                            SUM(IF(journal_entries.type = 'credit' AND transactions.posted_at < ?, journal_entries.amount, 0)) -
+                            SUM(IF(journal_entries.type = 'debit' AND transactions.posted_at < ?, journal_entries.amount, 0))
+                        ), 0
+                    ) AS starting_balance
+                "),
+                DB::raw("
+                    COALESCE(SUM(
+                        IF(journal_entries.type = 'debit' AND transactions.posted_at BETWEEN ? AND ?, journal_entries.amount, 0)
+                    ), 0) AS total_debit
+                "),
+                DB::raw("
+                    COALESCE(SUM(
+                        IF(journal_entries.type = 'credit' AND transactions.posted_at BETWEEN ? AND ?, journal_entries.amount, 0)
+                    ), 0) AS total_credit
+                "),
             ])
-            ->with(['subtype:id,name'])
-            ->whereHas('journalEntries.transaction', function ($query) use ($startDate, $endDate) {
-                $query->whereBetween('posted_at', [$startDate, $endDate]);
-            });
+            ->join('journal_entries', 'journal_entries.account_id', '=', 'accounts.id')
+            ->join('transactions', function (JoinClause $join) use ($endOfDay) {
+                $join->on('transactions.id', '=', 'journal_entries.transaction_id')
+                    ->where('transactions.posted_at', '<=', $endOfDay);
+            })
+            ->groupBy('accounts.id')
+            ->with(['subtype:id,name']);
 
         if (! empty($accountIds)) {
             $query->whereIn('accounts.id', $accountIds);
         }
 
+        $query->addBinding([$startDate, $startDate, $startDate, $startDate, $startDate, $endOfDay, $startDate, $endOfDay], 'select');
+
         return $query;
     }
 
+    public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money
+    {
+        $endOfDay = Carbon::parse($endDate)->endOfDay()->toDateTimeString();
+
+        $accountIds = Account::whereHas('bankAccount')
+            ->pluck('id')
+            ->toArray();
+
+        if (empty($accountIds)) {
+            return new Money(0, CurrencyAccessor::getDefaultCurrency());
+        }
+
+        $result = DB::table('journal_entries')
+            ->join('transactions', function (JoinClause $join) use ($endOfDay) {
+                $join->on('transactions.id', '=', 'journal_entries.transaction_id')
+                    ->where('transactions.posted_at', '<=', $endOfDay);
+            })
+            ->whereIn('journal_entries.account_id', $accountIds)
+            ->selectRaw('
+            SUM(CASE
+                WHEN transactions.posted_at < ? AND journal_entries.type = "debit" THEN journal_entries.amount
+                WHEN transactions.posted_at < ? AND journal_entries.type = "credit" THEN -journal_entries.amount
+                ELSE 0
+            END) AS totalStartingBalance,
+            SUM(CASE
+                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "debit" THEN journal_entries.amount
+                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "credit" THEN -journal_entries.amount
+                ELSE 0
+            END) AS totalNetMovement
+        ', [
+                $startDate,
+                $startDate,
+                $startDate,
+                $endOfDay,
+                $startDate,
+                $endOfDay,
+            ])
+            ->first();
+
+        $totalBalance = $result->totalStartingBalance + $result->totalNetMovement;
+
+        return new Money($totalBalance, CurrencyAccessor::getDefaultCurrency());
+    }
+
     public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money
     {
         $calculatedBalances = $this->calculateBalances($account, $startDate, $endDate);
@@ -175,7 +193,7 @@ class AccountService implements AccountHandler
         })
             ->where('type', 'credit')
             ->whereHas('transaction', static function ($query) use ($startDate) {
-                $query->where('posted_at', '<=', $startDate);
+                $query->where('posted_at', '<', $startDate);
             })
             ->sum('amount');
 
@@ -184,7 +202,7 @@ class AccountService implements AccountHandler
         })
             ->where('type', 'debit')
             ->whereHas('transaction', static function ($query) use ($startDate) {
-                $query->where('posted_at', '<=', $startDate);
+                $query->where('posted_at', '<', $startDate);
             })
             ->sum('amount');
 
@@ -251,57 +269,6 @@ class AccountService implements AccountHandler
         return array_filter($balances, static fn ($value) => $value !== null);
     }
 
-    public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money
-    {
-        $accountIds = Account::whereHas('bankAccount')
-            ->pluck('id')
-            ->toArray();
-
-        if (empty($accountIds)) {
-            return new Money(0, CurrencyAccessor::getDefaultCurrency());
-        }
-
-        $result = DB::table('journal_entries')
-            ->join('transactions', 'journal_entries.transaction_id', '=', 'transactions.id')
-            ->whereIn('journal_entries.account_id', $accountIds)
-            ->where('transactions.posted_at', '<=', $endDate)
-            ->selectRaw('
-            SUM(CASE
-                WHEN transactions.posted_at <= ? AND journal_entries.type = "debit" THEN journal_entries.amount
-                WHEN transactions.posted_at <= ? AND journal_entries.type = "credit" THEN -journal_entries.amount
-                ELSE 0
-            END) AS totalStartingBalance,
-            SUM(CASE
-                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "debit" THEN journal_entries.amount
-                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "credit" THEN -journal_entries.amount
-                ELSE 0
-            END) AS totalNetMovement
-        ', [
-                $startDate,
-                $startDate,
-                $startDate,
-                $endDate,
-                $startDate,
-                $endDate,
-            ])
-            ->first();
-
-        $totalBalance = $result->totalStartingBalance + $result->totalNetMovement;
-
-        return new Money($totalBalance, CurrencyAccessor::getDefaultCurrency());
-    }
-
-    public function getAccountCategoryOrder(): array
-    {
-        return [
-            AccountCategory::Asset->getPluralLabel(),
-            AccountCategory::Liability->getPluralLabel(),
-            AccountCategory::Equity->getPluralLabel(),
-            AccountCategory::Revenue->getPluralLabel(),
-            AccountCategory::Expense->getPluralLabel(),
-        ];
-    }
-
     public function getEarliestTransactionDate(): string
     {
         $earliestDate = Transaction::oldest('posted_at')

app/Services/ReportService.php

@@ -8,11 +8,9 @@ use App\DTO\AccountDTO;
 use App\DTO\AccountTransactionDTO;
 use App\DTO\ReportDTO;
 use App\Enums\Accounting\AccountCategory;
-use App\Enums\Accounting\JournalEntryType;
 use App\Models\Accounting\Account;
 use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
-use Illuminate\Support\Collection;
 
 class ReportService
 {
@@ -37,59 +35,36 @@ class ReportService
         );
     }
 
-    private function filterBalances(array $balances, array $fields): array
-    {
-        return array_filter($balances, static fn ($key) => in_array($key, $fields, true), ARRAY_FILTER_USE_KEY);
-    }
-
-    private function getCategoryGroupedAccounts(array $allCategories): Collection
-    {
-        return Account::whereHas('journalEntries')
-            ->select(['id', 'name', 'currency_code', 'category', 'code'])
-            ->get()
-            ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
-            ->sortBy(static fn (Collection $groupedAccounts, string $key) => array_search($key, $allCategories, true));
-    }
-
     public function buildAccountBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
     {
-        $allCategories = $this->accountService->getAccountCategoryOrder();
-
-        $accountIds = Account::whereHas('journalEntries')->pluck('id')->toArray();
-
-        $accounts = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds)->get();
+        $orderedCategories = AccountCategory::getOrderedCategories();
 
-        $balanceFields = ['starting_balance', 'debit_balance', 'credit_balance', 'net_movement', 'ending_balance'];
+        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
 
         $columnNameKeys = array_map(fn (Column $column) => $column->getName(), $columns);
 
-        $updatedBalanceFields = array_filter($balanceFields, fn (string $balanceField) => in_array($balanceField, $columnNameKeys, true));
-
         $accountCategories = [];
-        $reportTotalBalances = array_fill_keys($updatedBalanceFields, 0);
+        $reportTotalBalances = [];
+
+        foreach ($orderedCategories as $category) {
+            $accountsInCategory = $accounts->where('category', $category)
+                ->sortBy('code', SORT_NATURAL);
 
-        foreach ($allCategories as $categoryPluralName) {
-            $categoryName = AccountCategory::fromPluralLabel($categoryPluralName);
-            $accountsInCategory = $accounts->where('category', $categoryName)->keyBy('id');
-            $categorySummaryBalances = array_fill_keys($updatedBalanceFields, 0);
+            $relevantFields = array_intersect($category->getRelevantBalanceFields(), $columnNameKeys);
+
+            $categorySummaryBalances = array_fill_keys($relevantFields, 0);
 
             $categoryAccounts = [];
 
+            /** @var Account $account */
             foreach ($accountsInCategory as $account) {
-                $accountBalances = $this->calculateAccountBalances($account, $categoryName);
+                $accountBalances = $this->calculateAccountBalances($account, $category);
 
-                if ($this->hasZeroBalanceSum($accountBalances)) {
-                    continue;
+                foreach ($relevantFields as $field) {
+                    $categorySummaryBalances[$field] += $accountBalances[$field];
                 }
 
-                foreach ($accountBalances as $accountBalanceType => $accountBalance) {
-                    if (array_key_exists($accountBalanceType, $categorySummaryBalances)) {
-                        $categorySummaryBalances[$accountBalanceType] += $accountBalance;
-                    }
-                }
-
-                $filteredAccountBalances = $this->filterBalances($accountBalances, $updatedBalanceFields);
-                $formattedAccountBalances = $this->formatBalances($filteredAccountBalances);
+                $formattedAccountBalances = $this->formatBalances($accountBalances);
 
                 $categoryAccounts[] = new AccountDTO(
                     $account->name,
@@ -99,18 +74,13 @@ class ReportService
                 );
             }
 
-            $this->adjustAccountBalanceCategoryFields($categoryName, $categorySummaryBalances);
-
-            foreach ($updatedBalanceFields as $field) {
-                if (array_key_exists($field, $categorySummaryBalances)) {
-                    $reportTotalBalances[$field] += $categorySummaryBalances[$field];
-                }
+            foreach ($relevantFields as $field) {
+                $reportTotalBalances[$field] = ($reportTotalBalances[$field] ?? 0) + $categorySummaryBalances[$field];
             }
 
-            $filteredCategorySummaryBalances = $this->filterBalances($categorySummaryBalances, $updatedBalanceFields);
-            $formattedCategorySummaryBalances = $this->formatBalances($filteredCategorySummaryBalances);
+            $formattedCategorySummaryBalances = $this->formatBalances($categorySummaryBalances);
 
-            $accountCategories[$categoryPluralName] = new AccountCategoryDTO(
+            $accountCategories[$category->getPluralLabel()] = new AccountCategoryDTO(
                 $categoryAccounts,
                 $formattedCategorySummaryBalances,
             );
@@ -128,32 +98,20 @@ class ReportService
             'credit_balance' => $account->total_credit ?? 0,
         ];
 
-        if (in_array($category, [AccountCategory::Liability, AccountCategory::Equity, AccountCategory::Revenue])) {
-            $balances['net_movement'] = $balances['credit_balance'] - $balances['debit_balance'];
-        } else {
+        if ($category->isNormalDebitBalance()) {
             $balances['net_movement'] = $balances['debit_balance'] - $balances['credit_balance'];
+        } else {
+            $balances['net_movement'] = $balances['credit_balance'] - $balances['debit_balance'];
         }
 
-        if (! in_array($category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
+        if ($category->isReal()) {
             $balances['starting_balance'] = $account->starting_balance ?? 0;
-            $balances['ending_balance'] = $balances['starting_balance'] + $balances['credit_balance'] - $balances['debit_balance'];
+            $balances['ending_balance'] = $balances['starting_balance'] + $balances['net_movement'];
         }
 
         return $balances;
     }
 
-    private function adjustAccountBalanceCategoryFields(AccountCategory $category, array &$categorySummaryBalances): void
-    {
-        if (in_array($category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
-            unset($categorySummaryBalances['starting_balance'], $categorySummaryBalances['ending_balance']);
-        }
-    }
-
-    private function hasZeroBalanceSum(array $balances): bool
-    {
-        return array_sum(array_map('abs', $balances)) === 0;
-    }
-
     public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all'): ReportDTO
     {
         $columns ??= [];
@@ -189,19 +147,20 @@ class ReportService
                 $transaction = $journalEntry->transaction;
                 $signedAmount = $journalEntry->signed_amount;
 
-                // Adjust balance based on account category
-                if (in_array($account->category, [AccountCategory::Asset, AccountCategory::Expense])) {
+                if ($account->category->isNormalDebitBalance()) {
                     $currentBalance += $signedAmount;
                 } else {
                     $currentBalance -= $signedAmount;
                 }
 
+                $formattedAmount = money(abs($signedAmount), $defaultCurrency)->format();
+
                 $accountTransactions[] = new AccountTransactionDTO(
                     id: $transaction->id,
-                    date: $transaction->posted_at->format('Y-m-d'),
-                    description: $transaction->description ?? '',
-                    debit: $journalEntry->type === JournalEntryType::Debit ? money(abs($signedAmount), $defaultCurrency)->format() : '',
-                    credit: $journalEntry->type === JournalEntryType::Credit ? money(abs($signedAmount), $defaultCurrency)->format() : '',
+                    date: $transaction->posted_at->toDefaultDateFormat(),
+                    description: $transaction->description ?? 'Add a description',
+                    debit: $journalEntry->type->isDebit() ? $formattedAmount : '',
+                    credit: $journalEntry->type->isCredit() ? $formattedAmount : '',
                     balance: money($currentBalance, $defaultCurrency)->format(),
                     type: $transaction->type,
                     tableAction: $transaction->type->isJournal() ? 'updateJournalTransaction' : 'updateTransaction'
@@ -242,37 +201,38 @@ class ReportService
         return new ReportDTO(categories: $reportCategories, fields: $columns);
     }
 
-    private function buildReport(array $allCategories, Collection $categoryGroupedAccounts, callable $balanceCalculator, array $balanceFields, array $allFields, ?callable $initializeCategoryBalances = null, bool $includeRetainedEarnings = false, ?string $startDate = null): ReportDTO
+    public function buildTrialBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
     {
+        $orderedCategories = AccountCategory::getOrderedCategories();
+
+        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
+
+        $balanceFields = ['debit_balance', 'credit_balance'];
+
         $accountCategories = [];
         $reportTotalBalances = array_fill_keys($balanceFields, 0);
 
-        foreach ($allCategories as $categoryName) {
-            $accountsInCategory = $categoryGroupedAccounts[$categoryName] ?? collect();
-            $categorySummaryBalances = array_fill_keys($balanceFields, 0);
+        foreach ($orderedCategories as $category) {
+            $accountsInCategory = $accounts->where('category', $category)
+                ->sortBy('code', SORT_NATURAL);
 
-            if ($initializeCategoryBalances) {
-                $initializeCategoryBalances($categoryName, $categorySummaryBalances);
-            }
+            $categorySummaryBalances = array_fill_keys($balanceFields, 0);
 
             $categoryAccounts = [];
 
+            /** @var Account $account */
             foreach ($accountsInCategory as $account) {
-                /** @var Account $account */
-                $accountBalances = $balanceCalculator($account);
+                $accountBalances = $this->calculateAccountBalances($account, $category);
 
-                if (array_sum($accountBalances) === 0) {
-                    continue;
-                }
+                $endingBalance = $accountBalances['ending_balance'] ?? $accountBalances['net_movement'];
+
+                $trialBalance = $this->calculateTrialBalance($account->category, $endingBalance);
 
-                foreach ($accountBalances as $accountBalanceType => $accountBalance) {
-                    if (array_key_exists($accountBalanceType, $categorySummaryBalances)) {
-                        $categorySummaryBalances[$accountBalanceType] += $accountBalance;
-                    }
+                foreach ($trialBalance as $balanceType => $balance) {
+                    $categorySummaryBalances[$balanceType] += $balance;
                 }
 
-                $filteredAccountBalances = $this->filterBalances($accountBalances, $balanceFields);
-                $formattedAccountBalances = $this->formatBalances($filteredAccountBalances);
+                $formattedAccountBalances = $this->formatBalances($trialBalance);
 
                 $categoryAccounts[] = new AccountDTO(
                     $account->name,
@@ -282,39 +242,30 @@ class ReportService
                 );
             }
 
-            if ($includeRetainedEarnings && $categoryName === AccountCategory::Equity->getPluralLabel()) {
-                $retainedEarnings = $this->accountService->getRetainedEarnings($startDate);
-                $retainedEarningsAmount = $retainedEarnings->getAmount();
-
-                if ($retainedEarningsAmount >= 0) {
-                    $categorySummaryBalances['credit_balance'] += $retainedEarningsAmount;
-                    $categoryAccounts[] = new AccountDTO(
-                        'Retained Earnings',
-                        'RE',
-                        null,
-                        $this->formatBalances(['debit_balance' => 0, 'credit_balance' => $retainedEarningsAmount])
-                    );
-                } else {
-                    $categorySummaryBalances['debit_balance'] += abs($retainedEarningsAmount);
-                    $categoryAccounts[] = new AccountDTO(
-                        'Retained Earnings',
-                        'RE',
-                        null,
-                        $this->formatBalances(['debit_balance' => abs($retainedEarningsAmount), 'credit_balance' => 0])
-                    );
-                }
+            if ($category === AccountCategory::Equity) {
+                $retainedEarningsAmount = $this->accountService->getRetainedEarnings($startDate)->getAmount();
+                $isCredit = $retainedEarningsAmount >= 0;
+
+                $categorySummaryBalances[$isCredit ? 'credit_balance' : 'debit_balance'] += abs($retainedEarningsAmount);
+
+                $categoryAccounts[] = new AccountDTO(
+                    'Retained Earnings',
+                    'RE',
+                    null,
+                    $this->formatBalances([
+                        'debit_balance' => $isCredit ? 0 : abs($retainedEarningsAmount),
+                        'credit_balance' => $isCredit ? $retainedEarningsAmount : 0,
+                    ])
+                );
             }
 
-            foreach ($balanceFields as $field) {
-                if (array_key_exists($field, $categorySummaryBalances)) {
-                    $reportTotalBalances[$field] += $categorySummaryBalances[$field];
-                }
+            foreach ($categorySummaryBalances as $balanceType => $balance) {
+                $reportTotalBalances[$balanceType] += $balance;
             }
 
-            $filteredCategorySummaryBalances = $this->filterBalances($categorySummaryBalances, $balanceFields);
-            $formattedCategorySummaryBalances = $this->formatBalances($filteredCategorySummaryBalances);
+            $formattedCategorySummaryBalances = $this->formatBalances($categorySummaryBalances);
 
-            $accountCategories[$categoryName] = new AccountCategoryDTO(
+            $accountCategories[$category->getPluralLabel()] = new AccountCategoryDTO(
                 $categoryAccounts,
                 $formattedCategorySummaryBalances,
             );
@@ -322,31 +273,12 @@ class ReportService
 
         $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $allFields);
-    }
-
-    public function buildTrialBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
-    {
-        $allCategories = $this->accountService->getAccountCategoryOrder();
-
-        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
-
-        $balanceFields = ['debit_balance', 'credit_balance'];
-
-        return $this->buildReport($allCategories, $categoryGroupedAccounts, function (Account $account) use ($startDate, $endDate) {
-            $endingBalance = $this->accountService->getEndingBalance($account, $startDate, $endDate)?->getAmount() ?? 0;
-
-            if ($endingBalance === 0) {
-                return [];
-            }
-
-            return $this->calculateTrialBalance($account->category, $endingBalance);
-        }, $balanceFields, $columns, null, true, $startDate);
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
     }
 
     private function calculateTrialBalance(AccountCategory $category, int $endingBalance): array
     {
-        if (in_array($category, [AccountCategory::Asset, AccountCategory::Expense], true)) {
+        if ($category->isNormalDebitBalance()) {
             if ($endingBalance >= 0) {
                 return ['debit_balance' => $endingBalance, 'credit_balance' => 0];
             }

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.319.1",
+            "version": "3.320.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "78d9f8823a5796e9188a4ddcd9ef2374e47d8b7f"
+                "reference": "dbae075b861316237d63418715f8bf4bfdd9d33d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/78d9f8823a5796e9188a4ddcd9ef2374e47d8b7f",
-                "reference": "78d9f8823a5796e9188a4ddcd9ef2374e47d8b7f",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/dbae075b861316237d63418715f8bf4bfdd9d33d",
+                "reference": "dbae075b861316237d63418715f8bf4bfdd9d33d",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.319.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.320.2"
             },
-            "time": "2024-08-08T18:05:03+00:00"
+            "time": "2024-08-16T18:06:17+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -897,16 +897,16 @@
         },
         {
             "name": "blade-ui-kit/blade-icons",
-            "version": "1.7.0",
+            "version": "1.7.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/blade-ui-kit/blade-icons.git",
-                "reference": "74275f44c71e815b85bf7cea66e3bf98c57fb7e4"
+                "reference": "8f787baf09d88cdfd6ec4dbaba11ebfa885f0595"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/blade-ui-kit/blade-icons/zipball/74275f44c71e815b85bf7cea66e3bf98c57fb7e4",
-                "reference": "74275f44c71e815b85bf7cea66e3bf98c57fb7e4",
+                "url": "https://api.github.com/repos/blade-ui-kit/blade-icons/zipball/8f787baf09d88cdfd6ec4dbaba11ebfa885f0595",
+                "reference": "8f787baf09d88cdfd6ec4dbaba11ebfa885f0595",
                 "shasum": ""
             },
             "require": {
@@ -974,7 +974,7 @@
                     "type": "paypal"
                 }
             ],
-            "time": "2024-07-29T21:49:30+00:00"
+            "time": "2024-08-14T14:25:11+00:00"
         },
         {
             "name": "brick/math",
@@ -1038,26 +1038,26 @@
         },
         {
             "name": "carbonphp/carbon-doctrine-types",
-            "version": "2.1.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CarbonPHP/carbon-doctrine-types.git",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb"
+                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
-                "reference": "99f76ffa36cce3b70a4a6abce41dba15ca2e84cb",
+                "url": "https://api.github.com/repos/CarbonPHP/carbon-doctrine-types/zipball/18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
+                "reference": "18ba5ddfec8976260ead6e866180bd5d2f71aa1d",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ^8.0"
+                "php": "^8.1"
             },
             "conflict": {
-                "doctrine/dbal": "<3.7.0 || >=4.0.0"
+                "doctrine/dbal": "<4.0.0 || >=5.0.0"
             },
             "require-dev": {
-                "doctrine/dbal": "^3.7.0",
+                "doctrine/dbal": "^4.0.0",
                 "nesbot/carbon": "^2.71.0 || ^3.0.0",
                 "phpunit/phpunit": "^10.3"
             },
@@ -1087,7 +1087,7 @@
             ],
             "support": {
                 "issues": "https://github.com/CarbonPHP/carbon-doctrine-types/issues",
-                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/2.1.0"
+                "source": "https://github.com/CarbonPHP/carbon-doctrine-types/tree/3.2.0"
             },
             "funding": [
                 {
@@ -1103,7 +1103,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-11T17:09:12+00:00"
+            "time": "2024-02-09T16:56:22+00:00"
         },
         {
             "name": "danharrin/date-format-converter",
@@ -1285,142 +1285,44 @@
             },
             "time": "2024-07-08T12:26:09+00:00"
         },
-        {
-            "name": "doctrine/cache",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/cache.git",
-                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb",
-                "reference": "1ca8f21980e770095a31456042471a57bc4c68fb",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~7.1 || ^8.0"
-            },
-            "conflict": {
-                "doctrine/common": ">2.2,<2.4"
-            },
-            "require-dev": {
-                "cache/integration-tests": "dev-master",
-                "doctrine/coding-standard": "^9",
-                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
-                "psr/cache": "^1.0 || ^2.0 || ^3.0",
-                "symfony/cache": "^4.4 || ^5.4 || ^6",
-                "symfony/var-exporter": "^4.4 || ^5.4 || ^6"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.",
-            "homepage": "https://www.doctrine-project.org/projects/cache.html",
-            "keywords": [
-                "abstraction",
-                "apcu",
-                "cache",
-                "caching",
-                "couchdb",
-                "memcached",
-                "php",
-                "redis",
-                "xcache"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/cache/issues",
-                "source": "https://github.com/doctrine/cache/tree/2.2.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-20T20:07:39+00:00"
-        },
         {
             "name": "doctrine/dbal",
-            "version": "3.8.7",
+            "version": "4.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "2093d670ca17f634f3c095ec10a20687eccebd99"
+                "reference": "2377cd41609aa51bee822c8d207317a3f363a558"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/2093d670ca17f634f3c095ec10a20687eccebd99",
-                "reference": "2093d670ca17f634f3c095ec10a20687eccebd99",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/2377cd41609aa51bee822c8d207317a3f363a558",
+                "reference": "2377cd41609aa51bee822c8d207317a3f363a558",
                 "shasum": ""
             },
             "require": {
-                "composer-runtime-api": "^2",
-                "doctrine/cache": "^1.11|^2.0",
                 "doctrine/deprecations": "^0.5.3|^1",
-                "doctrine/event-manager": "^1|^2",
-                "php": "^7.4 || ^8.0",
+                "php": "^8.1",
                 "psr/cache": "^1|^2|^3",
                 "psr/log": "^1|^2|^3"
             },
             "require-dev": {
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
-                "jetbrains/phpstorm-stubs": "2023.1",
+                "jetbrains/phpstorm-stubs": "2023.2",
                 "phpstan/phpstan": "1.11.7",
+                "phpstan/phpstan-phpunit": "1.4.0",
                 "phpstan/phpstan-strict-rules": "^1.6",
-                "phpunit/phpunit": "9.6.20",
-                "psalm/plugin-phpunit": "0.18.4",
+                "phpunit/phpunit": "10.5.28",
+                "psalm/plugin-phpunit": "0.19.0",
                 "slevomat/coding-standard": "8.13.1",
                 "squizlabs/php_codesniffer": "3.10.2",
-                "symfony/cache": "^5.4|^6.0|^7.0",
-                "symfony/console": "^4.4|^5.4|^6.0|^7.0",
-                "vimeo/psalm": "4.30.0"
+                "symfony/cache": "^6.3.8|^7.0",
+                "symfony/console": "^5.4|^6.3|^7.0",
+                "vimeo/psalm": "5.24.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
             },
-            "bin": [
-                "bin/doctrine-dbal"
-            ],
             "type": "library",
             "autoload": {
                 "psr-4": {
@@ -1473,7 +1375,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.8.7"
+                "source": "https://github.com/doctrine/dbal/tree/4.1.0"
             },
             "funding": [
                 {
@@ -1489,7 +1391,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-08-07T11:57:25+00:00"
+            "time": "2024-08-15T07:37:07+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -1538,97 +1440,6 @@
             },
             "time": "2024-01-30T19:34:25+00:00"
         },
-        {
-            "name": "doctrine/event-manager",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/event-manager.git",
-                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e",
-                "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^8.1"
-            },
-            "conflict": {
-                "doctrine/common": "<2.9"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^12",
-                "phpstan/phpstan": "^1.8.8",
-                "phpunit/phpunit": "^10.5",
-                "vimeo/psalm": "^5.24"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                },
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
-                }
-            ],
-            "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.",
-            "homepage": "https://www.doctrine-project.org/projects/event-manager.html",
-            "keywords": [
-                "event",
-                "event dispatcher",
-                "event manager",
-                "event system",
-                "events"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/event-manager/issues",
-                "source": "https://github.com/doctrine/event-manager/tree/2.0.1"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-05-22T20:47:39+00:00"
-        },
         {
             "name": "doctrine/inflector",
             "version": "2.0.10",
@@ -1927,16 +1738,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.97",
+            "version": "v3.2.102",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "aff18fda397dbf3e9f449f9a9360f3359b154c0e"
+                "reference": "1ce746a4a75975f1844c175201f1f03443c48c95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/aff18fda397dbf3e9f449f9a9360f3359b154c0e",
-                "reference": "aff18fda397dbf3e9f449f9a9360f3359b154c0e",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/1ce746a4a75975f1844c175201f1f03443c48c95",
+                "reference": "1ce746a4a75975f1844c175201f1f03443c48c95",
                 "shasum": ""
             },
             "require": {
@@ -1976,20 +1787,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-07-31T11:53:04+00:00"
+            "time": "2024-08-14T16:52:38+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.97",
+            "version": "v3.2.102",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "9e0b750546a51fdbc67b1232f2399385587dcc9a"
+                "reference": "99c703952af053e1ef22a4dd556eba589a574d87"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/9e0b750546a51fdbc67b1232f2399385587dcc9a",
-                "reference": "9e0b750546a51fdbc67b1232f2399385587dcc9a",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/99c703952af053e1ef22a4dd556eba589a574d87",
+                "reference": "99c703952af053e1ef22a4dd556eba589a574d87",
                 "shasum": ""
             },
             "require": {
@@ -2041,20 +1852,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-07-31T11:53:12+00:00"
+            "time": "2024-08-14T16:52:48+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.97",
+            "version": "v3.2.102",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "d679d30ae1c345740920e45b0334b5eacc76f7aa"
+                "reference": "32ef8b049ac3c4577407cdc10e576082863f7e47"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/d679d30ae1c345740920e45b0334b5eacc76f7aa",
-                "reference": "d679d30ae1c345740920e45b0334b5eacc76f7aa",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/32ef8b049ac3c4577407cdc10e576082863f7e47",
+                "reference": "32ef8b049ac3c4577407cdc10e576082863f7e47",
                 "shasum": ""
             },
             "require": {
@@ -2097,20 +1908,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-07-31T11:53:08+00:00"
+            "time": "2024-08-15T19:37:09+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.97",
+            "version": "v3.2.102",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
-                "reference": "af2266e0cf9d26e88ea6153d608f11aa9cebb59e"
+                "reference": "96403f2842e4c485f32110e4456b7a3bbcb1e835"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/af2266e0cf9d26e88ea6153d608f11aa9cebb59e",
-                "reference": "af2266e0cf9d26e88ea6153d608f11aa9cebb59e",
+                "url": "https://api.github.com/repos/filamentphp/infolists/zipball/96403f2842e4c485f32110e4456b7a3bbcb1e835",
+                "reference": "96403f2842e4c485f32110e4456b7a3bbcb1e835",
                 "shasum": ""
             },
             "require": {
@@ -2148,11 +1959,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-07-31T11:53:07+00:00"
+            "time": "2024-08-14T16:52:44+00:00"
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.97",
+            "version": "v3.2.102",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -2204,25 +2015,26 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.2.97",
+            "version": "v3.2.102",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "94c5349b8fed252499314bd2149fadf96ddaf6d6"
+                "reference": "7dc30bc972b5c29572bd285bfb7c3f24e909522a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/94c5349b8fed252499314bd2149fadf96ddaf6d6",
-                "reference": "94c5349b8fed252499314bd2149fadf96ddaf6d6",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/7dc30bc972b5c29572bd285bfb7c3f24e909522a",
+                "reference": "7dc30bc972b5c29572bd285bfb7c3f24e909522a",
                 "shasum": ""
             },
             "require": {
                 "blade-ui-kit/blade-heroicons": "^2.2.1",
-                "doctrine/dbal": "^3.2",
+                "doctrine/dbal": "^3.2|^4.0",
                 "ext-intl": "*",
                 "illuminate/contracts": "^10.45|^11.0",
                 "illuminate/support": "^10.45|^11.0",
                 "illuminate/view": "^10.45|^11.0",
+                "kirschbaum-development/eloquent-power-joins": "^3.0",
                 "livewire/livewire": "^3.4.10",
                 "php": "^8.1",
                 "ryangjchandler/blade-capture-directive": "^0.2|^0.3|^1.0",
@@ -2258,20 +2070,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-07-31T11:53:25+00:00"
+            "time": "2024-08-13T12:36:11+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.97",
+            "version": "v3.2.102",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "0e6e96bde5337b26944ce3a657ae6755bef82d1e"
+                "reference": "072592eba6d29d5f82e2cacfaf6ec7b4309d66da"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/0e6e96bde5337b26944ce3a657ae6755bef82d1e",
-                "reference": "0e6e96bde5337b26944ce3a657ae6755bef82d1e",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/072592eba6d29d5f82e2cacfaf6ec7b4309d66da",
+                "reference": "072592eba6d29d5f82e2cacfaf6ec7b4309d66da",
                 "shasum": ""
             },
             "require": {
@@ -2284,7 +2096,6 @@
                 "illuminate/filesystem": "^10.45|^11.0",
                 "illuminate/support": "^10.45|^11.0",
                 "illuminate/view": "^10.45|^11.0",
-                "kirschbaum-development/eloquent-power-joins": "^3.0",
                 "php": "^8.1",
                 "spatie/laravel-package-tools": "^1.9"
             },
@@ -2311,11 +2122,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-07-31T11:53:24+00:00"
+            "time": "2024-08-12T16:38:51+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.97",
+            "version": "v3.2.102",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -3697,16 +3508,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.5.1",
+            "version": "2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c"
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/ac815920de0eff6de947eac0a6a94e5ed0fb147c",
-                "reference": "ac815920de0eff6de947eac0a6a94e5ed0fb147c",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/b650144166dfa7703e62a22e493b853b58d874b0",
+                "reference": "b650144166dfa7703e62a22e493b853b58d874b0",
                 "shasum": ""
             },
             "require": {
@@ -3719,8 +3530,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.31.0",
-                "commonmark/commonmark.js": "0.31.0",
+                "commonmark/cmark": "0.31.1",
+                "commonmark/commonmark.js": "0.31.1",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -3799,7 +3610,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-24T12:52:09+00:00"
+            "time": "2024-08-16T11:46:16+00:00"
         },
         {
             "name": "league/config",
@@ -5529,16 +5340,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.39",
+            "version": "3.0.41",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485"
+                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/211ebc399c6e73c225a018435fe5ae209d1d1485",
-                "reference": "211ebc399c6e73c225a018435fe5ae209d1d1485",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
+                "reference": "621c73f7dcb310b61de34d1da4c4204e8ace6ceb",
                 "shasum": ""
             },
             "require": {
@@ -5619,7 +5430,7 @@
             ],
             "support": {
                 "issues": "https://github.com/phpseclib/phpseclib/issues",
-                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.39"
+                "source": "https://github.com/phpseclib/phpseclib/tree/3.0.41"
             },
             "funding": [
                 {
@@ -5635,7 +5446,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-24T06:27:33+00:00"
+            "time": "2024-08-12T00:13:54+00:00"
         },
         {
             "name": "psr/cache",
@@ -10671,16 +10482,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "10.5.29",
+            "version": "10.5.30",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "8e9e80872b4e8064401788ee8a32d40b4455318f"
+                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e9e80872b4e8064401788ee8a32d40b4455318f",
-                "reference": "8e9e80872b4e8064401788ee8a32d40b4455318f",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b15524febac0153876b4ba9aab3326c2ee94c897",
+                "reference": "b15524febac0153876b4ba9aab3326c2ee94c897",
                 "shasum": ""
             },
             "require": {
@@ -10701,7 +10512,7 @@
                 "phpunit/php-timer": "^6.0.0",
                 "sebastian/cli-parser": "^2.0.1",
                 "sebastian/code-unit": "^2.0.0",
-                "sebastian/comparator": "^5.0.1",
+                "sebastian/comparator": "^5.0.2",
                 "sebastian/diff": "^5.1.1",
                 "sebastian/environment": "^6.1.0",
                 "sebastian/exporter": "^5.1.2",
@@ -10752,7 +10563,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.29"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.30"
             },
             "funding": [
                 {
@@ -10768,25 +10579,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-30T11:08:00+00:00"
+            "time": "2024-08-13T06:09:37+00:00"
         },
         {
             "name": "rector/rector",
-            "version": "1.2.2",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "044e6364017882d1e346da8690eeabc154da5495"
+                "reference": "2433e95410aef1b34b15d7f1b6a134365a4ddb39"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/044e6364017882d1e346da8690eeabc154da5495",
-                "reference": "044e6364017882d1e346da8690eeabc154da5495",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/2433e95410aef1b34b15d7f1b6a134365a4ddb39",
+                "reference": "2433e95410aef1b34b15d7f1b6a134365a4ddb39",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.11"
+                "phpstan/phpstan": "^1.11.9"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -10819,7 +10630,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/1.2.2"
+                "source": "https://github.com/rectorphp/rector/tree/1.2.3"
             },
             "funding": [
                 {
@@ -10827,7 +10638,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-25T07:44:34+00:00"
+            "time": "2024-08-12T16:36:46+00:00"
         },
         {
             "name": "sebastian/cli-parser",
@@ -10999,16 +10810,16 @@
         },
         {
             "name": "sebastian/comparator",
-            "version": "5.0.1",
+            "version": "5.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372"
+                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2db5010a484d53ebf536087a70b4a5423c102372",
-                "reference": "2db5010a484d53ebf536087a70b4a5423c102372",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
+                "reference": "2d3e04c3b4c1e84a5e7382221ad8883c8fbc4f53",
                 "shasum": ""
             },
             "require": {
@@ -11019,7 +10830,7 @@
                 "sebastian/exporter": "^5.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^10.3"
+                "phpunit/phpunit": "^10.4"
             },
             "type": "library",
             "extra": {
@@ -11064,7 +10875,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/comparator/issues",
                 "security": "https://github.com/sebastianbergmann/comparator/security/policy",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.1"
+                "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.2"
             },
             "funding": [
                 {
@@ -11072,7 +10883,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-14T13:18:12+00:00"
+            "time": "2024-08-12T06:03:08+00:00"
         },
         {
             "name": "sebastian/complexity",
@@ -12612,16 +12423,16 @@
         },
         {
             "name": "zbateson/mail-mime-parser",
-            "version": "3.0.2",
+            "version": "3.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/zbateson/mail-mime-parser.git",
-                "reference": "9a240522ae5e4eaeb7bf72c9bc88fe89dfb014a3"
+                "reference": "e0d4423fe27850c9dd301190767dbc421acc2f19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/zbateson/mail-mime-parser/zipball/9a240522ae5e4eaeb7bf72c9bc88fe89dfb014a3",
-                "reference": "9a240522ae5e4eaeb7bf72c9bc88fe89dfb014a3",
+                "url": "https://api.github.com/repos/zbateson/mail-mime-parser/zipball/e0d4423fe27850c9dd301190767dbc421acc2f19",
+                "reference": "e0d4423fe27850c9dd301190767dbc421acc2f19",
                 "shasum": ""
             },
             "require": {
@@ -12684,7 +12495,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-05-01T16:49:29+00:00"
+            "time": "2024-08-10T18:44:09+00:00"
         },
         {
             "name": "zbateson/mb-wrapper",

package-lock.json

@@ -900,9 +900,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.3.tgz",
-            "integrity": "sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==",
+            "version": "1.7.4",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+            "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.5",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.5.tgz",
-            "integrity": "sha512-QR7/A7ZkMS8tZuoftC/jfqNkZLQO779SSW3YuZHP4eXpj3EffGLFcB/Xu9AAZQzLccTiCV+EmUo3ha4mQ9wnlA==",
+            "version": "1.5.10",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.10.tgz",
+            "integrity": "sha512-C3RDERDjrNW262GCRvpoer3a0Ksd66CtgDLxMHhzShQ8fhL4kwnpVXsJPAKg9xJjIROXUbLBrvtOzVAjALMIWA==",
             "dev": true,
             "license": "ISC"
         },
@@ -1968,9 +1968,9 @@
             }
         },
         "node_modules/postcss-nested/node_modules/postcss-selector-parser": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
-            "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2056,9 +2056,9 @@
             }
         },
         "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
-            "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2417,9 +2417,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.9",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.9.tgz",
-            "integrity": "sha512-1SEOvRr6sSdV5IDf9iC+NU4dhwdqzF4zKKq3sAbasUWHEM6lsMhX+eNN5gkPx1BvLFEnZQEUFbXnGj8Qlp83Pg==",
+            "version": "3.4.10",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.10.tgz",
+            "integrity": "sha512-KWZkVPm7yJRhdu4SRSl9d4AK2wM3a50UsvgHZO7xY77NQr2V+fIrEuoDGQcbvswWvFGbS2f6e+jC/6WJm1Dl0w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2455,9 +2455,9 @@
             }
         },
         "node_modules/tailwindcss/node_modules/postcss-selector-parser": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz",
-            "integrity": "sha512-b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==",
+            "version": "6.1.2",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2550,14 +2550,14 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.4.0",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.0.tgz",
-            "integrity": "sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==",
+            "version": "5.4.1",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.1.tgz",
+            "integrity": "sha512-1oE6yuNXssjrZdblI9AfBbHCC41nnyoVoEZxQnID6yvQZAFBzxxkqoFLtHUMkYunL8hwOLEjgTuxpkRxvba3kA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "esbuild": "^0.21.3",
-                "postcss": "^8.4.40",
+                "postcss": "^8.4.41",
                 "rollup": "^4.13.0"
             },
             "bin": {