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

Development 3.x

app/Contracts/ExportableReport.php

@@ -3,6 +3,7 @@
 namespace App\Contracts;
 
 use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
 
 interface ExportableReport
 {
@@ -17,7 +18,12 @@ interface ExportableReport
 
     public function getOverallTotals(): array;
 
+    /**
+     * @return Column[]
+     */
     public function getColumns(): array;
 
     public function getPdfView(): string;
+
+    public function getAlignmentClass(string $columnName): string;
 }

app/Contracts/HasSummaryReport.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Contracts;
+
+use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
+
+interface HasSummaryReport
+{
+    /**
+     * @return Column[]
+     */
+    public function getSummaryColumns(): array;
+
+    public function getSummaryHeaders(): array;
+
+    /**
+     * @return ReportCategoryDTO[]
+     */
+    public function getSummaryCategories(): array;
+
+    public function getSummaryOverallTotals(): array;
+}

app/DTO/AccountCategoryDTO.php

@@ -5,10 +5,12 @@ namespace App\DTO;
 class AccountCategoryDTO
 {
     /**
-     * @param  AccountDTO[]  $accounts
+     * @param  AccountDTO[]|null  $accounts
+     * @param  AccountTypeDTO[]|null  $types
      */
     public function __construct(
-        public array $accounts,
-        public AccountBalanceDTO $summary,
+        public ?array $accounts = null,
+        public ?array $types = null,
+        public ?AccountBalanceDTO $summary = null,
     ) {}
 }

app/DTO/AccountTypeDTO.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\DTO;
+
+class AccountTypeDTO
+{
+    /**
+     * @param  AccountDTO[]  $accounts
+     */
+    public function __construct(
+        public array $accounts,
+        public AccountBalanceDTO $summary,
+    ) {}
+}

app/DTO/ReportCategoryDTO.php

@@ -4,9 +4,15 @@ namespace App\DTO;
 
 class ReportCategoryDTO
 {
+    /**
+     * ReportCategoryDTO constructor.
+     *
+     * @param  ReportTypeDTO[]|null  $types
+     */
     public function __construct(
-        public array $header,
-        public array $data,
-        public array $summary = [],
+        public ?array $header = null,
+        public ?array $data = null,
+        public ?array $summary = null,
+        public ?array $types = null,
     ) {}
 }

app/DTO/ReportTypeDTO.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\DTO;
+
+class ReportTypeDTO
+{
+    public function __construct(
+        public ?array $header = null,
+        public ?array $data = null,
+        public ?array $summary = null,
+    ) {}
+}

app/Enums/Accounting/AccountType.php

@@ -45,6 +45,28 @@ enum AccountType: string implements HasLabel
         };
     }
 
+    public function getPluralLabel(): ?string
+    {
+        return match ($this) {
+            self::CurrentAsset => 'Current Assets',
+            self::NonCurrentAsset => 'Non-Current Assets',
+            self::ContraAsset => 'Contra Assets',
+            self::CurrentLiability => 'Current Liabilities',
+            self::NonCurrentLiability => 'Non-Current Liabilities',
+            self::ContraLiability => 'Contra Liabilities',
+            self::Equity => 'Equity',
+            self::ContraEquity => 'Contra Equity',
+            self::OperatingRevenue => 'Operating Revenue',
+            self::NonOperatingRevenue => 'Non-Operating Revenue',
+            self::ContraRevenue => 'Contra Revenue',
+            self::UncategorizedRevenue => 'Uncategorized Revenue',
+            self::OperatingExpense => 'Operating Expenses',
+            self::NonOperatingExpense => 'Non-Operating Expenses',
+            self::ContraExpense => 'Contra Expenses',
+            self::UncategorizedExpense => 'Uncategorized Expenses',
+        };
+    }
+
     public function getCategory(): AccountCategory
     {
         return match ($this) {

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

@@ -185,6 +185,9 @@ class CurrencyResource extends Resource
                                     $action->cancel();
                                 }
                             }
+                        })
+                        ->hidden(function (Table $table) {
+                            return $table->getAllSelectableRecordsCount() === 0;
                         }),
                 ]),
             ])

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

@@ -33,12 +33,7 @@ class AccountChart extends Page
     protected static string $view = 'filament.company.pages.accounting.chart';
 
     #[Url]
-    public ?string $activeTab = null;
-
-    public function mount(): void
-    {
-        $this->activeTab = $this->activeTab ?? AccountCategory::Asset->value;
-    }
+    public ?string $activeTab = AccountCategory::Asset->value;
 
     protected function configureAction(Action $action): void
     {

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

@@ -459,7 +459,7 @@ class Transactions extends Page implements HasTable
     protected function getFormDefaultsForType(TransactionType $type): array
     {
         $commonDefaults = [
-            'posted_at' => now()->format('Y-m-d'),
+            'posted_at' => today(),
         ];
 
         return match ($type) {

app/Filament/Company/Pages/Reports.php

@@ -4,6 +4,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\IncomeStatement;
 use App\Filament\Company\Pages\Reports\TrialBalance;
 use App\Infolists\Components\ReportEntry;
@@ -41,7 +42,7 @@ class Reports extends Page
                             ->description('Snapshot of assets, liabilities, and equity at a specific point in time.')
                             ->icon('heroicon-o-clipboard-document-list')
                             ->iconColor(Color::Emerald)
-                            ->url('#'),
+                            ->url(BalanceSheet::getUrl()),
                         ReportEntry::make('cash_flow_statement')
                             ->hiddenLabel()
                             ->heading('Cash Flow Statement')

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

@@ -71,7 +71,7 @@ class AccountTransactions extends BaseReportPage
                 ->label('Credit')
                 ->alignment(Alignment::Right),
             Column::make('balance')
-                ->label('Balance')
+                ->label('Running Balance')
                 ->alignment(Alignment::Right),
         ];
     }

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

@@ -0,0 +1,87 @@
+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use App\Filament\Forms\Components\DateRangeSelect;
+use App\Services\ExportService;
+use App\Services\ReportService;
+use App\Support\Column;
+use App\Transformers\BalanceSheetReportTransformer;
+use Filament\Forms\Form;
+use Filament\Support\Enums\Alignment;
+use Livewire\Attributes\Url;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class BalanceSheet extends BaseReportPage
+{
+    protected static string $view = 'filament.company.pages.reports.balance-sheet';
+
+    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()
+                ->alignment(Alignment::Center),
+            Column::make('account_name')
+                ->label('Account')
+                ->alignment(Alignment::Left),
+            Column::make('ending_balance')
+                ->label('Amount')
+                ->alignment(Alignment::Right),
+        ];
+    }
+
+    public function filtersForm(Form $form): Form
+    {
+        return $form
+            ->inlineLabel()
+            ->columns(3)
+            ->schema([
+                DateRangeSelect::make('dateRange')
+                    ->label('As of')
+                    ->selectablePlaceholder(false)
+                    ->endDateField('asOfDate'),
+                $this->getAsOfDateFormComponent()
+                    ->hiddenLabel()
+                    ->extraFieldWrapperAttributes([]),
+            ]);
+    }
+
+    protected function buildReport(array $columns): ReportDTO
+    {
+        return $this->reportService->buildBalanceSheetReport($this->getFormattedAsOfDate(), $columns);
+    }
+
+    protected function getTransformer(ReportDTO $reportDTO): ExportableReport
+    {
+        return new BalanceSheetReportTransformer($reportDTO);
+    }
+
+    public function exportCSV(): StreamedResponse
+    {
+        return $this->exportService->exportToCsv($this->company, $this->report, endDate: $this->getFilterState('asOfDate'));
+    }
+
+    public function exportPDF(): StreamedResponse
+    {
+        return $this->exportService->exportToPdf($this->company, $this->report, endDate: $this->getFilterState('asOfDate'));
+    }
+}

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

@@ -11,6 +11,7 @@ use App\Transformers\IncomeStatementReportTransformer;
 use Filament\Forms\Form;
 use Filament\Support\Enums\Alignment;
 use Guava\FilamentClusters\Forms\Cluster;
+use Livewire\Attributes\Url;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class IncomeStatement extends BaseReportPage
@@ -25,6 +26,9 @@ class IncomeStatement extends BaseReportPage
 
     protected ExportService $exportService;
 
+    #[Url]
+    public ?string $activeTab = 'summary';
+
     public function boot(ReportService $reportService, ExportService $exportService): void
     {
         $this->reportService = $reportService;

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

@@ -143,7 +143,10 @@ class AccountResource extends Resource
                 Tables\Actions\BulkActionGroup::make([
                     Tables\Actions\DeleteBulkAction::make()
                         ->requiresConfirmation()
-                        ->modalDescription('Are you sure you want to delete the selected accounts? All transactions associated with the accounts will be deleted as well.'),
+                        ->modalDescription('Are you sure you want to delete the selected accounts? All transactions associated with the accounts will be deleted as well.')
+                        ->hidden(function (Table $table) {
+                            return $table->getAllSelectableRecordsCount() === 0;
+                        }),
                 ]),
             ])
             ->checkIfRecordIsSelectableUsing(static function (BankAccount $record) {

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

@@ -3,6 +3,7 @@
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
 use App\Filament\Company\Resources\Banking\AccountResource;
+use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 
 class EditAccount extends EditRecord
@@ -12,7 +13,7 @@ class EditAccount extends EditRecord
     protected function getHeaderActions(): array
     {
         return [
-            //
+            Actions\DeleteAction::make(),
         ];
     }
 

app/Listeners/UpdateAccountBalances.php

@@ -58,7 +58,7 @@ class UpdateAccountBalances
                         'type' => $transactionType,
                         'amount' => $formattedSimpleDifference,
                         'payment_channel' => 'other',
-                        'posted_at' => now(),
+                        'posted_at' => today(),
                         'description' => $description,
                         'pending' => false,
                         'reviewed' => false,

app/Models/Accounting/Transaction.php

@@ -48,7 +48,7 @@ class Transaction extends Model
         'amount' => TransactionAmountCast::class,
         'pending' => 'boolean',
         'reviewed' => 'boolean',
-        'posted_at' => 'datetime',
+        'posted_at' => 'date',
     ];
 
     public function account(): BelongsTo

app/Services/AccountService.php

@@ -138,6 +138,7 @@ class AccountService
                 'accounts.id',
                 'accounts.name',
                 'accounts.category',
+                'accounts.type',
                 'accounts.subtype_id',
                 'accounts.currency_code',
                 'accounts.code',
@@ -227,6 +228,6 @@ class AccountService
     {
         $earliestDate = Transaction::min('posted_at');
 
-        return $earliestDate ?? now()->toDateTimeString();
+        return $earliestDate ?? today()->toDateTimeString();
     }
 }

app/Services/ExportService.php

@@ -4,10 +4,13 @@ namespace App\Services;
 
 use App\Contracts\ExportableReport;
 use App\Models\Company;
-use App\Support\Column;
 use Barryvdh\Snappy\Facades\SnappyPdf;
 use Carbon\Exceptions\InvalidFormatException;
 use Illuminate\Support\Carbon;
+use League\Csv\Bom;
+use League\Csv\CannotInsertRecord;
+use League\Csv\Exception;
+use League\Csv\Writer;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ExportService
@@ -33,7 +36,8 @@ class ExportService
         ];
 
         $callback = function () use ($startDate, $endDate, $report, $company) {
-            $file = fopen('php://output', 'wb');
+            $csv = Writer::createFromStream(fopen('php://output', 'wb'));
+            $csv->setOutputBOM(Bom::Utf8);
 
             if ($startDate && $endDate) {
                 $defaultStartDateFormat = Carbon::parse($startDate)->toDefaultDateFormat();
@@ -43,61 +47,34 @@ class ExportService
                 $dateLabel = 'As of ' . Carbon::parse($endDate)->toDefaultDateFormat();
             }
 
-            fputcsv($file, [$report->getTitle()]);
-            fputcsv($file, [$company->name]);
-            fputcsv($file, [$dateLabel]);
-            fputcsv($file, []);
+            $csv->insertOne([$report->getTitle()]);
+            $csv->insertOne([$company->name]);
+            $csv->insertOne([$dateLabel]);
+            $csv->insertOne([]);
 
-            fputcsv($file, $report->getHeaders());
+            $csv->insertOne($report->getHeaders());
 
             foreach ($report->getCategories() as $category) {
-                if (isset($category->header[0]) && is_array($category->header[0])) {
-                    foreach ($category->header as $headerRow) {
-                        fputcsv($file, $headerRow);
-                    }
-                } else {
-                    fputcsv($file, $category->header);
-                }
+                $this->writeDataRowsToCsv($csv, $category->header, $category->data, $report->getColumns());
 
-                foreach ($category->data as $accountRow) {
-                    $row = [];
-                    $columns = $report->getColumns();
-
-                    /**
-                     * @var Column $column
-                     */
-                    foreach ($columns as $index => $column) {
-                        $cell = $accountRow[$index] ?? '';
-
-                        if ($column->isDate()) {
-                            try {
-                                $row[] = Carbon::parse($cell)->toDateString();
-                            } catch (InvalidFormatException) {
-                                $row[] = $cell;
-                            }
-                        } elseif (is_array($cell)) {
-                            // Handle array cells by extracting 'name' or 'description'
-                            $row[] = $cell['name'] ?? $cell['description'] ?? '';
-                        } else {
-                            $row[] = $cell;
-                        }
-                    }
+                foreach ($category->types ?? [] as $type) {
+                    $this->writeDataRowsToCsv($csv, $type->header, $type->data, $report->getColumns());
 
-                    fputcsv($file, $row);
+                    if (filled($type->summary)) {
+                        $csv->insertOne($type->summary);
+                    }
                 }
 
                 if (filled($category->summary)) {
-                    fputcsv($file, $category->summary);
+                    $csv->insertOne($category->summary);
                 }
 
-                fputcsv($file, []); // Empty row for spacing
+                $csv->insertOne([]);
             }
 
             if (filled($report->getOverallTotals())) {
-                fputcsv($file, $report->getOverallTotals());
+                $csv->insertOne($report->getOverallTotals());
             }
-
-            fclose($file);
         };
 
         return response()->streamDownload($callback, $filename, $headers);
@@ -129,4 +106,43 @@ class ExportService
             echo $pdf->inline();
         }, $filename);
     }
+
+    /**
+     * @throws CannotInsertRecord
+     * @throws Exception
+     */
+    protected function writeDataRowsToCsv(Writer $csv, array $header, array $data, array $columns): void
+    {
+        if (isset($header[0]) && is_array($header[0])) {
+            foreach ($header as $headerRow) {
+                $csv->insertOne($headerRow);
+            }
+        } else {
+            $csv->insertOne($header);
+        }
+
+        // Output data rows
+        foreach ($data as $rowData) {
+            $row = [];
+
+            foreach ($columns as $column) {
+                $columnName = $column->getName();
+                $cell = $rowData[$columnName] ?? '';
+
+                if ($column->isDate()) {
+                    try {
+                        $row[] = Carbon::parse($cell)->toDateString();
+                    } catch (InvalidFormatException) {
+                        $row[] = $cell;
+                    }
+                } elseif (is_array($cell)) {
+                    $row[] = $cell['name'] ?? $cell['description'] ?? '';
+                } else {
+                    $row[] = $cell;
+                }
+            }
+
+            $csv->insertOne($row);
+        }
+    }
 }

app/Services/ReportService.php

@@ -6,8 +6,10 @@ use App\DTO\AccountBalanceDTO;
 use App\DTO\AccountCategoryDTO;
 use App\DTO\AccountDTO;
 use App\DTO\AccountTransactionDTO;
+use App\DTO\AccountTypeDTO;
 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;
@@ -86,8 +88,8 @@ class ReportService
             $formattedCategorySummaryBalances = $this->formatBalances($categorySummaryBalances);
 
             $accountCategories[$category->getPluralLabel()] = new AccountCategoryDTO(
-                $categoryAccounts,
-                $formattedCategorySummaryBalances,
+                accounts: $categoryAccounts,
+                summary: $formattedCategorySummaryBalances,
             );
         }
 
@@ -305,8 +307,8 @@ class ReportService
             $formattedCategorySummaryBalances = $this->formatBalances($categorySummaryBalances);
 
             $accountCategories[$category->getPluralLabel()] = new AccountCategoryDTO(
-                $categoryAccounts,
-                $formattedCategorySummaryBalances,
+                accounts: $categoryAccounts,
+                summary: $formattedCategorySummaryBalances,
             );
         }
 
@@ -417,8 +419,8 @@ class ReportService
             }
 
             $accountCategories[$label] = new AccountCategoryDTO(
-                $categoryAccounts,
-                $this->formatBalances(['net_movement' => $netMovement])
+                accounts: $categoryAccounts,
+                summary: $this->formatBalances(['net_movement' => $netMovement])
             );
         }
 
@@ -429,4 +431,108 @@ class ReportService
 
         return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
     }
+
+    public function buildBalanceSheetReport(string $asOfDate, array $columns = []): ReportDTO
+    {
+        $asOfDateCarbon = Carbon::parse($asOfDate);
+        $startDateCarbon = Carbon::parse($this->accountService->getEarliestTransactionDate());
+
+        $orderedCategories = array_filter(AccountCategory::getOrderedCategories(), fn (AccountCategory $category) => $category->isReal());
+
+        $accounts = $this->accountService->getAccountBalances($startDateCarbon->toDateTimeString(), $asOfDateCarbon->toDateTimeString())
+            ->whereIn('category', $orderedCategories)
+            ->orderByRaw('LENGTH(code), code')
+            ->get();
+
+        $accountCategories = [];
+        $reportTotalBalances = [
+            'assets' => 0,
+            'liabilities' => 0,
+            'equity' => 0,
+        ];
+
+        foreach ($orderedCategories as $category) {
+            $categorySummaryBalances = ['ending_balance' => 0];
+
+            $categoryAccountsByType = [];
+            $categoryAccounts = [];
+            $subCategoryTotals = [];
+
+            /** @var Account $account */
+            foreach ($accounts as $account) {
+                if ($account->type->getCategory() === $category) {
+                    $accountBalances = $this->calculateAccountBalances($account, $category);
+                    $endingBalance = $accountBalances['ending_balance'] ?? $accountBalances['net_movement'];
+
+                    $categorySummaryBalances['ending_balance'] += $endingBalance;
+
+                    $formattedAccountBalances = $this->formatBalances($accountBalances);
+
+                    $accountDTO = new AccountDTO(
+                        $account->name,
+                        $account->code,
+                        $account->id,
+                        $formattedAccountBalances,
+                        startDate: $startDateCarbon->toDateString(),
+                        endDate: $asOfDateCarbon->toDateString(),
+                    );
+
+                    if ($category === AccountCategory::Equity && $account->type === AccountType::Equity) {
+                        $categoryAccounts[] = $accountDTO;
+                    } else {
+                        $accountType = $account->type->getPluralLabel();
+                        $categoryAccountsByType[$accountType][] = $accountDTO;
+                        $subCategoryTotals[$accountType] = ($subCategoryTotals[$accountType] ?? 0) + $endingBalance;
+                    }
+                }
+            }
+
+            if ($category === AccountCategory::Equity) {
+                $retainedEarningsAmount = $this->calculateRetainedEarnings($startDateCarbon->toDateTimeString(), $asOfDateCarbon->toDateTimeString())->getAmount();
+
+                $categorySummaryBalances['ending_balance'] += $retainedEarningsAmount;
+
+                $retainedEarningsDTO = new AccountDTO(
+                    'Retained Earnings',
+                    'RE',
+                    null,
+                    $this->formatBalances(['ending_balance' => $retainedEarningsAmount]),
+                    startDate: $startDateCarbon->toDateString(),
+                    endDate: $asOfDateCarbon->toDateString(),
+                );
+
+                $categoryAccounts[] = $retainedEarningsDTO;
+            }
+
+            $subCategories = [];
+            foreach ($categoryAccountsByType as $accountType => $accountsInType) {
+                $subCategorySummary = $this->formatBalances([
+                    'ending_balance' => $subCategoryTotals[$accountType] ?? 0,
+                ]);
+
+                $subCategories[$accountType] = new AccountTypeDTO(
+                    accounts: $accountsInType,
+                    summary: $subCategorySummary
+                );
+            }
+
+            $reportTotalBalances[match ($category) {
+                AccountCategory::Asset => 'assets',
+                AccountCategory::Liability => 'liabilities',
+                AccountCategory::Equity => 'equity',
+            }] += $categorySummaryBalances['ending_balance'];
+
+            $accountCategories[$category->getPluralLabel()] = new AccountCategoryDTO(
+                accounts: $categoryAccounts,
+                types: $subCategories,
+                summary: $this->formatBalances($categorySummaryBalances),
+            );
+        }
+
+        $netAssets = $reportTotalBalances['assets'] - $reportTotalBalances['liabilities'];
+
+        $formattedReportTotalBalances = $this->formatBalances(['ending_balance' => $netAssets]);
+
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $columns);
+    }
 }

app/Transformers/AccountBalanceReportTransformer.php

@@ -4,7 +4,6 @@ namespace App\Transformers;
 
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
-use App\Support\Column;
 
 class AccountBalanceReportTransformer extends BaseReportTransformer
 {
@@ -13,11 +12,6 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
         return 'Account Balances';
     }
 
-    public function getHeaders(): array
-    {
-        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
-    }
-
     /**
      * @return ReportCategoryDTO[]
      */
@@ -26,22 +20,17 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
         $categories = [];
 
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
-            // Initialize header with empty strings
             $header = [];
 
-            foreach ($this->getColumns() as $index => $column) {
-                if ($column->getName() === 'account_name') {
-                    $header[$index] = $accountCategoryName;
-                } else {
-                    $header[$index] = '';
-                }
+            foreach ($this->getColumns() as $column) {
+                $header[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
             }
 
             $data = array_map(function (AccountDTO $account) {
                 $row = [];
 
                 foreach ($this->getColumns() as $column) {
-                    $row[] = match ($column->getName()) {
+                    $row[$column->getName()] = match ($column->getName()) {
                         'account_code' => $account->accountCode,
                         'account_name' => [
                             'name' => $account->accountName,
@@ -64,7 +53,7 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
             $summary = [];
 
             foreach ($this->getColumns() as $column) {
-                $summary[] = match ($column->getName()) {
+                $summary[$column->getName()] = match ($column->getName()) {
                     'account_name' => 'Total ' . $accountCategoryName,
                     'starting_balance' => $accountCategory->summary->startingBalance ?? '',
                     'debit_balance' => $accountCategory->summary->debitBalance,
@@ -90,7 +79,7 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
         $totals = [];
 
         foreach ($this->getColumns() as $column) {
-            $totals[] = match ($column->getName()) {
+            $totals[$column->getName()] = match ($column->getName()) {
                 'account_name' => 'Total for all accounts',
                 'debit_balance' => $this->report->overallTotal->debitBalance,
                 'credit_balance' => $this->report->overallTotal->creditBalance,

app/Transformers/AccountTransactionReportTransformer.php

@@ -4,7 +4,6 @@ namespace App\Transformers;
 
 use App\DTO\AccountTransactionDTO;
 use App\DTO\ReportCategoryDTO;
-use App\Support\Column;
 
 class AccountTransactionReportTransformer extends BaseReportTransformer
 {
@@ -18,11 +17,6 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
         return 'Account Transactions';
     }
 
-    public function getHeaders(): array
-    {
-        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
-    }
-
     /**
      * @return ReportCategoryDTO[]
      */
@@ -31,17 +25,12 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
         $categories = [];
 
         foreach ($this->report->categories as $categoryData) {
-            // Initialize header with account and category information
-
-            $header = [
-                array_fill(0, count($this->getColumns()), ''),
-                array_fill(0, count($this->getColumns()), ''),
-            ];
+            $header = [];
 
-            foreach ($this->getColumns() as $index => $column) {
+            foreach ($this->getColumns() as $column) {
                 if ($column->getName() === 'date') {
-                    $header[0][$index] = $categoryData['category'];
-                    $header[1][$index] = $categoryData['under'];
+                    $header[0][$column->getName()] = $categoryData['category'];
+                    $header[1][$column->getName()] = $categoryData['under'];
                 }
             }
 
@@ -50,7 +39,7 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
                 $row = [];
 
                 foreach ($this->getColumns() as $column) {
-                    $row[] = match ($column->getName()) {
+                    $row[$column->getName()] = match ($column->getName()) {
                         'date' => $transaction->date,
                         'description' => [
                             'id' => $transaction->id,

app/Transformers/BalanceSheetReportTransformer.php

@@ -0,0 +1,261 @@
+<?php
+
+namespace App\Transformers;
+
+use App\DTO\AccountDTO;
+use App\DTO\ReportCategoryDTO;
+use App\DTO\ReportDTO;
+use App\DTO\ReportTypeDTO;
+use App\Utilities\Currency\CurrencyAccessor;
+
+class BalanceSheetReportTransformer extends SummaryReportTransformer
+{
+    protected string $totalAssets;
+
+    protected string $totalLiabilities;
+
+    protected string $totalEquity;
+
+    public function __construct(ReportDTO $report)
+    {
+        parent::__construct($report);
+
+        $this->calculateTotals();
+    }
+
+    public function getTitle(): string
+    {
+        return 'Balance Sheet';
+    }
+
+    public function calculateTotals(): void
+    {
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            match ($accountCategoryName) {
+                'Assets' => $this->totalAssets = $accountCategory->summary->endingBalance ?? '',
+                'Liabilities' => $this->totalLiabilities = $accountCategory->summary->endingBalance ?? '',
+                'Equity' => $this->totalEquity = $accountCategory->summary->endingBalance ?? '',
+            };
+        }
+    }
+
+    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,
+                    'ending_balance' => $accountCategory->summary->endingBalance ?? '',
+                    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,
+                        ],
+                        'ending_balance' => $account->balance->endingBalance ?? '',
+                        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,
+                            ],
+                            'ending_balance' => $account->balance->endingBalance ?? '',
+                            default => '',
+                        };
+                    }
+
+                    return $row;
+                }, $type->accounts);
+
+                // Subcategory (type) summary
+                $typeSummary = [];
+                foreach ($this->getColumns() as $column) {
+                    $typeSummary[$column->getName()] = match ($column->getName()) {
+                        'account_name' => 'Total ' . $typeName,
+                        'ending_balance' => $type->summary->endingBalance ?? '',
+                        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,
+                    'ending_balance' => $accountCategory->summary->endingBalance ?? '',
+                    default => '',
+                };
+            }
+
+            $types = [];
+            $totalTypeSummaries = 0;
+
+            // Iterate through each account type and calculate type summaries
+            foreach ($accountCategory->types as $typeName => $type) {
+                $typeSummary = [];
+                $typeEndingBalance = 0;
+
+                foreach ($columns as $column) {
+                    $typeSummary[$column->getName()] = match ($column->getName()) {
+                        'account_name' => 'Total ' . $typeName,
+                        'ending_balance' => $type->summary->endingBalance ?? '',
+                        default => '',
+                    };
+
+                    if ($column->getName() === 'ending_balance') {
+                        $typeEndingBalance = $type->summary->endingBalance ?? 0;
+                    }
+                }
+
+                $typeEndingBalance = money($typeEndingBalance, CurrencyAccessor::getDefaultCurrency())->getAmount();
+
+                $totalTypeSummaries += $typeEndingBalance;
+
+                $types[$typeName] = new ReportTypeDTO(
+                    header: [],
+                    data: [],
+                    summary: $typeSummary,
+                );
+            }
+
+            // Only for the "Equity" category, calculate and add "Total Other Equity"
+            if ($accountCategoryName === 'Equity') {
+                $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 => '',
+                    };
+                }
+
+                $types['Total Other Equity'] = new ReportTypeDTO(
+                    header: [],
+                    data: [],
+                    summary: $otherEquitySummary,
+                );
+            }
+
+            // 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 Assets',
+                'value' => $this->totalAssets,
+            ],
+            [
+                'label' => 'Total Liabilities',
+                'value' => $this->totalLiabilities,
+            ],
+            [
+                'label' => 'Net Assets',
+                'value' => $this->report->overallTotal->endingBalance ?? '',
+            ],
+        ];
+    }
+}

app/Transformers/BaseReportTransformer.php

@@ -4,6 +4,7 @@ namespace App\Transformers;
 
 use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
+use App\Support\Column;
 use Filament\Support\Enums\Alignment;
 
 abstract class BaseReportTransformer implements ExportableReport
@@ -15,9 +16,27 @@ abstract class BaseReportTransformer implements ExportableReport
         $this->report = $report;
     }
 
+    /**
+     * @return Column[]
+     */
     public function getColumns(): array
     {
-        return $this->report->fields;
+        return once(function (): array {
+            return $this->report->fields;
+        });
+    }
+
+    public function getHeaders(): array
+    {
+        return once(function (): array {
+            $headers = [];
+
+            foreach ($this->getColumns() as $column) {
+                $headers[$column->getName()] = $column->getLabel();
+            }
+
+            return $headers;
+        });
     }
 
     public function getPdfView(): string
@@ -25,18 +44,36 @@ abstract class BaseReportTransformer implements ExportableReport
         return 'components.company.reports.report-pdf';
     }
 
-    public function getAlignmentClass(int $index): string
+    public function getAlignment(int $index): string
     {
         $column = $this->getColumns()[$index];
 
         if ($column->getAlignment() === Alignment::Right) {
-            return 'text-right';
+            return 'right';
         }
 
         if ($column->getAlignment() === Alignment::Center) {
-            return 'text-center';
+            return 'center';
         }
 
-        return 'text-left';
+        return 'left';
+    }
+
+    public function getAlignmentClass(string $columnName): string
+    {
+        return once(function () use ($columnName): string {
+            /** @var Column|null $column */
+            $column = collect($this->getColumns())->first(fn (Column $column) => $column->getName() === $columnName);
+
+            if ($column?->getAlignment() === Alignment::Right) {
+                return 'text-right';
+            }
+
+            if ($column?->getAlignment() === Alignment::Center) {
+                return 'text-center';
+            }
+
+            return 'text-left';
+        });
     }
 }

app/Transformers/IncomeStatementReportTransformer.php

@@ -4,24 +4,27 @@ namespace App\Transformers;
 
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
-use App\Support\Column;
+use App\DTO\ReportDTO;
+use App\Utilities\Currency\CurrencyAccessor;
 
-class IncomeStatementReportTransformer extends BaseReportTransformer
+class IncomeStatementReportTransformer extends SummaryReportTransformer
 {
-    protected string $totalRevenue = '$0.00';
+    protected string $totalRevenue;
 
-    protected string $totalCogs = '$0.00';
+    protected string $totalCogs;
 
-    protected string $totalExpenses = '$0.00';
+    protected string $totalExpenses;
 
-    public function getTitle(): string
+    public function __construct(ReportDTO $report)
     {
-        return 'Income Statement';
+        parent::__construct($report);
+
+        $this->calculateTotals();
     }
 
-    public function getHeaders(): array
+    public function getTitle(): string
     {
-        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
+        return 'Income Statement';
     }
 
     public function calculateTotals(): void
@@ -40,22 +43,17 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
         $categories = [];
 
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
-            // Initialize header with empty strings
             $header = [];
 
-            foreach ($this->getColumns() as $index => $column) {
-                if ($column->getName() === 'account_name') {
-                    $header[$index] = $accountCategoryName;
-                } else {
-                    $header[$index] = '';
-                }
+            foreach ($this->getColumns() as $column) {
+                $header[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
             }
 
             $data = array_map(function (AccountDTO $account) {
                 $row = [];
 
                 foreach ($this->getColumns() as $column) {
-                    $row[] = match ($column->getName()) {
+                    $row[$column->getName()] = match ($column->getName()) {
                         'account_code' => $account->accountCode,
                         'account_name' => [
                             'name' => $account->accountName,
@@ -74,7 +72,7 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
             $summary = [];
 
             foreach ($this->getColumns() as $column) {
-                $summary[] = match ($column->getName()) {
+                $summary[$column->getName()] = match ($column->getName()) {
                     'account_name' => 'Total ' . $accountCategoryName,
                     'net_movement' => $accountCategory->summary->netMovement ?? '',
                     default => '',
@@ -91,12 +89,71 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
         return $categories;
     }
 
+    public function getSummaryCategories(): array
+    {
+        $summaryCategories = [];
+
+        $columns = $this->getSummaryColumns();
+
+        foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
+            // Header for the main category
+            $categoryHeader = [];
+
+            foreach ($columns as $column) {
+                $categoryHeader[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
+            }
+
+            // Category-level summary
+            $categorySummary = [];
+            foreach ($columns as $column) {
+                $categorySummary[$column->getName()] = match ($column->getName()) {
+                    'account_name' => $accountCategoryName,
+                    'net_movement' => $accountCategory->summary->netMovement ?? '',
+                    default => '',
+                };
+            }
+
+            // Add the category summary to the final array
+            $summaryCategories[$accountCategoryName] = new ReportCategoryDTO(
+                header: $categoryHeader,
+                data: [], // No direct accounts are needed here, only summaries
+                summary: $categorySummary,
+                types: [] // No types for the income statement
+            );
+        }
+
+        return $summaryCategories;
+    }
+
+    public function getGrossProfit(): array
+    {
+        $grossProfit = [];
+
+        $columns = $this->getSummaryColumns();
+
+        $revenue = money($this->totalRevenue, CurrencyAccessor::getDefaultCurrency())->getAmount();
+        $cogs = money($this->totalCogs, CurrencyAccessor::getDefaultCurrency())->getAmount();
+
+        $grossProfitAmount = $revenue - $cogs;
+        $grossProfitFormatted = money($grossProfitAmount, CurrencyAccessor::getDefaultCurrency(), true)->format();
+
+        foreach ($columns as $column) {
+            $grossProfit[$column->getName()] = match ($column->getName()) {
+                'account_name' => 'Gross Profit',
+                'net_movement' => $grossProfitFormatted,
+                default => '',
+            };
+        }
+
+        return $grossProfit;
+    }
+
     public function getOverallTotals(): array
     {
         $totals = [];
 
         foreach ($this->getColumns() as $column) {
-            $totals[] = match ($column->getName()) {
+            $totals[$column->getName()] = match ($column->getName()) {
                 'account_name' => 'Net Earnings',
                 'net_movement' => $this->report->overallTotal->netMovement ?? '',
                 default => '',
@@ -106,10 +163,24 @@ class IncomeStatementReportTransformer extends BaseReportTransformer
         return $totals;
     }
 
-    public function getSummary(): array
+    public function getSummaryOverallTotals(): array
     {
-        $this->calculateTotals();
+        $totals = [];
+        $columns = $this->getSummaryColumns();
+
+        foreach ($columns as $column) {
+            $totals[$column->getName()] = match ($column->getName()) {
+                'account_name' => 'Net Earnings',
+                'net_movement' => $this->report->overallTotal->netMovement ?? '',
+                default => '',
+            };
+        }
+
+        return $totals;
+    }
 
+    public function getSummary(): array
+    {
         return [
             [
                 'label' => 'Revenue',

app/Transformers/SummaryReportTransformer.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Transformers;
+
+use App\Contracts\HasSummaryReport;
+use App\Support\Column;
+
+abstract class SummaryReportTransformer extends BaseReportTransformer implements HasSummaryReport
+{
+    /**
+     * @return Column[]
+     */
+    public function getSummaryColumns(): array
+    {
+        return once(function (): array {
+            return collect($this->getColumns())
+                ->reject(fn (Column $column) => $column->getName() === 'account_code')
+                ->toArray();
+        });
+    }
+
+    public function getSummaryHeaders(): array
+    {
+        return once(function (): array {
+            $headers = [];
+
+            foreach ($this->getSummaryColumns() as $column) {
+                $headers[$column->getName()] = $column->getLabel();
+            }
+
+            return $headers;
+        });
+    }
+}

app/Transformers/TrialBalanceReportTransformer.php

@@ -4,7 +4,6 @@ namespace App\Transformers;
 
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
-use App\Support\Column;
 
 class TrialBalanceReportTransformer extends BaseReportTransformer
 {
@@ -16,11 +15,6 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
         };
     }
 
-    public function getHeaders(): array
-    {
-        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
-    }
-
     /**
      * @return ReportCategoryDTO[]
      */
@@ -32,19 +26,15 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
             // Initialize header with empty strings
             $header = [];
 
-            foreach ($this->getColumns() as $index => $column) {
-                if ($column->getName() === 'account_name') {
-                    $header[$index] = $accountCategoryName;
-                } else {
-                    $header[$index] = '';
-                }
+            foreach ($this->getColumns() as $column) {
+                $header[$column->getName()] = $column->getName() === 'account_name' ? $accountCategoryName : '';
             }
 
             $data = array_map(function (AccountDTO $account) {
                 $row = [];
 
                 foreach ($this->getColumns() as $column) {
-                    $row[] = match ($column->getName()) {
+                    $row[$column->getName()] = match ($column->getName()) {
                         'account_code' => $account->accountCode,
                         'account_name' => [
                             'name' => $account->accountName,
@@ -64,7 +54,7 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
             $summary = [];
 
             foreach ($this->getColumns() as $column) {
-                $summary[] = match ($column->getName()) {
+                $summary[$column->getName()] = match ($column->getName()) {
                     'account_name' => 'Total ' . $accountCategoryName,
                     'debit_balance' => $accountCategory->summary->debitBalance,
                     'credit_balance' => $accountCategory->summary->creditBalance,
@@ -87,7 +77,7 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
         $totals = [];
 
         foreach ($this->getColumns() as $column) {
-            $totals[] = match ($column->getName()) {
+            $totals[$column->getName()] = match ($column->getName()) {
                 'account_name' => 'Total for all accounts',
                 'debit_balance' => $this->report->overallTotal->debitBalance,
                 'credit_balance' => $this->report->overallTotal->creditBalance,

config/chart-of-accounts.php

@@ -67,11 +67,21 @@ 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',
+                'accounts' => [
+                    'Accumulated Depreciation' => [
+                        'description' => 'Used to account for the depreciation of fixed assets over time, offsetting assets like equipment or property.',
+                    ],
+                ],
             ],
             'Allowances for Receivables' => [
                 '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',
+                'accounts' => [
+                    'Allowance for Doubtful Accounts' => [
+                        'description' => 'Used to account for potential bad debts that may not be collectable, offsetting receivables.',
+                    ],
+                ],
             ],
             'Valuation Adjustments' => [
                 'description' => 'Accounts used to record adjustments in asset values due to impairments, market changes, or other factors affecting their recoverable amount.',
@@ -154,19 +164,6 @@ return [
                     'Owner\'s Investment' => [
                         'description' => 'The amount of money invested by the owner(s) or shareholders to start or expand the business.',
                     ],
-                    'Owner\'s Drawings' => [
-                        'description' => 'The amount of money withdrawn by the owner(s) or shareholders from the business for personal use.',
-                    ],
-                ],
-            ],
-            'Retained Earnings: Profit' => [
-                'description' => 'Cumulative profits retained in the business and not distributed as dividends. Indicates the company\'s financial health and profit-generating ability.',
-                'multi_currency' => false,
-                'base_code' => '3100',
-                'accounts' => [
-                    'Owner\'s Equity' => [
-                        'description' => 'Owner\'s equity is what remains after you subtract business liabilities from business assets. In other words, it\'s what\'s left over for you if you sell all your assets and pay all your debts.',
-                    ],
                 ],
             ],
         ],
@@ -175,6 +172,11 @@ 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',
+                'accounts' => [
+                    'Owner\'s Drawings' => [
+                        'description' => 'The amount of money withdrawn by the owner(s) or shareholders from the business for personal use, reducing equity.',
+                    ],
+                ],
             ],
         ],
         'operating_revenue' => [

database/factories/Accounting/TransactionFactory.php

@@ -57,16 +57,15 @@ class TransactionFactory extends Factory
 
             $account = Account::where('category', $this->faker->randomElement($associatedAccountTypes))
                 ->where('company_id', $company->id)
-                ->where('id', '<>', $accountIdForBankAccount)
+                ->whereKeyNot($accountIdForBankAccount)
                 ->inRandomOrder()
                 ->first();
 
-            // If no matching account is found, use a fallback
             if (! $account) {
                 $account = Account::where('company_id', $company->id)
-                    ->where('id', '<>', $accountIdForBankAccount)
+                    ->whereKeyNot($accountIdForBankAccount)
                     ->inRandomOrder()
-                    ->firstOrFail(); // Ensure there is at least some account
+                    ->firstOrFail();
             }
 
             return [

database/factories/Setting/CompanyDefaultFactory.php

@@ -72,6 +72,7 @@ class CompanyDefaultFactory extends Factory
     {
         return Currency::factory()->forCurrency($currencyCode)->createQuietly([
             'company_id' => $company->id,
+            'enabled' => true,
             'created_by' => $user->id,
             'updated_by' => $user->id,
         ]);
@@ -81,6 +82,7 @@ class CompanyDefaultFactory extends Factory
     {
         return Tax::factory()->salesTax()->createQuietly([
             'company_id' => $company->id,
+            'enabled' => true,
             'created_by' => $user->id,
             'updated_by' => $user->id,
         ]);
@@ -90,6 +92,7 @@ class CompanyDefaultFactory extends Factory
     {
         return Tax::factory()->purchaseTax()->createQuietly([
             'company_id' => $company->id,
+            'enabled' => true,
             'created_by' => $user->id,
             'updated_by' => $user->id,
         ]);
@@ -99,6 +102,7 @@ class CompanyDefaultFactory extends Factory
     {
         return Discount::factory()->salesDiscount()->createQuietly([
             'company_id' => $company->id,
+            'enabled' => true,
             'created_by' => $user->id,
             'updated_by' => $user->id,
         ]);
@@ -108,6 +112,7 @@ class CompanyDefaultFactory extends Factory
     {
         return Discount::factory()->purchaseDiscount()->createQuietly([
             'company_id' => $company->id,
+            'enabled' => true,
             'created_by' => $user->id,
             'updated_by' => $user->id,
         ]);

database/factories/Setting/CurrencyFactory.php

@@ -33,7 +33,7 @@ class CurrencyFactory extends Factory
             'symbol_first' => $defaultCurrency->isSymbolFirst(),
             'decimal_mark' => $defaultCurrency->getDecimalMark(),
             'thousands_separator' => $defaultCurrency->getThousandsSeparator(),
-            'enabled' => true,
+            'enabled' => false,
         ];
     }
 
@@ -53,7 +53,7 @@ class CurrencyFactory extends Factory
             'symbol_first' => $currency->isSymbolFirst(),
             'decimal_mark' => $currency->getDecimalMark(),
             'thousands_separator' => $currency->getThousandsSeparator(),
-            'enabled' => true,
+            'enabled' => false,
         ]);
     }
 }

database/migrations/2024_10_13_163049_update_posted_at_column_in_transactions_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('transactions', function (Blueprint $table) {
+            $table->date('posted_at')->change();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('transactions', function (Blueprint $table) {
+            $table->dateTime('posted_at')->change();
+        });
+    }
+};

package-lock.json

@@ -955,9 +955,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.24.0",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.0.tgz",
-            "integrity": "sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==",
+            "version": "4.24.2",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
             "dev": true,
             "funding": [
                 {
@@ -975,10 +975,10 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001663",
-                "electron-to-chromium": "^1.5.28",
+                "caniuse-lite": "^1.0.30001669",
+                "electron-to-chromium": "^1.5.41",
                 "node-releases": "^2.0.18",
-                "update-browserslist-db": "^1.1.0"
+                "update-browserslist-db": "^1.1.1"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -998,9 +998,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001667",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz",
-            "integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==",
+            "version": "1.0.30001669",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001669.tgz",
+            "integrity": "sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==",
             "dev": true,
             "funding": [
                 {
@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.33",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.33.tgz",
-            "integrity": "sha512-+cYTcFB1QqD4j4LegwLfpCNxifb6dDFUAwk6RsLusCwIaZI6or2f+q8rs5tTB2YC53HhOlIbEaqHMAAC8IOIwA==",
+            "version": "1.5.41",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.41.tgz",
+            "integrity": "sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==",
             "dev": true,
             "license": "ISC"
         },
@@ -1313,9 +1313,9 @@
             }
         },
         "node_modules/form-data": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
-            "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.1.tgz",
+            "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1786,9 +1786,9 @@
             }
         },
         "node_modules/picocolors": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
-            "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
+            "version": "1.1.1",
+            "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+            "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
             "dev": true,
             "license": "ISC"
         },
@@ -2417,9 +2417,9 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.13",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.13.tgz",
-            "integrity": "sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==",
+            "version": "3.4.14",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.14.tgz",
+            "integrity": "sha512-IcSvOcTRcUtQQ7ILQL5quRDg7Xs93PdJEk1ZLbhhvJc7uj/OAhYOnruEiwnGgBvUtaUAJ8/mhSw1o8L2jCiENA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2550,9 +2550,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "5.4.8",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.8.tgz",
-            "integrity": "sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==",
+            "version": "5.4.9",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.9.tgz",
+            "integrity": "sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2735,9 +2735,9 @@
             }
         },
         "node_modules/yaml": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.5.1.tgz",
-            "integrity": "sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==",
+            "version": "2.6.0",
+            "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+            "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
             "dev": true,
             "license": "ISC",
             "bin": {

resources/css/filament/company/theme.css

@@ -107,11 +107,7 @@
 }
 
 .es-table__header-ctn, .es-table__footer-ctn {
-    @apply divide-y divide-gray-200 dark:divide-white/10 h-12;
-}
-
-.es-table__row {
-    @apply [@media(hover:hover)]:transition [@media(hover:hover)]:duration-75 hover:bg-gray-50 dark:hover:bg-white/5;
+    @apply divide-y divide-gray-200 dark:divide-white/10 min-h-12;
 }
 
 .es-table .es-table__rowgroup td:first-child {

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

@@ -49,7 +49,7 @@
 
         .company-name {
             font-size: 1.125rem;
-            font-weight: 600;
+            font-weight: bold;
         }
 
         .date-range {
@@ -71,7 +71,7 @@
 
         .category-header-row > td {
             background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: 600;
+            font-weight: bold;
         }
 
         .table-body tr {
@@ -84,7 +84,7 @@
 
         .category-summary-row > td,
         .table-footer-row > td {
-            font-weight: 600;
+            font-weight: bold;
             background-color: #ffffff; /* White background for footer */
         }
     </style>

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

@@ -49,7 +49,7 @@
 
         .company-name {
             font-size: 1.125rem;
-            font-weight: 600;
+            font-weight: bold;
         }
 
         .date-range {
@@ -69,9 +69,16 @@
             border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
         }
 
-        .category-header-row > td {
+        .category-header-row > td,
+        .type-header-row > td {
             background-color: #f3f4f6; /* Gray background for category names */
-            font-weight: 600;
+            font-weight: bold;
+        }
+
+        .type-header-row > td,
+        .type-data-row > td,
+        .type-summary-row > td {
+            padding-left: 1.5rem; /* Indentation for type rows */
         }
 
         .table-body tr {
@@ -83,6 +90,7 @@
         }
 
         .category-summary-row > td,
+        .type-summary-row > td,
         .table-footer-row > td {
             font-weight: bold;
             background-color: #ffffff; /* White background for footer */
@@ -131,6 +139,43 @@
                 @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) }}">
+                        {{ $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) }} {{ $index === 'account_name' ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                            @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) }}">
+                        {{ $cell }}
+                    </td>
+                @endforeach
+            </tr>
+        @endforeach
+
         <tr class="category-summary-row">
             @foreach($category->summary as $index => $cell)
                 <td class="{{ $report->getAlignmentClass($index) }}">

resources/views/components/company/tables/category-header.blade.php

@@ -0,0 +1,20 @@
+@props([
+    'categoryHeaders',
+    'alignmentClass' => null,
+])
+
+
+<tr class="bg-gray-50 dark:bg-white/5">
+    @foreach($categoryHeaders as $index => $header)
+        <th
+            @class([
+                'px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6',
+                $alignmentClass($index) => $alignmentClass,
+            ])
+        >
+            <span class="text-sm font-semibold leading-6 text-gray-950 dark:text-white">
+                {{ $header }}
+            </span>
+        </th>
+    @endforeach
+</tr>

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

@@ -0,0 +1,23 @@
+@props([
+    'alignmentClass',
+    'indent' => false,
+    'bold' => false,
+])
+
+<td
+    @class([
+        $alignmentClass,
+        'last-of-type:pe-1 sm:last-of-type:pe-3',
+        'ps-3 sm:ps-6' => $indent,
+        'p-0 first-of-type:ps-1 sm:first-of-type:ps-3' => ! $indent,
+    ])
+>
+    <div
+        @class([
+            'px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white',
+            'font-semibold' => $bold,
+        ])
+    >
+        {{ $slot }}
+    </div>
+</td>

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

@@ -0,0 +1,24 @@
+@props([
+    'reportLoaded' => false,
+])
+
+<x-filament-tables::container>
+    <div class="es-table__header-ctn"></div>
+    <div
+        class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
+        <div wire:init="applyFilters">
+            <div wire:loading.class="flex items-center justify-center w-full h-full absolute inset-0 z-10">
+                <div wire:loading wire:target="applyFilters">
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
+                </div>
+            </div>
+
+            @if($reportLoaded)
+                <div wire:loading.remove wire:target="applyFilters">
+                    {{ $slot }}
+                </div>
+            @endif
+        </div>
+    </div>
+    <div class="es-table__footer-ctn border-t border-gray-200"></div>
+</x-filament-tables::container>

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

@@ -0,0 +1,15 @@
+@props(['totals', 'alignmentClass'])
+
+@if(!empty($totals))
+    <tfoot>
+    <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">
+                    {{ $totalCell }}
+                </div>
+            </x-filament-tables::cell>
+        @endforeach
+    </tr>
+    </tfoot>
+@endif

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

@@ -0,0 +1,16 @@
+@props([
+    'headers',
+    'alignmentClass',
+])
+
+<thead class="divide-y divide-gray-200 dark:divide-white/5">
+<tr class="bg-gray-50 dark:bg-white/5">
+    @foreach($headers as $headerIndex => $headerCell)
+        <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 {{ $alignmentClass($headerIndex) }}">
+            <span class="text-sm font-semibold leading-6 text-gray-950 dark:text-white">
+                {{ $headerCell }}
+            </span>
+        </th>
+    @endforeach
+</tr>
+</thead>

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

@@ -1,26 +1,14 @@
 <table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
-    <thead class="divide-y divide-gray-200 dark:divide-white/5">
-    <tr class="bg-gray-50 dark:bg-white/5">
-        @foreach($report->getHeaders() as $index => $header)
-            <th wire:key="header-{{ $index }}"
-                class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 {{ $report->getAlignmentClass($index) }}">
-                    <span class="text-sm font-semibold text-gray-950 dark:text-white">
-                        {{ $header }}
-                    </span>
-            </th>
-        @endforeach
-    </tr>
-    </thead>
+    <x-company.tables.header :headers="$report->getHeaders()" :alignmentClass="[$report, 'getAlignmentClass']"/>
     @foreach($report->getCategories() as $categoryIndex => $category)
-        <tbody wire:key="category-{{ $categoryIndex }}"
-               class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
         <!-- Category Header -->
         <tr class="bg-gray-50 dark:bg-white/5">
-            <x-filament-tables::cell colspan="{{ count($report->getHeaders()) }}" class="text-left">
-                <div class="px-3 py-2">
+            <x-filament-tables::cell tag="th" colspan="{{ count($report->getHeaders()) }}" class="text-left">
+                <div class="px-3 py-3.5">
                     @foreach ($category->header as $headerRow)
                         <div
-                            class="text-sm {{ $loop->first ? 'font-semibold text-gray-950 dark:text-white' : 'text-gray-500 dark:text-white/50' }}">
+                            class="text-sm {{ $loop->first ? 'font-semibold text-gray-950 dark:text-white' : 'font-normal text-gray-500 dark:text-white/50' }}">
                             @foreach ($headerRow as $headerValue)
                                 @if (!empty($headerValue))
                                     {{ $headerValue }}
@@ -33,14 +21,13 @@
         </tr>
         <!-- Transactions Data -->
         @foreach($category->data as $dataIndex => $transaction)
-            <tr wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}"
+            <tr
                 @class([
                     'bg-gray-50 dark:bg-white/5' => $loop->first || $loop->last || $loop->remaining === 1,
                 ])
             >
                 @foreach($transaction as $cellIndex => $cell)
                     <x-filament-tables::cell
-                        wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}-cell-{{ $cellIndex }}"
                         @class([
                            $report->getAlignmentClass($cellIndex),
                            'whitespace-normal' => $cellIndex === 1,
@@ -80,10 +67,10 @@
         @endforeach
         <!-- Spacer Row -->
         @unless($loop->last)
-            <tr wire:key="category-{{ $categoryIndex }}-spacer">
-                <x-filament-tables::cell colspan="{{ count($report->getHeaders()) }}">
-                    <div class="px-3 py-2 leading-6 invisible">Hidden Text</div>
-                </x-filament-tables::cell>
+            <tr>
+                <td colspan="{{ count($report->getHeaders()) }}">
+                    <div class="min-h-12"></div>
+                </td>
             </tr>
         @endunless
         </tbody>

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

@@ -0,0 +1,31 @@
+<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']"/>
+    @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">
+                    {{ $accountCategorySummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+        <tr>
+            <td colspan="{{ count($report->getSummaryHeaders()) }}">
+                <div class="min-h-12"></div>
+            </td>
+        </tr>
+        </tbody>
+    @endforeach
+</table>

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

@@ -0,0 +1,131 @@
+<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
+    <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)"
+                                           indent="true">
+                        @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="true" 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="true">
+                            @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="true" 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">
+                    {{ $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/components/company/tables/reports/detailed-report.blade.php

@@ -1,97 +1,67 @@
 <table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
-    <thead class="divide-y divide-gray-200 dark:divide-white/5">
-    <tr class="bg-gray-50 dark:bg-white/5">
-        @foreach($report->getHeaders() as $index => $header)
-            <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 {{ $report->getAlignmentClass($index) }}">
-                <span class="text-sm font-semibold text-gray-950 dark:text-white">
-                    {{ $header }}
-                </span>
-            </th>
-        @endforeach
-    </tr>
-    </thead>
-    @foreach($report->getCategories() as $categoryIndex => $category)
+    <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">
-        <tr class="bg-gray-50 dark:bg-white/5">
-            @foreach($category->header as $headerIndex => $header)
-                <x-filament-tables::cell class="{{ $report->getAlignmentClass($headerIndex) }}">
-                    <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
-                        {{ $header }}
-                    </div>
-                </x-filament-tables::cell>
-            @endforeach
-        </tr>
-        @foreach($category->data as $dataIndex => $account)
+        <x-company.tables.category-header :category-headers="$accountCategory->header"
+                                          :alignment-class="[$report, 'getAlignmentClass']"/>
+        @foreach($accountCategory->data as $categoryAccount)
             <tr>
-                @foreach($account as $cellIndex => $cell)
-                    <x-filament-tables::cell class="{{ $report->getAlignmentClass($cellIndex) }}">
-                        <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
-                            @if(is_array($cell) && isset($cell['name']))
-                                @if($cell['name'] === 'Retained Earnings' && isset($cell['start_date']) && isset($cell['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' => $cell['start_date'],
-                                            'endDate' => $cell['end_date']
+                @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']
                                         ]) }}"
-                                    >
-                                        {{ $cell['name'] }}
-                                    </x-filament::link>
-                                @elseif(isset($cell['id']) && isset($cell['start_date']) && isset($cell['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' => $cell['start_date'],
-                                            'endDate' => $cell['end_date'],
-                                            'selectedAccount' => $cell['id']
+                                >
+                                    {{ $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']
                                         ]) }}"
-                                    >
-                                        {{ $cell['name'] }}
-                                    </x-filament::link>
-                                @else
-                                    {{ $cell['name'] }}
-                                @endif
+                                >
+                                    {{ $categoryAccountCell['name'] }}
+                                </x-filament::link>
                             @else
-                                {{ $cell }}
+                                {{ $categoryAccountCell['name'] }}
                             @endif
-                        </div>
-                    </x-filament-tables::cell>
+                        @else
+                            {{ $categoryAccountCell }}
+                        @endif
+                    </x-company.tables.cell>
                 @endforeach
             </tr>
         @endforeach
         <tr>
-            @foreach($category->summary as $summaryIndex => $cell)
-                <x-filament-tables::cell class="{{ $report->getAlignmentClass($summaryIndex) }}">
-                    <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
-                        {{ $cell }}
-                    </div>
-                </x-filament-tables::cell>
+            @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>
-            <x-filament-tables::cell colspan="{{ count($report->getHeaders()) }}">
-                <div class="px-3 py-2 leading-6 invisible">Hidden Text</div>
-            </x-filament-tables::cell>
+            <td colspan="{{ count($report->getHeaders()) }}">
+                <div class="min-h-12"></div>
+            </td>
         </tr>
         </tbody>
     @endforeach
-    <tfoot>
-    <tr class="bg-gray-50 dark:bg-white/5">
-        @foreach($report->getOverallTotals() as $index => $total)
-            <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
-                <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
-                    {{ $total }}
-                </div>
-            </x-filament-tables::cell>
-        @endforeach
-    </tr>
-    </tfoot>
+    <x-company.tables.footer :totals="$report->getOverallTotals()" :alignment-class="[$report, 'getAlignmentClass']"/>
 </table>

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

@@ -0,0 +1,28 @@
+<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']"/>
+    @foreach($report->getSummaryCategories() as $accountCategory)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+        <tr>
+            @foreach($accountCategory->summary as $accountCategorySummaryIndex => $accountCategorySummaryCell)
+                <x-company.tables.cell :alignment-class="$report->getAlignmentClass($accountCategorySummaryIndex)">
+                    {{ $accountCategorySummaryCell }}
+                </x-company.tables.cell>
+            @endforeach
+        </tr>
+
+        @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>
+                @endforeach
+            </tr>
+        @endif
+        </tbody>
+    @endforeach
+    <x-company.tables.footer :totals="$report->getSummaryOverallTotals()"
+                             :alignment-class="[$report, 'getAlignmentClass']"/>
+</table>

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

@@ -15,10 +15,12 @@
 
         @foreach($this->categories as $categoryValue => $subtypes)
             @if($activeTab === $categoryValue)
-                <div class="es-table__container overflow-hidden rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:divide-white/10 dark:bg-gray-900 dark:ring-white/10">
+                <div
+                    class="es-table__container overflow-hidden rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:divide-white/10 dark:bg-gray-900 dark:ring-white/10">
                     <div class="es-table__header-ctn"></div>
                     <div class="es-table__content overflow-x-auto">
-                        <table class="es-table table-fixed w-full divide-y divide-gray-200 text-start text-sm dark:divide-white/5">
+                        <table
+                            class="es-table table-fixed w-full divide-y divide-gray-200 text-start text-sm dark:divide-white/5">
                             <colgroup>
                                 <col span="1" style="width: 12.5%;">
                                 <col span="1" style="width: 20%;">
@@ -28,12 +30,14 @@
                                 <col span="1" style="width: 7.5%;">
                             </colgroup>
                             @foreach($subtypes as $subtype)
-                                <tbody class="es-table__rowgroup divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
+                                <tbody
+                                    class="es-table__rowgroup divide-y divide-gray-200 whitespace-nowrap dark:divide-white/5">
                                 <!-- Subtype Name Header Row -->
                                 <tr class="es-table__row--header bg-gray-50 dark:bg-white/5">
                                     <td colspan="6" class="es-table__cell px-4 py-4">
                                         <div class="es-table__row-content flex items-center space-x-2">
-                                            <span class="es-table__row-title text-gray-800 dark:text-gray-200 font-semibold tracking-wider">
+                                            <span
+                                                class="es-table__row-title text-gray-800 dark:text-gray-200 font-semibold tracking-wider">
                                                 {{ $subtype->name }}
                                             </span>
                                             <x-tooltip
@@ -61,7 +65,8 @@
                                                 @endif
                                             </small>
                                         </td>
-                                        <td colspan="2" class="es-table__cell px-4 py-4">{{ $account->description }}</td>
+                                        <td colspan="2"
+                                            class="es-table__cell px-4 py-4">{{ $account->description }}</td>
                                         <td colspan="1" class="es-table__cell px-4 py-4">
                                             @if($account->archived)
                                                 <x-filament::badge color="gray" size="sm">
@@ -80,7 +85,8 @@
                                 @empty
                                     <!-- No Accounts Available Row -->
                                     <tr class="es-table__row">
-                                        <td colspan="5" class="es-table__cell px-4 py-4 italic text-xs text-gray-500 dark:text-gray-400">
+                                        <td colspan="5"
+                                            class="es-table__cell px-4 py-4 italic text-xs text-gray-500 dark:text-gray-400">
                                             {{ __("You haven't added any {$subtype->name} accounts yet.") }}
                                         </td>
                                     </tr>

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

@@ -5,31 +5,16 @@
         @endif
     </x-filament::section>
 
-    <x-filament-tables::container>
-        <div class="es-table__header-ctn"></div>
-        <div
-            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
-            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
-                <div wire:loading wire:target="applyFilters">
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
-                </div>
-            </div>
-
-            @if($this->reportLoaded)
-                <div wire:loading.remove wire:target="applyFilters">
-                    @if($this->report && !$this->tableHasEmptyState())
-                        <x-company.tables.reports.account-transactions :report="$this->report"/>
-                    @else
-                        <x-filament-tables::empty-state
-                            :actions="$this->getEmptyStateActions()"
-                            :description="$this->getEmptyStateDescription()"
-                            :heading="$this->getEmptyStateHeading()"
-                            :icon="$this->getEmptyStateIcon()"
-                        />
-                    @endif
-                </div>
-            @endif
-        </div>
-        <div class="es-table__footer-ctn border-t border-gray-200"></div>
-    </x-filament-tables::container>
+    <x-company.tables.container :report-loaded="$this->reportLoaded">
+        @if($this->report && ! $this->tableHasEmptyState())
+            <x-company.tables.reports.account-transactions :report="$this->report"/>
+        @else
+            <x-filament-tables::empty-state
+                :actions="$this->getEmptyStateActions()"
+                :description="$this->getEmptyStateDescription()"
+                :heading="$this->getEmptyStateHeading()"
+                :icon="$this->getEmptyStateIcon()"
+            />
+        @endif
+    </x-company.tables.container>
 </x-filament-panels::page>

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

@@ -0,0 +1,89 @@
+<x-filament-panels::page>
+    <x-filament::section>
+        <div class="flex flex-col lg:flex-row items-start lg:items-end justify-between gap-4">
+            <!-- Form Container -->
+            @if(method_exists($this, 'filtersForm'))
+                {{ $this->filtersForm }}
+            @endif
+
+            <!-- Grouping Button and Column Toggle -->
+            @if($this->hasToggleableColumns())
+                <div class="lg:mb-1">
+                    <x-filament-tables::column-toggle.dropdown
+                        :form="$this->getTableColumnToggleForm()"
+                        :trigger-action="$this->getToggleColumnsTriggerAction()"
+                    />
+                </div>
+            @endif
+
+            <div class="inline-flex items-center min-w-0 lg:min-w-[9.5rem] justify-end">
+                {{ $this->applyFiltersAction }}
+            </div>
+        </div>
+    </x-filament::section>
+
+
+    <x-filament::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
+                            $isNetAssets = $summary['label'] === 'Net Assets';
+                            $isPositive = money($summary['value'], \App\Utilities\Currency\CurrencyAccessor::getDefaultCurrency())->isPositive();
+                        @endphp
+
+                        <strong
+                            @class([
+                                'text-lg',
+                                'text-green-700' => $isNetAssets && $isPositive,
+                                'text-danger-700' => $isNetAssets && ! $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.balance-sheet-summary :report="$this->report"/>
+            @elseif($activeTab === 'details')
+                <x-company.tables.reports.balance-sheet :report="$this->report"/>
+            @endif
+        @endif
+    </x-company.tables.container>
+</x-filament-panels::page>
+

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

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

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

@@ -58,24 +58,29 @@
         @endif
     </x-filament::section>
 
-    <x-filament-tables::container>
-        <div class="es-table__header-ctn"></div>
-        <div
-            class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
-            <div wire:init="applyFilters" class="flex items-center justify-center w-full h-full absolute">
-                <div wire:loading wire:target="applyFilters">
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
-                </div>
-            </div>
+    <x-filament::tabs>
+        <x-filament::tabs.item
+            :active="$activeTab === 'summary'"
+            wire:click="$set('activeTab', 'summary')"
+        >
+            Summary
+        </x-filament::tabs.item>
 
-            @if($this->reportLoaded)
-                <div wire:loading.remove wire:target="applyFilters">
-                    @if($this->report)
-                        <x-company.tables.reports.detailed-report :report="$this->report"/>
-                    @endif
-                </div>
+        <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.income-statement-summary :report="$this->report"/>
+            @elseif($activeTab === 'details')
+                <x-company.tables.reports.detailed-report :report="$this->report"/>
             @endif
-        </div>
-        <div class="es-table__footer-ctn border-t border-gray-200"></div>
-    </x-filament-tables::container>
+        @endif
+    </x-company.tables.container>
 </x-filament-panels::page>

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

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

tests/Feature/Accounting/TransactionTest.php

@@ -226,7 +226,7 @@ it('can add an income or expense transaction', function (TransactionType $transa
     livewire(Transactions::class)
         ->mountAction($actionName)
         ->assertActionDataSet([
-            'posted_at' => now()->toDateTimeString(),
+            'posted_at' => today(),
             'type' => $transactionType,
             'bank_account_id' => $defaultBankAccount->id,
             'amount' => '0.00',
@@ -260,7 +260,7 @@ it('can add a transfer transaction', function () {
     livewire(Transactions::class)
         ->mountAction('addTransfer')
         ->assertActionDataSet([
-            'posted_at' => now()->toDateTimeString(),
+            'posted_at' => today(),
             'type' => TransactionType::Transfer,
             'bank_account_id' => $sourceBankAccount->id,
             'amount' => '0.00',
@@ -293,7 +293,7 @@ it('can add a journal transaction', function () {
     livewire(Transactions::class)
         ->mountAction('addJournalTransaction')
         ->assertActionDataSet([
-            'posted_at' => now()->toDateTimeString(),
+            'posted_at' => today(),
             'journalEntries' => [
                 ['type' => JournalEntryType::Debit, 'account_id' => $defaultDebitAccount->id, 'amount' => '0.00'],
                 ['type' => JournalEntryType::Credit, 'account_id' => $defaultCreditAccount->id, 'amount' => '0.00'],