wip

app/DTO/AccountDTO.php

@@ -9,6 +9,7 @@ class AccountDTO implements Wireable
     public function __construct(
         public string $accountName,
         public string $accountCode,
+        public ?int $accountId,
         public AccountBalanceDTO $balance,
     ) {}
 
@@ -17,6 +18,7 @@ class AccountDTO implements Wireable
         return [
             'accountName' => $this->accountName,
             'accountCode' => $this->accountCode,
+            'accountId' => $this->accountId,
             'balance' => $this->balance->toLivewire(),
         ];
     }
@@ -26,6 +28,7 @@ class AccountDTO implements Wireable
         return new static(
             $value['accountName'],
             $value['accountCode'],
+            $value['accountId'],
             AccountBalanceDTO::fromLivewire($value['balance']),
         );
     }

app/DTO/AccountTransactionDTO.php

@@ -5,6 +5,7 @@ namespace App\DTO;
 class AccountTransactionDTO
 {
     public function __construct(
+        public ?int $id,
         public string $date,
         public string $description,
         public string $debit,

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

@@ -90,6 +90,17 @@ class Transactions extends Page implements HasTable
         return static::getModel()::query();
     }
 
+    public function openModalForTransaction($recordId): void
+    {
+        $record = Transaction::findOrFail($recordId);
+
+        if ($record->type->isJournal()) {
+            $this->mountTableAction('updateJournalTransaction', $record->id);
+        } else {
+            $this->mountTableAction('updateTransaction', $record->id);
+        }
+    }
+
     protected function getHeaderActions(): array
     {
         return [

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/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));
@@ -115,6 +115,7 @@ class ReportService
             $totalCredit = 0;
 
             $accountTransactions[] = new AccountTransactionDTO(
+                id: null,
                 date: 'Starting Balance',
                 description: '',
                 debit: '',
@@ -131,6 +132,7 @@ 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() : '',
@@ -142,6 +144,7 @@ class ReportService
             $balanceChange = $currentBalance - ($startingBalance?->getAmount() ?? 0);
 
             $accountTransactions[] = new AccountTransactionDTO(
+                id: null,
                 date: 'Totals and Ending Balance',
                 description: '',
                 debit: money($totalDebit, $defaultCurrency)->format(),
@@ -150,6 +153,7 @@ class ReportService
             );
 
             $accountTransactions[] = new AccountTransactionDTO(
+                id: null,
                 date: 'Balance Change',
                 description: '',
                 debit: '',
@@ -202,6 +206,7 @@ class ReportService
                 $categoryAccounts[] = new AccountDTO(
                     $account->name,
                     $account->code,
+                    $account->id,
                     $formattedAccountBalances,
                 );
             }
@@ -215,6 +220,7 @@ class ReportService
                     $categoryAccounts[] = new AccountDTO(
                         'Retained Earnings',
                         'RE',
+                        null,
                         $this->formatBalances(['debit_balance' => 0, 'credit_balance' => $retainedEarningsAmount])
                     );
                 } else {
@@ -222,6 +228,7 @@ class ReportService
                     $categoryAccounts[] = new AccountDTO(
                         'Retained Earnings',
                         'RE',
+                        null,
                         $this->formatBalances(['debit_balance' => abs($retainedEarningsAmount), 'credit_balance' => 0])
                     );
                 }

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,10 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
                 foreach ($this->getColumns() as $column) {
                     $row[] = match ($column->getName()) {
                         'date' => $transaction->date,
-                        'description' => $transaction->description,
+                        'description' => [
+                            'id' => $transaction->id ?? null,
+                            'description' => $transaction->description,
+                        ],
                         'debit' => $transaction->debit,
                         'credit' => $transaction->credit,
                         'balance' => $transaction->balance,

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 => '',

composer.lock

@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "akaunting/laravel-money",
-            "version": "5.2.0",
+            "version": "5.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/akaunting/laravel-money.git",
-                "reference": "c6710ee50ad9a394e3f607a0ebbc64905c308e69"
+                "reference": "6cc8abb912286c671de5993ffbcd3225588aeace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/akaunting/laravel-money/zipball/c6710ee50ad9a394e3f607a0ebbc64905c308e69",
-                "reference": "c6710ee50ad9a394e3f607a0ebbc64905c308e69",
+                "url": "https://api.github.com/repos/akaunting/laravel-money/zipball/6cc8abb912286c671de5993ffbcd3225588aeace",
+                "reference": "6cc8abb912286c671de5993ffbcd3225588aeace",
                 "shasum": ""
             },
             "require": {
@@ -71,9 +71,9 @@
             ],
             "support": {
                 "issues": "https://github.com/akaunting/laravel-money/issues",
-                "source": "https://github.com/akaunting/laravel-money/tree/5.2.0"
+                "source": "https://github.com/akaunting/laravel-money/tree/5.2.1"
             },
-            "time": "2024-03-19T21:43:10+00:00"
+            "time": "2024-07-23T15:01:26+00:00"
         },
         {
             "name": "andrewdwallo/filament-companies",
@@ -2490,24 +2490,24 @@
         },
         {
             "name": "graham-campbell/result-type",
-            "version": "v1.1.2",
+            "version": "v1.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/GrahamCampbell/Result-Type.git",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862"
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/fbd48bce38f73f8a4ec8583362e732e4095e5862",
-                "reference": "fbd48bce38f73f8a4ec8583362e732e4095e5862",
+                "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/3ba905c11371512af9d9bdd27d99b782216b6945",
+                "reference": "3ba905c11371512af9d9bdd27d99b782216b6945",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2"
+                "phpoption/phpoption": "^1.9.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "autoload": {
@@ -2536,7 +2536,7 @@
             ],
             "support": {
                 "issues": "https://github.com/GrahamCampbell/Result-Type/issues",
-                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.2"
+                "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.3"
             },
             "funding": [
                 {
@@ -2548,7 +2548,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:16:48+00:00"
+            "time": "2024-07-20T21:45:45+00:00"
         },
         {
             "name": "guava/filament-clusters",
@@ -2627,16 +2627,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.9.0",
+            "version": "7.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "84ac2b2afc44e40d3e8e658a45d68d6d20437612"
+                "reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/84ac2b2afc44e40d3e8e658a45d68d6d20437612",
-                "reference": "84ac2b2afc44e40d3e8e658a45d68d6d20437612",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a629e5b69db96eb4939c1b34114130077dd4c6fc",
+                "reference": "a629e5b69db96eb4939c1b34114130077dd4c6fc",
                 "shasum": ""
             },
             "require": {
@@ -2733,7 +2733,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.9.0"
+                "source": "https://github.com/guzzle/guzzle/tree/7.9.1"
             },
             "funding": [
                 {
@@ -2749,7 +2749,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-07-18T11:52:56+00:00"
+            "time": "2024-07-19T16:19:57+00:00"
         },
         {
             "name": "guzzlehttp/promises",
@@ -3167,16 +3167,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.16.0",
+            "version": "v11.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "bd4808aaf103ccb5cb4b00bcee46140c070c0ec4"
+                "reference": "42f505a0c8afc0743f73e70bec08e641e2870bd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/bd4808aaf103ccb5cb4b00bcee46140c070c0ec4",
-                "reference": "bd4808aaf103ccb5cb4b00bcee46140c070c0ec4",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/42f505a0c8afc0743f73e70bec08e641e2870bd6",
+                "reference": "42f505a0c8afc0743f73e70bec08e641e2870bd6",
                 "shasum": ""
             },
             "require": {
@@ -3369,7 +3369,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-07-16T14:33:07+00:00"
+            "time": "2024-07-23T16:33:27+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3693,16 +3693,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.4.2",
+            "version": "2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf"
+                "reference": "0026475f5c9a104410ae824cb5a4d63fa3bdb1df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/91c24291965bd6d7c46c46a12ba7492f83b1cadf",
-                "reference": "91c24291965bd6d7c46c46a12ba7492f83b1cadf",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/0026475f5c9a104410ae824cb5a4d63fa3bdb1df",
+                "reference": "0026475f5c9a104410ae824cb5a4d63fa3bdb1df",
                 "shasum": ""
             },
             "require": {
@@ -3715,8 +3715,8 @@
             },
             "require-dev": {
                 "cebe/markdown": "^1.0",
-                "commonmark/cmark": "0.30.3",
-                "commonmark/commonmark.js": "0.30.0",
+                "commonmark/cmark": "0.31.0",
+                "commonmark/commonmark.js": "0.31.0",
                 "composer/package-versions-deprecated": "^1.8",
                 "embed/embed": "^4.4",
                 "erusev/parsedown": "^1.0",
@@ -3738,7 +3738,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "2.6-dev"
                 }
             },
             "autoload": {
@@ -3795,7 +3795,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-02-02T11:59:32+00:00"
+            "time": "2024-07-22T18:18:14+00:00"
         },
         {
             "name": "league/config",
@@ -5240,16 +5240,16 @@
         },
         {
             "name": "openspout/openspout",
-            "version": "v4.24.3",
+            "version": "v4.24.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/openspout/openspout.git",
-                "reference": "27de0c4d4a5b97927ece3e4dcbb7b48cb12e8a34"
+                "reference": "e5f92c5c9e6cc44119918da66bb097a0ffc202b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/openspout/openspout/zipball/27de0c4d4a5b97927ece3e4dcbb7b48cb12e8a34",
-                "reference": "27de0c4d4a5b97927ece3e4dcbb7b48cb12e8a34",
+                "url": "https://api.github.com/repos/openspout/openspout/zipball/e5f92c5c9e6cc44119918da66bb097a0ffc202b2",
+                "reference": "e5f92c5c9e6cc44119918da66bb097a0ffc202b2",
                 "shasum": ""
             },
             "require": {
@@ -5317,7 +5317,7 @@
             ],
             "support": {
                 "issues": "https://github.com/openspout/openspout/issues",
-                "source": "https://github.com/openspout/openspout/tree/v4.24.3"
+                "source": "https://github.com/openspout/openspout/tree/v4.24.4"
             },
             "funding": [
                 {
@@ -5329,7 +5329,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-12T12:32:17+00:00"
+            "time": "2024-07-22T09:30:54+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -5450,16 +5450,16 @@
         },
         {
             "name": "phpoption/phpoption",
-            "version": "1.9.2",
+            "version": "1.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/schmittjoh/php-option.git",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820"
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/80735db690fe4fc5c76dfa7f9b770634285fa820",
-                "reference": "80735db690fe4fc5c76dfa7f9b770634285fa820",
+                "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/e3fac8b24f56113f7cb96af14958c0dd16330f54",
+                "reference": "e3fac8b24f56113f7cb96af14958c0dd16330f54",
                 "shasum": ""
             },
             "require": {
@@ -5467,13 +5467,13 @@
             },
             "require-dev": {
                 "bamarni/composer-bin-plugin": "^1.8.2",
-                "phpunit/phpunit": "^8.5.34 || ^9.6.13 || ^10.4.2"
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20 || ^10.5.28"
             },
             "type": "library",
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "1.9-dev"
@@ -5509,7 +5509,7 @@
             ],
             "support": {
                 "issues": "https://github.com/schmittjoh/php-option/issues",
-                "source": "https://github.com/schmittjoh/php-option/tree/1.9.2"
+                "source": "https://github.com/schmittjoh/php-option/tree/1.9.3"
             },
             "funding": [
                 {
@@ -5521,7 +5521,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T21:59:55+00:00"
+            "time": "2024-07-20T21:41:07+00:00"
         },
         {
             "name": "phpseclib/phpseclib",
@@ -9270,23 +9270,23 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v5.6.0",
+            "version": "v5.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4"
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
-                "reference": "2cf9fb6054c2bb1d59d1f3817706ecdb9d2934c4",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/a59a13791077fe3d44f90e7133eb68e7d22eaff2",
+                "reference": "a59a13791077fe3d44f90e7133eb68e7d22eaff2",
                 "shasum": ""
             },
             "require": {
                 "ext-pcre": "*",
-                "graham-campbell/result-type": "^1.1.2",
+                "graham-campbell/result-type": "^1.1.3",
                 "php": "^7.2.5 || ^8.0",
-                "phpoption/phpoption": "^1.9.2",
+                "phpoption/phpoption": "^1.9.3",
                 "symfony/polyfill-ctype": "^1.24",
                 "symfony/polyfill-mbstring": "^1.24",
                 "symfony/polyfill-php80": "^1.24"
@@ -9303,7 +9303,7 @@
             "extra": {
                 "bamarni-bin": {
                     "bin-links": true,
-                    "forward-command": true
+                    "forward-command": false
                 },
                 "branch-alias": {
                     "dev-master": "5.6-dev"
@@ -9338,7 +9338,7 @@
             ],
             "support": {
                 "issues": "https://github.com/vlucas/phpdotenv/issues",
-                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.0"
+                "source": "https://github.com/vlucas/phpdotenv/tree/v5.6.1"
             },
             "funding": [
                 {
@@ -9350,7 +9350,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-12T22:43:29+00:00"
+            "time": "2024-07-20T21:52:34+00:00"
         },
         {
             "name": "voku/portable-ascii",
@@ -9673,16 +9673,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.16.2",
+            "version": "v1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "51f1ba679a6afe0315621ad143d788bd7ded0eca"
+                "reference": "4dba80c1de4b81dc4c4fb10ea6f4781495eb29f5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/51f1ba679a6afe0315621ad143d788bd7ded0eca",
-                "reference": "51f1ba679a6afe0315621ad143d788bd7ded0eca",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/4dba80c1de4b81dc4c4fb10ea6f4781495eb29f5",
+                "reference": "4dba80c1de4b81dc4c4fb10ea6f4781495eb29f5",
                 "shasum": ""
             },
             "require": {
@@ -9735,20 +9735,20 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2024-07-09T15:58:08+00:00"
+            "time": "2024-07-23T16:40:20+00:00"
         },
         {
             "name": "laravel/sail",
-            "version": "v1.30.2",
+            "version": "v1.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887"
+                "reference": "48d89608a3bb5be763c9bb87121d31e7da27c1cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887",
-                "reference": "f5a9699a1001e15de1aa5e7cb5c9f50a3f63f887",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/48d89608a3bb5be763c9bb87121d31e7da27c1cb",
+                "reference": "48d89608a3bb5be763c9bb87121d31e7da27c1cb",
                 "shasum": ""
             },
             "require": {
@@ -9798,7 +9798,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2024-07-05T16:01:51+00:00"
+            "time": "2024-07-22T14:36:50+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -10215,16 +10215,16 @@
         },
         {
             "name": "php-di/php-di",
-            "version": "7.0.6",
+            "version": "7.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHP-DI/PHP-DI.git",
-                "reference": "8097948a89f6ec782839b3e958432f427cac37fd"
+                "reference": "e87435e3c0e8f22977adc5af0d5cdcc467e15cf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/8097948a89f6ec782839b3e958432f427cac37fd",
-                "reference": "8097948a89f6ec782839b3e958432f427cac37fd",
+                "url": "https://api.github.com/repos/PHP-DI/PHP-DI/zipball/e87435e3c0e8f22977adc5af0d5cdcc467e15cf1",
+                "reference": "e87435e3c0e8f22977adc5af0d5cdcc467e15cf1",
                 "shasum": ""
             },
             "require": {
@@ -10272,7 +10272,7 @@
             ],
             "support": {
                 "issues": "https://github.com/PHP-DI/PHP-DI/issues",
-                "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.6"
+                "source": "https://github.com/PHP-DI/PHP-DI/tree/7.0.7"
             },
             "funding": [
                 {
@@ -10284,7 +10284,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-02T10:04:50+00:00"
+            "time": "2024-07-21T15:55:45+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -11743,16 +11743,16 @@
         },
         {
             "name": "spatie/backtrace",
-            "version": "1.6.1",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/backtrace.git",
-                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23"
+                "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/backtrace/zipball/8373b9d51638292e3bfd736a9c19a654111b4a23",
-                "reference": "8373b9d51638292e3bfd736a9c19a654111b4a23",
+                "url": "https://api.github.com/repos/spatie/backtrace/zipball/1a9a145b044677ae3424693f7b06479fc8c137a9",
+                "reference": "1a9a145b044677ae3424693f7b06479fc8c137a9",
                 "shasum": ""
             },
             "require": {
@@ -11790,7 +11790,7 @@
                 "spatie"
             ],
             "support": {
-                "source": "https://github.com/spatie/backtrace/tree/1.6.1"
+                "source": "https://github.com/spatie/backtrace/tree/1.6.2"
             },
             "funding": [
                 {
@@ -11802,20 +11802,20 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-04-24T13:22:11+00:00"
+            "time": "2024-07-22T08:21:24+00:00"
         },
         {
             "name": "spatie/error-solutions",
-            "version": "1.0.5",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/error-solutions.git",
-                "reference": "4bb6c734dc992b2db3e26df1ef021c75d2218b13"
+                "reference": "a014da18f2675ea15af0ba97f7e9aee59e13964f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/4bb6c734dc992b2db3e26df1ef021c75d2218b13",
-                "reference": "4bb6c734dc992b2db3e26df1ef021c75d2218b13",
+                "url": "https://api.github.com/repos/spatie/error-solutions/zipball/a014da18f2675ea15af0ba97f7e9aee59e13964f",
+                "reference": "a014da18f2675ea15af0ba97f7e9aee59e13964f",
                 "shasum": ""
             },
             "require": {
@@ -11868,7 +11868,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/error-solutions/issues",
-                "source": "https://github.com/spatie/error-solutions/tree/1.0.5"
+                "source": "https://github.com/spatie/error-solutions/tree/1.1.0"
             },
             "funding": [
                 {
@@ -11876,7 +11876,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-09T12:13:32+00:00"
+            "time": "2024-07-22T08:18:22+00:00"
         },
         {
             "name": "spatie/flare-client-php",

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,89 @@
 <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']))
+                                    <x-filament::link
+                                        :href="\App\Filament\Company\Pages\Accounting\Transactions::getUrl()"
+                                        target="_blank"
+                                        x-on:click="localStorage.setItem('openTransactionId', '{{ $cell['id'] }}')"
+                                        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/accounting/transactions.blade.php

@@ -1,4 +1,14 @@
 <x-filament-panels::page>
     {{ $this->form }}
     {{ $this->table }}
+
+    @script
+    <script>
+        const transactionId = localStorage.getItem('openTransactionId');
+        if (transactionId) {
+            localStorage.removeItem('openTransactionId');
+            $wire.openModalForTransaction(transactionId);
+        }
+    </script>
+    @endscript
 </x-filament-panels::page>

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>