wip

app/Contracts/ExportableReport.php

@@ -17,9 +17,5 @@ interface ExportableReport
 
     public function getOverallTotals(): array;
 
-    public function getRightAlignedColumns(): array;
-
-    public function getLeftAlignedColumns(): array;
-
-    public function getCenterAlignedColumns(): array;
+    public function getColumns(): array;
 }

app/DTO/AccountBalanceDTO.php

@@ -12,8 +12,7 @@ class AccountBalanceDTO implements Wireable
         public string $creditBalance,
         public ?string $netMovement,
         public ?string $endingBalance,
-    ) {
-    }
+    ) {}
 
     public function toLivewire(): array
     {

app/DTO/AccountCategoryDTO.php

@@ -12,8 +12,7 @@ class AccountCategoryDTO implements Wireable
     public function __construct(
         public array $accounts,
         public AccountBalanceDTO $summary,
-    ) {
-    }
+    ) {}
 
     public function toLivewire(): array
     {

app/DTO/AccountDTO.php

@@ -10,8 +10,7 @@ class AccountDTO implements Wireable
         public string $accountName,
         public string $accountCode,
         public AccountBalanceDTO $balance,
-    ) {
-    }
+    ) {}
 
     public function toLivewire(): array
     {

app/DTO/ReportCategoryDTO.php

@@ -13,6 +13,5 @@ class ReportCategoryDTO
         public array $header,
         public array $data,
         public array $summary,
-    ) {
-    }
+    ) {}
 }

app/DTO/ReportDTO.php

@@ -12,14 +12,15 @@ class ReportDTO implements Wireable
          */
         public array $categories,
         public AccountBalanceDTO $overallTotal,
-    ) {
-    }
+        public array $fields,
+    ) {}
 
     public function toLivewire(): array
     {
         return [
             'categories' => $this->categories,
             'overallTotal' => $this->overallTotal->toLivewire(),
+            'fields' => $this->fields,
         ];
     }
 
@@ -28,6 +29,7 @@ class ReportDTO implements Wireable
         return new static(
             $value['categories'],
             AccountBalanceDTO::fromLivewire($value['overallTotal']),
+            $value['fields'],
         );
     }
 }

app/Events/CompanyConfigured.php

@@ -15,6 +15,5 @@ class CompanyConfigured
 
     public function __construct(
         public Company $company
-    ) {
-    }
+    ) {}
 }

app/Events/CompanyDefaultEvent.php

@@ -18,6 +18,5 @@ class CompanyDefaultEvent
      */
     public function __construct(
         public Model $model
-    ) {
-    }
+    ) {}
 }

app/Events/CompanyDefaultUpdated.php

@@ -19,6 +19,5 @@ class CompanyDefaultUpdated
     public function __construct(
         public Model $record,
         public array $data
-    ) {
-    }
+    ) {}
 }

app/Events/CompanyGenerated.php

@@ -21,6 +21,5 @@ class CompanyGenerated
         public string $country,
         public string $language = 'en',
         public string $currency = 'USD'
-    ) {
-    }
+    ) {}
 }

app/Events/CurrencyRateChanged.php

@@ -17,6 +17,5 @@ class CurrencyRateChanged
         public Currency $currency,
         public float $oldRate,
         public float $newRate
-    ) {
-    }
+    ) {}
 }

app/Events/DefaultCurrencyChanged.php

@@ -18,6 +18,5 @@ class DefaultCurrencyChanged
      */
     public function __construct(
         public Currency $currency
-    ) {
-    }
+    ) {}
 }

app/Events/PlaidSuccess.php

@@ -18,6 +18,5 @@ class PlaidSuccess
         public string $publicToken,
         public string $accessToken,
         public Company $company
-    ) {
-    }
+    ) {}
 }

app/Events/StartTransactionImport.php

@@ -20,6 +20,5 @@ class StartTransactionImport
         public ConnectedBankAccount $connectedBankAccount,
         public int | string $selectedBankAccountId,
         public string $startDate
-    ) {
-    }
+    ) {}
 }

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

@@ -258,7 +258,7 @@ class Transactions extends Page implements HasTable
                             ->schema([
                                 Select::make('account_id')
                                     ->label('Category')
-                                    ->options(fn () => $this->getChartAccountOptions(nominalAccountsOnly: true, onlyWithTransactions: true))
+                                    ->options(fn () => $this->getChartAccountOptions(nominalAccountsOnly: true))
                                     ->multiple()
                                     ->searchable(),
                                 Select::make('reviewed')
@@ -713,9 +713,8 @@ class Transactions extends Page implements HasTable
         return 'uncategorized';
     }
 
-    protected function getChartAccountOptions(?TransactionType $type = null, ?bool $nominalAccountsOnly = null, ?bool $onlyWithTransactions = null, ?int $currentAccountId = null): array
+    protected function getChartAccountOptions(?TransactionType $type = null, ?bool $nominalAccountsOnly = null, ?int $currentAccountId = null): array
     {
-        $onlyWithTransactions ??= false;
         $nominalAccountsOnly ??= false;
 
         $excludedCategory = match ($type) {
@@ -727,7 +726,6 @@ class Transactions extends Page implements HasTable
         return Account::query()
             ->when($nominalAccountsOnly, fn (Builder $query) => $query->doesntHave('bankAccount'))
             ->when($excludedCategory, fn (Builder $query) => $query->whereNot('category', $excludedCategory))
-            ->when($onlyWithTransactions, fn (Builder $query) => $query->has('transactions'))
             ->where(function (Builder $query) use ($currentAccountId) {
                 $query->where('archived', false)
                     ->orWhere('id', $currentAccountId);

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

@@ -3,20 +3,19 @@
 namespace App\Filament\Company\Pages\Reports;
 
 use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
 use App\Services\ExportService;
 use App\Services\ReportService;
+use App\Support\Column;
 use App\Transformers\AccountBalanceReportTransformer;
-use Filament\Forms\Components\Checkbox;
-use Filament\Forms\Components\CheckboxList;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\Split;
 use Filament\Forms\Form;
+use Filament\Support\Enums\Alignment;
 use Guava\FilamentClusters\Forms\Cluster;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccountBalances extends BaseReportPage
 {
-    protected static string $view = 'filament.company.pages.reports.account-balances';
+    protected static string $view = 'filament.company.pages.reports.detailed-report';
 
     protected static ?string $slug = 'reports/account-balances';
 
@@ -24,8 +23,6 @@ class AccountBalances extends BaseReportPage
 
     protected ReportService $reportService;
 
-    public ExportableReport $accountBalanceReport;
-
     protected ExportService $exportService;
 
     public function boot(ReportService $reportService, ExportService $exportService): void
@@ -34,42 +31,77 @@ class AccountBalances extends BaseReportPage
         $this->exportService = $exportService;
     }
 
-    public function loadReportData(): void
+    /**
+     * @return array<Column>
+     */
+    public function getTable(): array
     {
-        $reportDTO = $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate);
-        $options = array_fill_keys($this->options, true);
-        $this->accountBalanceReport = new AccountBalanceReportTransformer($reportDTO, $options);
+        return [
+            Column::make('account_code')
+                ->label('Account Code')
+                ->toggleable()
+                ->alignment(Alignment::Center),
+            Column::make('account_name')
+                ->label('Account')
+                ->alignment(Alignment::Left),
+            Column::make('starting_balance')
+                ->label('Starting Balance')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('debit_balance')
+                ->label('Debit')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('credit_balance')
+                ->label('Credit')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('net_movement')
+                ->label('Net Movement')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('ending_balance')
+                ->label('Ending Balance')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+        ];
     }
 
     public function form(Form $form): Form
     {
         return $form
             ->inlineLabel()
+            ->columns([
+                'lg' => 1,
+                '2xl' => 2,
+            ])
+            ->live()
             ->schema([
-                Split::make([
-                    $this->getDateRangeFormComponent(),
-                    Cluster::make([
-                        $this->getStartDateFormComponent(),
-                        $this->getEndDateFormComponent(),
-                    ])
-                        ->hiddenLabel(),
-                ])->live(),
-                CheckboxList::make('options')
-                    ->options([
-                        'showAccountCode' => 'Show Account Code',
-                        'showZeroBalances' => 'Show Zero Balances',
-                    ])
-                    ->columns(2),
+                $this->getDateRangeFormComponent(),
+                Cluster::make([
+                    $this->getStartDateFormComponent(),
+                    $this->getEndDateFormComponent(),
+                ])->hiddenLabel(),
             ]);
     }
 
+    protected function buildReport(array $columns): ReportDTO
+    {
+        return $this->reportService->buildAccountBalanceReport($this->startDate, $this->endDate, $columns);
+    }
+
+    protected function getTransformer(ReportDTO $reportDTO): ExportableReport
+    {
+        return new AccountBalanceReportTransformer($reportDTO);
+    }
+
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->accountBalanceReport, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->accountBalanceReport, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
     }
 }

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

@@ -2,25 +2,37 @@
 
 namespace App\Filament\Company\Pages\Reports;
 
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Models\Company;
+use App\Support\Column;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
+use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Form;
 use Filament\Forms\Set;
 use Filament\Pages\Page;
+use Filament\Support\Enums\ActionSize;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
+use Filament\Support\Facades\FilamentIcon;
 use Illuminate\Support\Carbon;
+use Livewire\Attributes\Computed;
+use Livewire\Attributes\Session;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 abstract class BaseReportPage extends Page
 {
+    #[Session]
     public string $startDate = '';
 
+    #[Session]
     public string $endDate = '';
 
+    #[Session]
     public string $dateRange = '';
 
     public string $fiscalYearStartDate = '';
@@ -29,35 +41,153 @@ abstract class BaseReportPage extends Page
 
     public Company $company;
 
-    public array $options = [];
+    #[Session]
+    public array $toggledTableColumns = [];
+
+    abstract protected function buildReport(array $columns): ReportDTO;
+
+    abstract public function exportCSV(): StreamedResponse;
+
+    abstract public function exportPDF(): StreamedResponse;
+
+    abstract protected function getTransformer(ReportDTO $reportDTO): ExportableReport;
+
+    /**
+     * @return array<Column>
+     */
+    abstract public function getTable(): array;
 
     public function mount(): void
+    {
+        $this->initializeProperties();
+
+        $this->loadDefaultDateRange();
+
+        $this->loadReportData();
+
+        $this->loadDefaultTableColumnToggleState();
+    }
+
+    protected function getForms(): array
+    {
+        return [
+            'toggleTableColumnForm',
+            'form',
+        ];
+    }
+
+    protected function initializeProperties(): void
     {
         $this->company = auth()->user()->currentCompany;
         $this->fiscalYearStartDate = $this->company->locale->fiscalYearStartDate();
         $this->fiscalYearEndDate = $this->company->locale->fiscalYearEndDate();
-        $this->dateRange = $this->getDefaultDateRange();
-        $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
-        $this->options = ['showAccountCode'];
-
-        $this->loadReportData();
     }
 
-    abstract public function loadReportData(): void;
+    protected function loadDefaultDateRange(): void
+    {
+        if (empty($this->dateRange)) {
+            $this->dateRange = $this->getDefaultDateRange();
+            $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
+        }
+    }
 
-    abstract public function exportCSV(): StreamedResponse;
+    public function loadReportData(): void
+    {
+        unset($this->report);
+    }
 
-    abstract public function exportPDF(): StreamedResponse;
+    protected function loadDefaultTableColumnToggleState(): void
+    {
+        $tableColumns = $this->getTable();
+
+        if (empty($this->toggledTableColumns)) {
+            foreach ($tableColumns as $column) {
+                if ($column->isToggleable()) {
+                    if ($column->isToggledHiddenByDefault()) {
+                        $this->toggledTableColumns[$column->getName()] = false;
+                    } else {
+                        $this->toggledTableColumns[$column->getName()] = true;
+                    }
+                } else {
+                    $this->toggledTableColumns[$column->getName()] = true;
+                }
+            }
+        }
+
+        foreach ($tableColumns as $column) {
+            $columnName = $column->getName();
+            if (! $column->isToggleable()) {
+                $this->toggledTableColumns[$columnName] = true;
+            }
+
+            if ($column->isToggleable() && $column->isToggledHiddenByDefault() && isset($this->toggledTableColumns[$columnName]) && $this->toggledTableColumns[$columnName]) {
+                $this->toggledTableColumns[$columnName] = false;
+            }
+        }
+    }
 
     public function getDefaultDateRange(): string
     {
         return 'FY-' . now()->year;
     }
 
+    protected function getToggledColumns(): array
+    {
+        return array_values(
+            array_filter(
+                $this->getTable(),
+                fn (Column $column) => $this->toggledTableColumns[$column->getName()] ?? false,
+            )
+        );
+    }
+
+    #[Computed(persist: true)]
+    public function report(): ExportableReport
+    {
+        $columns = $this->getToggledColumns();
+        $reportDTO = $this->buildReport($columns);
+
+        return $this->getTransformer($reportDTO);
+    }
+
     public function setDateRange(Carbon $start, Carbon $end): void
     {
-        $this->startDate = $start->format('Y-m-d');
-        $this->endDate = $end->isFuture() ? now()->format('Y-m-d') : $end->format('Y-m-d');
+        $this->startDate = $start->toDateString();
+        $this->endDate = $end->isFuture() ? now()->toDateString() : $end->toDateString();
+    }
+
+    public function toggleColumnsAction(): Action
+    {
+        return Action::make('toggleColumns')
+            ->label(__('filament-tables::table.actions.toggle_columns.label'))
+            ->iconButton()
+            ->size(ActionSize::Large)
+            ->icon(FilamentIcon::resolve('tables::actions.toggle-columns') ?? 'heroicon-m-view-columns')
+            ->color('gray');
+    }
+
+    public function toggleTableColumnForm(Form $form): Form
+    {
+        return $form
+            ->schema($this->getTableColumnToggleFormSchema())
+            ->statePath('toggledTableColumns');
+    }
+
+    /**
+     * @return array<Checkbox>
+     */
+    protected function getTableColumnToggleFormSchema(): array
+    {
+        $schema = [];
+
+        foreach ($this->getTable() as $column) {
+            if ($column->isToggleable()) {
+                $schema[] = Checkbox::make($column->getName())
+                    ->label($column->getLabel());
+            }
+        }
+
+        return $schema;
     }
 
     protected function getHeaderActions(): array
@@ -91,6 +221,12 @@ abstract class BaseReportPage extends Page
             ->endDateField('endDate');
     }
 
+    protected function resetDateRange(): void
+    {
+        $this->dateRange = $this->getDefaultDateRange();
+        $this->setDateRange(Carbon::parse($this->fiscalYearStartDate), Carbon::parse($this->fiscalYearEndDate));
+    }
+
     protected function getStartDateFormComponent(): Component
     {
         return DatePicker::make('startDate')

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

@@ -3,16 +3,19 @@
 namespace App\Filament\Company\Pages\Reports;
 
 use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
 use App\Services\ExportService;
 use App\Services\ReportService;
+use App\Support\Column;
 use App\Transformers\TrialBalanceReportTransformer;
-use Filament\Forms\Components\Split;
 use Filament\Forms\Form;
+use Filament\Support\Enums\Alignment;
+use Guava\FilamentClusters\Forms\Cluster;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class TrialBalance extends BaseReportPage
 {
-    protected static string $view = 'filament.company.pages.reports.trial-balance';
+    protected static string $view = 'filament.company.pages.reports.detailed-report';
 
     protected static ?string $slug = 'reports/trial-balance';
 
@@ -20,8 +23,6 @@ class TrialBalance extends BaseReportPage
 
     protected ReportService $reportService;
 
-    public ExportableReport $trialBalanceReport;
-
     protected ExportService $exportService;
 
     public function boot(ReportService $reportService, ExportService $exportService): void
@@ -30,31 +31,62 @@ class TrialBalance extends BaseReportPage
         $this->exportService = $exportService;
     }
 
-    public function loadReportData(): void
+    public function getTable(): array
     {
-        $reportDTO = $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate);
-        $this->trialBalanceReport = new TrialBalanceReportTransformer($reportDTO);
+        return [
+            Column::make('account_code')
+                ->label('Account Code')
+                ->toggleable()
+                ->alignment(Alignment::Center),
+            Column::make('account_name')
+                ->label('Account')
+                ->alignment(Alignment::Left),
+            Column::make('debit_balance')
+                ->label('Debit')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+            Column::make('credit_balance')
+                ->label('Credit')
+                ->toggleable()
+                ->alignment(Alignment::Right),
+        ];
     }
 
     public function form(Form $form): Form
     {
         return $form
+            ->inlineLabel()
+            ->columns([
+                'lg' => 1,
+                '2xl' => 2,
+            ])
+            ->live()
             ->schema([
-                Split::make([
-                    $this->getDateRangeFormComponent(),
+                $this->getDateRangeFormComponent(),
+                Cluster::make([
                     $this->getStartDateFormComponent(),
                     $this->getEndDateFormComponent(),
-                ])->live(),
+                ])->hiddenLabel(),
             ]);
     }
 
+    protected function buildReport(array $columns): ReportDTO
+    {
+        return $this->reportService->buildTrialBalanceReport($this->startDate, $this->endDate, $columns);
+    }
+
+    protected function getTransformer(ReportDTO $reportDTO): ExportableReport
+    {
+        return new TrialBalanceReportTransformer($reportDTO);
+    }
+
     public function exportCSV(): StreamedResponse
     {
-        return $this->exportService->exportToCsv($this->company, $this->trialBalanceReport, $this->startDate, $this->endDate);
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
     }
 
     public function exportPDF(): StreamedResponse
     {
-        return $this->exportService->exportToPdf($this->company, $this->trialBalanceReport, $this->startDate, $this->endDate);
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
     }
 }

app/Jobs/ProcessTransactionImport.php

@@ -28,8 +28,7 @@ class ProcessTransactionImport implements ShouldQueue
         protected BankAccount $bankAccount,
         protected ConnectedBankAccount $connectedBankAccount,
         protected string $startDate
-    ) {
-    }
+    ) {}
 
     /**
      * Execute the job.

app/Jobs/ProcessTransactionUpdate.php

@@ -23,8 +23,7 @@ class ProcessTransactionUpdate implements ShouldQueue
     public function __construct(
         protected Company $company,
         protected string $itemId
-    ) {
-    }
+    ) {}
 
     /**
      * Execute the job.

app/Listeners/CreateConnectedAccount.php

@@ -15,8 +15,7 @@ class CreateConnectedAccount
      */
     public function __construct(
         protected PlaidService $plaidService
-    ) {
-    }
+    ) {}
 
     /**
      * Handle the event.

app/Listeners/HandleTransactionImport.php

@@ -14,8 +14,7 @@ class HandleTransactionImport
      */
     public function __construct(
         protected ConnectedBankAccountService $connectedBankAccountService
-    ) {
-    }
+    ) {}
 
     /**
      * Handle the event.

app/Listeners/UpdateCurrencyRates.php

@@ -15,8 +15,7 @@ readonly class UpdateCurrencyRates
      */
     public function __construct(
         private CurrencyHandler $currencyService
-    ) {
-    }
+    ) {}
 
     /**
      * Handle the event.

app/Models/Company.php

@@ -54,6 +54,8 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
      * @var array<string, class-string>
      */
     protected $dispatchesEvents = [
+        'created' => CompanyCreated::class,
+        'updated' => CompanyUpdated::class,
         'deleted' => CompanyDeleted::class,
     ];
 

app/Providers/CurrencyServiceProvider.php

@@ -21,7 +21,5 @@ class CurrencyServiceProvider extends ServiceProvider
         });
     }
 
-    public function boot(): void
-    {
-    }
+    public function boot(): void {}
 }

app/Providers/SquireServiceProvider.php

@@ -10,10 +10,7 @@ use Squire\Repository;
 
 class SquireServiceProvider extends ServiceProvider
 {
-    public function register(): void
-    {
-
-    }
+    public function register(): void {}
 
     public function boot(): void
     {

app/Services/AccountService.php

@@ -15,8 +15,7 @@ class AccountService implements AccountHandler
 {
     public function __construct(
         protected JournalEntryRepository $journalEntryRepository
-    ) {
-    }
+    ) {}
 
     public function getDebitBalance(Account $account, string $startDate, string $endDate): Money
     {

app/Services/ConnectedBankAccountService.php

@@ -14,8 +14,7 @@ class ConnectedBankAccountService
     public function __construct(
         protected AccountSubtypeRepository $accountSubtypeRepository,
         protected ConnectedBankAccountRepository $connectedBankAccountRepository
-    ) {
-    }
+    ) {}
 
     public function getOrProcessBankAccountForConnectedBankAccount(Company $company, ConnectedBankAccount $connectedBankAccount, int | string $selectedBankAccountId): BankAccount
     {

app/Services/CurrencyService.php

@@ -14,8 +14,7 @@ class CurrencyService implements CurrencyHandler
         protected ?string $apiKey,
         protected ?string $baseUrl,
         protected Client $client
-    ) {
-    }
+    ) {}
 
     /**
      * Determine if the Currency Exchange Rate feature is enabled.

app/Services/ReportService.php

@@ -15,8 +15,7 @@ class ReportService
 {
     public function __construct(
         protected AccountService $accountService,
-    ) {
-    }
+    ) {}
 
     public function formatBalances(array $balances): AccountBalanceDTO
     {
@@ -49,14 +48,51 @@ class ReportService
             ->sortBy(static fn (Collection $groupedAccounts, string $key) => array_search($key, $allCategories, true));
     }
 
-    private function buildReport(array $allCategories, Collection $categoryGroupedAccounts, callable $balanceCalculator, array $fields, ?callable $initializeCategoryBalances = null): ReportDTO
+    public function buildAccountBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    {
+        $allCategories = $this->accountService->getAccountCategoryOrder();
+
+        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
+
+        $balanceFields = ['starting_balance', 'debit_balance', 'credit_balance', 'net_movement', 'ending_balance'];
+
+        return $this->buildReport(
+            $allCategories,
+            $categoryGroupedAccounts,
+            fn (Account $account) => $this->accountService->getBalances($account, $startDate, $endDate),
+            $balanceFields,
+            $columns,
+            fn (string $categoryName, array &$categorySummaryBalances) => $this->adjustAccountBalanceCategoryFields($categoryName, $categorySummaryBalances),
+        );
+    }
+
+    public function buildTrialBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    {
+        $allCategories = $this->accountService->getAccountCategoryOrder();
+
+        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
+
+        $balanceFields = ['debit_balance', 'credit_balance'];
+
+        return $this->buildReport($allCategories, $categoryGroupedAccounts, function (Account $account) use ($startDate, $endDate) {
+            $endingBalance = $this->accountService->getEndingBalance($account, $startDate, $endDate)?->getAmount() ?? 0;
+
+            if ($endingBalance === 0) {
+                return [];
+            }
+
+            return $this->calculateTrialBalance($account->category, $endingBalance);
+        }, $balanceFields, $columns);
+    }
+
+    private function buildReport(array $allCategories, Collection $categoryGroupedAccounts, callable $balanceCalculator, array $balanceFields, array $allFields, ?callable $initializeCategoryBalances = null): ReportDTO
     {
         $accountCategories = [];
-        $reportTotalBalances = array_fill_keys($fields, 0);
+        $reportTotalBalances = array_fill_keys($balanceFields, 0);
 
         foreach ($allCategories as $categoryName) {
             $accountsInCategory = $categoryGroupedAccounts[$categoryName] ?? collect();
-            $categorySummaryBalances = array_fill_keys($fields, 0);
+            $categorySummaryBalances = array_fill_keys($balanceFields, 0);
 
             if ($initializeCategoryBalances) {
                 $initializeCategoryBalances($categoryName, $categorySummaryBalances);
@@ -78,7 +114,7 @@ class ReportService
                     }
                 }
 
-                $filteredAccountBalances = $this->filterBalances($accountBalances, $fields);
+                $filteredAccountBalances = $this->filterBalances($accountBalances, $balanceFields);
                 $formattedAccountBalances = $this->formatBalances($filteredAccountBalances);
 
                 $categoryAccounts[] = new AccountDTO(
@@ -88,13 +124,13 @@ class ReportService
                 );
             }
 
-            foreach ($fields as $field) {
+            foreach ($balanceFields as $field) {
                 if (array_key_exists($field, $categorySummaryBalances)) {
                     $reportTotalBalances[$field] += $categorySummaryBalances[$field];
                 }
             }
 
-            $filteredCategorySummaryBalances = $this->filterBalances($categorySummaryBalances, $fields);
+            $filteredCategorySummaryBalances = $this->filterBalances($categorySummaryBalances, $balanceFields);
             $formattedCategorySummaryBalances = $this->formatBalances($filteredCategorySummaryBalances);
 
             $accountCategories[$categoryName] = new AccountCategoryDTO(
@@ -105,24 +141,7 @@ class ReportService
 
         $formattedReportTotalBalances = $this->formatBalances($reportTotalBalances);
 
-        return new ReportDTO($accountCategories, $formattedReportTotalBalances);
-    }
-
-    public function buildAccountBalanceReport(string $startDate, string $endDate): ReportDTO
-    {
-        $allCategories = $this->accountService->getAccountCategoryOrder();
-
-        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
-
-        $fields = ['starting_balance', 'debit_balance', 'credit_balance', 'net_movement', 'ending_balance'];
-
-        return $this->buildReport(
-            $allCategories,
-            $categoryGroupedAccounts,
-            fn (Account $account) => $this->accountService->getBalances($account, $startDate, $endDate),
-            $fields,
-            fn (string $categoryName, array &$categorySummaryBalances) => $this->adjustAccountBalanceCategoryFields($categoryName, $categorySummaryBalances),
-        );
+        return new ReportDTO($accountCategories, $formattedReportTotalBalances, $allFields);
     }
 
     private function adjustAccountBalanceCategoryFields(string $categoryName, array &$categorySummaryBalances): void
@@ -132,25 +151,6 @@ class ReportService
         }
     }
 
-    public function buildTrialBalanceReport(string $startDate, string $endDate): ReportDTO
-    {
-        $allCategories = $this->accountService->getAccountCategoryOrder();
-
-        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
-
-        $fields = ['debit_balance', 'credit_balance'];
-
-        return $this->buildReport($allCategories, $categoryGroupedAccounts, function (Account $account) use ($startDate, $endDate) {
-            $endingBalance = $this->accountService->getEndingBalance($account, $startDate, $endDate)?->getAmount() ?? 0;
-
-            if ($endingBalance === 0) {
-                return [];
-            }
-
-            return $this->calculateTrialBalance($account->category, $endingBalance);
-        }, $fields);
-    }
-
     private function calculateTrialBalance(AccountCategory $category, int $endingBalance): array
     {
         if (in_array($category, [AccountCategory::Asset, AccountCategory::Expense], true)) {

app/Support/Column.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Support;
+
+use Filament\Support\Components\Component;
+use Filament\Support\Concerns\HasAlignment;
+use Filament\Support\Enums\Alignment;
+use Filament\Tables\Columns\Concerns\CanBeHidden;
+use Filament\Tables\Columns\Concerns\CanBeToggled;
+use Filament\Tables\Columns\Concerns\HasLabel;
+use Filament\Tables\Columns\Concerns\HasName;
+
+class Column extends Component
+{
+    use CanBeHidden;
+    use CanBeToggled;
+    use HasAlignment;
+    use HasLabel;
+    use HasName;
+
+    final public function __construct(string $name)
+    {
+        $this->name($name);
+    }
+
+    public static function make(string $name): static
+    {
+        $static = app(static::class, ['name' => $name]);
+        $static->configure();
+
+        return $static;
+    }
+
+    public function getAlignmentClass(): string
+    {
+        return match ($this->getAlignment()) {
+            Alignment::Center, Alignment::Justify, Alignment::Between => 'text-center',
+            Alignment::Left, Alignment::Start => 'text-left',
+            Alignment::Right, Alignment::End => 'text-right',
+            default => '',
+        };
+    }
+}

app/Transformers/AccountBalanceReportTransformer.php

@@ -4,6 +4,7 @@ namespace App\Transformers;
 
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
 
 class AccountBalanceReportTransformer extends BaseReportTransformer
 {
@@ -14,44 +15,7 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
 
     public function getHeaders(): array
     {
-        $headers = ['Account', 'Starting Balance', 'Debit', 'Credit', 'Net Movement', 'Ending Balance'];
-
-        if ($this->options['showAccountCode'] ?? false) {
-            array_unshift($headers, 'Account Code');
-        }
-
-        return $headers;
-    }
-
-    public function getRightAlignedColumns(): array
-    {
-        $columns = [1, 2, 3, 4, 5];
-
-        if ($this->options['showAccountCode'] ?? false) {
-            $columns = [2, 3, 4, 5, 6];
-        }
-
-        return $columns;
-    }
-
-    public function getLeftAlignedColumns(): array
-    {
-        $columns = [0];
-
-        if ($this->options['showAccountCode'] ?? false) {
-            $columns = [1];
-        }
-
-        return $columns;
-    }
-
-    public function getCenterAlignedColumns(): array
-    {
-        if ($this->options['showAccountCode'] ?? false) {
-            return [0];
-        }
-
-        return [];
+        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
     }
 
     /**
@@ -62,40 +26,48 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
         $categories = [];
 
         foreach ($this->report->categories as $accountCategoryName => $accountCategory) {
-            $header = [$accountCategoryName, '', '', '', '', ''];
-
-            if ($this->options['showAccountCode'] ?? false) {
-                array_unshift($header, '');
+            // Initialize header with empty strings
+            $header = [];
+
+            foreach ($this->getColumns() as $index => $column) {
+                if ($column->getName() === 'account_name') {
+                    $header[$index] = $accountCategoryName;
+                } else {
+                    $header[$index] = '';
+                }
             }
 
             $data = array_map(function (AccountDTO $account) {
-                $row = [
-                    $account->accountName,
-                    $account->balance->startingBalance ?? '',
-                    $account->balance->debitBalance,
-                    $account->balance->creditBalance,
-                    $account->balance->netMovement ?? '',
-                    $account->balance->endingBalance ?? '',
-                ];
-
-                if ($this->options['showAccountCode'] ?? false) {
-                    array_unshift($row, $account->accountCode);
+                $row = [];
+
+                foreach ($this->getColumns() as $column) {
+                    $row[] = match ($column->getName()) {
+                        'account_code' => $account->accountCode,
+                        'account_name' => $account->accountName,
+                        'starting_balance' => $account->balance->startingBalance ?? '',
+                        'debit_balance' => $account->balance->debitBalance,
+                        'credit_balance' => $account->balance->creditBalance,
+                        'net_movement' => $account->balance->netMovement ?? '',
+                        'ending_balance' => $account->balance->endingBalance ?? '',
+                        default => '',
+                    };
                 }
 
                 return $row;
             }, $accountCategory->accounts);
 
-            $summary = [
-                'Total ' . $accountCategoryName,
-                $accountCategory->summary->startingBalance ?? '',
-                $accountCategory->summary->debitBalance,
-                $accountCategory->summary->creditBalance,
-                $accountCategory->summary->netMovement ?? '',
-                $accountCategory->summary->endingBalance ?? '',
-            ];
-
-            if ($this->options['showAccountCode'] ?? false) {
-                array_unshift($summary, '');
+            $summary = [];
+
+            foreach ($this->getColumns() as $column) {
+                $summary[] = match ($column->getName()) {
+                    'account_name' => 'Total ' . $accountCategoryName,
+                    'starting_balance' => $accountCategory->summary->startingBalance ?? '',
+                    'debit_balance' => $accountCategory->summary->debitBalance,
+                    'credit_balance' => $accountCategory->summary->creditBalance,
+                    'net_movement' => $accountCategory->summary->netMovement ?? '',
+                    'ending_balance' => $accountCategory->summary->endingBalance ?? '',
+                    default => '',
+                };
             }
 
             $categories[] = new ReportCategoryDTO(
@@ -110,17 +82,15 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
 
     public function getOverallTotals(): array
     {
-        $totals = [
-            'Total for all accounts',
-            '',
-            $this->report->overallTotal->debitBalance,
-            $this->report->overallTotal->creditBalance,
-            '',
-            '',
-        ];
-
-        if ($this->options['showAccountCode'] ?? false) {
-            array_unshift($totals, '');
+        $totals = [];
+
+        foreach ($this->getColumns() as $column) {
+            $totals[] = match ($column->getName()) {
+                'account_name' => 'Total for all accounts',
+                'debit_balance' => $this->report->overallTotal->debitBalance,
+                'credit_balance' => $this->report->overallTotal->creditBalance,
+                default => '',
+            };
         }
 
         return $totals;

app/Transformers/BaseReportTransformer.php

@@ -4,39 +4,38 @@ namespace App\Transformers;
 
 use App\Contracts\ExportableReport;
 use App\DTO\ReportDTO;
+use Filament\Support\Enums\Alignment;
 use Livewire\Wireable;
 
 abstract class BaseReportTransformer implements ExportableReport, Wireable
 {
     protected ReportDTO $report;
 
-    protected array $options;
-
-    public function __construct(ReportDTO $report, array $options = [])
+    public function __construct(ReportDTO $report)
     {
         $this->report = $report;
-        $this->options = $options;
+    }
+
+    public function getColumns(): array
+    {
+        return $this->report->fields;
     }
 
     public function getAlignmentClass(int $index): string
     {
-        if (in_array($index, $this->getRightAlignedColumns())) {
+        $column = $this->getColumns()[$index];
+
+        if ($column->getAlignment() === Alignment::Right) {
             return 'text-right';
         }
 
-        if (in_array($index, $this->getCenterAlignedColumns())) {
+        if ($column->getAlignment() === Alignment::Center) {
             return 'text-center';
         }
 
         return 'text-left';
     }
 
-    abstract public function getRightAlignedColumns(): array;
-
-    abstract public function getCenterAlignedColumns(): array;
-
-    abstract public function getLeftAlignedColumns(): array;
-
     public function toLivewire(): array
     {
         return [

app/Transformers/TrialBalanceReportTransformer.php

@@ -4,6 +4,7 @@ namespace App\Transformers;
 
 use App\DTO\AccountDTO;
 use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
 
 class TrialBalanceReportTransformer extends BaseReportTransformer
 {
@@ -14,22 +15,7 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
 
     public function getHeaders(): array
     {
-        return ['', 'Account', 'Debit', 'Credit'];
-    }
-
-    public function getRightAlignedColumns(): array
-    {
-        return [2, 3];
-    }
-
-    public function getLeftAlignedColumns(): array
-    {
-        return [1];
-    }
-
-    public function getCenterAlignedColumns(): array
-    {
-        return [0];
+        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
     }
 
     /**
@@ -40,22 +26,48 @@ class TrialBalanceReportTransformer 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] = '';
+                }
+            }
+
+            $data = array_map(function (AccountDTO $account) {
+                $row = [];
+
+                foreach ($this->getColumns() as $column) {
+                    $row[] = match ($column->getName()) {
+                        'account_code' => $account->accountCode,
+                        'account_name' => $account->accountName,
+                        'debit_balance' => $account->balance->debitBalance,
+                        'credit_balance' => $account->balance->creditBalance,
+                        default => '',
+                    };
+                }
+
+                return $row;
+            }, $accountCategory->accounts);
+
+            $summary = [];
+
+            foreach ($this->getColumns() as $column) {
+                $summary[] = match ($column->getName()) {
+                    'account_name' => 'Total ' . $accountCategoryName,
+                    'debit_balance' => $accountCategory->summary->debitBalance,
+                    'credit_balance' => $accountCategory->summary->creditBalance,
+                    default => '',
+                };
+            }
+
             $categories[] = new ReportCategoryDTO(
-                header: ['', $accountCategoryName, '', ''],
-                data: array_map(static function (AccountDTO $account) {
-                    return [
-                        $account->accountCode,
-                        $account->accountName,
-                        $account->balance->debitBalance,
-                        $account->balance->creditBalance,
-                    ];
-                }, $accountCategory->accounts),
-                summary: [
-                    '',
-                    'Total ' . $accountCategoryName,
-                    $accountCategory->summary->debitBalance,
-                    $accountCategory->summary->creditBalance,
-                ],
+                header: $header,
+                data: $data,
+                summary: $summary,
             );
         }
 
@@ -64,11 +76,17 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
 
     public function getOverallTotals(): array
     {
-        return [
-            '',
-            'Total for all accounts',
-            $this->report->overallTotal->debitBalance,
-            $this->report->overallTotal->creditBalance,
-        ];
+        $totals = [];
+
+        foreach ($this->getColumns() as $column) {
+            $totals[] = match ($column->getName()) {
+                'account_name' => 'Total for all accounts',
+                'debit_balance' => $this->report->overallTotal->debitBalance,
+                'credit_balance' => $this->report->overallTotal->creditBalance,
+                default => '',
+            };
+        }
+
+        return $totals;
     }
 }

app/ValueObjects/Money.php

@@ -12,8 +12,7 @@ class Money
     public function __construct(
         private readonly int $amount,
         private readonly string $currencyCode
-    ) {
-    }
+    ) {}
 
     public function getAmount(): int
     {

app/View/Models/InvoiceViewModel.php

@@ -14,8 +14,7 @@ class InvoiceViewModel
     public function __construct(
         public DocumentDefault $invoice,
         public ?array $data = null
-    ) {
-    }
+    ) {}
 
     public function logo(): ?string
     {

composer.json

@@ -35,7 +35,8 @@
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.0",
         "phpunit/phpunit": "^10.5",
-        "spatie/laravel-ignition": "^2.4"
+        "spatie/laravel-ignition": "^2.4",
+        "spatie/laravel-ray": "^1.36"
     },
     "autoload": {
         "psr-4": {

package-lock.json

@@ -6,14 +6,14 @@
         "": {
             "devDependencies": {
                 "@tailwindcss/forms": "^0.5.7",
-                "@tailwindcss/typography": "^0.5.10",
-                "autoprefixer": "^10.4.18",
-                "axios": "^1.6.4",
+                "@tailwindcss/typography": "^0.5.13",
+                "autoprefixer": "^10.4.19",
+                "axios": "^1.7.2",
                 "laravel-vite-plugin": "^1.0",
-                "postcss": "^8.4.35",
-                "postcss-nesting": "^12.1.0",
-                "tailwindcss": "^3.4.1",
-                "vite": "^5.0"
+                "postcss": "^8.4.38",
+                "postcss-nesting": "^12.1.5",
+                "tailwindcss": "^3.4.4",
+                "vite": "^5.3"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -931,9 +931,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001634",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz",
-            "integrity": "sha512-fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA==",
+            "version": "1.0.30001636",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz",
+            "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==",
             "dev": true,
             "funding": [
                 {
@@ -1079,9 +1079,9 @@
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.4.803",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.803.tgz",
-            "integrity": "sha512-61H9mLzGOCLLVsnLiRzCbc63uldP0AniRYPV3hbGVtONA1pI7qSGILdbofR7A8TMbOypDocEAjH/e+9k1QIe3g==",
+            "version": "1.4.807",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.807.tgz",
+            "integrity": "sha512-kSmJl2ZwhNf/bcIuCH/imtNOKlpkLDn2jqT5FJ+/0CXjhnFaOa9cOe9gHKKy71eM49izwuQjZhKk+lWQ1JxB7A==",
             "dev": true
         },
         "node_modules/emoji-regex": {
@@ -1273,15 +1273,16 @@
             }
         },
         "node_modules/glob": {
-            "version": "10.4.1",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
-            "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
+            "version": "10.4.2",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.2.tgz",
+            "integrity": "sha512-GwMlUF6PkPo3Gk21UxkCohOv0PLcIXVtKyLlpEI28R/cO/4eNOdmLk3CMW1wROV/WR/EsZOWAfBbBOqYvs88/w==",
             "dev": true,
             "dependencies": {
                 "foreground-child": "^3.1.0",
                 "jackspeak": "^3.1.2",
                 "minimatch": "^9.0.4",
                 "minipass": "^7.1.2",
+                "package-json-from-dist": "^1.0.0",
                 "path-scurry": "^1.11.1"
             },
             "bin": {
@@ -1331,12 +1332,15 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.13.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-            "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
+            "version": "2.14.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.14.0.tgz",
+            "integrity": "sha512-a5dFJih5ZLYlRtDc0dZWP7RiKr6xIKzmn/oAYCDvdLThadVgyJwlaoQPmRtMSpz+rk0OGAgIu+TcM9HUF0fk1A==",
             "dev": true,
             "dependencies": {
-                "hasown": "^2.0.0"
+                "hasown": "^2.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
             },
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -1622,6 +1626,12 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/package-json-from-dist": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+            "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+            "dev": true
+        },
         "node_modules/path-key": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",

package.json

@@ -7,13 +7,13 @@
     },
     "devDependencies": {
         "@tailwindcss/forms": "^0.5.7",
-        "@tailwindcss/typography": "^0.5.10",
-        "autoprefixer": "^10.4.18",
-        "axios": "^1.6.4",
+        "@tailwindcss/typography": "^0.5.13",
+        "autoprefixer": "^10.4.19",
+        "axios": "^1.7.2",
         "laravel-vite-plugin": "^1.0",
-        "postcss": "^8.4.35",
-        "postcss-nesting": "^12.1.0",
-        "tailwindcss": "^3.4.1",
-        "vite": "^5.0"
+        "postcss": "^8.4.38",
+        "postcss-nesting": "^12.1.5",
+        "tailwindcss": "^3.4.4",
+        "vite": "^5.3"
     }
 }

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

@@ -1,8 +1,8 @@
-<table class="w-full table-auto divide-y divide-gray-200 text-start dark:divide-white/5">
+<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) }}">
+                <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>
@@ -10,48 +10,48 @@
             @endforeach
         </tr>
     </thead>
-    @foreach($report->getCategories() as $category)
-        <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 $index => $header)
-                <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
-                    <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
-                        {{ $header }}
-                    </div>
-                </x-filament-tables::cell>
+    @foreach($report->getCategories() as $categoryIndex => $category)
+        <tbody wire:key="category-{{ $categoryIndex }}" 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 wire:key="category-{{ $categoryIndex }}-header-{{ $headerIndex }}" 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)
+                <tr wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}">
+                    @foreach($account as $cellIndex => $cell)
+                        <x-filament-tables::cell wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}-cell-{{ $cellIndex }}" class="{{ $report->getAlignmentClass($cellIndex) }}">
+                            <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
+                                {{ $cell }}
+                            </div>
+                        </x-filament-tables::cell>
+                    @endforeach
+                </tr>
             @endforeach
-        </tr>
-        @foreach($category->data as $account)
-            <tr>
-                @foreach($account as $index => $cell)
-                    <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
-                        <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
+            <tr wire:key="category-{{ $categoryIndex }}-summary">
+                @foreach($category->summary as $summaryIndex => $cell)
+                    <x-filament-tables::cell wire:key="category-{{ $categoryIndex }}-summary-{{ $summaryIndex }}" 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>
                 @endforeach
             </tr>
-        @endforeach
-        <tr>
-            @foreach($category->summary as $index => $cell)
-                <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">
-                        {{ $cell }}
-                    </div>
+            <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>
-            @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>
-        </tr>
+            </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) }}">
+                <x-filament-tables::cell wire:key="footer-total-{{ $index }}" class="{{ $report->getAlignmentClass($index) }}">
                     <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
                         {{ $total }}
                     </div>

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

@@ -1,22 +0,0 @@
-<x-filament-panels::page>
-    <div class="flex flex-col gap-y-6">
-        <x-filament-tables::container>
-            <div class="p-6 divide-y divide-gray-200 dark:divide-white/5">
-                <form wire:submit.prevent="loadReportData" class="w-full">
-                    <div class="flex flex-col md:flex-row items-start justify-center gap-4 md:gap-12">
-                        <div class="flex-grow">
-                            {{ $this->form }}
-                        </div>
-                        <x-filament::button type="submit" class="mt-4 md:mt-0 flex-shrink-0">
-                            Update Report
-                        </x-filament::button>
-                    </div>
-                </form>
-            </div>
-            <div class="divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10">
-                <x-company.tables.reports.detailed-report :report="$accountBalanceReport" />
-            </div>
-            <div class="es-table__footer-ctn border-t border-gray-200"></div>
-        </x-filament-tables::container>
-    </div>
-</x-filament-panels::page>

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

@@ -0,0 +1,25 @@
+<x-filament-panels::page>
+    <div class="flex flex-col gap-y-6">
+        <x-filament-tables::container>
+            <div class="p-6 divide-y divide-gray-200 dark:divide-white/5">
+                <form wire:submit.prevent="loadReportData">
+                    <div class="flex flex-col lg:flex-row items-start lg:items-center justify-center gap-4 lg:gap-12">
+                        {{ $this->form }}
+                        <x-filament-tables::column-toggle.dropdown
+                            class="my-auto"
+                            :form="$this->toggleTableColumnForm"
+                            :trigger-action="$this->toggleColumnsAction"
+                        />
+                        <x-filament::button type="submit" class="flex-shrink-0">
+                            Update Report
+                        </x-filament::button>
+                    </div>
+                </form>
+            </div>
+            <div class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10">
+                <x-company.tables.reports.detailed-report :report="$this->report" />
+            </div>
+            <div class="es-table__footer-ctn border-t border-gray-200"></div>
+        </x-filament-tables::container>
+    </div>
+</x-filament-panels::page>

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

@@ -1,23 +0,0 @@
-<x-filament-panels::page>
-    <div class="flex flex-col gap-y-6">
-        <x-filament-tables::container>
-            <div class="p-6 divide-y divide-gray-200 dark:divide-white/5">
-                <form wire:submit.prevent="loadReportData" class="w-full">
-                    <div class="flex flex-col md:flex-row items-end justify-center gap-4 md:gap-6">
-                        <div class="flex-grow">
-                            {{ $this->form }}
-                        </div>
-                        <x-filament::button type="submit" class="mt-4 md:mt-0">
-                            Update Report
-                        </x-filament::button>
-                    </div>
-                </form>
-            </div>
-            <div class="divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10">
-                <x-company.tables.reports.detailed-report :report="$trialBalanceReport" />
-            </div>
-            <div class="es-table__footer-ctn border-t border-gray-200"></div>
-        </x-filament-tables::container>
-    </div>
-</x-filament-panels::page>
-