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

Development 3.x

app/Collections/Accounting/JournalEntryCollection.php

@@ -2,9 +2,9 @@
 
 namespace App\Collections\Accounting;
 
-use App\Enums\Accounting\JournalEntryType;
 use App\Models\Accounting\JournalEntry;
 use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
 use App\ValueObjects\Money;
 use Illuminate\Database\Eloquent\Collection;
 
@@ -12,20 +12,30 @@ class JournalEntryCollection extends Collection
 {
     public function sumDebits(): Money
     {
-        $total = $this->where('type', JournalEntryType::Debit)
-            ->sum(static function (JournalEntry $item) {
-                return $item->rawValue('amount');
-            });
+        $total = $this->reduce(static function ($carry, JournalEntry $item) {
+            if ($item->type->isDebit()) {
+                $amountAsInteger = CurrencyConverter::convertToCents($item->amount);
+
+                return bcadd($carry, $amountAsInteger, 0);
+            }
+
+            return $carry;
+        }, 0);
 
         return new Money($total, CurrencyAccessor::getDefaultCurrency());
     }
 
     public function sumCredits(): Money
     {
-        $total = $this->where('type', JournalEntryType::Credit)
-            ->sum(static function (JournalEntry $item) {
-                return $item->rawValue('amount');
-            });
+        $total = $this->reduce(static function ($carry, JournalEntry $item) {
+            if ($item->type->isCredit()) {
+                $amountAsInteger = CurrencyConverter::convertToCents($item->amount);
+
+                return bcadd($carry, $amountAsInteger, 0);
+            }
+
+            return $carry;
+        }, 0);
 
         return new Money($total, CurrencyAccessor::getDefaultCurrency());
     }

app/Contracts/ExportableReport.php

@@ -26,4 +26,8 @@ interface ExportableReport
     public function getPdfView(): string;
 
     public function getAlignmentClass(string $columnName): string;
+
+    public function getStartDate(): ?string;
+
+    public function getEndDate(): ?string;
 }

app/DTO/CashFlowOverviewDTO.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\DTO;
+
+class CashFlowOverviewDTO
+{
+    public function __construct(
+        public array $categories,
+    ) {}
+}

app/DTO/ReportDTO.php

@@ -2,6 +2,8 @@
 
 namespace App\DTO;
 
+use Illuminate\Support\Carbon;
+
 class ReportDTO
 {
     public function __construct(
@@ -12,5 +14,8 @@ class ReportDTO
         public ?AccountBalanceDTO $overallTotal = null,
         public array $fields = [],
         public ?string $reportType = null,
+        public ?CashFlowOverviewDTO $overview = null,
+        public ?Carbon $startDate = null,
+        public ?Carbon $endDate = null,
     ) {}
 }

app/Enums/Accounting/AccountType.php

@@ -85,4 +85,59 @@ enum AccountType: string implements HasLabel
             default => false,
         };
     }
+
+    public function isNormalDebitBalance(): bool
+    {
+        return in_array($this, [
+            self::CurrentAsset,
+            self::NonCurrentAsset,
+            self::ContraLiability,
+            self::ContraEquity,
+            self::ContraRevenue,
+            self::OperatingExpense,
+            self::NonOperatingExpense,
+            self::UncategorizedExpense,
+        ], true);
+    }
+
+    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->getCategory(), [
+            AccountCategory::Revenue,
+            AccountCategory::Expense,
+        ], true);
+    }
+
+    /**
+     * Determines if the account is a real account.
+     *
+     * 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
+    {
+        return ! $this->isNominal();
+    }
+
+    public function isContra(): bool
+    {
+        return in_array($this, [
+            self::ContraAsset,
+            self::ContraLiability,
+            self::ContraEquity,
+            self::ContraRevenue,
+            self::ContraExpense,
+        ], true);
+    }
 }

app/Filament/Company/Pages/Reports.php

@@ -5,6 +5,7 @@ namespace App\Filament\Company\Pages;
 use App\Filament\Company\Pages\Reports\AccountBalances;
 use App\Filament\Company\Pages\Reports\AccountTransactions;
 use App\Filament\Company\Pages\Reports\BalanceSheet;
+use App\Filament\Company\Pages\Reports\CashFlowStatement;
 use App\Filament\Company\Pages\Reports\IncomeStatement;
 use App\Filament\Company\Pages\Reports\TrialBalance;
 use App\Infolists\Components\ReportEntry;
@@ -49,7 +50,7 @@ class Reports extends Page
                             ->description('Shows cash inflows and outflows over a specific period of time.')
                             ->icon('heroicon-o-document-currency-dollar')
                             ->iconColor(Color::Cyan)
-                            ->url('#'),
+                            ->url(CashFlowStatement::getUrl()),
                     ]),
                 Section::make('Detailed Reports')
                     ->aside()

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

@@ -38,30 +38,30 @@ class AccountBalances extends BaseReportPage
     {
         return [
             Column::make('account_code')
-                ->label('Account Code')
-                ->toggleable()
-                ->alignment(Alignment::Center),
+                ->label('ACCOUNT CODE')
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
             Column::make('account_name')
-                ->label('Account')
+                ->label('ACCOUNT')
                 ->alignment(Alignment::Left),
             Column::make('starting_balance')
-                ->label('Starting Balance')
+                ->label('STARTING BALANCE')
                 ->toggleable()
                 ->alignment(Alignment::Right),
             Column::make('debit_balance')
-                ->label('Debit')
+                ->label('DEBIT')
                 ->toggleable()
                 ->alignment(Alignment::Right),
             Column::make('credit_balance')
-                ->label('Credit')
+                ->label('CREDIT')
                 ->toggleable()
                 ->alignment(Alignment::Right),
             Column::make('net_movement')
-                ->label('Net Movement')
+                ->label('NET MOVEMENT')
                 ->toggleable()
                 ->alignment(Alignment::Right),
             Column::make('ending_balance')
-                ->label('Ending Balance')
+                ->label('ENDING BALANCE')
                 ->toggleable()
                 ->alignment(Alignment::Right),
         ];

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

@@ -6,6 +6,7 @@ use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
 use App\Filament\Company\Pages\Accounting\Transactions;
 use App\Models\Accounting\Account;
+use App\Models\Accounting\JournalEntry;
 use App\Services\ExportService;
 use App\Services\ReportService;
 use App\Support\Column;
@@ -18,6 +19,7 @@ use Filament\Support\Enums\MaxWidth;
 use Filament\Tables\Actions\Action;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
@@ -58,20 +60,20 @@ class AccountTransactions extends BaseReportPage
     {
         return [
             Column::make('date')
-                ->label('Date')
+                ->label('DATE')
                 ->markAsDate()
                 ->alignment(Alignment::Left),
             Column::make('description')
-                ->label('Description')
+                ->label('DESCRIPTION')
                 ->alignment(Alignment::Left),
             Column::make('debit')
-                ->label('Debit')
+                ->label('DEBIT')
                 ->alignment(Alignment::Right),
             Column::make('credit')
-                ->label('Credit')
+                ->label('CREDIT')
                 ->alignment(Alignment::Right),
             Column::make('balance')
-                ->label('Running Balance')
+                ->label('RUNNING BALANCE')
                 ->alignment(Alignment::Right),
         ];
     }
@@ -162,12 +164,26 @@ class AccountTransactions extends BaseReportPage
         ];
     }
 
-    public function tableHasEmptyState(): bool
+    public function hasNoTransactionsForSelectedAccount(): bool
     {
-        if ($this->report) {
-            return empty($this->report->getCategories());
-        } else {
-            return true;
+        $query = JournalEntry::query();
+        $selectedAccountId = $this->getFilterState('selectedAccount');
+
+        if ($selectedAccountId !== 'all') {
+            $query->where('account_id', $selectedAccountId);
         }
+
+        if ($this->getFilterState('startDate') && $this->getFilterState('endDate')) {
+            $query->whereHas('transaction', function (Builder $query) {
+                $query->whereBetween('posted_at', [$this->getFormattedStartDate(), $this->getFormattedEndDate()]);
+            });
+        }
+
+        return $query->doesntExist();
+    }
+
+    public function tableHasEmptyState(): bool
+    {
+        return $this->hasNoTransactionsForSelectedAccount();
     }
 }

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

@@ -37,14 +37,14 @@ class BalanceSheet extends BaseReportPage
     {
         return [
             Column::make('account_code')
-                ->label('Account Code')
-                ->toggleable()
-                ->alignment(Alignment::Center),
+                ->label('ACCOUNT CODE')
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
             Column::make('account_name')
-                ->label('Account')
+                ->label('ACCOUNTS')
                 ->alignment(Alignment::Left),
             Column::make('ending_balance')
-                ->label('Amount')
+                ->label($this->getDisplayAsOfDate())
                 ->alignment(Alignment::Right),
         ];
     }

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

@@ -169,6 +169,29 @@ abstract class BaseReportPage extends Page
         return Carbon::parse($this->getFilterState('asOfDate'))->endOfDay()->toDateTimeString();
     }
 
+    public function getDisplayAsOfDate(): string
+    {
+        return Carbon::parse($this->getFilterState('asOfDate'))->toDefaultDateFormat();
+    }
+
+    public function getDisplayStartDate(): string
+    {
+        return Carbon::parse($this->getFilterState('startDate'))->toDefaultDateFormat();
+    }
+
+    public function getDisplayEndDate(): string
+    {
+        return Carbon::parse($this->getFilterState('endDate'))->toDefaultDateFormat();
+    }
+
+    public function getDisplayDateRange(): string
+    {
+        $startDate = Carbon::parse($this->getFilterState('startDate'));
+        $endDate = Carbon::parse($this->getFilterState('endDate'));
+
+        return $startDate->toDefaultDateFormat() . ' - ' . $endDate->toDefaultDateFormat();
+    }
+
     protected function getHeaderActions(): array
     {
         return [

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

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use App\Services\ExportService;
+use App\Services\ReportService;
+use App\Support\Column;
+use App\Transformers\CashFlowStatementReportTransformer;
+use Filament\Forms\Form;
+use Filament\Support\Enums\Alignment;
+use Guava\FilamentClusters\Forms\Cluster;
+use Livewire\Attributes\Url;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class CashFlowStatement extends BaseReportPage
+{
+    protected static string $view = 'filament.company.pages.reports.cash-flow-statement';
+
+    protected static ?string $slug = 'reports/cash-flow-statement';
+
+    protected static bool $shouldRegisterNavigation = false;
+
+    protected ReportService $reportService;
+
+    protected ExportService $exportService;
+
+    #[Url]
+    public ?string $activeTab = 'summary';
+
+    public function boot(ReportService $reportService, ExportService $exportService): void
+    {
+        $this->reportService = $reportService;
+        $this->exportService = $exportService;
+    }
+
+    public function getTable(): array
+    {
+        return [
+            Column::make('account_code')
+                ->label('ACCOUNT CODE')
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
+            Column::make('account_name')
+                ->label('CASH INFLOWS AND OUTFLOWS')
+                ->alignment(Alignment::Left),
+            Column::make('net_movement')
+                ->label($this->getDisplayDateRange())
+                ->alignment(Alignment::Right),
+        ];
+    }
+
+    public function filtersForm(Form $form): Form
+    {
+        return $form
+            ->inlineLabel()
+            ->columns()
+            ->schema([
+                $this->getDateRangeFormComponent(),
+                Cluster::make([
+                    $this->getStartDateFormComponent(),
+                    $this->getEndDateFormComponent(),
+                ])->hiddenLabel(),
+            ]);
+    }
+
+    protected function buildReport(array $columns): ReportDTO
+    {
+        return $this->reportService->buildCashFlowStatementReport($this->getFormattedStartDate(), $this->getFormattedEndDate(), $columns);
+    }
+
+    protected function getTransformer(ReportDTO $reportDTO): ExportableReport
+    {
+        return new CashFlowStatementReportTransformer($reportDTO);
+    }
+
+    public function exportCSV(): StreamedResponse
+    {
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
+    }
+
+    public function exportPDF(): StreamedResponse
+    {
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->getFilterState('startDate'), $this->getFilterState('endDate'));
+    }
+}

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

@@ -39,14 +39,14 @@ class IncomeStatement extends BaseReportPage
     {
         return [
             Column::make('account_code')
-                ->label('Account Code')
-                ->toggleable()
-                ->alignment(Alignment::Center),
+                ->label('ACCOUNT CODE')
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
             Column::make('account_name')
-                ->label('Account')
+                ->label('ACCOUNTS')
                 ->alignment(Alignment::Left),
             Column::make('net_movement')
-                ->label('Amount')
+                ->label($this->getDisplayDateRange())
                 ->alignment(Alignment::Right),
         ];
     }

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

@@ -43,17 +43,17 @@ class TrialBalance extends BaseReportPage
     {
         return [
             Column::make('account_code')
-                ->label('Account Code')
-                ->toggleable()
-                ->alignment(Alignment::Center),
+                ->label('ACCOUNT CODE')
+                ->toggleable(isToggledHiddenByDefault: true)
+                ->alignment(Alignment::Left),
             Column::make('account_name')
-                ->label('Account')
+                ->label('ACCOUNTS')
                 ->alignment(Alignment::Left),
             Column::make('debit_balance')
-                ->label('Debit')
+                ->label('DEBIT')
                 ->alignment(Alignment::Right),
             Column::make('credit_balance')
-                ->label('Credit')
+                ->label('CREDIT')
                 ->alignment(Alignment::Right),
         ];
     }

app/Models/Accounting/AccountSubtype.php

@@ -21,6 +21,7 @@ class AccountSubtype extends Model
     protected $fillable = [
         'company_id',
         'multi_currency',
+        'inverse_cash_flow',
         'category',
         'type',
         'name',
@@ -29,6 +30,7 @@ class AccountSubtype extends Model
 
     protected $casts = [
         'multi_currency' => 'boolean',
+        'inverse_cash_flow' => 'boolean',
         'category' => AccountCategory::class,
         'type' => AccountType::class,
     ];

app/Services/AccountService.php

@@ -171,7 +171,67 @@ class AccountService
                     ->where('transactions.posted_at', '<=', $endDate);
             })
             ->groupBy('accounts.id')
-            ->with(['subtype:id,name']);
+            ->with(['subtype:id,name,inverse_cash_flow']);
+
+        if (! empty($accountIds)) {
+            $query->whereIn('accounts.id', $accountIds);
+        }
+
+        $query->addBinding([$startDate, $startDate, $startDate, $startDate, $startDate, $endDate, $startDate, $endDate], 'select');
+
+        return $query;
+    }
+
+    public function getCashFlowAccountBalances(string $startDate, string $endDate, array $accountIds = []): Builder
+    {
+        $accountIds = array_map('intval', $accountIds);
+
+        $query = Account::query()
+            ->select([
+                'accounts.id',
+                'accounts.name',
+                'accounts.category',
+                'accounts.type',
+                'accounts.subtype_id',
+                'accounts.currency_code',
+                'accounts.code',
+            ])
+            ->addSelect([
+                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
+                "),
+            ])
+            ->join('journal_entries', 'journal_entries.account_id', '=', 'accounts.id')
+            ->join('transactions', function (JoinClause $join) use ($endDate) {
+                $join->on('transactions.id', '=', 'journal_entries.transaction_id')
+                    ->where('transactions.posted_at', '<=', $endDate);
+            })
+            ->whereExists(function (\Illuminate\Database\Query\Builder $subQuery) {
+                $subQuery->select(DB::raw(1))
+                    ->from('journal_entries as je')
+                    ->join('accounts as bank_accounts', 'bank_accounts.id', '=', 'je.account_id')
+                    ->whereNotNull('bank_accounts.bank_account_id')
+                    ->whereColumn('je.transaction_id', 'journal_entries.transaction_id');
+            })
+            ->groupBy('accounts.id')
+            ->with(['subtype:id,name,inverse_cash_flow']);
 
         if (! empty($accountIds)) {
             $query->whereIn('accounts.id', $accountIds);
@@ -224,6 +284,50 @@ class AccountService
         return new Money($totalBalance, CurrencyAccessor::getDefaultCurrency());
     }
 
+    public function getStartingBalanceForAllBankAccounts(string $startDate): Money
+    {
+        $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 ($startDate) {
+                $join->on('transactions.id', '=', 'journal_entries.transaction_id')
+                    ->where('transactions.posted_at', '<', $startDate);
+            })
+            ->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
+        ', [
+                $startDate,
+                $startDate,
+            ])
+            ->first();
+
+        return new Money($result->totalStartingBalance ?? 0, CurrencyAccessor::getDefaultCurrency());
+    }
+
+    public function getBankAccountBalances(string $startDate, string $endDate): Builder | array
+    {
+        $accountIds = Account::whereHas('bankAccount')
+            ->pluck('id')
+            ->toArray();
+
+        if (empty($accountIds)) {
+            return [];
+        }
+
+        return $this->getAccountBalances($startDate, $endDate, $accountIds);
+    }
+
     public function getEarliestTransactionDate(): string
     {
         $earliestDate = Transaction::min('posted_at');

app/Services/ChartOfAccountsService.php

@@ -21,6 +21,7 @@ class ChartOfAccountsService
                 $subtype = $company->accountSubtypes()
                     ->createQuietly([
                         'multi_currency' => $subtypeConfig['multi_currency'] ?? false,
+                        'inverse_cash_flow' => $subtypeConfig['inverse_cash_flow'] ?? false,
                         'category' => AccountType::from($type)->getCategory()->value,
                         'type' => $type,
                         'name' => $subtypeName,

app/Services/ExportService.php

@@ -4,6 +4,7 @@ namespace App\Services;
 
 use App\Contracts\ExportableReport;
 use App\Models\Company;
+use App\Transformers\CashFlowStatementReportTransformer;
 use Barryvdh\Snappy\Facades\SnappyPdf;
 use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Support\Carbon;
@@ -72,6 +73,10 @@ class ExportService
                 $csv->insertOne([]);
             }
 
+            if ($report->getTitle() === 'Cash Flow Statement') {
+                $this->writeOverviewTableToCsv($csv, $report);
+            }
+
             if (filled($report->getOverallTotals())) {
                 $csv->insertOne($report->getOverallTotals());
             }
@@ -80,6 +85,45 @@ class ExportService
         return response()->streamDownload($callback, $filename, $headers);
     }
 
+    /**
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    protected function writeOverviewTableToCsv(Writer $csv, ExportableReport $report): void
+    {
+        /** @var CashFlowStatementReportTransformer $report */
+        $headers = $report->getOverviewHeaders();
+
+        if (filled($headers)) {
+            $csv->insertOne($headers);
+        }
+
+        foreach ($report->getOverview() as $overviewCategory) {
+            if (filled($overviewCategory->header)) {
+                $this->writeDataRowsToCsv($csv, $overviewCategory->header, $overviewCategory->data, $report->getColumns());
+            }
+
+            if (filled($overviewCategory->summary)) {
+                $csv->insertOne($overviewCategory->summary);
+            }
+
+            if ($overviewCategory->header['account_name'] === 'Starting Balance') {
+                foreach ($report->getOverviewAlignedWithColumns() as $summaryRow) {
+                    $row = [];
+
+                    foreach ($report->getColumns() as $column) {
+                        $columnName = $column->getName();
+                        $row[] = $summaryRow[$columnName] ?? '';
+                    }
+
+                    if (array_filter($row)) {
+                        $csv->insertOne($row);
+                    }
+                }
+            }
+        }
+    }
+
     public function exportToPdf(Company $company, ExportableReport $report, ?string $startDate = null, ?string $endDate = null): StreamedResponse
     {
         if ($startDate && $endDate) {

app/Services/ReportService.php

@@ -7,12 +7,14 @@ use App\DTO\AccountCategoryDTO;
 use App\DTO\AccountDTO;
 use App\DTO\AccountTransactionDTO;
 use App\DTO\AccountTypeDTO;
+use App\DTO\CashFlowOverviewDTO;
 use App\DTO\ReportDTO;
 use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
 use App\Models\Accounting\Account;
 use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
 use App\ValueObjects\Money;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Carbon;
@@ -44,7 +46,9 @@ class ReportService
     {
         $orderedCategories = AccountCategory::getOrderedCategories();
 
-        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)->get();
+        $accounts = $this->accountService->getAccountBalances($startDate, $endDate)
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
 
         $columnNameKeys = array_map(fn (Column $column) => $column->getName(), $columns);
 
@@ -52,8 +56,7 @@ class ReportService
         $reportTotalBalances = [];
 
         foreach ($orderedCategories as $category) {
-            $accountsInCategory = $accounts->where('category', $category)
-                ->sortBy('code', SORT_NATURAL);
+            $accountsInCategory = $accounts->where('category', $category);
 
             $relevantFields = array_intersect($category->getRelevantBalanceFields(), $columnNameKeys);
 
@@ -63,7 +66,7 @@ class ReportService
 
             /** @var Account $account */
             foreach ($accountsInCategory as $account) {
-                $accountBalances = $this->calculateAccountBalances($account, $category);
+                $accountBalances = $this->calculateAccountBalances($account);
 
                 foreach ($relevantFields as $field) {
                     $categorySummaryBalances[$field] += $accountBalances[$field];
@@ -95,11 +98,16 @@ class ReportService
 
         $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+        return new ReportDTO(
+            categories: $accountCategories,
+            overallTotal: $formattedReportTotalBalances,
+            fields: $columns,
+        );
     }
 
-    public function calculateAccountBalances(Account $account, AccountCategory $category): array
+    public function calculateAccountBalances(Account $account): array
     {
+        $category = $account->category;
         $balances = [
             'debit_balance' => $account->total_debit ?? 0,
             'credit_balance' => $account->total_credit ?? 0,
@@ -130,12 +138,12 @@ class ReportService
         $expenseTotal = 0;
 
         foreach ($revenueAccounts as $account) {
-            $revenueBalances = $this->calculateAccountBalances($account, AccountCategory::Revenue);
+            $revenueBalances = $this->calculateAccountBalances($account);
             $revenueTotal += $revenueBalances['net_movement'];
         }
 
         foreach ($expenseAccounts as $account) {
-            $expenseBalances = $this->calculateAccountBalances($account, AccountCategory::Expense);
+            $expenseBalances = $this->calculateAccountBalances($account);
             $expenseTotal += $expenseBalances['net_movement'];
         }
 
@@ -151,7 +159,8 @@ class ReportService
 
         $accountIds = $accountId !== 'all' ? [$accountId] : [];
 
-        $query = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds);
+        $query = $this->accountService->getAccountBalances($startDate, $endDate, $accountIds)
+            ->orderByRaw('LENGTH(code), code');
 
         $accounts = $query->with(['journalEntries' => $this->accountService->getTransactionDetailsSubquery($startDate, $endDate)])->get();
 
@@ -242,6 +251,7 @@ class ReportService
 
         $accounts = $this->accountService->getAccountBalances($startDateCarbon->toDateTimeString(), $asOfDateCarbon->toDateTimeString())
             ->when($isPostClosingTrialBalance, fn (Builder $query) => $query->whereNotIn('category', [AccountCategory::Revenue, AccountCategory::Expense]))
+            ->orderByRaw('LENGTH(code), code')
             ->get();
 
         $balanceFields = ['debit_balance', 'credit_balance'];
@@ -250,8 +260,7 @@ class ReportService
         $reportTotalBalances = array_fill_keys($balanceFields, 0);
 
         foreach ($orderedCategories as $category) {
-            $accountsInCategory = $accounts->where('category', $category)
-                ->sortBy('code', SORT_NATURAL);
+            $accountsInCategory = $accounts->where('category', $category);
 
             $categorySummaryBalances = array_fill_keys($balanceFields, 0);
 
@@ -259,7 +268,7 @@ class ReportService
 
             /** @var Account $account */
             foreach ($accountsInCategory as $account) {
-                $accountBalances = $this->calculateAccountBalances($account, $category);
+                $accountBalances = $this->calculateAccountBalances($account);
 
                 $endingBalance = $accountBalances['ending_balance'] ?? $accountBalances['net_movement'];
 
@@ -402,7 +411,7 @@ class ReportService
                 };
 
                 if ($category !== null) {
-                    $accountBalances = $this->calculateAccountBalances($account, $category);
+                    $accountBalances = $this->calculateAccountBalances($account);
                     $movement = $accountBalances['net_movement'];
                     $netMovement += $movement;
                     $group['total'] += $movement;
@@ -429,7 +438,238 @@ class ReportService
         $netProfit = $grossProfit - $totalExpenses;
         $formattedReportTotalBalances = $this->formatBalances(['net_movement' => $netProfit]);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+        return new ReportDTO(
+            categories: $accountCategories,
+            overallTotal: $formattedReportTotalBalances,
+            fields: $columns,
+            startDate: Carbon::parse($startDate),
+            endDate: Carbon::parse($endDate),
+        );
+    }
+
+    public function buildCashFlowStatementReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    {
+        $sections = [
+            'Operating Activities' => $this->buildOperatingActivities($startDate, $endDate),
+            'Investing Activities' => $this->buildInvestingActivities($startDate, $endDate),
+            'Financing Activities' => $this->buildFinancingActivities($startDate, $endDate),
+        ];
+
+        $totalCashFlows = $this->calculateTotalCashFlows($sections, $startDate);
+
+        $overview = $this->buildCashFlowOverview($startDate, $endDate);
+
+        return new ReportDTO(
+            categories: $sections,
+            overallTotal: $totalCashFlows,
+            fields: $columns,
+            overview: $overview,
+            startDate: Carbon::parse($startDate),
+            endDate: Carbon::parse($endDate),
+        );
+    }
+
+    private function calculateTotalCashFlows(array $sections, string $startDate): AccountBalanceDTO
+    {
+        $totalInflow = 0;
+        $totalOutflow = 0;
+        $startingBalance = $this->accountService->getStartingBalanceForAllBankAccounts($startDate)->getAmount();
+
+        foreach ($sections as $section) {
+            $netMovement = $section->summary->netMovement ?? 0;
+
+            $numericNetMovement = CurrencyConverter::convertToCents($netMovement);
+
+            if ($numericNetMovement > 0) {
+                $totalInflow += $numericNetMovement;
+            } else {
+                $totalOutflow += $numericNetMovement;
+            }
+        }
+
+        $netCashChange = $totalInflow + $totalOutflow;
+        $endingBalance = $startingBalance + $netCashChange;
+
+        return $this->formatBalances([
+            'starting_balance' => $startingBalance,
+            'debit_balance' => $totalInflow,
+            'credit_balance' => abs($totalOutflow),
+            'net_movement' => $netCashChange,
+            'ending_balance' => $endingBalance,
+        ]);
+    }
+
+    private function buildCashFlowOverview(string $startDate, string $endDate): CashFlowOverviewDTO
+    {
+        $accounts = $this->accountService->getBankAccountBalances($startDate, $endDate)->get();
+
+        $startingBalanceAccounts = [];
+        $endingBalanceAccounts = [];
+
+        $startingBalanceTotal = 0;
+        $endingBalanceTotal = 0;
+
+        foreach ($accounts as $account) {
+            $accountBalances = $this->calculateAccountBalances($account);
+
+            $startingBalanceTotal += $accountBalances['starting_balance'];
+            $endingBalanceTotal += $accountBalances['ending_balance'];
+
+            $startingBalanceAccounts[] = new AccountDTO(
+                accountName: $account->name,
+                accountCode: $account->code,
+                accountId: $account->id,
+                balance: $this->formatBalances(['starting_balance' => $accountBalances['starting_balance']]),
+                startDate: $startDate,
+                endDate: $endDate,
+            );
+
+            $endingBalanceAccounts[] = new AccountDTO(
+                accountName: $account->name,
+                accountCode: $account->code,
+                accountId: $account->id,
+                balance: $this->formatBalances(['ending_balance' => $accountBalances['ending_balance']]),
+                startDate: $startDate,
+                endDate: $endDate,
+            );
+        }
+
+        $startingBalanceSummary = $this->formatBalances(['starting_balance' => $startingBalanceTotal]);
+        $endingBalanceSummary = $this->formatBalances(['ending_balance' => $endingBalanceTotal]);
+
+        $overviewCategories = [
+            'Starting Balance' => new AccountCategoryDTO(
+                accounts: $startingBalanceAccounts,
+                summary: $startingBalanceSummary,
+            ),
+            'Ending Balance' => new AccountCategoryDTO(
+                accounts: $endingBalanceAccounts,
+                summary: $endingBalanceSummary,
+            ),
+        ];
+
+        return new CashFlowOverviewDTO($overviewCategories);
+    }
+
+    private function buildOperatingActivities(string $startDate, string $endDate): AccountCategoryDTO
+    {
+        $accounts = $this->accountService->getCashFlowAccountBalances($startDate, $endDate)
+            ->whereIn('accounts.type', [
+                AccountType::OperatingRevenue,
+                AccountType::UncategorizedRevenue,
+                AccountType::ContraRevenue,
+                AccountType::OperatingExpense,
+                AccountType::NonOperatingExpense,
+                AccountType::UncategorizedExpense,
+                AccountType::ContraExpense,
+                AccountType::CurrentAsset,
+            ])
+            ->whereRelation('subtype', 'name', '!=', 'Cash and Cash Equivalents')
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
+
+        $adjustments = $this->accountService->getCashFlowAccountBalances($startDate, $endDate)
+            ->whereIn('accounts.type', [
+                AccountType::ContraAsset,
+                AccountType::CurrentLiability,
+            ])
+            ->whereRelation('subtype', 'name', '!=', 'Short-Term Borrowings')
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
+
+        return $this->formatSectionAccounts($accounts, $adjustments, $startDate, $endDate);
+    }
+
+    private function buildInvestingActivities(string $startDate, string $endDate): AccountCategoryDTO
+    {
+        $accounts = $this->accountService->getCashFlowAccountBalances($startDate, $endDate)
+            ->whereIn('accounts.type', [AccountType::NonCurrentAsset])
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
+
+        $adjustments = $this->accountService->getCashFlowAccountBalances($startDate, $endDate)
+            ->whereIn('accounts.type', [AccountType::NonOperatingRevenue])
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
+
+        return $this->formatSectionAccounts($accounts, $adjustments, $startDate, $endDate);
+    }
+
+    private function buildFinancingActivities(string $startDate, string $endDate): AccountCategoryDTO
+    {
+        $accounts = $this->accountService->getCashFlowAccountBalances($startDate, $endDate)
+            ->where(function (Builder $query) {
+                $query->whereIn('accounts.type', [
+                    AccountType::Equity,
+                    AccountType::NonCurrentLiability,
+                ])
+                    ->orWhere(function (Builder $subQuery) {
+                        $subQuery->where('accounts.type', AccountType::CurrentLiability)
+                            ->whereRelation('subtype', 'name', 'Short-Term Borrowings');
+                    });
+            })
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
+
+        return $this->formatSectionAccounts($accounts, [], $startDate, $endDate);
+    }
+
+    private function formatSectionAccounts($accounts, $adjustments, string $startDate, string $endDate): AccountCategoryDTO
+    {
+        $categoryAccountsByType = [];
+        $sectionTotal = 0;
+        $subCategoryTotals = [];
+
+        // Process accounts and adjustments
+        /** @var Account[] $entries */
+        foreach ([$accounts, $adjustments] as $entries) {
+            foreach ($entries as $entry) {
+                $accountCategory = $entry->type->getCategory();
+                $accountBalances = $this->calculateAccountBalances($entry);
+                $netCashFlow = $accountBalances['net_movement'] ?? 0;
+
+                if ($entry->subtype->inverse_cash_flow) {
+                    $netCashFlow *= -1;
+                }
+
+                // Accumulate totals
+                $sectionTotal += $netCashFlow;
+                $accountTypeName = $entry->subtype->name;
+                $subCategoryTotals[$accountTypeName] = ($subCategoryTotals[$accountTypeName] ?? 0) + $netCashFlow;
+
+                // Create AccountDTO and group by account type
+                $accountDTO = new AccountDTO(
+                    $entry->name,
+                    $entry->code,
+                    $entry->id,
+                    $this->formatBalances(['net_movement' => $netCashFlow]),
+                    $startDate,
+                    $endDate
+                );
+
+                $categoryAccountsByType[$accountTypeName][] = $accountDTO;
+            }
+        }
+
+        // Prepare AccountTypeDTO for each account type with the accumulated totals
+        $subCategories = [];
+        foreach ($categoryAccountsByType as $typeName => $accountsInType) {
+            $typeTotal = $subCategoryTotals[$typeName] ?? 0;
+            $formattedTypeTotal = $this->formatBalances(['net_movement' => $typeTotal]);
+            $subCategories[$typeName] = new AccountTypeDTO(
+                accounts: $accountsInType,
+                summary: $formattedTypeTotal
+            );
+        }
+
+        // Format the overall section total as the section summary
+        $formattedSectionTotal = $this->formatBalances(['net_movement' => $sectionTotal]);
+
+        return new AccountCategoryDTO(
+            accounts: [], // No direct accounts at the section level
+            types: $subCategories, // Grouped by AccountTypeDTO
+            summary: $formattedSectionTotal,
+        );
     }
 
     public function buildBalanceSheetReport(string $asOfDate, array $columns = []): ReportDTO
@@ -461,7 +701,7 @@ class ReportService
             /** @var Account $account */
             foreach ($accounts as $account) {
                 if ($account->type->getCategory() === $category) {
-                    $accountBalances = $this->calculateAccountBalances($account, $category);
+                    $accountBalances = $this->calculateAccountBalances($account);
                     $endingBalance = $accountBalances['ending_balance'] ?? $accountBalances['net_movement'];
 
                     $categorySummaryBalances['ending_balance'] += $endingBalance;
@@ -533,6 +773,12 @@ class ReportService
 
         $formattedReportTotalBalances = $this->formatBalances(['ending_balance' => $netAssets]);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+        return new ReportDTO(
+            categories: $accountCategories,
+            overallTotal: $formattedReportTotalBalances,
+            fields: $columns,
+            startDate: $startDateCarbon,
+            endDate: $asOfDateCarbon,
+        );
     }
 }

app/Transformers/BalanceSheetReportTransformer.php

@@ -200,23 +200,26 @@ class BalanceSheetReportTransformer extends SummaryReportTransformer
                 $totalEquitySummary = $accountCategory->summary->endingBalance ?? 0;
                 $totalEquitySummary = money($totalEquitySummary, CurrencyAccessor::getDefaultCurrency())->getAmount();
                 $totalOtherEquity = $totalEquitySummary - $totalTypeSummaries;
-                $totalOtherEquity = money($totalOtherEquity, CurrencyAccessor::getDefaultCurrency(), true)->format();
 
-                // Add "Total Other Equity" as a new "type"
-                $otherEquitySummary = [];
-                foreach ($columns as $column) {
-                    $otherEquitySummary[$column->getName()] = match ($column->getName()) {
-                        'account_name' => 'Total Other Equity',
-                        'ending_balance' => $totalOtherEquity,
-                        default => '',
-                    };
-                }
+                if ($totalOtherEquity != 0) {
+                    $totalOtherEquityFormatted = money($totalOtherEquity, CurrencyAccessor::getDefaultCurrency(), true)->format();
 
-                $types['Total Other Equity'] = new ReportTypeDTO(
-                    header: [],
-                    data: [],
-                    summary: $otherEquitySummary,
-                );
+                    // Add "Total Other Equity" as a new "type"
+                    $otherEquitySummary = [];
+                    foreach ($columns as $column) {
+                        $otherEquitySummary[$column->getName()] = match ($column->getName()) {
+                            'account_name' => 'Total Other Equity',
+                            'ending_balance' => $totalOtherEquityFormatted,
+                            default => '',
+                        };
+                    }
+
+                    $types['Total Other Equity'] = new ReportTypeDTO(
+                        header: [],
+                        data: [],
+                        summary: $otherEquitySummary,
+                    );
+                }
             }
 
             // Add the category with its types and summary to the final array

app/Transformers/BaseReportTransformer.php

@@ -76,4 +76,14 @@ abstract class BaseReportTransformer implements ExportableReport
             return 'text-left';
         });
     }
+
+    public function getStartDate(): ?string
+    {
+        return $this->report->startDate?->toDefaultDateFormat();
+    }
+
+    public function getEndDate(): ?string
+    {
+        return $this->report->endDate?->toDefaultDateFormat();
+    }
 }

app/Transformers/CashFlowStatementReportTransformer.php

@@ -0,0 +1,338 @@
+<?php
+
+namespace App\Transformers;
+
+use App\DTO\AccountDTO;
+use App\DTO\ReportCategoryDTO;
+use App\DTO\ReportTypeDTO;
+
+class CashFlowStatementReportTransformer extends SummaryReportTransformer
+{
+    public function getPdfView(): string
+    {
+        return 'components.company.reports.cash-flow-statement-pdf';
+    }
+
+    public function getTitle(): string
+    {
+        return 'Cash Flow Statement';
+    }
+
+    public function getCategories(): array
+    {
+        $categories = [];
+
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            // Header for the main category
+            $header = [];
+
+            foreach ($this->getColumns() as $column) {
+                $header[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
+            }
+
+            // Category-level summary
+            $categorySummary = [];
+            foreach ($this->getColumns() as $column) {
+                $categorySummary[$column->getName()] = match ($column->getName()) {
+                    'account_name' => 'Total ' . $accountCategoryName,
+                    'net_movement' => $accountCategory->summary->netMovement ?? '',
+                    default => '',
+                };
+            }
+
+            // Accounts directly under the main category
+            $data = array_map(function (AccountDTO $account) {
+                $row = [];
+
+                foreach ($this->getColumns() as $column) {
+                    $row[$column->getName()] = match ($column->getName()) {
+                        'account_code' => $account->accountCode,
+                        'account_name' => [
+                            'name' => $account->accountName,
+                            'id' => $account->accountId ?? null,
+                            'start_date' => $account->startDate,
+                            'end_date' => $account->endDate,
+                        ],
+                        'net_movement' => $account->balance->netMovement ?? '',
+                        default => '',
+                    };
+                }
+
+                return $row;
+            }, $accountCategory->accounts ?? []);
+
+            // Subcategories (types) under the main category
+            $types = [];
+            foreach ($accountCategory->types as $typeName => $type) {
+                // Header for subcategory (type)
+                $typeHeader = [];
+                foreach ($this->getColumns() as $column) {
+                    $typeHeader[$column->getName()] = $column->getName() === 'account_name' ? $typeName : '';
+                }
+
+                // Account data for the subcategory
+                $typeData = array_map(function (AccountDTO $account) {
+                    $row = [];
+
+                    foreach ($this->getColumns() as $column) {
+                        $row[$column->getName()] = match ($column->getName()) {
+                            'account_code' => $account->accountCode,
+                            'account_name' => [
+                                'name' => $account->accountName,
+                                'id' => $account->accountId ?? null,
+                                'start_date' => $account->startDate,
+                                'end_date' => $account->endDate,
+                            ],
+                            'net_movement' => $account->balance->netMovement ?? '',
+                            default => '',
+                        };
+                    }
+
+                    return $row;
+                }, $type->accounts ?? []);
+
+                // Subcategory (type) summary
+                $typeSummary = [];
+                foreach ($this->getColumns() as $column) {
+                    $typeSummary[$column->getName()] = match ($column->getName()) {
+                        'account_name' => 'Total ' . $typeName,
+                        'net_movement' => $type->summary->netMovement ?? '',
+                        default => '',
+                    };
+                }
+
+                // Add subcategory (type) to the list
+                $types[$typeName] = new ReportTypeDTO(
+                    header: $typeHeader,
+                    data: $typeData,
+                    summary: $typeSummary,
+                );
+            }
+
+            // Add the category to the final array with its direct accounts and subcategories (types)
+            $categories[$accountCategoryName] = new ReportCategoryDTO(
+                header: $header,
+                data: $data, // Direct accounts under the category
+                summary: $categorySummary,
+                types: $types, // Subcategories (types) under the category
+            );
+        }
+
+        return $categories;
+    }
+
+    public function getSummaryCategories(): array
+    {
+        $summaryCategories = [];
+
+        $columns = $this->getSummaryColumns();
+
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            $categoryHeader = [];
+
+            foreach ($columns as $column) {
+                $categoryHeader[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
+            }
+
+            $categorySummary = [];
+            foreach ($columns as $column) {
+                $categorySummary[$column->getName()] = match ($column->getName()) {
+                    'account_name' => 'Total ' . $accountCategoryName,
+                    'net_movement' => $accountCategory->summary->netMovement ?? '',
+                    default => '',
+                };
+            }
+
+            $types = [];
+
+            // Iterate through each account type and calculate type summaries
+            foreach ($accountCategory->types as $typeName => $type) {
+                $typeSummary = [];
+
+                foreach ($columns as $column) {
+                    $typeSummary[$column->getName()] = match ($column->getName()) {
+                        'account_name' => $typeName,
+                        'net_movement' => $type->summary->netMovement ?? '',
+                        default => '',
+                    };
+                }
+
+                $types[$typeName] = new ReportTypeDTO(
+                    header: [],
+                    data: [],
+                    summary: $typeSummary,
+                );
+            }
+
+            // Add the category with its types and summary to the final array
+            $summaryCategories[$accountCategoryName] = new ReportCategoryDTO(
+                header: $categoryHeader,
+                data: [],
+                summary: $categorySummary,
+                types: $types,
+            );
+        }
+
+        return $summaryCategories;
+    }
+
+    public function getOverallTotals(): array
+    {
+        return [];
+    }
+
+    public function getSummaryOverallTotals(): array
+    {
+        return [];
+    }
+
+    public function getSummary(): array
+    {
+        return [
+            [
+                'label' => 'Total Cash Inflows',
+                'value' => $this->report->overallTotal->debitBalance ?? '',
+            ],
+            [
+                'label' => 'Total Cash Outflows',
+                'value' => $this->report->overallTotal->creditBalance ?? '',
+            ],
+            [
+                'label' => 'Net Cash Flow',
+                'value' => $this->report->overallTotal->netMovement ?? '',
+            ],
+        ];
+    }
+
+    public function getOverviewAlignedWithColumns(): array
+    {
+        $summary = [];
+
+        foreach ($this->getSummary() as $summaryItem) {
+            $row = [];
+
+            foreach ($this->getColumns() as $column) {
+                $row[$column->getName()] = match ($column->getName()) {
+                    'account_name' => $summaryItem['label'] ?? '',
+                    'net_movement' => $summaryItem['value'] ?? '',
+                    default => '',
+                };
+            }
+
+            $summary[] = $row;
+        }
+
+        return $summary;
+    }
+
+    public function getSummaryOverviewAlignedWithColumns(): array
+    {
+        return array_map(static function ($row) {
+            unset($row['account_code']);
+
+            return $row;
+        }, $this->getOverviewAlignedWithColumns());
+    }
+
+    public function getOverviewHeaders(): array
+    {
+        return once(function (): array {
+            $headers = [];
+
+            foreach ($this->getColumns() as $column) {
+                $headers[$column->getName()] = $column->getName() === 'account_name' ? 'OVERVIEW' : '';
+            }
+
+            return $headers;
+        });
+    }
+
+    public function getSummaryOverviewHeaders(): array
+    {
+        return once(function (): array {
+            $headers = $this->getOverviewHeaders();
+
+            unset($headers['account_code']);
+
+            return $headers;
+        });
+    }
+
+    public function getOverview(): array
+    {
+        $categories = [];
+
+        foreach ($this->report->overview->categories as $categoryName => $category) {
+            $header = [];
+
+            foreach ($this->getColumns() as $column) {
+                $header[$column->getName()] = $column->getName() === 'account_name' ? $categoryName : '';
+            }
+
+            $data = array_map(function (AccountDTO $account) {
+                $row = [];
+
+                foreach ($this->getColumns() as $column) {
+                    $row[$column->getName()] = match ($column->getName()) {
+                        'account_code' => $account->accountCode,
+                        'account_name' => [
+                            'name' => $account->accountName,
+                            'id' => $account->accountId ?? null,
+                            'start_date' => $account->startDate,
+                            'end_date' => $account->endDate,
+                        ],
+                        'net_movement' => $account->balance->startingBalance ?? $account->balance->endingBalance ?? '',
+                        default => '',
+                    };
+                }
+
+                return $row;
+            }, $category->accounts);
+
+            $summary = [];
+
+            foreach ($this->getColumns() as $column) {
+                $summary[$column->getName()] = match ($column->getName()) {
+                    'account_name' => 'Total ' . $categoryName,
+                    'net_movement' => $category->summary->startingBalance ?? $category->summary->endingBalance ?? '',
+                    default => '',
+                };
+            }
+
+            $categories[] = new ReportCategoryDTO(
+                header: $header,
+                data: $data,
+                summary: $summary,
+            );
+        }
+
+        return $categories;
+    }
+
+    public function getSummaryOverview(): array
+    {
+        $summaryCategories = [];
+
+        $columns = $this->getSummaryColumns();
+
+        foreach ($this->report->overview->categories as $categoryName => $category) {
+            $categorySummary = [];
+
+            foreach ($columns as $column) {
+                $categorySummary[$column->getName()] = match ($column->getName()) {
+                    'account_name' => $categoryName,
+                    'net_movement' => $category->summary->startingBalance ?? $category->summary->endingBalance ?? '',
+                    default => '',
+                };
+            }
+
+            $summaryCategories[] = new ReportCategoryDTO(
+                header: [],
+                data: [],
+                summary: $categorySummary,
+            );
+        }
+
+        return $summaryCategories;
+    }
+}

app/Utilities/Currency/CurrencyConverter.php

@@ -15,24 +15,38 @@ class CurrencyConverter
 
         $old_attr = currency($oldCurrency);
         $new_attr = currency($newCurrency);
-        $temp_balance = str_replace([$old_attr->getThousandsSeparator(), $old_attr->getDecimalMark()], ['', '.'], $amount);
+        $temp_amount = str_replace([$old_attr->getThousandsSeparator(), $old_attr->getDecimalMark()], ['', '.'], $amount);
 
-        return number_format((float) $temp_balance, $new_attr->getPrecision(), $new_attr->getDecimalMark(), $new_attr->getThousandsSeparator());
+        return number_format((float) $temp_amount, $new_attr->getPrecision(), $new_attr->getDecimalMark(), $new_attr->getThousandsSeparator());
     }
 
-    public static function convertBalance(int $balance, string $oldCurrency, string $newCurrency): int
+    public static function convertBalance(int $amount, string $oldCurrency, string $newCurrency): int
     {
-        return money($balance, $oldCurrency)->swapAmountFor($newCurrency);
+        return money($amount, $oldCurrency)->swapAmountFor($newCurrency);
     }
 
-    public static function prepareForMutator(int $balance, string $currency): string
+    public static function prepareForMutator(int $amount, string $currency): string
     {
-        return money($balance, $currency)->formatSimple();
+        return money($amount, $currency)->formatSimple();
     }
 
-    public static function prepareForAccessor(string $balance, string $currency): int
+    public static function prepareForAccessor(string $amount, string $currency): int
     {
-        return money($balance, $currency, true)->getAmount();
+        return money($amount, $currency, true)->getAmount();
+    }
+
+    public static function convertToCents(string | float $amount, ?string $currency = null): int
+    {
+        $currency ??= CurrencyAccessor::getDefaultCurrency();
+
+        return money($amount, $currency, true)->getAmount();
+    }
+
+    public static function formatCentsToMoney(int $amount, ?string $currency = null): string
+    {
+        $currency ??= CurrencyAccessor::getDefaultCurrency();
+
+        return money($amount, $currency)->format();
     }
 
     public static function handleCurrencyChange(Set $set, $state): void

config/chart-of-accounts.php

@@ -8,6 +8,7 @@ return [
                 'multi_currency' => true,
                 'base_code' => '1000',
                 'bank_account_type' => 'depository',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Cash on Hand' => [
                         'description' => 'The amount of money held by the company in the form of cash.',
@@ -18,6 +19,7 @@ return [
                 'description' => 'Amounts owed to the company for goods sold or services rendered, including accounts receivable, notes receivable, and other receivables.',
                 'multi_currency' => false,
                 'base_code' => '1100',
+                'inverse_cash_flow' => true,
                 'accounts' => [
                     'Accounts Receivable' => [
                         'description' => 'The amount of money owed to the company by customers who have not yet paid for goods or services received.',
@@ -28,16 +30,19 @@ return [
                 'description' => 'The raw materials, work-in-progress goods and completely finished goods that are considered to be the portion of a business\'s assets that are ready or will be ready for sale.',
                 'multi_currency' => true,
                 'base_code' => '1200',
+                'inverse_cash_flow' => true,
             ],
             'Prepaid and Deferred Charges' => [
                 'description' => 'Payments made in advance for future goods or services, such as insurance premiums, rent, and prepaid taxes.',
                 'multi_currency' => true,
                 'base_code' => '1300',
+                'inverse_cash_flow' => true,
             ],
             'Other Current Assets' => [
                 'description' => 'Other assets that are expected to be converted to cash, sold, or consumed within one year or the business\'s operating cycle.',
                 'multi_currency' => true,
                 'base_code' => '1400',
+                'inverse_cash_flow' => true,
             ],
         ],
         'non_current_asset' => [
@@ -45,21 +50,25 @@ return [
                 'description' => 'Investments in securities like bonds and stocks, investments in other companies, or real estate held for more than one year, aiming for long-term benefits.',
                 'multi_currency' => true,
                 'base_code' => '1500',
+                'inverse_cash_flow' => true,
             ],
             'Fixed Assets' => [
                 'description' => 'Physical, tangible assets used in the business\'s operations with a useful life exceeding one year, such as buildings, machinery, and vehicles. These assets are subject to depreciation.',
                 'multi_currency' => true,
                 'base_code' => '1600',
+                'inverse_cash_flow' => true,
             ],
             'Intangible Assets' => [
                 'description' => 'Assets lacking physical substance but offering value to the business, like patents, copyrights, trademarks, software, and goodwill.',
                 'multi_currency' => true,
                 'base_code' => '1700',
+                'inverse_cash_flow' => true,
             ],
             'Other Non-Current Assets' => [
                 'description' => 'Includes long-term assets not classified in the above categories, such as long-term prepaid expenses, deferred tax assets, and loans made to other entities that are not expected to be settled within the next year.',
                 'multi_currency' => true,
                 'base_code' => '1800',
+                'inverse_cash_flow' => true,
             ],
         ],
         'contra_asset' => [
@@ -67,6 +76,7 @@ return [
                 'description' => 'Accounts that accumulate depreciation of tangible assets and amortization of intangible assets, reflecting the reduction in value over time.',
                 'multi_currency' => false,
                 'base_code' => '1900',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Accumulated Depreciation' => [
                         'description' => 'Used to account for the depreciation of fixed assets over time, offsetting assets like equipment or property.',
@@ -77,6 +87,7 @@ return [
                 'description' => 'Accounts representing estimated uncollected receivables, used to adjust the value of gross receivables to a realistic collectible amount.',
                 'multi_currency' => false,
                 'base_code' => '1940',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Allowance for Doubtful Accounts' => [
                         'description' => 'Used to account for potential bad debts that may not be collectable, offsetting receivables.',
@@ -87,6 +98,7 @@ return [
                 'description' => 'Accounts used to record adjustments in asset values due to impairments, market changes, or other factors affecting their recoverable amount.',
                 'multi_currency' => false,
                 'base_code' => '1950',
+                'inverse_cash_flow' => false,
             ],
         ],
         'current_liability' => [
@@ -94,6 +106,7 @@ return [
                 'description' => 'Liabilities arising from purchases of goods or services from suppliers, not yet paid for. This can include individual accounts payable and trade credits.',
                 'multi_currency' => true,
                 'base_code' => '2000',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Accounts Payable' => [
                         'description' => 'The amount of money owed by the company to suppliers for goods or services received.',
@@ -104,6 +117,7 @@ return [
                 'description' => 'Expenses that have been incurred but not yet paid, including wages, utilities, interest, and taxes. This category can house various accrued expense accounts.',
                 'multi_currency' => false,
                 'base_code' => '2100',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Sales Tax Payable' => [
                         'description' => 'The amount of money owed to the government for sales tax collected from customers.',
@@ -114,16 +128,19 @@ return [
                 'description' => 'Debt obligations due within the next year, such as bank loans, lines of credit, and short-term notes. This category can cover multiple short-term debt accounts.',
                 'multi_currency' => true,
                 'base_code' => '2200',
+                'inverse_cash_flow' => false,
             ],
             'Customer Deposits and Advances' => [
                 'description' => 'Funds received in advance for goods or services to be provided in the future, including customer deposits and prepayments.',
                 'multi_currency' => true,
                 'base_code' => '2300',
+                'inverse_cash_flow' => false,
             ],
             'Other Current Liabilities' => [
                 'description' => 'A grouping for miscellaneous short-term liabilities not covered in other categories, like the current portion of long-term debts, short-term provisions, and other similar obligations.',
                 'multi_currency' => true,
                 'base_code' => '2400',
+                'inverse_cash_flow' => false,
             ],
         ],
         'non_current_liability' => [
@@ -131,16 +148,19 @@ return [
                 'description' => 'Obligations such as bonds, mortgages, and loans with a maturity of more than one year, covering various types of long-term debt instruments.',
                 'multi_currency' => true,
                 'base_code' => '2500',
+                'inverse_cash_flow' => false,
             ],
             'Deferred Tax Liabilities' => [
                 'description' => 'Taxes incurred in the current period but payable in a future period, typically due to differences in accounting methods between tax reporting and financial reporting.',
                 'multi_currency' => false,
                 'base_code' => '2600',
+                'inverse_cash_flow' => false,
             ],
             'Other Long-Term Liabilities' => [
                 'description' => 'Liabilities not due within the next year and not classified as long-term debt or deferred taxes, including pension liabilities, lease obligations, and long-term provisions.',
                 'multi_currency' => true,
                 'base_code' => '2700',
+                'inverse_cash_flow' => false,
             ],
         ],
         'contra_liability' => [
@@ -148,11 +168,13 @@ return [
                 'description' => 'Accumulated amount representing the reduction of bond or loan liabilities, reflecting the difference between the face value and the discounted issuance price over time.',
                 'multi_currency' => false,
                 'base_code' => '2900',
+                'inverse_cash_flow' => false,
             ],
             'Valuation Adjustments for Liabilities' => [
                 'description' => 'Adjustments made to the recorded value of liabilities, such as changes in fair value of derivative liabilities or adjustments for hedging activities.',
                 'multi_currency' => false,
                 'base_code' => '2950',
+                'inverse_cash_flow' => false,
             ],
         ],
         'equity' => [
@@ -160,6 +182,7 @@ return [
                 'description' => 'Funds provided by owners or shareholders for starting the business and subsequent capital injections. Reflects the financial commitment of the owner(s) or shareholders to the business.',
                 'multi_currency' => true,
                 'base_code' => '3000',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Owner\'s Investment' => [
                         'description' => 'The amount of money invested by the owner(s) or shareholders to start or expand the business.',
@@ -172,6 +195,7 @@ return [
                 'description' => 'Equity that is deducted from gross equity to arrive at net equity. This includes treasury stock, which is stock that has been repurchased by the company.',
                 'multi_currency' => false,
                 'base_code' => '3900',
+                'inverse_cash_flow' => true,
                 'accounts' => [
                     'Owner\'s Drawings' => [
                         'description' => 'The amount of money withdrawn by the owner(s) or shareholders from the business for personal use, reducing equity.',
@@ -184,6 +208,7 @@ return [
                 'description' => 'Income from selling physical or digital products. Includes revenue from all product lines or categories.',
                 'multi_currency' => false,
                 'base_code' => '4000',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Product Sales' => [
                         'description' => 'The amount of money earned from selling physical or digital products.',
@@ -194,11 +219,13 @@ return [
                 'description' => 'Income earned from providing services, encompassing activities like consulting, maintenance, and repair services.',
                 'multi_currency' => false,
                 'base_code' => '4100',
+                'inverse_cash_flow' => false,
             ],
             'Other Operating Revenue' => [
                 'description' => 'Income from other business operations not classified as product sales or services, such as rental income, royalties, or income from licensing agreements.',
                 'multi_currency' => false,
                 'base_code' => '4200',
+                'inverse_cash_flow' => false,
             ],
         ],
         'non_operating_revenue' => [
@@ -206,6 +233,7 @@ return [
                 'description' => 'Earnings from investments, including dividends, interest from securities, and profits from real estate investments.',
                 'multi_currency' => false,
                 'base_code' => '4500',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Dividends' => [
                         'description' => 'The amount of money received from investments in shares of other companies.',
@@ -219,11 +247,13 @@ return [
                 'description' => 'Profits from selling assets like property, equipment, or investments, excluding regular sales of inventory.',
                 'multi_currency' => false,
                 'base_code' => '4600',
+                'inverse_cash_flow' => false,
             ],
             'Other Non-Operating Revenue' => [
                 'description' => 'Income from sources not related to the main business activities, such as legal settlements, insurance recoveries, or gains from foreign exchange transactions.',
                 'multi_currency' => false,
                 'base_code' => '4700',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Gain on Foreign Exchange' => [
                         'description' => 'The amount of money earned from foreign exchange transactions due to favorable exchange rate changes.',
@@ -236,6 +266,7 @@ return [
                 'description' => 'Revenue that is deducted from gross revenue to arrive at net revenue. This includes sales discounts, returns, and allowances.',
                 'multi_currency' => false,
                 'base_code' => '4900',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Sales Returns and Allowances' => [
                         'description' => 'The amount of money returned to customers or deducted from sales due to returned goods or allowances granted.',
@@ -251,6 +282,7 @@ return [
                 'description' => 'Revenue that has not been categorized into other revenue categories.',
                 'multi_currency' => false,
                 'base_code' => '4950',
+                'inverse_cash_flow' => false,
                 'accounts' => [
                     'Uncategorized Income' => [
                         'description' => 'Revenue from other business operations that don\'t fall under regular sales or services. This account is used as the default for all new transactions.',
@@ -263,11 +295,13 @@ return [
                 'description' => 'Direct costs attributable to the production of goods sold by a company. This includes material costs and direct labor.',
                 'multi_currency' => false,
                 'base_code' => '5000',
+                'inverse_cash_flow' => true,
             ],
             'Payroll and Employee Benefits' => [
                 'description' => 'Expenses related to employee compensation, including salaries, wages, bonuses, commissions, and payroll taxes.',
                 'multi_currency' => false,
                 'base_code' => '5050',
+                'inverse_cash_flow' => true,
                 'accounts' => [
                     'Salaries and Wages' => [
                         'description' => 'The amount of money paid to employees for their work, including regular salaries and hourly wages.',
@@ -287,6 +321,7 @@ return [
                 'description' => 'Costs incurred for business premises, including rent or lease payments, property taxes, utilities, and building maintenance.',
                 'multi_currency' => false,
                 'base_code' => '5100',
+                'inverse_cash_flow' => true,
                 'accounts' => [
                     'Rent or Lease Payments' => [
                         'description' => 'The amount of money paid for renting or leasing business premises.',
@@ -309,6 +344,7 @@ return [
                 'description' => 'Expenses related to general business operations, such as office supplies, insurance, and professional fees.',
                 'multi_currency' => false,
                 'base_code' => '5150',
+                'inverse_cash_flow' => true,
                 'accounts' => [
                     'Food and Drink' => [
                         'description' => 'The amount of money spent on food and drink for business purposes, such as office snacks, meals, and catering.',
@@ -340,6 +376,7 @@ return [
                 'description' => 'Expenses related to marketing and advertising activities, such as advertising campaigns, promotional events, and marketing materials.',
                 'multi_currency' => false,
                 'base_code' => '5200',
+                'inverse_cash_flow' => true,
                 'accounts' => [
                     'Advertising' => [
                         'description' => 'The amount of money spent on advertising campaigns, including print, digital, and outdoor advertising.',
@@ -353,11 +390,13 @@ return [
                 'description' => 'Expenses incurred in the process of researching and developing new products or services.',
                 'multi_currency' => false,
                 'base_code' => '5250',
+                'inverse_cash_flow' => true,
             ],
             'Other Operating Expenses' => [
                 'description' => 'Miscellaneous expenses not categorized elsewhere, such as research and development costs, legal fees, and other irregular expenses.',
                 'multi_currency' => false,
                 'base_code' => '5300',
+                'inverse_cash_flow' => true,
             ],
         ],
         'non_operating_expense' => [
@@ -365,16 +404,19 @@ return [
                 'description' => 'Expenses related to borrowing and financing, such as interest payments on loans, bonds, and credit lines.',
                 'multi_currency' => false,
                 'base_code' => '5500',
+                'inverse_cash_flow' => true,
             ],
             'Tax Expenses' => [
                 'description' => 'Various taxes incurred by the business, including income tax, sales tax, property tax, and payroll tax.',
                 'multi_currency' => false,
                 'base_code' => '5600',
+                'inverse_cash_flow' => true,
             ],
             'Other Non-Operating Expense' => [
                 'description' => 'Expenses not related to primary business activities, like losses from asset disposals, legal settlements, restructuring costs, or foreign exchange losses.',
                 'multi_currency' => false,
                 'base_code' => '5700',
+                'inverse_cash_flow' => true,
                 'accounts' => [
                     'Loss on Foreign Exchange' => [
                         'description' => 'The amount of money lost from foreign exchange transactions due to unfavorable exchange rate changes.',
@@ -387,6 +429,7 @@ return [
                 'description' => 'Expenses that are deducted from gross expenses to arrive at net expenses. This includes purchase discounts, returns, and allowances.',
                 'multi_currency' => false,
                 'base_code' => '5900',
+                'inverse_cash_flow' => true,
                 'accounts' => [
                     'Purchase Returns and Allowances' => [
                         'description' => 'The amount of money returned to suppliers or deducted from purchases due to returned goods or allowances granted.',
@@ -402,6 +445,7 @@ return [
                 'description' => 'Expenses that have not been categorized into other expense categories.',
                 'multi_currency' => false,
                 'base_code' => '5950',
+                'inverse_cash_flow' => true,
                 'accounts' => [
                     'Uncategorized Expense' => [
                         'description' => 'Expenses not classified into regular expense categories. This account is used as the default for all new transactions.',

database/factories/Accounting/TransactionFactory.php

@@ -49,13 +49,27 @@ class TransactionFactory extends Factory
             $type = $this->faker->randomElement([TransactionType::Deposit, TransactionType::Withdrawal]);
 
             $associatedAccountTypes = match ($type) {
-                TransactionType::Deposit => ['asset', 'liability', 'equity', 'revenue'],
-                TransactionType::Withdrawal => ['asset', 'liability', 'equity', 'expense'],
+                TransactionType::Deposit => [
+                    AccountType::CurrentLiability,
+                    AccountType::NonCurrentLiability,
+                    AccountType::Equity,
+                    AccountType::OperatingRevenue,
+                    AccountType::NonOperatingRevenue,
+                    AccountType::ContraExpense,
+                ],
+                TransactionType::Withdrawal => [
+                    AccountType::OperatingExpense,
+                    AccountType::NonOperatingExpense,
+                    AccountType::CurrentLiability,
+                    AccountType::NonCurrentLiability,
+                    AccountType::Equity,
+                    AccountType::ContraRevenue,
+                ],
             };
 
             $accountIdForBankAccount = $bankAccount->account->id;
 
-            $account = Account::where('category', $this->faker->randomElement($associatedAccountTypes))
+            $account = Account::whereIn('type', $associatedAccountTypes)
                 ->where('company_id', $company->id)
                 ->whereKeyNot($accountIdForBankAccount)
                 ->inRandomOrder()

database/migrations/2024_11_02_182328_add_inverse_cash_flow_to_account_subtypes_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('account_subtypes', function (Blueprint $table) {
+            $table->boolean('inverse_cash_flow')->default(false)->after('multi_currency');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('account_subtypes', function (Blueprint $table) {
+            $table->dropColumn('inverse_cash_flow');
+        });
+    }
+};

package-lock.json

@@ -541,9 +541,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
-            "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.25.0.tgz",
+            "integrity": "sha512-CC/ZqFZwlAIbU1wUPisHyV/XRc5RydFrNLtgl3dGYskdwPZdt4HERtKm50a/+DtTlKeCq9IXFEWR+P6blwjqBA==",
             "cpu": [
                 "arm"
             ],
@@ -555,9 +555,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
-            "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.25.0.tgz",
+            "integrity": "sha512-/Y76tmLGUJqVBXXCfVS8Q8FJqYGhgH4wl4qTA24E9v/IJM0XvJCGQVSW1QZ4J+VURO9h8YCa28sTFacZXwK7Rg==",
             "cpu": [
                 "arm64"
             ],
@@ -569,9 +569,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
-            "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.25.0.tgz",
+            "integrity": "sha512-YVT6L3UrKTlC0FpCZd0MGA7NVdp7YNaEqkENbWQ7AOVOqd/7VzyHpgIpc1mIaxRAo1ZsJRH45fq8j4N63I/vvg==",
             "cpu": [
                 "arm64"
             ],
@@ -583,9 +583,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
-            "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.25.0.tgz",
+            "integrity": "sha512-ZRL+gexs3+ZmmWmGKEU43Bdn67kWnMeWXLFhcVv5Un8FQcx38yulHBA7XR2+KQdYIOtD0yZDWBCudmfj6lQJoA==",
             "cpu": [
                 "x64"
             ],
@@ -596,10 +596,38 @@
                 "darwin"
             ]
         },
+        "node_modules/@rollup/rollup-freebsd-arm64": {
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.25.0.tgz",
+            "integrity": "sha512-xpEIXhiP27EAylEpreCozozsxWQ2TJbOLSivGfXhU4G1TBVEYtUPi2pOZBnvGXHyOdLAUUhPnJzH3ah5cqF01g==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/@rollup/rollup-freebsd-x64": {
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.25.0.tgz",
+            "integrity": "sha512-sC5FsmZGlJv5dOcURrsnIK7ngc3Kirnx3as2XU9uER+zjfyqIjdcMVgzy4cOawhsssqzoAX19qmxgJ8a14Qrqw==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
-            "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.25.0.tgz",
+            "integrity": "sha512-uD/dbLSs1BEPzg564TpRAQ/YvTnCds2XxyOndAO8nJhaQcqQGFgv/DAVko/ZHap3boCvxnzYMa3mTkV/B/3SWA==",
             "cpu": [
                 "arm"
             ],
@@ -611,9 +639,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
-            "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.25.0.tgz",
+            "integrity": "sha512-ZVt/XkrDlQWegDWrwyC3l0OfAF7yeJUF4fq5RMS07YM72BlSfn2fQQ6lPyBNjt+YbczMguPiJoCfaQC2dnflpQ==",
             "cpu": [
                 "arm"
             ],
@@ -625,9 +653,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
-            "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.25.0.tgz",
+            "integrity": "sha512-qboZ+T0gHAW2kkSDPHxu7quaFaaBlynODXpBVnPxUgvWYaE84xgCKAPEYE+fSMd3Zv5PyFZR+L0tCdYCMAtG0A==",
             "cpu": [
                 "arm64"
             ],
@@ -639,9 +667,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
-            "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.25.0.tgz",
+            "integrity": "sha512-ndWTSEmAaKr88dBuogGH2NZaxe7u2rDoArsejNslugHZ+r44NfWiwjzizVS1nUOHo+n1Z6qV3X60rqE/HlISgw==",
             "cpu": [
                 "arm64"
             ],
@@ -653,9 +681,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
-            "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.25.0.tgz",
+            "integrity": "sha512-BVSQvVa2v5hKwJSy6X7W1fjDex6yZnNKy3Kx1JGimccHft6HV0THTwNtC2zawtNXKUu+S5CjXslilYdKBAadzA==",
             "cpu": [
                 "ppc64"
             ],
@@ -667,9 +695,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
-            "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.25.0.tgz",
+            "integrity": "sha512-G4hTREQrIdeV0PE2JruzI+vXdRnaK1pg64hemHq2v5fhv8C7WjVaeXc9P5i4Q5UC06d/L+zA0mszYIKl+wY8oA==",
             "cpu": [
                 "riscv64"
             ],
@@ -681,9 +709,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
-            "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.25.0.tgz",
+            "integrity": "sha512-9T/w0kQ+upxdkFL9zPVB6zy9vWW1deA3g8IauJxojN4bnz5FwSsUAD034KpXIVX5j5p/rn6XqumBMxfRkcHapQ==",
             "cpu": [
                 "s390x"
             ],
@@ -695,9 +723,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
-            "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.25.0.tgz",
+            "integrity": "sha512-ThcnU0EcMDn+J4B9LD++OgBYxZusuA7iemIIiz5yzEcFg04VZFzdFjuwPdlURmYPZw+fgVrFzj4CA64jSTG4Ig==",
             "cpu": [
                 "x64"
             ],
@@ -709,9 +737,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
-            "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.25.0.tgz",
+            "integrity": "sha512-zx71aY2oQxGxAT1JShfhNG79PnjYhMC6voAjzpu/xmMjDnKNf6Nl/xv7YaB/9SIa9jDYf8RBPWEnjcdlhlv1rQ==",
             "cpu": [
                 "x64"
             ],
@@ -723,9 +751,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
-            "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.25.0.tgz",
+            "integrity": "sha512-JT8tcjNocMs4CylWY/CxVLnv8e1lE7ff1fi6kbGocWwxDq9pj30IJ28Peb+Y8yiPNSF28oad42ApJB8oUkwGww==",
             "cpu": [
                 "arm64"
             ],
@@ -737,9 +765,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
-            "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.25.0.tgz",
+            "integrity": "sha512-dRLjLsO3dNOfSN6tjyVlG+Msm4IiZnGkuZ7G5NmpzwF9oOc582FZG05+UdfTbz5Jd4buK/wMb6UeHFhG18+OEg==",
             "cpu": [
                 "ia32"
             ],
@@ -751,9 +779,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
-            "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.25.0.tgz",
+            "integrity": "sha512-/RqrIFtLB926frMhZD0a5oDa4eFIbyNEwLLloMTEjmqfwZWXywwVVOVmwTsuyhC9HKkVEZcOOi+KV4U9wmOdlg==",
             "cpu": [
                 "x64"
             ],
@@ -998,9 +1026,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001669",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
-            "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
+            "version": "1.0.30001680",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001680.tgz",
+            "integrity": "sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==",
             "dev": true,
             "funding": [
                 {
@@ -1100,9 +1128,9 @@
             }
         },
         "node_modules/cross-spawn": {
-            "version": "7.0.3",
-            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-            "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+            "version": "7.0.5",
+            "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
+            "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1159,9 +1187,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.41",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz",
-            "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==",
+            "version": "1.5.56",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.56.tgz",
+            "integrity": "sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==",
             "dev": true,
             "license": "ISC"
         },
@@ -1826,9 +1854,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.47",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
-            "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+            "version": "8.4.49",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+            "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
             "dev": true,
             "funding": [
                 {
@@ -1847,7 +1875,7 @@
             "license": "MIT",
             "dependencies": {
                 "nanoid": "^3.3.7",
-                "picocolors": "^1.1.0",
+                "picocolors": "^1.1.1",
                 "source-map-js": "^1.2.1"
             },
             "engines": {
@@ -1982,9 +2010,9 @@
             }
         },
         "node_modules/postcss-nesting": {
-            "version": "13.0.0",
-            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.0.tgz",
-            "integrity": "sha512-TCGQOizyqvEkdeTPM+t6NYwJ3EJszYE/8t8ILxw/YoeUvz2rz7aM8XTAmBWh9/DJjfaaabL88fWrsVHSPF2zgA==",
+            "version": "13.0.1",
+            "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-13.0.1.tgz",
+            "integrity": "sha512-VbqqHkOBOt4Uu3G8Dm8n6lU5+9cJFxiuty9+4rcoyRPO9zZS1JIs6td49VIoix3qYqELHlJIn46Oih9SAKo+yQ==",
             "dev": true,
             "funding": [
                 {
@@ -1998,9 +2026,9 @@
             ],
             "license": "MIT-0",
             "dependencies": {
-                "@csstools/selector-resolve-nested": "^2.0.0",
-                "@csstools/selector-specificity": "^4.0.0",
-                "postcss-selector-parser": "^6.1.0"
+                "@csstools/selector-resolve-nested": "^3.0.0",
+                "@csstools/selector-specificity": "^5.0.0",
+                "postcss-selector-parser": "^7.0.0"
             },
             "engines": {
                 "node": ">=18"
@@ -2010,9 +2038,9 @@
             }
         },
         "node_modules/postcss-nesting/node_modules/@csstools/selector-resolve-nested": {
-            "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==",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@csstools/selector-resolve-nested/-/selector-resolve-nested-3.0.0.tgz",
+            "integrity": "sha512-ZoK24Yku6VJU1gS79a5PFmC8yn3wIapiKmPgun0hZgEI5AOqgH2kiPRsPz1qkGv4HL+wuDLH83yQyk6inMYrJQ==",
             "dev": true,
             "funding": [
                 {
@@ -2029,13 +2057,13 @@
                 "node": ">=18"
             },
             "peerDependencies": {
-                "postcss-selector-parser": "^6.1.0"
+                "postcss-selector-parser": "^7.0.0"
             }
         },
         "node_modules/postcss-nesting/node_modules/@csstools/selector-specificity": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-4.0.0.tgz",
-            "integrity": "sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==",
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-5.0.0.tgz",
+            "integrity": "sha512-PCqQV3c4CoVm3kdPhyeZ07VmBRdH2EpMFA/pd9OASpOEC3aXNGoqPDAZ80D0cLpMBxnmk0+yNhGsEx31hq7Gtw==",
             "dev": true,
             "funding": [
                 {
@@ -2052,13 +2080,13 @@
                 "node": ">=18"
             },
             "peerDependencies": {
-                "postcss-selector-parser": "^6.1.0"
+                "postcss-selector-parser": "^7.0.0"
             }
         },
         "node_modules/postcss-nesting/node_modules/postcss-selector-parser": {
-            "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==",
+            "version": "7.0.0",
+            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.0.0.tgz",
+            "integrity": "sha512-9RbEr1Y7FFfptd/1eEdntyjMwLeghW1bHX9GWjXo19vx4ytPQhANltvVxDggzJl7mnWM+dX28kb6cyS/4iQjlQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2171,9 +2199,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
-            "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
+            "version": "4.25.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.25.0.tgz",
+            "integrity": "sha512-uVbClXmR6wvx5R1M3Od4utyLUxrmOcEm3pAtMphn73Apq19PDtHpgZoEvqH2YnnaNUuvKmg2DgRd2Sqv+odyqg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2187,22 +2215,24 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.24.0",
-                "@rollup/rollup-android-arm64": "4.24.0",
-                "@rollup/rollup-darwin-arm64": "4.24.0",
-                "@rollup/rollup-darwin-x64": "4.24.0",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
-                "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
-                "@rollup/rollup-linux-arm64-gnu": "4.24.0",
-                "@rollup/rollup-linux-arm64-musl": "4.24.0",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
-                "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
-                "@rollup/rollup-linux-s390x-gnu": "4.24.0",
-                "@rollup/rollup-linux-x64-gnu": "4.24.0",
-                "@rollup/rollup-linux-x64-musl": "4.24.0",
-                "@rollup/rollup-win32-arm64-msvc": "4.24.0",
-                "@rollup/rollup-win32-ia32-msvc": "4.24.0",
-                "@rollup/rollup-win32-x64-msvc": "4.24.0",
+                "@rollup/rollup-android-arm-eabi": "4.25.0",
+                "@rollup/rollup-android-arm64": "4.25.0",
+                "@rollup/rollup-darwin-arm64": "4.25.0",
+                "@rollup/rollup-darwin-x64": "4.25.0",
+                "@rollup/rollup-freebsd-arm64": "4.25.0",
+                "@rollup/rollup-freebsd-x64": "4.25.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.25.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.25.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.25.0",
+                "@rollup/rollup-linux-arm64-musl": "4.25.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.25.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.25.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.25.0",
+                "@rollup/rollup-linux-x64-gnu": "4.25.0",
+                "@rollup/rollup-linux-x64-musl": "4.25.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.25.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.25.0",
+                "@rollup/rollup-win32-x64-msvc": "4.25.0",
                 "fsevents": "~2.3.2"
             }
         },
@@ -2550,9 +2580,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.4.9",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.9.tgz",
-            "integrity": "sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==",
+            "version": "5.4.11",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
+            "integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

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

@@ -5,87 +5,87 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ $report->getTitle() }}</title>
     <style>
-        .header {
-            color: #374151;
-            margin-bottom: 1rem;
+        .category-header-row > td {
+            background-color: #f3f4f6;
+            font-weight: bold;
         }
 
-        .header > * + * {
-            margin-top: 0.5rem;
+        .category-summary-row > td,
+        .table-footer-row > td {
+            background-color: #ffffff;
+            font-weight: bold;
         }
 
-        .table-head {
-            display: table-row-group;
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: bold;
         }
 
-        .text-left {
-            text-align: left;
+        .date-range {
+            font-size: 0.875rem;
         }
 
-        .text-right {
-            text-align: right;
+        .header {
+            color: #374151;
+            margin-bottom: 1rem;
         }
 
-        .text-center {
-            text-align: center;
+        .header div + div {
+            margin-top: 0.5rem;
         }
 
-        .table-class th,
-        .table-class td {
-            color: #374151;
+        .spacer-row > td {
+            height: 0.75rem;
         }
 
-        .whitespace-normal {
-            white-space: normal;
+        .table-body tr {
+            background-color: #ffffff;
         }
 
-        .whitespace-nowrap {
-            white-space: nowrap;
+        .table-class {
+            border-collapse: collapse;
+            width: 100%;
         }
 
-        .title {
-            font-size: 1.5rem;
+        .table-class td,
+        .table-class th {
+            border-bottom: 1px solid #d1d5db;
+            color: #374151;
+            font-size: 0.75rem;
+            line-height: 1rem;
+            padding: 0.75rem;
         }
 
-        .company-name {
-            font-size: 1.125rem;
-            font-weight: bold;
+        .table-head {
+            display: table-row-group;
         }
 
-        .date-range {
-            font-size: 0.875rem;
+        .text-center {
+            text-align: center;
         }
 
-        .table-class {
-            width: 100%;
-            border-collapse: collapse;
+        .text-left {
+            text-align: left;
         }
 
-        .table-class th,
-        .table-class td {
-            padding: 0.75rem;
-            font-size: 0.75rem;
-            line-height: 1rem;
-            border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
+        .text-right {
+            text-align: right;
         }
 
-        .category-header-row > td {
-            background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: bold;
+        .title {
+            font-size: 1.5rem;
         }
 
-        .table-body tr {
-            background-color: #ffffff; /* White background for other rows */
+        .whitespace-normal {
+            white-space: normal;
         }
 
-        .spacer-row > td {
-            height: 0.75rem;
+        .whitespace-nowrap {
+            white-space: nowrap;
         }
 
-        .category-summary-row > td,
-        .table-footer-row > td {
-            font-weight: bold;
-            background-color: #ffffff; /* White background for footer */
+        table tfoot {
+            display: table-row-group;
         }
     </style>
 </head>
@@ -128,7 +128,12 @@
                     'category-header-row' => $loop->first || $loop->last || $loop->remaining === 1,
                 ])>
                 @foreach($transaction as $cellIndex => $cell)
-                    <td class="{{ $report->getAlignmentClass($cellIndex) }} {{ $cellIndex === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                    <td @class([
+                            $report->getAlignmentClass($cellIndex),
+                            'whitespace-normal' => $cellIndex === 'description',
+                            'whitespace-nowrap' => $cellIndex !== 'description',
+                        ])
+                    >
                         @if(is_array($cell) && isset($cell['description']))
                             {{ $cell['description'] }}
                         @else

resources/views/components/company/reports/cash-flow-statement-pdf.blade.php

@@ -0,0 +1,334 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ $report->getTitle() }}</title>
+    <style>
+        .font-bold {
+            font-weight: bold;
+        }
+
+        .category-header-row > td,
+        .type-header-row > td {
+            background-color: #f3f4f6;
+            font-weight: bold;
+        }
+
+        .category-summary-row > td,
+        .table-footer-row > td,
+        .type-summary-row > td {
+            background-color: #ffffff;
+            font-weight: bold;
+        }
+
+        .cell {
+            padding-bottom: 5px;
+            position: relative;
+        }
+
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: bold;
+        }
+
+        .date-range {
+            font-size: 0.875rem;
+        }
+
+        .header {
+            color: #374151;
+            margin-bottom: 1rem;
+        }
+
+        .header div + div {
+            margin-top: 0.5rem;
+        }
+
+        .spacer-row > td {
+            height: 0.75rem;
+        }
+
+        .table-body tr {
+            background-color: #ffffff;
+        }
+
+        .table-class {
+            border-collapse: collapse;
+            table-layout: fixed;
+            width: 100%;
+        }
+
+        .table-class .type-row-indent {
+            padding-left: 1.5rem;
+        }
+
+        .table-class td,
+        .table-class th {
+            border-bottom: 1px solid #d1d5db;
+            color: #374151;
+            font-size: 0.75rem;
+            line-height: 1rem;
+            padding: 0.75rem;
+        }
+
+        .table-head {
+            display: table-row-group;
+        }
+
+        .text-center {
+            text-align: center;
+        }
+
+        .text-left {
+            text-align: left;
+        }
+
+        .text-right {
+            text-align: right;
+        }
+
+        .title {
+            font-size: 1.5rem;
+        }
+
+        .table-class .underline-bold {
+            border-bottom: 2px solid #374151;
+        }
+
+        .table-class .underline-thin {
+            border-bottom: 1px solid #374151;
+        }
+
+        .whitespace-normal {
+            white-space: normal;
+        }
+
+        .whitespace-nowrap {
+            white-space: nowrap;
+        }
+
+        table tfoot {
+            display: table-row-group;
+        }
+    </style>
+</head>
+<body>
+<div class="header">
+    <div class="title">{{ $report->getTitle() }}</div>
+    <div class="company-name">{{ $company->name }}</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">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
+    <thead class="table-head">
+    <tr>
+        @foreach($report->getHeaders() as $index => $header)
+            <th class="{{ $report->getAlignmentClass($index) }}">
+                {{ $header }}
+            </th>
+        @endforeach
+    </tr>
+    </thead>
+    @foreach($report->getCategories() as $category)
+        <tbody>
+        <tr class="category-header-row">
+            @foreach($category->header as $index => $header)
+                <td class="{{ $report->getAlignmentClass($index) }}">
+                    {{ $header }}
+                </td>
+            @endforeach
+        </tr>
+        @foreach($category->data as $account)
+            <tr>
+                @foreach($account as $index => $cell)
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'whitespace-normal' => $index === 'account_name',
+                            'whitespace-nowrap' => $index !== 'account_name',
+                        ])
+                    >
+                        @if(is_array($cell) && isset($cell['name']))
+                            {{ $cell['name'] }}
+                        @else
+                            {{ $cell }}
+                        @endif
+                    </td>
+                @endforeach
+            </tr>
+        @endforeach
+
+        <!-- Category Types -->
+        @foreach($category->types ?? [] as $type)
+            <!-- Type Header -->
+            <tr class="type-header-row">
+                @foreach($type->header as $index => $header)
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'type-row-indent' => $index === 'account_name',
+                        ])
+                    >
+                        {{ $header }}
+                    </td>
+                @endforeach
+            </tr>
+
+            <!-- Type Data -->
+            @foreach($type->data as $typeRow)
+                <tr class="type-data-row">
+                    @foreach($typeRow as $index => $cell)
+                        <td @class([
+                                $report->getAlignmentClass($index),
+                                'whitespace-normal type-row-indent' => $index === 'account_name',
+                                'whitespace-nowrap' => $index !== 'account_name',
+                            ])
+                        >
+                            @if(is_array($cell) && isset($cell['name']))
+                                {{ $cell['name'] }}
+                            @else
+                                {{ $cell }}
+                            @endif
+                        </td>
+                    @endforeach
+                </tr>
+            @endforeach
+
+            <!-- Type Summary -->
+            <tr class="type-summary-row">
+                @foreach($type->summary as $index => $cell)
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'type-row-indent' => $index === 'account_name',
+                        ])
+                    >
+                        {{ $cell }}
+                    </td>
+                @endforeach
+            </tr>
+        @endforeach
+
+        <tr class="category-summary-row">
+            @foreach($category->summary as $index => $cell)
+                <td @class([
+                        'cell',
+                        $report->getAlignmentClass($index),
+                        'underline-bold' => $loop->last,
+                    ])
+                >
+                    {{ $cell }}
+                </td>
+            @endforeach
+        </tr>
+
+        @unless($loop->last && empty($report->getOverallTotals()))
+            <tr class="spacer-row">
+                <td colspan="{{ count($report->getHeaders()) }}"></td>
+            </tr>
+        @endunless
+        </tbody>
+    @endforeach
+    <tfoot>
+    <tr class="table-footer-row">
+        @foreach ($report->getOverallTotals() as $index => $total)
+            <td class="{{ $report->getAlignmentClass($index) }}">
+                {{ $total }}
+            </td>
+        @endforeach
+    </tr>
+    </tfoot>
+</table>
+
+<!-- Second Overview Table -->
+<table class="table-class">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
+    <thead class="table-head">
+    <tr>
+        @foreach($report->getOverviewHeaders() as $index => $header)
+            <th class="{{ $report->getAlignmentClass($index) }}">
+                {{ $header }}
+            </th>
+        @endforeach
+    </tr>
+    </thead>
+    <!-- Overview Content -->
+    @foreach($report->getOverview() as $overviewCategory)
+        <tbody>
+        <tr class="category-header-row">
+            @foreach($overviewCategory->header as $index => $header)
+                <td class="{{ $report->getAlignmentClass($index) }}">
+                    {{ $header }}
+                </td>
+            @endforeach
+        </tr>
+        @foreach($overviewCategory->data as $overviewAccount)
+            <tr>
+                @foreach($overviewAccount as $index => $cell)
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'whitespace-normal' => $index === 'account_name',
+                            'whitespace-nowrap' => $index !== 'account_name',
+                        ])
+                    >
+                        @if(is_array($cell) && isset($cell['name']))
+                            {{ $cell['name'] }}
+                        @else
+                            {{ $cell }}
+                        @endif
+                    </td>
+                @endforeach
+            </tr>
+        @endforeach
+        <!-- Summary Row -->
+        <tr class="category-summary-row">
+            @foreach($overviewCategory->summary as $index => $summaryCell)
+                <td class="{{ $report->getAlignmentClass($index) }}">
+                    {{ $summaryCell }}
+                </td>
+            @endforeach
+        </tr>
+
+        @if($overviewCategory->header['account_name'] === 'Starting Balance')
+            @foreach($report->getOverviewAlignedWithColumns() as $summaryRow)
+                <tr>
+                    @foreach($summaryRow as $index => $summaryCell)
+                        <td @class([
+                                'cell',
+                                $report->getAlignmentClass($index),
+                                'font-bold' => $loop->parent->last,
+                                'underline-thin' => $loop->parent->remaining === 1 && $index === 'net_movement',
+                                'underline-bold' => $loop->parent->last && $index === 'net_movement',
+                            ])
+                        >
+                            {{ $summaryCell }}
+                        </td>
+                    @endforeach
+                </tr>
+            @endforeach
+        @endif
+        </tbody>
+    @endforeach
+</table>
+</body>
+</html>

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

@@ -5,95 +5,105 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ $report->getTitle() }}</title>
     <style>
+        .font-bold {
+            font-weight: bold;
+        }
+
+        .category-header-row > td,
+        .type-header-row > td {
+            background-color: #f3f4f6;
+            font-weight: bold;
+        }
+
+        .category-summary-row > td,
+        .table-footer-row > td,
+        .type-summary-row > td {
+            background-color: #ffffff;
+            font-weight: bold;
+        }
+
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: bold;
+        }
+
+        .date-range {
+            font-size: 0.875rem;
+        }
+
         .header {
             color: #374151;
             margin-bottom: 1rem;
         }
 
-        .header > * + * {
+        .header div + div {
             margin-top: 0.5rem;
         }
 
-        .table-head {
-            display: table-row-group;
+        .spacer-row > td {
+            height: 0.75rem;
         }
 
-        .text-left {
-            text-align: left;
+        .table-body tr {
+            background-color: #ffffff;
         }
 
-        .text-right {
-            text-align: right;
+        .table-class {
+            border-collapse: collapse;
+            width: 100%;
         }
 
-        .text-center {
-            text-align: center;
+        .table-class .type-row-indent {
+            padding-left: 1.5rem;
         }
 
-        .table-class th,
-        .table-class td {
+        .table-class td,
+        .table-class th {
+            border-bottom: 1px solid #d1d5db;
             color: #374151;
+            font-size: 0.75rem;
+            line-height: 1rem;
+            padding: 0.75rem;
         }
 
-        .whitespace-normal {
-            white-space: normal;
-        }
-
-        .whitespace-nowrap {
-            white-space: nowrap;
-        }
-
-        .title {
-            font-size: 1.5rem;
+        .table-head {
+            display: table-row-group;
         }
 
-        .company-name {
-            font-size: 1.125rem;
-            font-weight: bold;
+        .text-center {
+            text-align: center;
         }
 
-        .date-range {
-            font-size: 0.875rem;
+        .text-left {
+            text-align: left;
         }
 
-        .table-class {
-            width: 100%;
-            border-collapse: collapse;
+        .text-right {
+            text-align: right;
         }
 
-        .table-class th,
-        .table-class td {
-            padding: 0.75rem;
-            font-size: 0.75rem;
-            line-height: 1rem;
-            border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
+        .title {
+            font-size: 1.5rem;
         }
 
-        .category-header-row > td,
-        .type-header-row > td {
-            background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: bold;
+        .table-class .underline-bold {
+            border-bottom: 2px solid #374151;
         }
 
-        .type-header-row > td,
-        .type-data-row > td,
-        .type-summary-row > td {
-            padding-left: 1.5rem; /* Indentation for type rows */
+        .table-class .underline-thin {
+            border-bottom: 1px solid #374151;
         }
 
-        .table-body tr {
-            background-color: #ffffff; /* White background for other rows */
+        .whitespace-normal {
+            white-space: normal;
         }
 
-        .spacer-row > td {
-            height: 0.75rem;
+        .whitespace-nowrap {
+            white-space: nowrap;
         }
 
-        .category-summary-row > td,
-        .type-summary-row > td,
-        .table-footer-row > td {
-            font-weight: bold;
-            background-color: #ffffff; /* White background for footer */
+        table tfoot {
+            display: table-row-group;
         }
     </style>
 </head>
@@ -129,7 +139,12 @@
         @foreach($category->data as $account)
             <tr>
                 @foreach($account as $index => $cell)
-                    <td class="{{ $report->getAlignmentClass($index) }} {{ $index === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'whitespace-normal' => $index === 'account_name',
+                            'whitespace-nowrap' => $index !== 'account_name',
+                        ])
+                    >
                         @if(is_array($cell) && isset($cell['name']))
                             {{ $cell['name'] }}
                         @else
@@ -145,7 +160,11 @@
             <!-- Type Header -->
             <tr class="type-header-row">
                 @foreach($type->header as $index => $header)
-                    <td class="{{ $report->getAlignmentClass($index) }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'type-row-indent' => $index === 'account_name',
+                        ])
+                    >
                         {{ $header }}
                     </td>
                 @endforeach
@@ -155,7 +174,12 @@
             @foreach($type->data as $typeRow)
                 <tr class="type-data-row">
                     @foreach($typeRow as $index => $cell)
-                        <td class="{{ $report->getAlignmentClass($index) }} {{ $index === 'account_name' ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                        <td @class([
+                                $report->getAlignmentClass($index),
+                                'whitespace-normal type-row-indent' => $index === 'account_name',
+                                'whitespace-nowrap' => $index !== 'account_name',
+                            ])
+                        >
                             @if(is_array($cell) && isset($cell['name']))
                                 {{ $cell['name'] }}
                             @else
@@ -169,7 +193,11 @@
             <!-- Type Summary -->
             <tr class="type-summary-row">
                 @foreach($type->summary as $index => $cell)
-                    <td class="{{ $report->getAlignmentClass($index) }}">
+                    <td @class([
+                            $report->getAlignmentClass($index),
+                            'type-row-indent' => $index === 'account_name',
+                        ])
+                    >
                         {{ $cell }}
                     </td>
                 @endforeach
@@ -183,12 +211,15 @@
                 </td>
             @endforeach
         </tr>
-        <tr class="spacer-row">
-            <td colspan="{{ count($report->getHeaders()) }}"></td>
-        </tr>
+
+        @unless($loop->last && empty($report->getOverallTotals()))
+            <tr class="spacer-row">
+                <td colspan="{{ count($report->getHeaders()) }}"></td>
+            </tr>
+        @endunless
         </tbody>
     @endforeach
-    <tbody>
+    <tfoot>
     <tr class="table-footer-row">
         @foreach ($report->getOverallTotals() as $index => $total)
             <td class="{{ $report->getAlignmentClass($index) }}">
@@ -196,7 +227,7 @@
             </td>
         @endforeach
     </tr>
-    </tbody>
+    </tfoot>
 </table>
 </body>
 </html>

resources/views/components/company/tables/cell.blade.php

@@ -2,13 +2,15 @@
     'alignmentClass',
     'indent' => false,
     'bold' => false,
+    'underlineThin' => false,
+    'underlineBold' => false,
 ])
 
 <td
     @class([
         $alignmentClass,
         'last-of-type:pe-1 sm:last-of-type:pe-3',
-        'ps-3 sm:ps-6' => $indent,
+        'ps-4 sm:first-of-type:ps-7' => $indent,
         'p-0 first-of-type:ps-1 sm:first-of-type:ps-3' => ! $indent,
     ])
 >
@@ -16,6 +18,8 @@
         @class([
             'px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white',
             'font-semibold' => $bold,
+            'border-b border-gray-700 dark:border-white/10' => $underlineThin,
+            'border-b-[1.5px] border-gray-800 dark:border-white/5' => $underlineBold,
         ])
     >
         {{ $slot }}

resources/views/components/company/tables/footer.blade.php

@@ -5,7 +5,7 @@
     <tr class="bg-gray-50 dark:bg-white/5">
         @foreach($totals as $totalIndex => $totalCell)
             <x-filament-tables::cell class="{{ $alignmentClass($totalIndex) }}">
-                <div class="px-3 py-3 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
+                <div class="px-3 py-3.5 text-sm font-semibold leading-6 text-gray-950 dark:text-white">
                     {{ $totalCell }}
                 </div>
             </x-filament-tables::cell>

resources/views/components/company/tables/reports/balance-sheet-summary.blade.php

@@ -1,5 +1,10 @@
-<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
-    <x-company.tables.header :headers="$report->getSummaryHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        <col span="1" style="width: 65%;">
+        <col span="1" style="width: 35%;">
+    </colgroup>
+    <x-company.tables.header :headers="$report->getSummaryHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getSummaryCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <x-company.tables.category-header :category-headers="$accountCategory->header"

resources/views/components/company/tables/reports/balance-sheet.blade.php

@@ -1,4 +1,14 @@
-<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
     <x-company.tables.header :headers="$report->getHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
@@ -7,8 +17,7 @@
         @foreach($accountCategory->data as $categoryAccount)
             <tr>
                 @foreach($categoryAccount as $accountIndex => $categoryAccountCell)
-                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)"
-                                           indent="true">
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)">
                         @if(is_array($categoryAccountCell) && isset($categoryAccountCell['name']))
                             @if($categoryAccountCell['name'] === 'Retained Earnings' && isset($categoryAccountCell['start_date']) && isset($categoryAccountCell['end_date']))
                                 <x-filament::link
@@ -53,7 +62,7 @@
             <tr class="bg-gray-50 dark:bg-white/5">
                 @foreach($accountType->header as $accountTypeHeaderIndex => $accountTypeHeaderCell)
                     <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeHeaderIndex)"
-                                           indent="true" bold="true">
+                                           :indent="$accountTypeHeaderIndex === 'account_name'" bold="true">
                         {{ $accountTypeHeaderCell }}
                     </x-company.tables.cell>
                 @endforeach
@@ -62,7 +71,7 @@
                 <tr>
                     @foreach($typeAccount as $accountIndex => $typeAccountCell)
                         <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)"
-                                               indent="true">
+                                               :indent="$accountIndex === 'account_name'">
                             @if(is_array($typeAccountCell) && isset($typeAccountCell['name']))
                                 @if($typeAccountCell['name'] === 'Retained Earnings' && isset($typeAccountCell['start_date']) && isset($typeAccountCell['end_date']))
                                     <x-filament::link
@@ -106,7 +115,7 @@
             <tr>
                 @foreach($accountType->summary as $accountTypeSummaryIndex => $accountTypeSummaryCell)
                     <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeSummaryIndex)"
-                                           indent="true" bold="true">
+                                           :indent="$accountTypeSummaryIndex === 'account_name'" bold="true">
                         {{ $accountTypeSummaryCell }}
                     </x-company.tables.cell>
                 @endforeach

resources/views/components/company/tables/reports/cash-flow-statement-summary.blade.php

@@ -0,0 +1,71 @@
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        <col span="1" style="width: 65%;">
+        <col span="1" style="width: 35%;">
+    </colgroup>
+    <x-company.tables.header :headers="$report->getSummaryHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
+    @foreach($report->getSummaryCategories() as $accountCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <x-company.tables.category-header :category-headers="$accountCategory->header"
+                                          :alignment-class="[$report, 'getAlignmentClass']"/>
+        @foreach($accountCategory->types as $accountType)
+            <tr>
+                @foreach($accountType->summary as $accountTypeSummaryIndex => $accountTypeSummaryCell)
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeSummaryIndex)">
+                        {{ $accountTypeSummaryCell }}
+                    </x-company.tables.cell>
+                @endforeach
+            </tr>
+        @endforeach
+        <tr>
+            @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountCategorySummaryIndex)"
+                                       bold="true" :underline-bold="$loop->last">
+                    {{ $accountCategorySummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+        <tr>
+            <td colspan="{{ count($report->getSummaryHeaders()) }}">
+                <div class="min-h-12"></div>
+            </td>
+        </tr>
+        </tbody>
+    @endforeach
+</table>
+
+<table class="w-full table-fixed divide-y border-t divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        <col span="1" style="width: 65%;">
+        <col span="1" style="width: 35%;">
+    </colgroup>
+    <x-company.tables.header :headers="$report->getSummaryOverviewHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
+    @foreach($report->getSummaryOverview() as $overviewCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <tr class="bg-gray-50 dark:bg-white/5">
+            @foreach($overviewCategory->summary as $overviewSummaryIndex => $overviewSummaryCell)
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($overviewSummaryIndex)" bold="true">
+                    {{ $overviewSummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+        @if($overviewCategory->summary['account_name'] === 'Starting Balance')
+            @foreach($report->getSummaryOverviewAlignedWithColumns() as $summaryRow)
+                <tr>
+                    @foreach($summaryRow as $summaryIndex => $summaryCell)
+                        <x-company.tables.cell :alignment-class="$report->getAlignmentClass($summaryIndex)"
+                                               :bold="$loop->parent->last"
+                                               :underline-bold="$loop->parent->last && $summaryIndex === 'net_movement'"
+                                               :underline-thin="$loop->parent->remaining === 1 && $summaryIndex === 'net_movement'"
+                        >
+                            {{ $summaryCell }}
+                        </x-company.tables.cell>
+                    @endforeach
+                </tr>
+            @endforeach
+        @endif
+        </tbody>
+    @endforeach
+</table>

resources/views/components/company/tables/reports/cash-flow-statement.blade.php

@@ -0,0 +1,213 @@
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
+    <x-company.tables.header :headers="$report->getHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+    @foreach($report->getCategories() as $accountCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <x-company.tables.category-header :category-headers="$accountCategory->header"
+                                          :alignment-class="[$report, 'getAlignmentClass']"/>
+        @foreach($accountCategory->data as $categoryAccount)
+            <tr>
+                @foreach($categoryAccount as $accountIndex => $categoryAccountCell)
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)">
+                        @if(is_array($categoryAccountCell) && isset($categoryAccountCell['name']))
+                            @if($categoryAccountCell['name'] === 'Retained Earnings' && isset($categoryAccountCell['start_date']) && isset($categoryAccountCell['end_date']))
+                                <x-filament::link
+                                    color="primary"
+                                    target="_blank"
+                                    icon="heroicon-o-arrow-top-right-on-square"
+                                    :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                    :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                    href="{{ \App\Filament\Company\Pages\Reports\IncomeStatement::getUrl([
+                                            'startDate' => $categoryAccountCell['start_date'],
+                                            'endDate' => $categoryAccountCell['end_date']
+                                        ]) }}"
+                                >
+                                    {{ $categoryAccountCell['name'] }}
+                                </x-filament::link>
+                            @elseif(isset($categoryAccountCell['id']) && isset($categoryAccountCell['start_date']) && isset($categoryAccountCell['end_date']))
+                                <x-filament::link
+                                    color="primary"
+                                    target="_blank"
+                                    icon="heroicon-o-arrow-top-right-on-square"
+                                    :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                    :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                    href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl([
+                                            'startDate' => $categoryAccountCell['start_date'],
+                                            'endDate' => $categoryAccountCell['end_date'],
+                                            'selectedAccount' => $categoryAccountCell['id']
+                                        ]) }}"
+                                >
+                                    {{ $categoryAccountCell['name'] }}
+                                </x-filament::link>
+                            @else
+                                {{ $categoryAccountCell['name'] }}
+                            @endif
+                        @else
+                            {{ $categoryAccountCell }}
+                        @endif
+                    </x-company.tables.cell>
+                @endforeach
+            </tr>
+        @endforeach
+        @foreach($accountCategory->types as $accountType)
+            <tr class="bg-gray-50 dark:bg-white/5">
+                @foreach($accountType->header as $accountTypeHeaderIndex => $accountTypeHeaderCell)
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeHeaderIndex)"
+                                           :indent="$accountTypeHeaderIndex === 'account_name'" bold="true">
+                        {{ $accountTypeHeaderCell }}
+                    </x-company.tables.cell>
+                @endforeach
+            </tr>
+            @foreach($accountType->data as $typeAccount)
+                <tr>
+                    @foreach($typeAccount as $accountIndex => $typeAccountCell)
+                        <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)"
+                                               :indent="$accountIndex === 'account_name'">
+                            @if(is_array($typeAccountCell) && isset($typeAccountCell['name']))
+                                @if($typeAccountCell['name'] === 'Retained Earnings' && isset($typeAccountCell['start_date']) && isset($typeAccountCell['end_date']))
+                                    <x-filament::link
+                                        color="primary"
+                                        target="_blank"
+                                        icon="heroicon-o-arrow-top-right-on-square"
+                                        :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                        :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                        href="{{ \App\Filament\Company\Pages\Reports\IncomeStatement::getUrl([
+                                            'startDate' => $typeAccountCell['start_date'],
+                                            'endDate' => $typeAccountCell['end_date']
+                                        ]) }}"
+                                    >
+                                        {{ $typeAccountCell['name'] }}
+                                    </x-filament::link>
+                                @elseif(isset($typeAccountCell['id']) && isset($typeAccountCell['start_date']) && isset($typeAccountCell['end_date']))
+                                    <x-filament::link
+                                        color="primary"
+                                        target="_blank"
+                                        icon="heroicon-o-arrow-top-right-on-square"
+                                        :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                        :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                        href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl([
+                                            'startDate' => $typeAccountCell['start_date'],
+                                            'endDate' => $typeAccountCell['end_date'],
+                                            'selectedAccount' => $typeAccountCell['id']
+                                        ]) }}"
+                                    >
+                                        {{ $typeAccountCell['name'] }}
+                                    </x-filament::link>
+                                @else
+                                    {{ $typeAccountCell['name'] }}
+                                @endif
+                            @else
+                                {{ $typeAccountCell }}
+                            @endif
+                        </x-company.tables.cell>
+                    @endforeach
+                </tr>
+            @endforeach
+            <tr>
+                @foreach($accountType->summary as $accountTypeSummaryIndex => $accountTypeSummaryCell)
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountTypeSummaryIndex)"
+                                           :indent="$accountTypeSummaryIndex === 'account_name'" bold="true">
+                        {{ $accountTypeSummaryCell }}
+                    </x-company.tables.cell>
+                @endforeach
+            </tr>
+        @endforeach
+        <tr>
+            @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountCategorySummaryIndex)"
+                                       bold="true" :underline-bold="$loop->last">
+                    {{ $accountCategorySummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+        <tr>
+            <td colspan="{{ count($report->getHeaders()) }}">
+                <div class="min-h-12"></div>
+            </td>
+        </tr>
+        </tbody>
+    @endforeach
+    <x-company.tables.footer :totals="$report->getOverallTotals()" :alignment-class="[$report, 'getAlignmentClass']"/>
+</table>
+
+<table class="w-full table-fixed divide-y border-t divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
+    <x-company.tables.header :headers="$report->getOverviewHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
+    @foreach($report->getOverview() as $overviewCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <x-company.tables.category-header :category-headers="$overviewCategory->header"
+                                          :alignment-class="[$report, 'getAlignmentClass']"/>
+        @foreach($overviewCategory->data as $overviewAccount)
+            <tr>
+                @foreach($overviewAccount as $overviewIndex => $overviewCell)
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($overviewIndex)">
+                        @if(is_array($overviewCell) && isset($overviewCell['name']))
+                            @if(isset($overviewCell['id']) && isset($overviewCell['start_date']) && isset($overviewCell['end_date']))
+                                <x-filament::link
+                                    color="primary"
+                                    target="_blank"
+                                    icon="heroicon-o-arrow-top-right-on-square"
+                                    :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                    :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                    href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl([
+                                            'startDate' => $overviewCell['start_date'],
+                                            'endDate' => $overviewCell['end_date'],
+                                            'selectedAccount' => $overviewCell['id']
+                                        ]) }}"
+                                >
+                                    {{ $overviewCell['name'] }}
+                                </x-filament::link>
+                            @else
+                                {{ $overviewCell['name'] }}
+                            @endif
+                        @else
+                            {{ $overviewCell }}
+                        @endif
+                    </x-company.tables.cell>
+                @endforeach
+            </tr>
+        @endforeach
+        <tr>
+            @foreach($overviewCategory->summary as $overviewSummaryIndex => $overviewSummaryCell)
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($overviewSummaryIndex)" bold="true">
+                    {{ $overviewSummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+        @if($overviewCategory->header['account_name'] === 'Starting Balance')
+            @foreach($report->getOverviewAlignedWithColumns() as $summaryRow)
+                <tr>
+                    @foreach($summaryRow as $summaryIndex => $summaryCell)
+                        <x-company.tables.cell :alignment-class="$report->getAlignmentClass($summaryIndex)"
+                                               :bold="$loop->parent->last"
+                                               :underline-bold="$loop->parent->last && $summaryIndex === 'net_movement'"
+                                               :underline-thin="$loop->parent->remaining === 1 && $summaryIndex === 'net_movement'"
+                        >
+                            {{ $summaryCell }}
+                        </x-company.tables.cell>
+                    @endforeach
+                </tr>
+            @endforeach
+        @endif
+        </tbody>
+    @endforeach
+</table>

resources/views/components/company/tables/reports/income-statement-summary.blade.php

@@ -1,5 +1,10 @@
-<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
-    <x-company.tables.header :headers="$report->getSummaryHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        <col span="1" style="width: 65%;">
+        <col span="1" style="width: 35%;">
+    </colgroup>
+    <x-company.tables.header :headers="$report->getSummaryHeaders()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
     @foreach($report->getSummaryCategories() as $accountCategory)
         <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <tr>
@@ -13,11 +18,9 @@
         @if($accountCategory->header['account_name'] === 'Cost of Goods Sold')
             <tr class="bg-gray-50 dark:bg-white/5">
                 @foreach($report->getGrossProfit() as $grossProfitIndex => $grossProfitCell)
-                    <x-filament-tables::cell class="{{ $report->getAlignmentClass($grossProfitIndex) }}">
-                        <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
-                            {{ $grossProfitCell }}
-                        </div>
-                    </x-filament-tables::cell>
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($grossProfitIndex)" bold="true">
+                        {{ $grossProfitCell }}
+                    </x-company.tables.cell>
                 @endforeach
             </tr>
         @endif

resources/views/components/company/tables/reports/income-statement.blade.php

@@ -0,0 +1,77 @@
+<table class="w-full table-fixed divide-y divide-gray-200 dark:divide-white/5">
+    <colgroup>
+        @if(array_key_exists('account_code', $report->getHeaders()))
+            <col span="1" style="width: 20%;">
+            <col span="1" style="width: 55%;">
+            <col span="1" style="width: 25%;">
+        @else
+            <col span="1" style="width: 65%;">
+            <col span="1" style="width: 35%;">
+        @endif
+    </colgroup>
+    <x-company.tables.header :headers="$report->getHeaders()" :alignment-class="[$report, 'getAlignmentClass']"/>
+    @foreach($report->getCategories() as $accountCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <x-company.tables.category-header :category-headers="$accountCategory->header"
+                                          :alignment-class="[$report, 'getAlignmentClass']"/>
+        @foreach($accountCategory->data as $categoryAccount)
+            <tr>
+                @foreach($categoryAccount as $accountIndex => $categoryAccountCell)
+                    <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountIndex)">
+                        @if(is_array($categoryAccountCell) && isset($categoryAccountCell['name']))
+                            @if($categoryAccountCell['name'] === 'Retained Earnings' && isset($categoryAccountCell['start_date']) && isset($categoryAccountCell['end_date']))
+                                <x-filament::link
+                                    color="primary"
+                                    target="_blank"
+                                    icon="heroicon-o-arrow-top-right-on-square"
+                                    :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                    :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                    href="{{ \App\Filament\Company\Pages\Reports\IncomeStatement::getUrl([
+                                            'startDate' => $categoryAccountCell['start_date'],
+                                            'endDate' => $categoryAccountCell['end_date']
+                                        ]) }}"
+                                >
+                                    {{ $categoryAccountCell['name'] }}
+                                </x-filament::link>
+                            @elseif(isset($categoryAccountCell['id']) && isset($categoryAccountCell['start_date']) && isset($categoryAccountCell['end_date']))
+                                <x-filament::link
+                                    color="primary"
+                                    target="_blank"
+                                    icon="heroicon-o-arrow-top-right-on-square"
+                                    :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                    :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                    href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl([
+                                            'startDate' => $categoryAccountCell['start_date'],
+                                            'endDate' => $categoryAccountCell['end_date'],
+                                            'selectedAccount' => $categoryAccountCell['id']
+                                        ]) }}"
+                                >
+                                    {{ $categoryAccountCell['name'] }}
+                                </x-filament::link>
+                            @else
+                                {{ $categoryAccountCell['name'] }}
+                            @endif
+                        @else
+                            {{ $categoryAccountCell }}
+                        @endif
+                    </x-company.tables.cell>
+                @endforeach
+            </tr>
+        @endforeach
+        <tr>
+            @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountCategorySummaryIndex)"
+                                       bold="true">
+                    {{ $accountCategorySummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+        <tr>
+            <td colspan="{{ count($report->getHeaders()) }}">
+                <div class="min-h-12"></div>
+            </td>
+        </tr>
+        </tbody>
+    @endforeach
+    <x-company.tables.footer :totals="$report->getOverallTotals()" :alignment-class="[$report, 'getAlignmentClass']"/>
+</table>

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

@@ -0,0 +1,87 @@
+<x-filament-panels::page>
+    <x-filament::section>
+        <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4">
+            <!-- Form Container -->
+            @if(method_exists($this, 'filtersForm'))
+                {{ $this->filtersForm }}
+            @endif
+
+            <!-- Grouping Button and Column Toggle -->
+            @if($this->hasToggleableColumns())
+                <x-filament-tables::column-toggle.dropdown
+                    :form="$this->getTableColumnToggleForm()"
+                    :trigger-action="$this->getToggleColumnsTriggerAction()"
+                />
+            @endif
+
+            <div class="inline-flex items-center min-w-0 md:min-w-[9.5rem] justify-end">
+                {{ $this->applyFiltersAction }}
+            </div>
+        </div>
+    </x-filament::section>
+
+
+    <x-filament::section>
+        <!-- Summary Section -->
+        @if($this->reportLoaded)
+            <div
+                class="flex flex-col md:flex-row items-center md:items-end text-center justify-center gap-4 md:gap-8">
+                @foreach($this->report->getSummary() as $summary)
+                    <div class="text-sm">
+                        <div class="text-gray-600 font-medium mb-2">{{ $summary['label'] }}</div>
+
+                        @php
+                            $isNetCashFlow = $summary['label'] === 'Net Cash Flow';
+                            $isPositive = money($summary['value'], \App\Utilities\Currency\CurrencyAccessor::getDefaultCurrency())->isPositive();
+                        @endphp
+
+                        <strong
+                            @class([
+                                'text-lg',
+                                'text-green-700' => $isNetCashFlow && $isPositive,
+                                'text-danger-700' => $isNetCashFlow && ! $isPositive,
+                            ])
+                        >
+                            {{ $summary['value'] }}
+                        </strong>
+                    </div>
+
+                    @if(! $loop->last)
+                        <div class="flex items-center justify-center px-2">
+                            <strong class="text-lg">
+                                {{ $loop->remaining === 1 ? '=' : '-' }}
+                            </strong>
+                        </div>
+                    @endif
+                @endforeach
+            </div>
+        @endif
+    </x-filament::section>
+
+    <x-filament::tabs>
+        <x-filament::tabs.item
+            :active="$activeTab === 'summary'"
+            wire:click="$set('activeTab', 'summary')"
+        >
+            Summary
+        </x-filament::tabs.item>
+
+        <x-filament::tabs.item
+            :active="$activeTab === 'details'"
+            wire:click="$set('activeTab', 'details')"
+        >
+            Details
+        </x-filament::tabs.item>
+    </x-filament::tabs>
+
+    <x-company.tables.container :report-loaded="$this->reportLoaded">
+        @if($this->report)
+            @if($activeTab === 'summary')
+                <x-company.tables.reports.cash-flow-statement-summary :report="$this->report"/>
+            @elseif($activeTab === 'details')
+                <x-company.tables.reports.cash-flow-statement :report="$this->report"/>
+            @endif
+        @endif
+    </x-company.tables.container>
+</x-filament-panels::page>
+

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

@@ -79,7 +79,7 @@
             @if($activeTab === 'summary')
                 <x-company.tables.reports.income-statement-summary :report="$this->report"/>
             @elseif($activeTab === 'details')
-                <x-company.tables.reports.detailed-report :report="$this->report"/>
+                <x-company.tables.reports.income-statement :report="$this->report"/>
             @endif
         @endif
     </x-company.tables.container>

tests/Feature/Reports/TrialBalanceReportTest.php

@@ -70,7 +70,6 @@ it('correctly builds a standard trial balance report', function () {
         ->call('applyFilters')
         ->assertDontSeeText('Retained Earnings')
         ->assertSeeTextInOrder([
-            $defaultBankAccountAccount->code,
             $defaultBankAccountAccount->name,
             $formattedExpectedBalances->debitBalance,
             $formattedExpectedBalances->creditBalance,
@@ -143,7 +142,6 @@ it('correctly builds a post-closing trial balance report', function () {
             'asOfDate' => $defaultEndDate->toDateString(),
         ])
         ->assertSeeTextInOrder([
-            $defaultBankAccountAccount->code,
             $defaultBankAccountAccount->name,
             $formattedExpectedBalances->debitBalance,
             $formattedExpectedBalances->creditBalance,