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

Add Account Transactions Report & Change to SnappyPDF

README.md

 
     php artisan migrate:refresh
 
+## Generating PDFs for Reports
+
+To generate PDFs for reports, the application uses Laravel Snappy. The Laravel Snappy package is already included in the application, but you need to install Wkhtmltopdf separately.
+
+### Wkhtmltopdf Installation
+
+1. **Download and install Wkhtmltopdf**
+   - [Wkhtmltopdf Downloads](https://wkhtmltopdf.org/downloads.html)
+   
+   - Alternatively, if you are using Homebrew on macOS, you can install it using the following command:
+     ```bash
+     brew install wkhtmltopdf
+     ```
+
+2. **Configure the binary paths**
+   - If needed, you can change the paths to the Wkhtmltopdf binaries in the Snappy configuration file (`config/snappy.php`).
+
+For detailed installation instructions, refer to the [Laravel Snappy documentation](https://github.com/barryvdh/laravel-snappy).
+
 ## Live Currency
 
 ### Overview

app/Contracts/ExportableReport.php

     public function getOverallTotals(): array;
 
     public function getColumns(): array;
+
+    public function getPdfView(): string;
 }

app/DTO/AccountTransactionDTO.php

+<?php
+
+namespace App\DTO;
+
+class AccountTransactionDTO
+{
+    public function __construct(
+        public string $date,
+        public string $description,
+        public string $debit,
+        public string $credit,
+        public string $balance,
+    ) {}
+}

app/DTO/ReportCategoryDTO.php

 
 class ReportCategoryDTO
 {
-    /**
-     * @param  string[]  $header
-     * @param  string[][]  $data
-     * @param  string[]  $summary
-     */
     public function __construct(
         public array $header,
         public array $data,
-        public array $summary,
+        public array $summary = [],
     ) {}
 }

app/DTO/ReportDTO.php

          * @var AccountCategoryDTO[]
          */
         public array $categories,
-        public AccountBalanceDTO $overallTotal,
-        public array $fields,
+        public ?AccountBalanceDTO $overallTotal = null,
+        public array $fields = [],
     ) {}
 
     public function toLivewire(): array
     {
         return [
             'categories' => $this->categories,
-            'overallTotal' => $this->overallTotal->toLivewire(),
+            'overallTotal' => $this->overallTotal?->toLivewire(),
             'fields' => $this->fields,
         ];
     }
     {
         return new static(
             $value['categories'],
-            AccountBalanceDTO::fromLivewire($value['overallTotal']),
-            $value['fields'],
+            isset($value['overallTotal']) ? AccountBalanceDTO::fromLivewire($value['overallTotal']) : null,
+            $value['fields'] ?? [],
         );
     }
 }

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

 use App\Models\Locale\Country;
 use App\Models\Locale\State;
 use App\Models\Setting\CompanyProfile as CompanyProfileModel;
+use App\Utilities\Localization\Timezone;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Component;
             $data = $this->form->getState();
 
             $this->handleRecordUpdate($this->record, $data);
-
         } catch (Halt $exception) {
             return;
         }
 
+        $countryChanged = $this->record->wasChanged('country');
+        $stateChanged = $this->record->wasChanged('state_id');
+
         $this->getSavedNotification()->send();
+
+        if ($countryChanged || $stateChanged) {
+            if ($countryChanged) {
+                $this->updateTimezone($this->record->country);
+            }
+
+            $this->getTimezoneChangeNotification()->send();
+        }
+    }
+
+    protected function updateTimezone(string $countryCode): void
+    {
+        $model = \App\Models\Setting\Localization::firstOrFail();
+
+        $timezones = Timezone::getTimezonesForCountry($countryCode);
+
+        if (! empty($timezones)) {
+            $model->update([
+                'timezone' => $timezones[0],
+            ]);
+        }
+    }
+
+    protected function getTimezoneChangeNotification(): Notification
+    {
+        return Notification::make()
+            ->warning()
+            ->title('Timezone Update Required')
+            ->body('You have changed your country or state. Please update your timezone to ensure accurate date and time information.')
+            ->actions([
+                \Filament\Notifications\Actions\Action::make('updateTimezone')
+                    ->label('Update Timezone')
+                    ->url(Localization::getUrl()),
+            ])
+            ->persistent()
+            ->send();
     }
 
     protected function getSavedNotification(): Notification
                     ->searchable()
                     ->live()
                     ->options(static fn (Get $get) => State::getStateOptions($get('country')))
+                    ->afterStateUpdated(static fn (Set $set) => $set('city_id', null))
                     ->nullable(),
                 TextInput::make('address')
                     ->localizeLabel('Street Address')

app/Filament/Company/Pages/Reports.php

 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\TrialBalance;
 use App\Infolists\Components\ReportEntry;
 use Filament\Infolists\Components\Section;
                             ->description('A record of all transactions for a company. The general ledger is the core of a company\'s financial records.')
                             ->icon('heroicon-o-adjustments-horizontal')
                             ->iconColor(Color::Amber)
-                            ->url('#'),
+                            ->url(AccountTransactions::getUrl()),
                     ]),
             ]);
     }

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

     {
         return $form
             ->inlineLabel()
-            ->columns([
-                'lg' => 1,
-                '2xl' => 2,
-            ])
+            ->columns()
             ->live()
             ->schema([
                 $this->getDateRangeFormComponent(),

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

+<?php
+
+namespace App\Filament\Company\Pages\Reports;
+
+use App\Contracts\ExportableReport;
+use App\DTO\ReportDTO;
+use App\Models\Accounting\Account;
+use App\Services\ExportService;
+use App\Services\ReportService;
+use App\Support\Column;
+use App\Transformers\AccountTransactionReportTransformer;
+use Filament\Forms\Components\Actions;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Form;
+use Filament\Support\Enums\Alignment;
+use Guava\FilamentClusters\Forms\Cluster;
+use Illuminate\Support\Collection;
+use Livewire\Attributes\Session;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class AccountTransactions extends BaseReportPage
+{
+    protected static string $view = 'filament.company.pages.reports.account-transactions';
+
+    protected static ?string $slug = 'reports/account-transactions';
+
+    protected static bool $shouldRegisterNavigation = false;
+
+    protected ReportService $reportService;
+
+    protected ExportService $exportService;
+
+    #[Session]
+    public ?string $account_id = 'all';
+
+    public function boot(ReportService $reportService, ExportService $exportService): void
+    {
+        $this->reportService = $reportService;
+        $this->exportService = $exportService;
+    }
+
+    /**
+     * @return array<Column>
+     */
+    public function getTable(): array
+    {
+        return [
+            Column::make('date')
+                ->label('Date')
+                ->alignment(Alignment::Left),
+            Column::make('description')
+                ->label('Description')
+                ->alignment(Alignment::Left),
+            Column::make('debit')
+                ->label('Debit')
+                ->alignment(Alignment::Right),
+            Column::make('credit')
+                ->label('Credit')
+                ->alignment(Alignment::Right),
+            Column::make('balance')
+                ->label('Balance')
+                ->alignment(Alignment::Right),
+        ];
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->columns(4)
+            ->live()
+            ->schema([
+                Select::make('account_id')
+                    ->label('Account')
+                    ->options($this->getAccountOptions())
+                    ->selectablePlaceholder(false)
+                    ->searchable(),
+                $this->getDateRangeFormComponent(),
+                Cluster::make([
+                    $this->getStartDateFormComponent(),
+                    $this->getEndDateFormComponent(),
+                ])->label("\u{200B}"), // its too bad hiddenLabel removes spacing of the label
+                Actions::make([
+                    Actions\Action::make('loadReportData')
+                        ->label('Update Report')
+                        ->submit('loadReportData')
+                        ->keyBindings(['mod+s']),
+                ])->alignEnd()->verticallyAlignEnd(),
+            ]);
+    }
+
+    protected function getAccountOptions(): array
+    {
+        $accounts = Account::query()
+            ->get()
+            ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
+            ->map(fn (Collection $accounts, string $category) => $accounts->pluck('name', 'id'))
+            ->toArray();
+
+        $allAccountsOption = [
+            'All Accounts' => ['all' => 'All Accounts'],
+        ];
+
+        return $allAccountsOption + $accounts;
+    }
+
+    protected function buildReport(array $columns): ReportDTO
+    {
+        return $this->reportService->buildAccountTransactionsReport($this->startDate, $this->endDate, $columns, $this->account_id);
+    }
+
+    protected function getTransformer(ReportDTO $reportDTO): ExportableReport
+    {
+        return new AccountTransactionReportTransformer($reportDTO);
+    }
+
+    public function exportCSV(): StreamedResponse
+    {
+        return $this->exportService->exportToCsv($this->company, $this->report, $this->startDate, $this->endDate);
+    }
+
+    public function exportPDF(): StreamedResponse
+    {
+        return $this->exportService->exportToPdf($this->company, $this->report, $this->startDate, $this->endDate);
+    }
+}

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

             ->statePath('toggledTableColumns');
     }
 
+    protected function hasToggleableColumns(): bool
+    {
+        return ! empty($this->getTableColumnToggleFormSchema());
+    }
+
     /**
      * @return array<Checkbox>
      */

app/Listeners/ConfigureChartOfAccounts.php

 
 namespace App\Listeners;
 
-use App\Enums\Accounting\AccountType;
-use App\Enums\Banking\BankAccountType;
 use App\Events\CompanyGenerated;
-use App\Models\Accounting\Account;
-use App\Models\Accounting\AccountSubtype;
-use App\Models\Banking\BankAccount;
-use App\Models\Company;
-use App\Utilities\Currency\CurrencyAccessor;
+use App\Services\ChartOfAccountsService;
 
 class ConfigureChartOfAccounts
 {
     {
         $company = $event->company;
 
-        $this->createChartOfAccounts($company);
-    }
-
-    public function createChartOfAccounts(Company $company): void
-    {
-        $chartOfAccounts = config('chart-of-accounts.default');
-
-        foreach ($chartOfAccounts as $type => $subtypes) {
-            foreach ($subtypes as $subtypeName => $subtypeConfig) {
-                $subtype = AccountSubtype::create([
-                    'company_id' => $company->id,
-                    'multi_currency' => $subtypeConfig['multi_currency'] ?? false,
-                    'category' => AccountType::from($type)->getCategory()->value,
-                    'type' => $type,
-                    'name' => $subtypeName,
-                    'description' => $subtypeConfig['description'] ?? 'No description available.',
-                ]);
-
-                $this->createDefaultAccounts($company, $subtype, $subtypeConfig);
-            }
-        }
-    }
-
-    private function createDefaultAccounts(Company $company, AccountSubtype $subtype, array $subtypeConfig): void
-    {
-        if (isset($subtypeConfig['accounts']) && is_array($subtypeConfig['accounts'])) {
-            $baseCode = $subtypeConfig['base_code'];
-
-            foreach ($subtypeConfig['accounts'] as $accountName => $accountDetails) {
-                $bankAccount = null;
-
-                if ($subtypeConfig['multi_currency'] && isset($subtypeConfig['bank_account_type'])) {
-                    $bankAccount = $this->createBankAccountForMultiCurrency($company, $subtypeConfig['bank_account_type']);
-                }
-
-                $account = Account::create([
-                    'company_id' => $company->id,
-                    'subtype_id' => $subtype->id,
-                    'category' => $subtype->type->getCategory()->value,
-                    'type' => $subtype->type->value,
-                    'code' => $baseCode++,
-                    'name' => $accountName,
-                    'currency_code' => CurrencyAccessor::getDefaultCurrency(),
-                    'description' => $accountDetails['description'] ?? 'No description available.',
-                    'default' => true,
-                    'created_by' => $company->owner->id,
-                    'updated_by' => $company->owner->id,
-                ]);
-
-                if ($bankAccount) {
-                    $account->bankAccount()->associate($bankAccount);
-                }
-
-                $account->save();
-            }
-        }
-    }
-
-    private function createBankAccountForMultiCurrency(Company $company, string $bankAccountType): BankAccount
-    {
-        $bankAccountType = BankAccountType::from($bankAccountType) ?? BankAccountType::Other;
+        $chartOfAccountsService = new ChartOfAccountsService();
 
-        return BankAccount::create([
-            'company_id' => $company->id,
-            'institution_id' => null,
-            'type' => $bankAccountType,
-            'number' => null,
-            'enabled' => BankAccount::where('company_id', $company->id)->where('enabled', true)->doesntExist(),
-            'created_by' => $company->owner->id,
-            'updated_by' => $company->owner->id,
-        ]);
+        $chartOfAccountsService->createChartOfAccounts($company);
     }
 }

app/Services/AccountService.php

         return new Money($balances['net_movement'], $account->currency_code);
     }
 
-    public function getStartingBalance(Account $account, string $startDate): ?Money
+    public function getStartingBalance(Account $account, string $startDate, bool $override = false): ?Money
     {
-        if (in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
+        if ($override === false && in_array($account->category, [AccountCategory::Expense, AccountCategory::Revenue], true)) {
             return null;
         }
 

app/Services/ChartOfAccountsService.php

+<?php
+
+namespace App\Services;
+
+use App\Enums\Accounting\AccountType;
+use App\Enums\Banking\BankAccountType;
+use App\Models\Accounting\Account;
+use App\Models\Accounting\AccountSubtype;
+use App\Models\Banking\BankAccount;
+use App\Models\Company;
+use App\Utilities\Currency\CurrencyAccessor;
+
+class ChartOfAccountsService
+{
+    public function createChartOfAccounts(Company $company): void
+    {
+        $chartOfAccounts = config('chart-of-accounts.default');
+
+        foreach ($chartOfAccounts as $type => $subtypes) {
+            foreach ($subtypes as $subtypeName => $subtypeConfig) {
+                $subtype = AccountSubtype::create([
+                    'company_id' => $company->id,
+                    'multi_currency' => $subtypeConfig['multi_currency'] ?? false,
+                    'category' => AccountType::from($type)->getCategory()->value,
+                    'type' => $type,
+                    'name' => $subtypeName,
+                    'description' => $subtypeConfig['description'] ?? 'No description available.',
+                ]);
+
+                $this->createDefaultAccounts($company, $subtype, $subtypeConfig);
+            }
+        }
+    }
+
+    private function createDefaultAccounts(Company $company, AccountSubtype $subtype, array $subtypeConfig): void
+    {
+        if (isset($subtypeConfig['accounts']) && is_array($subtypeConfig['accounts'])) {
+            $baseCode = $subtypeConfig['base_code'];
+
+            foreach ($subtypeConfig['accounts'] as $accountName => $accountDetails) {
+                $bankAccount = null;
+
+                if ($subtypeConfig['multi_currency'] && isset($subtypeConfig['bank_account_type'])) {
+                    $bankAccount = $this->createBankAccountForMultiCurrency($company, $subtypeConfig['bank_account_type']);
+                }
+
+                $account = Account::create([
+                    'company_id' => $company->id,
+                    'subtype_id' => $subtype->id,
+                    'category' => $subtype->type->getCategory()->value,
+                    'type' => $subtype->type->value,
+                    'code' => $baseCode++,
+                    'name' => $accountName,
+                    'currency_code' => CurrencyAccessor::getDefaultCurrency(),
+                    'description' => $accountDetails['description'] ?? 'No description available.',
+                    'default' => true,
+                    'created_by' => $company->owner->id,
+                    'updated_by' => $company->owner->id,
+                ]);
+
+                if ($bankAccount) {
+                    $account->bankAccount()->associate($bankAccount);
+                }
+
+                $account->save();
+            }
+        }
+    }
+
+    private function createBankAccountForMultiCurrency(Company $company, string $bankAccountType): BankAccount
+    {
+        $bankAccountType = BankAccountType::from($bankAccountType) ?? BankAccountType::Other;
+
+        return BankAccount::create([
+            'company_id' => $company->id,
+            'institution_id' => null,
+            'type' => $bankAccountType,
+            'number' => null,
+            'enabled' => BankAccount::where('company_id', $company->id)->where('enabled', true)->doesntExist(),
+            'created_by' => $company->owner->id,
+            'updated_by' => $company->owner->id,
+        ]);
+    }
+}

app/Services/ExportService.php

 
 use App\Contracts\ExportableReport;
 use App\Models\Company;
-use Barryvdh\DomPDF\Facade\Pdf;
+use Barryvdh\Snappy\Facades\SnappyPdf;
 use Illuminate\Support\Carbon;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class ExportService
 {
-    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate): StreamedResponse
+    public function exportToCsv(Company $company, ExportableReport $report, string $startDate, string $endDate, bool $separateCategoryHeaders = false): StreamedResponse
     {
         $formattedStartDate = Carbon::parse($startDate)->format('Y-m-d');
         $formattedEndDate = Carbon::parse($endDate)->format('Y-m-d');
             fputcsv($file, $report->getHeaders());
 
             foreach ($report->getCategories() as $category) {
-                fputcsv($file, $category->header);
+                if (isset($category->header[0]) && is_array($category->header[0])) {
+                    foreach ($category->header as $headerRow) {
+                        fputcsv($file, $headerRow);
+                    }
+                } else {
+                    fputcsv($file, $category->header);
+                }
 
                 foreach ($category->data as $accountRow) {
                     fputcsv($file, $accountRow);
                 }
 
-                fputcsv($file, $category->summary);
+                if (filled($category->summary)) {
+                    fputcsv($file, $category->summary);
+                }
+
                 fputcsv($file, []); // Empty row for spacing
             }
 
-            fputcsv($file, $report->getOverallTotals());
+            if (filled($report->getOverallTotals())) {
+                fputcsv($file, $report->getOverallTotals());
+            }
 
             fclose($file);
         };
 
         $filename = $company->name . ' ' . $report->getTitle() . ' ' . $formattedStartDate . ' to ' . $formattedEndDate . ' ' . $timestamp . '.pdf';
 
-        $pdf = Pdf::loadView('components.company.reports.report-pdf', [
+        $pdf = SnappyPdf::loadView($report->getPdfView(), [
             'company' => $company,
             'report' => $report,
             'startDate' => Carbon::parse($startDate)->format('M d, Y'),
             'endDate' => Carbon::parse($endDate)->format('M d, Y'),
-        ])->setPaper('letter');
+        ]);
 
         return response()->streamDownload(function () use ($pdf) {
-            echo $pdf->stream();
+            echo $pdf->inline();
         }, $filename);
     }
 }

app/Services/ReportService.php

 use App\DTO\AccountBalanceDTO;
 use App\DTO\AccountCategoryDTO;
 use App\DTO\AccountDTO;
+use App\DTO\AccountTransactionDTO;
 use App\DTO\ReportDTO;
 use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
 use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Relations\Relation;
 
 class ReportService
 {
         }, $balanceFields, $columns);
     }
 
+    public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all'): ReportDTO
+    {
+        $columns ??= [];
+        $query = Account::whereHas('journalEntries.transaction', function (Builder $query) use ($startDate, $endDate) {
+            $query->whereBetween('posted_at', [$startDate, $endDate]);
+        })
+            ->with(['journalEntries' => function (Relation $query) use ($startDate, $endDate) {
+                $query->whereHas('transaction', function (Builder $query) use ($startDate, $endDate) {
+                    $query->whereBetween('posted_at', [$startDate, $endDate]);
+                })
+                    ->with(['transaction' => function (Relation $query) {
+                        $query->select(['id', 'description', 'posted_at']);
+                    }])
+                    ->select(['account_id', 'transaction_id'])
+                    ->selectRaw('SUM(CASE WHEN type = "debit" THEN amount ELSE 0 END) AS total_debit')
+                    ->selectRaw('SUM(CASE WHEN type = "credit" THEN amount ELSE 0 END) AS total_credit')
+                    ->selectRaw('(SELECT MIN(posted_at) FROM transactions WHERE transactions.id = journal_entries.transaction_id) AS earliest_posted_at')
+                    ->groupBy('account_id', 'transaction_id')
+                    ->orderBy('earliest_posted_at');
+            }])
+            ->select(['id', 'name', 'category', 'subtype_id', 'currency_code']);
+
+        if ($accountId !== 'all') {
+            $query->where('id', $accountId);
+        }
+
+        $accounts = $query->get();
+
+        $reportCategories = [];
+
+        $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
+
+        foreach ($accounts as $account) {
+            $accountTransactions = [];
+            $startingBalance = $this->accountService->getStartingBalance($account, $startDate, true);
+
+            $currentBalance = $startingBalance?->getAmount() ?? 0;
+            $totalDebit = 0;
+            $totalCredit = 0;
+
+            $accountTransactions[] = new AccountTransactionDTO(
+                date: 'Starting Balance',
+                description: '',
+                debit: '',
+                credit: '',
+                balance: $startingBalance?->formatInDefaultCurrency() ?? 0,
+            );
+
+            foreach ($account->journalEntries as $journalEntry) {
+                $transaction = $journalEntry->transaction;
+                $totalDebit += $journalEntry->total_debit;
+                $totalCredit += $journalEntry->total_credit;
+
+                $currentBalance += $journalEntry->total_debit;
+                $currentBalance -= $journalEntry->total_credit;
+
+                $accountTransactions[] = new AccountTransactionDTO(
+                    date: $transaction->posted_at->format('Y-m-d'),
+                    description: $transaction->description ?? '',
+                    debit: $journalEntry->total_debit ? money($journalEntry->total_debit, $defaultCurrency)->format() : '',
+                    credit: $journalEntry->total_credit ? money($journalEntry->total_credit, $defaultCurrency)->format() : '',
+                    balance: money($currentBalance, $defaultCurrency)->format(),
+                );
+            }
+
+            $balanceChange = $currentBalance - ($startingBalance?->getAmount() ?? 0);
+
+            $accountTransactions[] = new AccountTransactionDTO(
+                date: 'Totals and Ending Balance',
+                description: '',
+                debit: money($totalDebit, $defaultCurrency)->format(),
+                credit: money($totalCredit, $defaultCurrency)->format(),
+                balance: money($currentBalance, $defaultCurrency)->format(),
+            );
+
+            $accountTransactions[] = new AccountTransactionDTO(
+                date: 'Balance Change',
+                description: '',
+                debit: '',
+                credit: '',
+                balance: money($balanceChange, $defaultCurrency)->format(),
+            );
+
+            $reportCategories[] = [
+                'category' => $account->name,
+                'under' => $account->category->getLabel() . ' > ' . $account->subtype->name,
+                'transactions' => $accountTransactions,
+            ];
+        }
+
+        return new ReportDTO(categories: $reportCategories, fields: $columns);
+    }
+
     private function buildReport(array $allCategories, Collection $categoryGroupedAccounts, callable $balanceCalculator, array $balanceFields, array $allFields, ?callable $initializeCategoryBalances = null): ReportDTO
     {
         $accountCategories = [];

app/Transformers/AccountTransactionReportTransformer.php

+<?php
+
+namespace App\Transformers;
+
+use App\DTO\AccountTransactionDTO;
+use App\DTO\ReportCategoryDTO;
+use App\Support\Column;
+
+class AccountTransactionReportTransformer extends BaseReportTransformer
+{
+    public function getPdfView(): string
+    {
+        return 'components.company.reports.account-transactions-report-pdf';
+    }
+
+    public function getTitle(): string
+    {
+        return 'Account Transactions';
+    }
+
+    public function getHeaders(): array
+    {
+        return array_map(fn (Column $column) => $column->getLabel(), $this->getColumns());
+    }
+
+    /**
+     * @return ReportCategoryDTO[]
+     */
+    public function getCategories(): array
+    {
+        $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()), ''),
+            ];
+
+            foreach ($this->getColumns() as $index => $column) {
+                if ($column->getName() === 'date') {
+                    $header[0][$index] = $categoryData['category'];
+                    $header[1][$index] = $categoryData['under'];
+                }
+            }
+
+            // Map transaction data
+            $data = array_map(function (AccountTransactionDTO $transaction) {
+                $row = [];
+
+                foreach ($this->getColumns() as $column) {
+                    $row[] = match ($column->getName()) {
+                        'date' => $transaction->date,
+                        'description' => $transaction->description,
+                        'debit' => $transaction->debit,
+                        'credit' => $transaction->credit,
+                        'balance' => $transaction->balance,
+                        default => '',
+                    };
+                }
+
+                return $row;
+            }, $categoryData['transactions']);
+
+            $categories[] = new ReportCategoryDTO(
+                header: $header,
+                data: $data,
+            );
+        }
+
+        return $categories;
+    }
+
+    public function getOverallTotals(): array
+    {
+        return [];
+    }
+}

app/Transformers/BaseReportTransformer.php

         return $this->report->fields;
     }
 
+    public function getPdfView(): string
+    {
+        return 'components.company.reports.report-pdf';
+    }
+
     public function getAlignmentClass(int $index): string
     {
         $column = $this->getColumns()[$index];

app/Utilities/Currency/CurrencyAccessor.php

 use Akaunting\Money\Currency as ISOCurrencies;
 use App\Facades\Forex;
 use App\Models\Setting\Currency;
+use Illuminate\Support\Facades\Cache;
 
 class CurrencyAccessor
 {
 
     public static function getDefaultCurrency(): ?string
     {
-        return Currency::query()
-            ->where('enabled', true)
-            ->value('code');
+        $companyId = auth()->user()?->currentCompany?->id;
+        $cacheKey = "default_currency_{$companyId}";
+
+        if ($companyId === null) {
+            return 'USD';
+        }
+
+        return Cache::rememberForever($cacheKey, function () {
+            return Currency::query()
+                ->where('enabled', true)
+                ->value('code');
+        });
     }
 }

app/Utilities/Localization/Timezone.php

             return [];
         }
 
-        $countryTimezones = DateTimeZone::listIdentifiers(DateTimeZone::PER_COUNTRY, strtoupper($countryCode));
+        $countryTimezones = self::getTimezonesForCountry($countryCode);
 
         if (empty($countryTimezones)) {
             return [];
 
         return now($timezone)->translatedFormat($time_format);
     }
+
+    public static function getTimezonesForCountry(string $countryCode): array
+    {
+        return DateTimeZone::listIdentifiers(DateTimeZone::PER_COUNTRY, strtoupper($countryCode));
+    }
 }

app/ValueObjects/Money.php

         return money($this->getEffectiveAmount(), $this->getCurrencyCode())->format();
     }
 
+    public function formatInDefaultCurrency(): string
+    {
+        return money($this->getEffectiveAmount(), CurrencyAccessor::getDefaultCurrency())->format();
+    }
+
     public function formatSimple(): string
     {
         return money($this->getEffectiveAmount(), $this->getCurrencyCode())->formatSimple();

composer.json

         "andrewdwallo/filament-selectify": "^2.0",
         "andrewdwallo/transmatic": "^1.1",
         "awcodes/filament-table-repeater": "^3.0",
-        "barryvdh/laravel-dompdf": "^2.1",
+        "barryvdh/laravel-snappy": "^1.0",
         "bezhansalleh/filament-panel-switch": "^1.0",
         "filament/filament": "^3.2.29",
         "guava/filament-clusters": "^1.1",

config/dompdf.php

-<?php
-
-return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Settings
-    |--------------------------------------------------------------------------
-    |
-    | Set some default values. It is possible to add all defines that can be set
-    | in dompdf_config.inc.php. You can also override the entire config file.
-    |
-    */
-    'show_warnings' => false,   // Throw an Exception on warnings from dompdf
-
-    'public_path' => null,  // Override the public path if needed
-
-    /*
-     * Dejavu Sans font is missing glyphs for converted entities, turn it off if you need to show € and £.
-     */
-    'convert_entities' => true,
-
-    'options' => [
-        /**
-         * The location of the DOMPDF font directory
-         *
-         * The location of the directory where DOMPDF will store fonts and font metrics
-         * Note: This directory must exist and be writable by the webserver process.
-         * *Please note the trailing slash.*
-         *
-         * Notes regarding fonts:
-         * Additional .afm font metrics can be added by executing load_font.php from command line.
-         *
-         * Only the original "Base 14 fonts" are present on all pdf viewers. Additional fonts must
-         * be embedded in the pdf file or the PDF may not display correctly. This can significantly
-         * increase file size unless font subsetting is enabled. Before embedding a font please
-         * review your rights under the font license.
-         *
-         * Any font specification in the source HTML is translated to the closest font available
-         * in the font directory.
-         *
-         * The pdf standard "Base 14 fonts" are:
-         * Courier, Courier-Bold, Courier-BoldOblique, Courier-Oblique,
-         * Helvetica, Helvetica-Bold, Helvetica-BoldOblique, Helvetica-Oblique,
-         * Times-Roman, Times-Bold, Times-BoldItalic, Times-Italic,
-         * Symbol, ZapfDingbats.
-         */
-        'font_dir' => storage_path('fonts'), // advised by dompdf (https://github.com/dompdf/dompdf/pull/782)
-
-        /**
-         * The location of the DOMPDF font cache directory
-         *
-         * This directory contains the cached font metrics for the fonts used by DOMPDF.
-         * This directory can be the same as DOMPDF_FONT_DIR
-         *
-         * Note: This directory must exist and be writable by the webserver process.
-         */
-        'font_cache' => storage_path('fonts'),
-
-        /**
-         * The location of a temporary directory.
-         *
-         * The directory specified must be writeable by the webserver process.
-         * The temporary directory is required to download remote images and when
-         * using the PDFLib back end.
-         */
-        'temp_dir' => sys_get_temp_dir(),
-
-        /**
-         * ==== IMPORTANT ====
-         *
-         * dompdf's "chroot": Prevents dompdf from accessing system files or other
-         * files on the webserver.  All local files opened by dompdf must be in a
-         * subdirectory of this directory.  DO NOT set it to '/' since this could
-         * allow an attacker to use dompdf to read any files on the server.  This
-         * should be an absolute path.
-         * This is only checked on command line call by dompdf.php, but not by
-         * direct class use like:
-         * $dompdf = new DOMPDF();  $dompdf->load_html($htmldata); $dompdf->render(); $pdfdata = $dompdf->output();
-         */
-        'chroot' => realpath(base_path()),
-
-        /**
-         * Protocol whitelist
-         *
-         * Protocols and PHP wrappers allowed in URIs, and the validation rules
-         * that determine if a resource may be loaded. Full support is not guaranteed
-         * for the protocols/wrappers specified
-         * by this array.
-         *
-         * @var array
-         */
-        'allowed_protocols' => [
-            'file://' => ['rules' => []],
-            'http://' => ['rules' => []],
-            'https://' => ['rules' => []],
-        ],
-
-        'log_output_file' => null,
-
-        /**
-         * Whether to enable font subsetting or not.
-         */
-        'enable_font_subsetting' => true,
-
-        /**
-         * The PDF rendering backend to use
-         *
-         * Valid settings are 'PDFLib', 'CPDF' (the bundled R&OS PDF class), 'GD' and
-         * 'auto'. 'auto' will look for PDFLib and use it if found, or if not it will
-         * fall back on CPDF. 'GD' renders PDFs to graphic files. {@link * Canvas_Factory} ultimately determines which rendering class to instantiate
-         * based on this setting.
-         *
-         * Both PDFLib & CPDF rendering backends provide sufficient rendering
-         * capabilities for dompdf, however additional features (e.g. object,
-         * image and font support, etc.) differ between backends.  Please see
-         * {@link PDFLib_Adapter} for more information on the PDFLib backend
-         * and {@link CPDF_Adapter} and lib/class.pdf.php for more information
-         * on CPDF. Also see the documentation for each backend at the links
-         * below.
-         *
-         * The GD rendering backend is a little different than PDFLib and
-         * CPDF. Several features of CPDF and PDFLib are not supported or do
-         * not make any sense when creating image files.  For example,
-         * multiple pages are not supported, nor are PDF 'objects'.  Have a
-         * look at {@link GD_Adapter} for more information.  GD support is
-         * experimental, so use it at your own risk.
-         *
-         * @link http://www.pdflib.com
-         * @link http://www.ros.co.nz/pdf
-         * @link http://www.php.net/image
-         */
-        'pdf_backend' => 'CPDF',
-
-        /**
-         * PDFlib license key
-         *
-         * If you are using a licensed, commercial version of PDFlib, specify
-         * your license key here.  If you are using PDFlib-Lite or are evaluating
-         * the commercial version of PDFlib, comment out this setting.
-         *
-         * @link http://www.pdflib.com
-         *
-         * If pdflib present in web server and auto or selected explicitly above,
-         * a real license code must exist!
-         */
-        //"DOMPDF_PDFLIB_LICENSE" => "your license key here",
-
-        /**
-         * html target media view which should be rendered into pdf.
-         * List of types and parsing rules for future extensions:
-         * http://www.w3.org/TR/REC-html40/types.html
-         *   screen, tty, tv, projection, handheld, print, braille, aural, all
-         * Note: aural is deprecated in CSS 2.1 because it is replaced by speech in CSS 3.
-         * Note, even though the generated pdf file is intended for print output,
-         * the desired content might be different (e.g. screen or projection view of html file).
-         * Therefore allow specification of content here.
-         */
-        'default_media_type' => 'screen',
-
-        /**
-         * The default paper size.
-         *
-         * North America standard is "letter"; other countries generally "a4"
-         *
-         * @see CPDF_Adapter::PAPER_SIZES for valid sizes ('letter', 'legal', 'A4', etc.)
-         */
-        'default_paper_size' => 'a4',
-
-        /**
-         * The default paper orientation.
-         *
-         * The orientation of the page (portrait or landscape).
-         */
-        'default_paper_orientation' => 'portrait',
-
-        /**
-         * The default font family
-         *
-         * Used if no suitable fonts can be found. This must exist in the font folder.
-         */
-        'default_font' => 'sans-serif',
-
-        /**
-         * Image DPI setting
-         *
-         * This setting determines the default DPI setting for images and fonts.  The
-         * DPI may be overridden for inline images by explicitly setting the
-         * image's width & height style attributes (i.e. if the image's native
-         * width is 600 pixels and you specify the image's width as 72 points,
-         * the image will have a DPI of 600 in the rendered PDF.  The DPI of
-         * background images can not be overridden and is controlled entirely
-         * via this parameter.
-         *
-         * For the purposes of DOMPDF, pixels per inch (PPI) = dots per inch (DPI).
-         * If a size in html is given as px (or without unit as image size),
-         * this tells the corresponding size in pt.
-         * This adjusts the relative sizes to be similar to the rendering of the
-         * html page in a reference browser.
-         *
-         * In pdf, always 1 pt = 1/72 inch
-         *
-         * Rendering resolution of various browsers in px per inch:
-         * Windows Firefox and Internet Explorer:
-         *   SystemControl->Display properties->FontResolution: Default:96, largefonts:120, custom:?
-         * Linux Firefox:
-         *   about:config *resolution: Default:96
-         *   (xorg screen dimension in mm and Desktop font dpi settings are ignored)
-         *
-         * Take care about extra font/image zoom factor of browser.
-         *
-         * In images, <img> size in pixel attribute, img css style, are overriding
-         * the real image dimension in px for rendering.
-         */
-        'dpi' => 96,
-
-        /**
-         * Enable inline PHP
-         *
-         * If this setting is set to true then DOMPDF will automatically evaluate
-         * inline PHP contained within <script type="text/php"> ... </script> tags.
-         *
-         * Enabling this for documents you do not trust (e.g. arbitrary remote html
-         * pages) is a security risk.  Set this option to false if you wish to process
-         * untrusted documents.
-         */
-        'enable_php' => true,
-
-        /**
-         * Enable inline Javascript
-         *
-         * If this setting is set to true then DOMPDF will automatically insert
-         * JavaScript code contained within <script type="text/javascript"> ... </script> tags.
-         */
-        'enable_javascript' => true,
-
-        /**
-         * Enable remote file access
-         *
-         * If this setting is set to true, DOMPDF will access remote sites for
-         * images and CSS files as required.
-         * This is required for part of test case www/test/image_variants.html through www/examples.php
-         *
-         * Attention!
-         * This can be a security risk, in particular in combination with DOMPDF_ENABLE_PHP and
-         * allowing remote access to dompdf.php or on allowing remote html code to be passed to
-         * $dompdf = new DOMPDF(, $dompdf->load_html(...,
-         * This allows anonymous users to download legally doubtful internet content which on
-         * tracing back appears to being downloaded by your server, or allows malicious php code
-         * in remote html pages to be executed by your server with your account privileges.
-         */
-        'enable_remote' => true,
-
-        /**
-         * A ratio applied to the fonts height to be more like browsers' line height
-         */
-        'font_height_ratio' => 1.1,
-
-        /**
-         * Use the HTML5 Lib parser
-         *
-         * @deprecated This feature is now always on in dompdf 2.x
-         */
-        'enable_html5_parser' => true,
-    ],
-
-];

config/snappy.php

+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Snappy PDF / Image Configuration
+    |--------------------------------------------------------------------------
+    |
+    | This option contains settings for PDF generation.
+    |
+    | Enabled:
+    |
+    |    Whether to load PDF / Image generation.
+    |
+    | Binary:
+    |
+    |    The file path of the wkhtmltopdf / wkhtmltoimage executable.
+    |
+    | Timeout:
+    |
+    |    The amount of time to wait (in seconds) before PDF / Image generation is stopped.
+    |    Setting this to false disables the timeout (unlimited processing time).
+    |
+    | Options:
+    |
+    |    The wkhtmltopdf command options. These are passed directly to wkhtmltopdf.
+    |    See https://wkhtmltopdf.org/usage/wkhtmltopdf.txt for all options.
+    |
+    | Env:
+    |
+    |    The environment variables to set while running the wkhtmltopdf process.
+    |
+    */
+
+    'pdf' => [
+        'enabled' => true,
+        'binary' => env('WKHTMLTOPDF_BINARY', '/usr/local/bin/wkhtmltopdf'),
+        'timeout' => false,
+        'options' => [
+            'no-pdf-compression' => true,
+            'disable-javascript' => true,
+            'margin-top' => '10mm',
+            'margin-right' => '7.5mm',
+            'margin-bottom' => '15mm',
+            'margin-left' => '7.5mm',
+            'page-size' => 'Letter',
+            'footer-right' => 'Page [page] / [toPage]',
+            'footer-font-size' => '8',
+            'footer-spacing' => '5',
+        ],
+        'env' => [],
+    ],
+
+    'image' => [
+        'enabled' => true,
+        'binary' => env('WKHTMLTOIMAGE_BINARY', '/usr/local/bin/wkhtmltoimage'),
+        'timeout' => false,
+        'options' => [],
+        'env' => [],
+    ],
+
+];

database/factories/Accounting/TransactionFactory.php

 
 namespace Database\Factories\Accounting;
 
+use App\Models\Accounting\Account;
 use App\Models\Accounting\Transaction;
+use App\Models\Banking\BankAccount;
+use App\Models\Company;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
  */
 class TransactionFactory extends Factory
 {
+    /**
+     * The name of the factory's corresponding model.
+     */
+    protected $model = Transaction::class;
+
     /**
      * Define the model's default state.
      *
     {
         return [
             'company_id' => 1,
-            'account_id' => $this->faker->numberBetween(1, 30),
             'bank_account_id' => 1,
+            'account_id' => $this->faker->numberBetween(2, 30),
             'type' => $this->faker->randomElement(['deposit', 'withdrawal', 'journal']),
             'payment_channel' => $this->faker->randomElement(['online', 'in store', 'other']),
             'description' => $this->faker->sentence,
             ]);
         });
     }
+
+    public function forCompanyAndBankAccount(Company $company, BankAccount $bankAccount): static
+    {
+        return $this->state(function (array $attributes) use ($bankAccount, $company) {
+            $type = $this->faker->randomElement(['deposit', 'withdrawal', 'journal']);
+
+            $associatedAccountTypes = match ($type) {
+                'deposit' => ['asset', 'liability', 'equity', 'revenue'],
+                'withdrawal' => ['asset', 'liability', 'equity', 'expense'],
+                default => ['asset', 'liability', 'equity', 'revenue', 'expense'],
+            };
+
+            $accountIdForBankAccount = $bankAccount->account->id;
+
+            $account = Account::where('category', $this->faker->randomElement($associatedAccountTypes))
+                ->where('company_id', $company->id)
+                ->where('id', '<>', $accountIdForBankAccount)
+                ->inRandomOrder()
+                ->firstOrFail();
+
+            return [
+                'company_id' => $company->id,
+                'bank_account_id' => $bankAccount->id,
+                'account_id' => $account->id,
+                'type' => $type,
+            ];
+        });
+    }
 }

database/factories/UserFactory.php

 
 namespace Database\Factories;
 
-use App\Events\CompanyGenerated;
 use App\Models\Company;
 use App\Models\Setting\CompanyProfile;
 use App\Models\User;
+use App\Services\ChartOfAccountsService;
+use App\Services\CompanyDefaultService;
 use Database\Factories\Accounting\TransactionFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Str;
 use Wallo\FilamentCompanies\FilamentCompanies;
             Company::factory()
                 ->has(CompanyProfile::factory()->withCountry($countryCode), 'profile')
                 ->afterCreating(function (Company $company) use ($user, $countryCode) {
-                    CompanyGenerated::dispatch($user, $company, $countryCode);
+                    DB::transaction(function () use ($company, $user, $countryCode) {
+                        $companyDefaultService = app()->make(CompanyDefaultService::class);
+                        $companyDefaultService->createCompanyDefaults($company, $user, 'USD', $countryCode, 'en');
 
-                    $defaultBankAccount = $company->bankAccounts()->where('enabled', true)->first();
-                    $defaultCurrency = $company->currencies()->where('enabled', true)->first();
-                    $defaultSalesTax = $company->taxes()->where('type', 'sales')->where('enabled', true)->first();
-                    $defaultPurchaseTax = $company->taxes()->where('type', 'purchase')->where('enabled', true)->first();
-                    $defaultSalesDiscount = $company->discounts()->where('type', 'sales')->where('enabled', true)->first();
-                    $defaultPurchaseDiscount = $company->discounts()->where('type', 'purchase')->where('enabled', true)->first();
+                        $chartOfAccountsService = app()->make(ChartOfAccountsService::class);
+                        $chartOfAccountsService->createChartOfAccounts($company);
 
-                    $company->default()->create([
-                        'bank_account_id' => $defaultBankAccount?->id,
-                        'currency_code' => $defaultCurrency?->code,
-                        'sales_tax_id' => $defaultSalesTax?->id,
-                        'purchase_tax_id' => $defaultPurchaseTax?->id,
-                        'sales_discount_id' => $defaultSalesDiscount?->id,
-                        'purchase_discount_id' => $defaultPurchaseDiscount?->id,
-                        'created_by' => $user->id,
-                        'updated_by' => $user->id,
-                    ]);
+                        $defaultBankAccount = $company->bankAccounts()->where('enabled', true)->first();
+                        $defaultCurrency = $company->currencies()->where('enabled', true)->first();
+                        $defaultSalesTax = $company->taxes()->where('type', 'sales')->where('enabled', true)->first();
+                        $defaultPurchaseTax = $company->taxes()->where('type', 'purchase')->where('enabled', true)->first();
+                        $defaultSalesDiscount = $company->discounts()->where('type', 'sales')->where('enabled', true)->first();
+                        $defaultPurchaseDiscount = $company->discounts()->where('type', 'purchase')->where('enabled', true)->first();
 
-                    TransactionFactory::new()
-                        ->count(2000)
-                        ->createQuietly([
-                            'company_id' => $company->id,
+                        $company->default()->create([
                             'bank_account_id' => $defaultBankAccount?->id,
+                            'currency_code' => $defaultCurrency?->code,
+                            'sales_tax_id' => $defaultSalesTax?->id,
+                            'purchase_tax_id' => $defaultPurchaseTax?->id,
+                            'sales_discount_id' => $defaultSalesDiscount?->id,
+                            'purchase_discount_id' => $defaultPurchaseDiscount?->id,
                             'created_by' => $user->id,
                             'updated_by' => $user->id,
                         ]);
+
+                        TransactionFactory::new()
+                            ->forCompanyAndBankAccount($company, $defaultBankAccount)
+                            ->count(2000)
+                            ->createQuietly([
+                                'created_by' => $user->id,
+                                'updated_by' => $user->id,
+                            ]);
+                    });
                 })
                 ->create([
                     'name' => $user->name . '\'s Company',

package-lock.json

             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001636",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001636.tgz",
-            "integrity": "sha512-bMg2vmr8XBsbL6Lr0UHXy/21m84FTxDLWn2FSqMd5PrlbMxwJlQnC2YWYxVgp66PZE+BBNF2jYQUBKCo1FDeZg==",
+            "version": "1.0.30001640",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001640.tgz",
+            "integrity": "sha512-lA4VMpW0PSUrFnkmVuEKBUovSWKhj7puyCg8StBChgu298N1AtuF1sKWEvfDuimSEDbhlb/KqPKC3fs1HbuQUA==",
             "dev": true,
             "funding": [
                 {
             "dev": true
         },
         "node_modules/electron-to-chromium": {
-            "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==",
+            "version": "1.4.817",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.817.tgz",
+            "integrity": "sha512-3znu+lZMIbTe8ZOs360OMJvVroVF2NpNI8T5jfLnDetVvj0uNmIucZzQVYMSJfsu9f47Ssox1Gt46PR+R+1JUg==",
             "dev": true
         },
         "node_modules/emoji-regex": {
             "dev": true
         },
         "node_modules/lru-cache": {
-            "version": "10.2.2",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-            "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+            "version": "10.3.0",
+            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.3.0.tgz",
+            "integrity": "sha512-CQl19J/g+Hbjbv4Y3mFNNXFEL/5t/KCg8POCuUqd4rMKjGG+j1ybER83hxV58zL+dFI1PTkt3GNFSHRt+d8qEQ==",
             "dev": true,
             "engines": {
                 "node": "14 || >=16.14"
             }
         },
         "node_modules/minimatch": {
-            "version": "9.0.4",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-            "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
             "dev": true,
             "dependencies": {
                 "brace-expansion": "^2.0.1"
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.38",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-            "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+            "version": "8.4.39",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz",
+            "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==",
             "dev": true,
             "funding": [
                 {
             ],
             "dependencies": {
                 "nanoid": "^3.3.7",
-                "picocolors": "^1.0.0",
+                "picocolors": "^1.0.1",
                 "source-map-js": "^1.2.0"
             },
             "engines": {
             "dev": true
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.0.16",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz",
-            "integrity": "sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
+            "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
             "dev": true,
             "funding": [
                 {
             "dev": true
         },
         "node_modules/vite": {
-            "version": "5.3.1",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.1.tgz",
-            "integrity": "sha512-XBmSKRLXLxiaPYamLv3/hnP/KXDai1NDexN0FpkTaZXTfycHvkRHoenpgl/fvuK/kPbB6xAgoyiryAhQNxYmAQ==",
+            "version": "5.3.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz",
+            "integrity": "sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==",
             "dev": true,
             "dependencies": {
                 "esbuild": "^0.21.3",
-                "postcss": "^8.4.38",
+                "postcss": "^8.4.39",
                 "rollup": "^4.13.0"
             },
             "bin": {

resources/css/filament/company/theme.css

 }
 
 .choices[data-type="select-one"] .choices__inner {
-    height: 2.25rem;
+    line-height: 1.5;
+    display: flex;
+    align-items: center;
+    min-height: 2.25rem;
+    box-sizing: border-box;
+}
+
+.choices__item {
+    cursor: pointer;
 }
 
 .table-repeater-container {
 
 .fi-body::before {
     content: '';
-    position: absolute;
+    position: fixed;
     top: 0;
     left: 0;
     width: 100%;
 
 :is(.dark .fi-body)::before {
     content: '';
-    position: absolute;
+    position: fixed;
     top: 0;
     right: 0;
     background-image: radial-gradient(

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

+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>{{ $report->getTitle() }}</title>
+    <style>
+        .header {
+            color: #374151;
+            margin-bottom: 1rem;
+        }
+
+        .header > * + * {
+            margin-top: 0.5rem;
+        }
+
+        .table-head {
+            display: table-row-group;
+        }
+
+        .text-left {
+            text-align: left;
+        }
+
+        .text-right {
+            text-align: right;
+        }
+
+        .text-center {
+            text-align: center;
+        }
+
+        .table-class th,
+        .table-class td {
+            color: #374151;
+        }
+
+        .title {
+            font-size: 1.5rem;
+        }
+
+        .company-name {
+            font-size: 1.125rem;
+            font-weight: 600;
+        }
+
+        .date-range {
+            font-size: 0.875rem;
+        }
+
+        .table-class {
+            width: 100%;
+            border-collapse: collapse;
+        }
+
+        .table-class th,
+        .table-class td {
+            padding: 0.75rem;
+            font-size: 0.75rem;
+            line-height: 1rem;
+            border-bottom: 1px solid #d1d5db; /* Gray border for all rows */
+        }
+
+        .whitespace-normal {
+            white-space: normal;
+        }
+
+        .whitespace-nowrap {
+            white-space: nowrap;
+        }
+
+        .category-header-row > td {
+            background-color: #f3f4f6; /* Gray background for category names */
+            font-weight: 600;
+        }
+
+        .table-body tr {
+            background-color: #ffffff; /* White background for other rows */
+        }
+
+        .spacer-row > td {
+            height: 0.75rem;
+        }
+
+        .category-summary-row > td,
+        .table-footer-row > td {
+            font-weight: 600;
+            background-color: #ffffff; /* White background for footer */
+        }
+    </style>
+</head>
+<body>
+<div class="header">
+    <div class="title">{{ $report->getTitle() }}</div>
+    <div class="company-name">{{ $company->name }}</div>
+    <div class="date-range">Date Range: {{ $startDate }} to {{ $endDate }}</div>
+</div>
+<table class="table-class">
+    <thead class="table-head">
+    <tr>
+        @foreach($report->getHeaders() as $index => $header)
+            <th class="{{ $report->getAlignmentClass($index) }}">
+                {{ $header }}
+            </th>
+        @endforeach
+    </tr>
+    </thead>
+    @foreach($report->getCategories() as $category)
+        <tbody>
+        <tr class="category-header-row">
+            <td colspan="{{ count($report->getHeaders()) }}">
+                <div>
+                    @foreach($category->header as $headerRow)
+                        <div>
+                            @foreach($headerRow as $headerValue)
+                                @if (!empty($headerValue))
+                                    {{ $headerValue }}
+                                @endif
+                            @endforeach
+                        </div>
+                    @endforeach
+                </div>
+            </td>
+        </tr>
+        @foreach($category->data as $dataIndex => $transaction)
+            <tr
+                @class([
+                    'category-header-row' => $loop->first || $loop->last || $loop->remaining === 1,
+                ])>
+                @foreach($transaction as $cellIndex => $cell)
+                    <td class="{{ $report->getAlignmentClass($cellIndex) }} {{ $cellIndex === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                        {{ $cell }}
+                    </td>
+                @endforeach
+            </tr>
+        @endforeach
+        @unless($loop->last)
+            <tr class="spacer-row">
+                <td colspan="{{ count($report->getHeaders()) }}"></td>
+            </tr>
+        @endunless
+        </tbody>
+    @endforeach
+</table>
+</body>
+</html>

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

     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ $report->getTitle() }}</title>
     <style>
-        @page {
-            size: auto;
-            margin: 10mm 7.5mm;
-        }
-
         .header {
             color: #374151;
             margin-bottom: 1rem;

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

+<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>
+    @foreach($report->getCategories() as $categoryIndex => $category)
+        <tbody wire:key="category-{{ $categoryIndex }}" 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">
+                        @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' }}">
+                                @foreach ($headerRow as $headerValue)
+                                    @if (!empty($headerValue))
+                                        {{ $headerValue }}
+                                    @endif
+                                @endforeach
+                            </div>
+                        @endforeach
+                    </div>
+                </x-filament-tables::cell>
+            </tr>
+            <!-- Transactions Data -->
+            @foreach($category->data as $dataIndex => $transaction)
+                <tr wire:key="category-{{ $categoryIndex }}-data-{{ $dataIndex }}"
+                    @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,
+                            ])
+                        >
+                            <div
+                                @class([
+                                    'px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white',
+                                    'font-semibold' => $loop->parent->first || $loop->parent->last || $loop->parent->remaining === 1,
+                                ])
+                            >
+                                {{ $cell }}
+                            </div>
+                        </x-filament-tables::cell>
+                    @endforeach
+                </tr>
+            @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>
+            @endunless
+        </tbody>
+    @endforeach
+</table>

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

+<x-filament-panels::page>
+    <x-filament-tables::container>
+        <form wire:submit="loadReportData" class="p-6">
+            {{ $this->form }}
+        </form>
+        <div class="divide-y divide-gray-200 overflow-x-auto overflow-y-hidden dark:divide-white/10 dark:border-t-white/10">
+            <div wire:init="loadReportData" class="flex items-center justify-center">
+                <div wire:loading.delay wire:target="loadReportData">
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
+                </div>
+            </div>
+
+            <div wire:loading.remove wire:target="loadReportData">
+                @if($this->report)
+                    <x-company.tables.reports.account-transactions :report="$this->report" />
+                @endif
+            </div>
+        </div>
+        <div class="es-table__footer-ctn border-t border-gray-200"></div>
+    </x-filament-tables::container>
+</x-filament-panels::page>

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

 <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::container>
+        <div class="p-6 divide-y divide-gray-200 dark:divide-white/5">
+            <form wire:submit="loadReportData">
+                <div class="flex flex-col md:flex-row items-start md:items-center justify-center gap-4 md:gap-12">
+                    {{ $this->form }}
+                    @if($this->hasToggleableColumns())
                         <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="divide-y divide-gray-200 overflow-x-auto overflow-y-hidden dark:divide-white/10 dark:border-t-white/10">
-                <div wire:init="loadReportData" class="flex items-center justify-center">
-                    <div wire:loading.delay wire:target="loadReportData">
-                        <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
-                    </div>
-                </div>
-
-                <div wire:loading.remove wire:target="loadReportData">
-                    @if($this->report)
-                        <x-company.tables.reports.detailed-report :report="$this->report" />
                     @endif
+                    <x-filament::button type="submit" wire:target="loadReportData" class="flex-shrink-0">
+                        Update Report
+                    </x-filament::button>
                 </div>
+            </form>
+        </div>
+        <div class="divide-y divide-gray-200 overflow-x-auto overflow-y-hidden dark:divide-white/10 dark:border-t-white/10">
+            <div wire:init="loadReportData" class="flex items-center justify-center">
+                <div wire:loading.delay wire:target="loadReportData">
+                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
+                </div>
+            </div>
+
+            <div wire:loading.remove wire:target="loadReportData">
+                @if($this->report)
+                    <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>
-    </div>
+        </div>
+        <div class="es-table__footer-ctn border-t border-gray-200"></div>
+    </x-filament-tables::container>
 </x-filament-panels::page>

resources/views/vendor/filament-clusters/cluster.blade.php

+<x-dynamic-component
+    :component="$getFieldWrapperView()"
+    :field="$field"
+>
+    <x-filament::input.wrapper
+        @class([
+            "guava-fi-cl-cluster",
+            ...$field->getResponsiveClasses(),
+        ])
+    >
+        {{ $getChildComponentContainer() }}
+    </x-filament::input.wrapper>
+
+
+    @foreach($field->getChildComponents() as $child)
+        @if ($childStatePath = $child->getStatePath())
+            @if($errors->has($childStatePath) )
+                <x-filament-forms::field-wrapper.error-message>
+                    {{ $errors->first($childStatePath) }}
+                </x-filament-forms::field-wrapper.error-message>
+            @endif
+        @endif
+    @endforeach
+</x-dynamic-component>

resources/views/vendor/filament-clusters/components/field-wrapper.blade.php

+<div>
+    {{ $slot }}
+</div>