wip

app/DTO/AccountTransactionDTO.php

@@ -14,6 +14,6 @@ class AccountTransactionDTO
         public string $credit,
         public string $balance,
         public ?TransactionType $type,
-        public ?array $tableAction,
+        public ?string $url = null,
     ) {}
 }

app/Filament/Company/Resources/Accounting/TransactionResource/Pages/ViewTransaction.php

@@ -4,15 +4,26 @@ namespace App\Filament\Company\Resources\Accounting\TransactionResource\Pages;
 
 use App\Filament\Actions\EditTransactionAction;
 use App\Filament\Company\Resources\Accounting\TransactionResource;
+use App\Filament\Company\Resources\Purchases\BillResource\Pages\ViewBill;
+use App\Filament\Company\Resources\Purchases\VendorResource;
+use App\Filament\Company\Resources\Sales\ClientResource;
+use App\Filament\Company\Resources\Sales\InvoiceResource\Pages\ViewInvoice;
+use App\Models\Accounting\Bill;
+use App\Models\Accounting\Invoice;
 use App\Models\Accounting\JournalEntry;
 use App\Models\Accounting\Transaction;
+use App\Models\Common\Client;
+use App\Models\Common\Vendor;
 use Filament\Actions;
+use Filament\Infolists\Components\IconEntry;
 use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\IconPosition;
 
+use function Filament\Support\get_model_label;
+
 class ViewTransaction extends ViewRecord
 {
     protected static string $resource = TransactionResource::class;
@@ -22,6 +33,24 @@ class ViewTransaction extends ViewRecord
         return [
             EditTransactionAction::make()
                 ->outlined(),
+            Actions\ViewAction::make('viewAssociatedDocument')
+                ->outlined()
+                ->icon('heroicon-o-document-text')
+                ->hidden(static fn (Transaction $record): bool => ! $record->transactionable_id)
+                ->label(static function (Transaction $record) {
+                    if (! $record->transactionable_type) {
+                        return 'View document';
+                    }
+
+                    return 'View ' . get_model_label($record->transactionable_type);
+                })
+                ->url(static function (Transaction $record) {
+                    return match ($record->transactionable_type) {
+                        Bill::class => ViewBill::getUrl(['record' => $record->transactionable_id]),
+                        Invoice::class => ViewInvoice::getUrl(['record' => $record->transactionable_id]),
+                        default => null,
+                    };
+                }),
             Actions\ActionGroup::make([
                 Actions\ActionGroup::make([
                     Actions\Action::make('markAsReviewed')
@@ -69,35 +98,44 @@ class ViewTransaction extends ViewRecord
                             ->date(),
                         TextEntry::make('type')
                             ->badge(),
-                        TextEntry::make('is_payment')
+                        IconEntry::make('is_payment')
                             ->label('Payment')
-                            ->badge()
-                            ->formatStateUsing(fn (bool $state): string => $state ? 'Yes' : 'No')
-                            ->color(fn (bool $state): string => $state ? 'info' : 'gray')
-                            ->visible(fn (Transaction $record): bool => $record->isPayment()),
+                            ->boolean(),
                         TextEntry::make('description')
                             ->label('Description'),
                         TextEntry::make('bankAccount.account.name')
-                            ->label('Bank Account')
-                            ->visible(fn (Transaction $record): bool => $record->bankAccount !== null),
+                            ->label('Account')
+                            ->hidden(static fn (Transaction $record): bool => ! $record->bankAccount),
                         TextEntry::make('payeeable.name')
                             ->label('Payee')
-                            ->visible(fn (Transaction $record): bool => $record->payeeable !== null),
+                            ->hidden(static fn (Transaction $record): bool => ! $record->payeeable_type)
+                            ->url(static function (Transaction $record): ?string {
+                                if (! $record->payeeable_type) {
+                                    return null;
+                                }
+
+                                return match ($record->payeeable_type) {
+                                    Vendor::class => VendorResource::getUrl('view', ['record' => $record->payeeable_id]),
+                                    Client::class => ClientResource::getUrl('view', ['record' => $record->payeeable_id]),
+                                    default => null,
+                                };
+                            })
+                            ->link(),
                         TextEntry::make('account.name')
                             ->label('Category')
-                            ->visible(fn (Transaction $record): bool => $record->account !== null),
+                            ->hidden(static fn (Transaction $record): bool => ! $record->account),
                         TextEntry::make('amount')
                             ->label('Amount')
-                            ->currency(fn (Transaction $record) => $record->bankAccount?->account->currency_code ?? 'USD'),
+                            ->currency(static fn (Transaction $record) => $record->bankAccount?->account->currency_code ?? 'USD'),
                         TextEntry::make('reviewed')
                             ->label('Status')
                             ->badge()
-                            ->formatStateUsing(fn (bool $state): string => $state ? 'Reviewed' : 'Not Reviewed')
-                            ->color(fn (bool $state): string => $state ? 'success' : 'warning'),
+                            ->formatStateUsing(static fn (bool $state): string => $state ? 'Reviewed' : 'Not Reviewed')
+                            ->color(static fn (bool $state): string => $state ? 'success' : 'warning'),
                         TextEntry::make('notes')
                             ->label('Notes')
                             ->columnSpan(2)
-                            ->visible(fn (Transaction $record): bool => filled($record->notes)),
+                            ->visible(static fn (Transaction $record): bool => filled($record->notes)),
                     ]),
             ]);
     }

app/Filament/Company/Resources/Purchases/BillResource/Pages/ViewBill.php

@@ -10,7 +10,6 @@ use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
-use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
 
 class ViewBill extends ViewRecord
@@ -55,9 +54,8 @@ class ViewBill extends ViewRecord
                             ->badge(),
                         TextEntry::make('vendor.name')
                             ->label('Vendor')
-                            ->color('primary')
-                            ->weight(FontWeight::SemiBold)
-                            ->url(static fn (Bill $record) => VendorResource::getUrl('view', ['record' => $record->vendor_id])),
+                            ->url(static fn (Bill $record) => VendorResource::getUrl('view', ['record' => $record->vendor_id]))
+                            ->link(),
                         TextEntry::make('total')
                             ->label('Total')
                             ->currency(fn (Bill $record) => $record->currency_code),

app/Filament/Company/Resources/Purchases/VendorResource/Pages/ViewVendor.php

@@ -77,7 +77,8 @@ class ViewVendor extends ViewRecord
                             ->label('Primary phone'),
                         TextEntry::make('website')
                             ->label('Website')
-                            ->url(static fn ($state) => $state, true),
+                            ->url(static fn ($state) => $state, true)
+                            ->link(),
                     ]),
                 Section::make('Additional Details')
                     ->columns()

app/Filament/Company/Resources/Sales/ClientResource/Pages/ViewClient.php

@@ -90,7 +90,8 @@ class ViewClient extends ViewRecord
                             ->label('Primary phone'),
                         TextEntry::make('website')
                             ->label('Website')
-                            ->url(static fn ($state) => $state, true),
+                            ->url(static fn ($state) => $state, true)
+                            ->link(),
                     ]),
                 Section::make('Additional Details')
                     ->columns()

app/Filament/Company/Resources/Sales/EstimateResource/Pages/ViewEstimate.php

@@ -14,7 +14,6 @@ use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
-use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
 use Illuminate\Support\HtmlString;
 
@@ -93,9 +92,8 @@ class ViewEstimate extends ViewRecord
                                     ->badge(),
                                 TextEntry::make('client.name')
                                     ->label('Client')
-                                    ->color('primary')
-                                    ->weight(FontWeight::SemiBold)
-                                    ->url(static fn (Estimate $record) => ClientResource::getUrl('view', ['record' => $record->client_id])),
+                                    ->url(static fn (Estimate $record) => ClientResource::getUrl('view', ['record' => $record->client_id]))
+                                    ->link(),
                                 TextEntry::make('expiration_date')
                                     ->label('Expiration date')
                                     ->asRelativeDay(),

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/ViewInvoice.php

@@ -14,7 +14,6 @@ use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
-use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
 use Illuminate\Support\HtmlString;
 
@@ -90,9 +89,8 @@ class ViewInvoice extends ViewRecord
                                     ->badge(),
                                 TextEntry::make('client.name')
                                     ->label('Client')
-                                    ->color('primary')
-                                    ->weight(FontWeight::SemiBold)
-                                    ->url(static fn (Invoice $record) => ClientResource::getUrl('view', ['record' => $record->client_id])),
+                                    ->url(static fn (Invoice $record) => ClientResource::getUrl('view', ['record' => $record->client_id]))
+                                    ->link(),
                                 TextEntry::make('amount_due')
                                     ->label('Amount due')
                                     ->currency(static fn (Invoice $record) => $record->currency_code),

app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/ViewRecurringInvoice.php

@@ -108,7 +108,8 @@ class ViewRecurringInvoice extends ViewRecord
                                     ->label('Client')
                                     ->color('primary')
                                     ->weight(FontWeight::SemiBold)
-                                    ->url(static fn (RecurringInvoice $record) => ClientResource::getUrl('view', ['record' => $record->client_id])),
+                                    ->url(static fn (RecurringInvoice $record) => ClientResource::getUrl('view', ['record' => $record->client_id]))
+                                    ->link(),
                                 TextEntry::make('last_date')
                                     ->label('Last invoice')
                                     ->date()

app/Models/Accounting/Transaction.php

@@ -9,6 +9,9 @@ use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
 use App\Enums\Accounting\PaymentMethod;
 use App\Enums\Accounting\TransactionType;
+use App\Filament\Company\Resources\Accounting\TransactionResource\Pages\ViewTransaction;
+use App\Filament\Company\Resources\Purchases\BillResource\Pages\ViewBill;
+use App\Filament\Company\Resources\Sales\InvoiceResource\Pages\ViewInvoice;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Client;
 use App\Models\Common\Contact;
@@ -246,6 +249,18 @@ class Transaction extends Model
         ];
     }
 
+    public function getReportTableUrl(): string
+    {
+        if ($this->transactionable_type && ! $this->is_payment) {
+            return match ($this->transactionable_type) {
+                Bill::class => ViewBill::getUrl(['record' => $this->transactionable_id]),
+                default => ViewInvoice::getUrl(['record' => $this->transactionable_id]),
+            };
+        }
+
+        return ViewTransaction::getUrl(['record' => $this->id]);
+    }
+
     protected static function newFactory(): Factory
     {
         return TransactionFactory::new();

app/Providers/MacroServiceProvider.php

@@ -19,6 +19,7 @@ use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Field;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
+use Filament\Support\Enums\IconPosition;
 use Filament\Tables\Columns\TextColumn;
 use Filament\Tables\Contracts\HasTable;
 use Illuminate\Contracts\Support\Htmlable;
@@ -375,6 +376,19 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
+        TextEntry::macro('link', function (bool $condition = true): static {
+            if ($condition) {
+                $this
+                    ->limit(50)
+                    ->openUrlInNewTab()
+                    ->icon('heroicon-o-arrow-top-right-on-square')
+                    ->iconColor('primary')
+                    ->iconPosition(IconPosition::After);
+            }
+
+            return $this;
+        });
+
         Money::macro('swapAmountFor', function ($newCurrency) {
             $oldCurrency = $this->currency->getCurrency();
             $balanceInSubunits = $this->getAmount();

app/Services/ReportService.php

@@ -20,12 +20,9 @@ use App\Enums\Accounting\AccountType;
 use App\Enums\Accounting\BillStatus;
 use App\Enums\Accounting\DocumentEntityType;
 use App\Enums\Accounting\InvoiceStatus;
-use App\Enums\Accounting\TransactionType;
-use App\Filament\Company\Resources\Accounting\TransactionResource\Pages\ViewTransaction;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Bill;
 use App\Models\Accounting\Invoice;
-use App\Models\Accounting\Transaction;
 use App\Support\Column;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
@@ -207,7 +204,6 @@ class ReportService
                 credit: '',
                 balance: money($currentBalance, $defaultCurrency)->format(),
                 type: null,
-                tableAction: null
             );
 
             foreach ($account->journalEntries as $journalEntry) {
@@ -237,7 +233,7 @@ class ReportService
                     credit: $journalEntry->type->isCredit() ? $formattedAmount : '',
                     balance: money($currentBalance, $defaultCurrency)->format(),
                     type: $transaction->type,
-                    tableAction: $this->determineTableAction($transaction),
+                    url: $transaction->getReportTableUrl(),
                 );
             }
 
@@ -251,7 +247,6 @@ class ReportService
                 credit: money($periodCreditTotal, $defaultCurrency)->format(),
                 balance: money($currentBalance, $defaultCurrency)->format(),
                 type: null,
-                tableAction: null
             );
 
             $accountTransactions[] = new AccountTransactionDTO(
@@ -262,7 +257,6 @@ class ReportService
                 credit: '',
                 balance: money($balanceChange, $defaultCurrency)->format(),
                 type: null,
-                tableAction: null
             );
 
             $reportCategories[] = [
@@ -275,34 +269,6 @@ class ReportService
         return new ReportDTO(categories: $reportCategories, fields: $columns);
     }
 
-    // TODO: Refactor and potentially only use the url
-    private function determineTableAction(Transaction $transaction): array
-    {
-        if ($transaction->transactionable_type === null) {
-            return [
-                'type' => 'transaction',
-                'action' => match ($transaction->type) {
-                    TransactionType::Journal => 'editJournalEntry',
-                    TransactionType::Transfer => 'editTransfer',
-                    default => 'editTransaction',
-                },
-                'id' => $transaction->id,
-            ];
-        } elseif ($transaction->is_payment) {
-            return [
-                'type' => 'view_transaction',
-                'url' => ViewTransaction::getUrl(['record' => $transaction->id]),
-                'id' => $transaction->id,
-            ];
-        } else {
-            return [
-                'type' => 'transactionable',
-                'model' => $transaction->transactionable_type,
-                'id' => $transaction->transactionable_id,
-            ];
-        }
-    }
-
     public function buildTrialBalanceReport(string $trialBalanceType, string $asOfDate, array $columns = []): ReportDTO
     {
         $asOfDateCarbon = Carbon::parse($asOfDate);

app/Transformers/AccountTransactionReportTransformer.php

@@ -44,7 +44,7 @@ class AccountTransactionReportTransformer extends BaseReportTransformer
                         'description' => [
                             'id' => $transaction->id,
                             'description' => $transaction->description,
-                            'tableAction' => $transaction->tableAction,
+                            'url' => $transaction->url,
                         ],
                         'debit' => $transaction->debit,
                         'credit' => $transaction->credit,

resources/css/filament/company/theme.css

@@ -10,6 +10,10 @@
 
 @config 'tailwind.config.js';
 
+.fi-in-text-item .group-hover\/item\:underline, .fi-ta-text-item .group-hover\/item\:underline {
+    @apply text-primary-600 dark:text-primary-400 font-semibold;
+}
+
 .fi-sidebar-nav {
     scrollbar-width: thin;
 }

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

@@ -49,46 +49,17 @@
                             ])
                         >
                             @if(is_array($cell) && isset($cell['description']))
-                                @if(isset($cell['id']) && $cell['tableAction'])
-                                    @if($cell['tableAction']['type'] === 'transaction')
-                                        <x-filament::link
-                                            :href="TransactionResource::getUrl(parameters: [
-                                                'tableAction' => $cell['tableAction']['action'],
-                                                'tableActionRecord' => $cell['tableAction']['id'],
-                                            ])"
-                                            target="_blank"
-                                            color="primary"
-                                            icon="heroicon-o-arrow-top-right-on-square"
-                                            :icon-position="$iconPosition"
-                                            icon-size="w-4 h-4 min-w-4 min-h-4"
-                                        >
-                                            {{ $cell['description'] }}
-                                        </x-filament::link>
-                                    @elseif($cell['tableAction']['type'] === 'view_transaction')
-                                        <x-filament::link
-                                            :href="$cell['tableAction']['url']"
-                                            target="_blank"
-                                            color="primary"
-                                            icon="heroicon-o-arrow-top-right-on-square"
-                                            :icon-position="$iconPosition"
-                                            icon-size="w-4 h-4 min-w-4 min-h-4"
-                                        >
-                                            {{ $cell['description'] }}
-                                        </x-filament::link>
-                                    @else
-                                        <x-filament::link
-                                            :href="$cell['tableAction']['model'] === Bill::class
-                                                ? ViewBill::getUrl(['record' => $cell['tableAction']['id']])
-                                                : ViewInvoice::getUrl(['record' => $cell['tableAction']['id']])"
-                                            target="_blank"
-                                            color="primary"
-                                            icon="heroicon-o-arrow-top-right-on-square"
-                                            :icon-position="$iconPosition"
-                                            icon-size="w-4 h-4 min-w-4 min-h-4"
-                                        >
-                                            {{ $cell['description'] }}
-                                        </x-filament::link>
-                                    @endif
+                                @if(isset($cell['id']) && isset($cell['url']))
+                                    <x-filament::link
+                                        :href="$cell['url']"
+                                        target="_blank"
+                                        color="primary"
+                                        icon="heroicon-o-arrow-top-right-on-square"
+                                        :icon-position="$iconPosition"
+                                        icon-size="w-4 h-4 min-w-4 min-h-4"
+                                    >
+                                        {{ $cell['description'] }}
+                                    </x-filament::link>
                                 @else
                                     {{ $cell['description'] }}
                                 @endif