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

Development 3.x

app/DTO/AccountBalanceDTO.php

@@ -2,9 +2,7 @@
 
 namespace App\DTO;
 
-use Livewire\Wireable;
-
-class AccountBalanceDTO implements Wireable
+class AccountBalanceDTO
 {
     public function __construct(
         public ?string $startingBalance,
@@ -13,26 +11,4 @@ class AccountBalanceDTO implements Wireable
         public ?string $netMovement,
         public ?string $endingBalance,
     ) {}
-
-    public function toLivewire(): array
-    {
-        return [
-            'startingBalance' => $this->startingBalance,
-            'debitBalance' => $this->debitBalance,
-            'creditBalance' => $this->creditBalance,
-            'netMovement' => $this->netMovement,
-            'endingBalance' => $this->endingBalance,
-        ];
-    }
-
-    public static function fromLivewire($value): static
-    {
-        return new static(
-            $value['startingBalance'],
-            $value['debitBalance'],
-            $value['creditBalance'],
-            $value['netMovement'],
-            $value['endingBalance'],
-        );
-    }
 }

app/DTO/AccountCategoryDTO.php

@@ -2,9 +2,7 @@
 
 namespace App\DTO;
 
-use Livewire\Wireable;
-
-class AccountCategoryDTO implements Wireable
+class AccountCategoryDTO
 {
     /**
      * @param  AccountDTO[]  $accounts
@@ -13,20 +11,4 @@ class AccountCategoryDTO implements Wireable
         public array $accounts,
         public AccountBalanceDTO $summary,
     ) {}
-
-    public function toLivewire(): array
-    {
-        return [
-            'accounts' => $this->accounts,
-            'summary' => $this->summary->toLivewire(),
-        ];
-    }
-
-    public static function fromLivewire($value): static
-    {
-        return new static(
-            $value['accounts'],
-            AccountBalanceDTO::fromLivewire($value['summary']),
-        );
-    }
 }

app/DTO/AccountDTO.php

@@ -2,31 +2,12 @@
 
 namespace App\DTO;
 
-use Livewire\Wireable;
-
-class AccountDTO implements Wireable
+class AccountDTO
 {
     public function __construct(
         public string $accountName,
         public string $accountCode,
+        public ?int $accountId,
         public AccountBalanceDTO $balance,
     ) {}
-
-    public function toLivewire(): array
-    {
-        return [
-            'accountName' => $this->accountName,
-            'accountCode' => $this->accountCode,
-            'balance' => $this->balance->toLivewire(),
-        ];
-    }
-
-    public static function fromLivewire($value): static
-    {
-        return new static(
-            $value['accountName'],
-            $value['accountCode'],
-            AccountBalanceDTO::fromLivewire($value['balance']),
-        );
-    }
 }

app/DTO/AccountTransactionDTO.php

@@ -2,13 +2,18 @@
 
 namespace App\DTO;
 
+use App\Enums\Accounting\TransactionType;
+
 class AccountTransactionDTO
 {
     public function __construct(
+        public ?int $id,
         public string $date,
         public string $description,
         public string $debit,
         public string $credit,
         public string $balance,
+        public ?TransactionType $type,
+        public ?string $tableAction,
     ) {}
 }

app/DTO/ReportDTO.php

@@ -2,9 +2,7 @@
 
 namespace App\DTO;
 
-use Livewire\Wireable;
-
-class ReportDTO implements Wireable
+class ReportDTO
 {
     public function __construct(
         /**
@@ -14,22 +12,4 @@ class ReportDTO implements Wireable
         public ?AccountBalanceDTO $overallTotal = null,
         public array $fields = [],
     ) {}
-
-    public function toLivewire(): array
-    {
-        return [
-            'categories' => $this->categories,
-            'overallTotal' => $this->overallTotal?->toLivewire(),
-            'fields' => $this->fields,
-        ];
-    }
-
-    public static function fromLivewire($value): static
-    {
-        return new static(
-            $value['categories'],
-            isset($value['overallTotal']) ? AccountBalanceDTO::fromLivewire($value['overallTotal']) : null,
-            $value['fields'] ?? [],
-        );
-    }
 }

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

@@ -39,6 +39,6 @@ class CreateCurrency extends CreateRecord
             throw new Halt('No authenticated user found');
         }
 
-        return $this->handleRecordCreationWithUniqueField($data, new Currency(), $user);
+        return $this->handleRecordCreationWithUniqueField($data, new Currency, $user);
     }
 }

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/CreateDiscount.php

@@ -41,6 +41,6 @@ class CreateDiscount extends CreateRecord
 
         $evaluatedTypes = [DiscountType::Sales, DiscountType::Purchase];
 
-        return $this->handleRecordCreationWithUniqueField($data, new Discount(), $user, 'type', $evaluatedTypes);
+        return $this->handleRecordCreationWithUniqueField($data, new Discount, $user, 'type', $evaluatedTypes);
     }
 }

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/CreateTax.php

@@ -41,6 +41,6 @@ class CreateTax extends CreateRecord
 
         $evaluatedTypes = [TaxType::Sales, TaxType::Purchase];
 
-        return $this->handleRecordCreationWithUniqueField($data, new Tax(), $user, 'type', $evaluatedTypes);
+        return $this->handleRecordCreationWithUniqueField($data, new Tax, $user, 'type', $evaluatedTypes);
     }
 }

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

@@ -18,6 +18,7 @@ use Filament\Tables\Actions\Action;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\Collection;
+use Livewire\Attributes\Url;
 use Symfony\Component\HttpFoundation\StreamedResponse;
 
 class AccountTransactions extends BaseReportPage
@@ -32,6 +33,7 @@ class AccountTransactions extends BaseReportPage
 
     protected ExportService $exportService;
 
+    #[Url]
     public ?string $account_id = 'all';
 
     public function boot(ReportService $reportService, ExportService $exportService): void

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

@@ -43,11 +43,9 @@ class TrialBalance extends BaseReportPage
                 ->alignment(Alignment::Left),
             Column::make('debit_balance')
                 ->label('Debit')
-                ->toggleable()
                 ->alignment(Alignment::Right),
             Column::make('credit_balance')
                 ->label('Credit')
-                ->toggleable()
                 ->alignment(Alignment::Right),
         ];
     }

app/Services/AccountService.php

@@ -5,11 +5,12 @@ namespace App\Services;
 use App\Contracts\AccountHandler;
 use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
+use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
-use App\Models\Banking\BankAccount;
 use App\Repositories\Accounting\JournalEntryRepository;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\ValueObjects\Money;
+use Illuminate\Support\Facades\DB;
 
 class AccountService implements AccountHandler
 {
@@ -65,6 +66,31 @@ class AccountService implements AccountHandler
         return new Money($endingBalance, $account->currency_code);
     }
 
+    public function getRetainedEarnings(string $startDate): Money
+    {
+        $revenue = JournalEntry::whereHas('account', static function ($query) {
+            $query->where('category', AccountCategory::Revenue);
+        })
+            ->where('type', 'credit')
+            ->whereHas('transaction', static function ($query) use ($startDate) {
+                $query->where('posted_at', '<=', $startDate);
+            })
+            ->sum('amount');
+
+        $expense = JournalEntry::whereHas('account', static function ($query) {
+            $query->where('category', AccountCategory::Expense);
+        })
+            ->where('type', 'debit')
+            ->whereHas('transaction', static function ($query) use ($startDate) {
+                $query->where('posted_at', '<=', $startDate);
+            })
+            ->sum('amount');
+
+        $retainedEarnings = $revenue - $expense;
+
+        return new Money($retainedEarnings, CurrencyAccessor::getDefaultCurrency());
+    }
+
     private function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int
     {
         return match ($category) {
@@ -125,20 +151,41 @@ class AccountService implements AccountHandler
 
     public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money
     {
-        $bankAccounts = BankAccount::with('account')
-            ->get();
+        $accountIds = Account::whereHas('bankAccount')
+            ->pluck('id')
+            ->toArray();
 
-        $totalBalance = 0;
-
-        foreach ($bankAccounts as $bankAccount) {
-            $account = $bankAccount->account;
-
-            if ($account) {
-                $endingBalance = $this->getEndingBalance($account, $startDate, $endDate)?->getAmount() ?? 0;
-                $totalBalance += $endingBalance;
-            }
+        if (empty($accountIds)) {
+            return new Money(0, CurrencyAccessor::getDefaultCurrency());
         }
 
+        $result = DB::table('journal_entries')
+            ->join('transactions', 'journal_entries.transaction_id', '=', 'transactions.id')
+            ->whereIn('journal_entries.account_id', $accountIds)
+            ->where('transactions.posted_at', '<=', $endDate)
+            ->selectRaw('
+            SUM(CASE
+                WHEN transactions.posted_at <= ? AND journal_entries.type = "debit" THEN journal_entries.amount
+                WHEN transactions.posted_at <= ? AND journal_entries.type = "credit" THEN -journal_entries.amount
+                ELSE 0
+            END) AS totalStartingBalance,
+            SUM(CASE
+                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "debit" THEN journal_entries.amount
+                WHEN transactions.posted_at BETWEEN ? AND ? AND journal_entries.type = "credit" THEN -journal_entries.amount
+                ELSE 0
+            END) AS totalNetMovement
+        ', [
+                $startDate,
+                $startDate,
+                $startDate,
+                $endDate,
+                $startDate,
+                $endDate,
+            ])
+            ->first();
+
+        $totalBalance = $result->totalStartingBalance + $result->totalNetMovement;
+
         return new Money($totalBalance, CurrencyAccessor::getDefaultCurrency());
     }
 

app/Services/ReportService.php

@@ -12,8 +12,8 @@ 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;
+use Illuminate\Support\Collection;
 
 class ReportService
 {
@@ -46,7 +46,7 @@ class ReportService
     private function getCategoryGroupedAccounts(array $allCategories): Collection
     {
         return Account::whereHas('journalEntries')
-            ->select('id', 'name', 'currency_code', 'category', 'code')
+            ->select(['id', 'name', 'currency_code', 'category', 'code'])
             ->get()
             ->groupBy(fn (Account $account) => $account->category->getPluralLabel())
             ->sortBy(static fn (Collection $groupedAccounts, string $key) => array_search($key, $allCategories, true));
@@ -74,25 +74,6 @@ class ReportService
         );
     }
 
-    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);
-    }
-
     public function buildAccountTransactionsReport(string $startDate, string $endDate, ?array $columns = null, ?string $accountId = 'all'): ReportDTO
     {
         $columns ??= [];
@@ -103,9 +84,7 @@ class ReportService
                 $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']);
-                    }])
+                    ->with('transaction:id,type,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')
@@ -134,11 +113,14 @@ class ReportService
             $totalCredit = 0;
 
             $accountTransactions[] = new AccountTransactionDTO(
+                id: null,
                 date: 'Starting Balance',
                 description: '',
                 debit: '',
                 credit: '',
                 balance: $startingBalance?->formatInDefaultCurrency() ?? 0,
+                type: null,
+                tableAction: null,
             );
 
             foreach ($account->journalEntries as $journalEntry) {
@@ -150,30 +132,39 @@ class ReportService
                 $currentBalance -= $journalEntry->total_credit;
 
                 $accountTransactions[] = new AccountTransactionDTO(
+                    id: $transaction->id,
                     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(),
+                    type: $transaction->type,
+                    tableAction: $transaction->type->isJournal() ? 'updateJournalTransaction' : 'updateTransaction',
                 );
             }
 
             $balanceChange = $currentBalance - ($startingBalance?->getAmount() ?? 0);
 
             $accountTransactions[] = new AccountTransactionDTO(
+                id: null,
                 date: 'Totals and Ending Balance',
                 description: '',
                 debit: money($totalDebit, $defaultCurrency)->format(),
                 credit: money($totalCredit, $defaultCurrency)->format(),
                 balance: money($currentBalance, $defaultCurrency)->format(),
+                type: null,
+                tableAction: null,
             );
 
             $accountTransactions[] = new AccountTransactionDTO(
+                id: null,
                 date: 'Balance Change',
                 description: '',
                 debit: '',
                 credit: '',
                 balance: money($balanceChange, $defaultCurrency)->format(),
+                type: null,
+                tableAction: null,
             );
 
             $reportCategories[] = [
@@ -186,7 +177,7 @@ class ReportService
         return new ReportDTO(categories: $reportCategories, fields: $columns);
     }
 
-    private function buildReport(array $allCategories, Collection $categoryGroupedAccounts, callable $balanceCalculator, array $balanceFields, array $allFields, ?callable $initializeCategoryBalances = null): ReportDTO
+    private function buildReport(array $allCategories, Collection $categoryGroupedAccounts, callable $balanceCalculator, array $balanceFields, array $allFields, ?callable $initializeCategoryBalances = null, bool $includeRetainedEarnings = false, ?string $startDate = null): ReportDTO
     {
         $accountCategories = [];
         $reportTotalBalances = array_fill_keys($balanceFields, 0);
@@ -221,10 +212,34 @@ class ReportService
                 $categoryAccounts[] = new AccountDTO(
                     $account->name,
                     $account->code,
+                    $account->id,
                     $formattedAccountBalances,
                 );
             }
 
+            if ($includeRetainedEarnings && $categoryName === AccountCategory::Equity->getPluralLabel()) {
+                $retainedEarnings = $this->accountService->getRetainedEarnings($startDate);
+                $retainedEarningsAmount = $retainedEarnings->getAmount();
+
+                if ($retainedEarningsAmount >= 0) {
+                    $categorySummaryBalances['credit_balance'] += $retainedEarningsAmount;
+                    $categoryAccounts[] = new AccountDTO(
+                        'Retained Earnings',
+                        'RE',
+                        null,
+                        $this->formatBalances(['debit_balance' => 0, 'credit_balance' => $retainedEarningsAmount])
+                    );
+                } else {
+                    $categorySummaryBalances['debit_balance'] += abs($retainedEarningsAmount);
+                    $categoryAccounts[] = new AccountDTO(
+                        'Retained Earnings',
+                        'RE',
+                        null,
+                        $this->formatBalances(['debit_balance' => abs($retainedEarningsAmount), 'credit_balance' => 0])
+                    );
+                }
+            }
+
             foreach ($balanceFields as $field) {
                 if (array_key_exists($field, $categorySummaryBalances)) {
                     $reportTotalBalances[$field] += $categorySummaryBalances[$field];
@@ -252,6 +267,25 @@ class ReportService
         }
     }
 
+    public function buildTrialBalanceReport(string $startDate, string $endDate, array $columns = []): ReportDTO
+    {
+        $allCategories = $this->accountService->getAccountCategoryOrder();
+
+        $categoryGroupedAccounts = $this->getCategoryGroupedAccounts($allCategories);
+
+        $balanceFields = ['debit_balance', 'credit_balance'];
+
+        return $this->buildReport($allCategories, $categoryGroupedAccounts, function (Account $account) use ($startDate, $endDate) {
+            $endingBalance = $this->accountService->getEndingBalance($account, $startDate, $endDate)?->getAmount() ?? 0;
+
+            if ($endingBalance === 0) {
+                return [];
+            }
+
+            return $this->calculateTrialBalance($account->category, $endingBalance);
+        }, $balanceFields, $columns, null, true, $startDate);
+    }
+
     private function calculateTrialBalance(AccountCategory $category, int $endingBalance): array
     {
         if (in_array($category, [AccountCategory::Asset, AccountCategory::Expense], true)) {

app/Transformers/AccountBalanceReportTransformer.php

@@ -43,7 +43,10 @@ class AccountBalanceReportTransformer extends BaseReportTransformer
                 foreach ($this->getColumns() as $column) {
                     $row[] = match ($column->getName()) {
                         'account_code' => $account->accountCode,
-                        'account_name' => $account->accountName,
+                        'account_name' => [
+                            'name' => $account->accountName,
+                            'id' => $account->accountId ?? null,
+                        ],
                         'starting_balance' => $account->balance->startingBalance ?? '',
                         'debit_balance' => $account->balance->debitBalance,
                         'credit_balance' => $account->balance->creditBalance,

app/Transformers/AccountTransactionReportTransformer.php

@@ -52,7 +52,11 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
                 foreach ($this->getColumns() as $column) {
                     $row[] = match ($column->getName()) {
                         'date' => $transaction->date,
-                        'description' => $transaction->description,
+                        'description' => [
+                            'id' => $transaction->id,
+                            'description' => $transaction->description,
+                            'tableAction' => $transaction->tableAction,
+                        ],
                         'debit' => $transaction->debit,
                         'credit' => $transaction->credit,
                         'balance' => $transaction->balance,

app/Transformers/BaseReportTransformer.php

@@ -5,9 +5,8 @@ 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
+abstract class BaseReportTransformer implements ExportableReport
 {
     protected ReportDTO $report;
 
@@ -40,18 +39,4 @@ abstract class BaseReportTransformer implements ExportableReport, Wireable
 
         return 'text-left';
     }
-
-    public function toLivewire(): array
-    {
-        return [
-            'report' => $this->report->toLivewire(),
-        ];
-    }
-
-    public static function fromLivewire($value): static
-    {
-        return new static(
-            ReportDTO::fromLivewire($value['report']),
-        );
-    }
 }

app/Transformers/TrialBalanceReportTransformer.php

@@ -43,7 +43,10 @@ class TrialBalanceReportTransformer extends BaseReportTransformer
                 foreach ($this->getColumns() as $column) {
                     $row[] = match ($column->getName()) {
                         'account_code' => $account->accountCode,
-                        'account_name' => $account->accountName,
+                        'account_name' => [
+                            'name' => $account->accountName,
+                            'id' => $account->accountId ?? null,
+                        ],
                         'debit_balance' => $account->balance->debitBalance,
                         'credit_balance' => $account->balance->creditBalance,
                         default => '',

database/migrations/2024_01_01_234943_create_transactions_table.php

@@ -31,8 +31,8 @@ return new class extends Migration
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
 
-            $table->index(['company_id', 'account_id', 'posted_at']);
-            $table->index(['company_id', 'bank_account_id', 'posted_at']);
+            $table->index(['account_id', 'posted_at']);
+            $table->index(['bank_account_id', 'posted_at']);
         });
     }
 

database/migrations/2024_01_11_062614_create_journal_entries_table.php

@@ -23,8 +23,8 @@ return new class extends Migration
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
 
-            $table->index(['company_id', 'account_id', 'type']);
-            $table->index(['company_id', 'account_id', 'transaction_id']);
+            $table->index(['account_id', 'type']);
+            $table->index(['account_id', 'transaction_id']);
         });
     }
 

resources/css/filament/user/theme.css

@@ -8,24 +8,19 @@
     z-index: 1;
 }
 
-.fi-input-password-revealable::-ms-reveal {
-    display: none;
-}
-
 .fi-body::before {
     content: '';
-    position: absolute;
+    position: fixed;
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
-    background-image:
-        linear-gradient(99.6deg,
-            rgba(232, 233, 235, 1) 10.6%,
-            rgba(240, 241, 243, 1) 32.9%,
-            rgba(248, 249, 251, 0.7) 50%,
-            rgba(240, 241, 243, 1) 67.1%,
-            rgba(232, 233, 235, 1) 83.4%);
+    background-image: linear-gradient(99.6deg,
+    rgba(232, 233, 235, 1) 10.6%,
+    rgba(240, 241, 243, 1) 32.9%,
+    rgba(248, 249, 251, 0.7) 50%,
+    rgba(240, 241, 243, 1) 67.1%,
+    rgba(232, 233, 235, 1) 83.4%);
     pointer-events: none;
     z-index: -1;
 }
@@ -38,7 +33,7 @@
 
 :is(.dark .fi-body)::before {
     content: '';
-    position: absolute;
+    position: fixed;
     top: 0;
     right: 0;
     background-image: radial-gradient(
@@ -49,7 +44,7 @@
         rgba(var(--primary-900), 0.5) 45%,
         rgba(var(--primary-950), 0.3) 60%,
         rgba(var(--primary-950), 0.1) 75%,
-        rgba(3,7,18,0) 100%
+        rgba(3, 7, 18, 0) 100%
     );
     width: 100%;
     height: 100%;

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

@@ -35,6 +35,14 @@
             color: #374151;
         }
 
+        .whitespace-normal {
+            white-space: normal;
+        }
+
+        .whitespace-nowrap {
+            white-space: nowrap;
+        }
+
         .title {
             font-size: 1.5rem;
         }
@@ -61,14 +69,6 @@
             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;

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

@@ -35,6 +35,14 @@
             color: #374151;
         }
 
+        .whitespace-normal {
+            white-space: normal;
+        }
+
+        .whitespace-nowrap {
+            white-space: nowrap;
+        }
+
         .title {
             font-size: 1.5rem;
         }
@@ -109,8 +117,12 @@
         @foreach($category->data as $account)
             <tr>
                 @foreach($account as $index => $cell)
-                    <td class="{{ $report->getAlignmentClass($index) }}">
-                        {{ $cell }}
+                    <td class="{{ $report->getAlignmentClass($index) }} {{ $index === 1 ? 'whitespace-normal' : 'whitespace-nowrap' }}">
+                        @if(isset($cell['id']) && isset($cell['name']))
+                            {{ $cell['name'] }}
+                        @else
+                            {{ $cell }}
+                        @endif
                     </td>
                 @endforeach
             </tr>

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

@@ -1,68 +1,91 @@
 <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) }}">
+    <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>
+            </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,
+        <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,
                             ])
                         >
-                            <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,
-                                ])
-                            >
+                            @if(is_array($cell) && isset($cell['description']))
+                                @if(isset($cell['id']) && $cell['tableAction'])
+                                    <x-filament::link
+                                        :href="\App\Filament\Company\Pages\Accounting\Transactions::getUrl(parameters: [
+                                            'tableAction' => $cell['tableAction'],
+                                            'tableActionRecord' => $cell['id'],
+                                        ])"
+                                        target="_blank"
+                                        color="primary"
+                                        icon="heroicon-o-arrow-top-right-on-square"
+                                        :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                        icon-size="w-4 h-4 min-w-4 min-h-4"
+                                    >
+                                        {{ $cell['description'] }}
+                                    </x-filament::link>
+                                @else
+                                    {{ $cell['description'] }}
+                                @endif
+                            @else
                                 {{ $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>
+                            @endif
+                        </div>
                     </x-filament-tables::cell>
-                </tr>
-            @endunless
+                @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/components/company/tables/reports/detailed-report.blade.php

@@ -1,62 +1,79 @@
-<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5">
+<table class="w-full table-auto divide-y divide-gray-200 dark:divide-white/5" x-data>
     <thead class="divide-y divide-gray-200 dark:divide-white/5">
+    <tr class="bg-gray-50 dark:bg-white/5">
+        @foreach($report->getHeaders() as $index => $header)
+            <th class="px-3 py-3.5 sm:first-of-type:ps-6 sm:last-of-type:pe-6 {{ $report->getAlignmentClass($index) }}">
+                <span class="text-sm font-semibold text-gray-950 dark:text-white">
+                    {{ $header }}
+                </span>
+            </th>
+        @endforeach
+    </tr>
+    </thead>
+    @foreach($report->getCategories() as $categoryIndex => $category)
+        <tbody class="divide-y divide-gray-200 whitespace-nowrap 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">
+            @foreach($category->header as $headerIndex => $header)
+                <x-filament-tables::cell class="{{ $report->getAlignmentClass($headerIndex) }}">
+                    <div class="px-3 py-2 text-sm font-semibold text-gray-950 dark:text-white">
                         {{ $header }}
-                    </span>
-                </th>
+                    </div>
+                </x-filament-tables::cell>
             @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">
-            <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">
+        @foreach($category->data as $dataIndex => $account)
+            <tr>
+                @foreach($account as $cellIndex => $cell)
+                    <x-filament-tables::cell class="{{ $report->getAlignmentClass($cellIndex) }}">
+                        <div class="px-3 py-4 text-sm leading-6 text-gray-950 dark:text-white">
+                            @if(is_array($cell) && isset($cell['name']))
+                                @if(isset($cell['id']))
+                                    <x-filament::link
+                                        color="primary"
+                                        target="_blank"
+                                        icon="heroicon-o-arrow-top-right-on-square"
+                                        :icon-position="\Filament\Support\Enums\IconPosition::After"
+                                        :icon-size="\Filament\Support\Enums\IconSize::Small"
+                                        href="{{ \App\Filament\Company\Pages\Reports\AccountTransactions::getUrl(['account_id' => $cell['id']]) }}"
+                                    >
+                                        {{ $cell['name'] }}
+                                    </x-filament::link>
+                                @else
+                                    {{ $cell['name'] }}
+                                @endif
+                            @else
                                 {{ $cell }}
-                            </div>
-                        </x-filament-tables::cell>
-                    @endforeach
-                </tr>
-            @endforeach
-            <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 }}
+                            @endif
                         </div>
                     </x-filament-tables::cell>
                 @endforeach
             </tr>
-            <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>
-        </tbody>
-    @endforeach
-    <tfoot>
-        <tr class="bg-gray-50 dark:bg-white/5">
-            @foreach($report->getOverallTotals() as $index => $total)
-                <x-filament-tables::cell wire:key="footer-total-{{ $index }}" class="{{ $report->getAlignmentClass($index) }}">
+        @endforeach
+        <tr>
+            @foreach($category->summary as $summaryIndex => $cell)
+                <x-filament-tables::cell class="{{ $report->getAlignmentClass($summaryIndex) }}">
                     <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
-                        {{ $total }}
+                        {{ $cell }}
                     </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>
+        </tbody>
+    @endforeach
+    <tfoot>
+    <tr class="bg-gray-50 dark:bg-white/5">
+        @foreach($report->getOverallTotals() as $index => $total)
+            <x-filament-tables::cell class="{{ $report->getAlignmentClass($index) }}">
+                <div class="px-3 py-2 text-sm leading-6 font-semibold text-gray-950 dark:text-white">
+                    {{ $total }}
+                </div>
+            </x-filament-tables::cell>
+        @endforeach
+    </tr>
     </tfoot>
 </table>

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

@@ -14,19 +14,20 @@
                 </x-filament::button>
             </div>
         </form>
-        <div class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
-            <div wire:init="loadReportData" class="flex items-center justify-center w-full h-full absolute">
-                <div wire:loading wire:target="loadReportData">
-                    <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300" />
-                </div>
-            </div>
-
+        <div wire:init="loadReportData"
+             class="relative divide-y divide-gray-200 overflow-x-auto dark:divide-white/10 dark:border-t-white/10 min-h-64">
             @if($this->reportLoaded)
                 <div wire:loading.remove wire:target="loadReportData">
                     @if($this->report)
-                        <x-company.tables.reports.detailed-report :report="$this->report" />
+                        <x-company.tables.reports.detailed-report :report="$this->report"/>
                     @endif
                 </div>
+            @else
+                <div class="absolute inset-0 flex items-center justify-center">
+                    <div wire:loading wire:target="loadReportData">
+                        <x-filament::loading-indicator class="p-6 text-primary-700 dark:text-primary-300"/>
+                    </div>
+                </div>
             @endif
         </div>
         <div class="es-table__footer-ctn border-t border-gray-200"></div>