wip

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

@@ -48,8 +48,8 @@ class AccountTransactions extends BaseReportPage
             $this->setFilterState('selectedAccount', 'all');
         }
 
-        if (empty($this->getFilterState('selectedEntity'))) {
-            $this->setFilterState('selectedEntity', 'all');
+        if (empty($this->getFilterState('selectedPayee'))) {
+            $this->setFilterState('selectedPayee', 'all');
         }
     }
 
@@ -95,8 +95,8 @@ class AccountTransactions extends BaseReportPage
                 ])->extraFieldWrapperAttributes([
                     'class' => 'report-hidden-label',
                 ]),
-                Select::make('selectedEntity')
-                    ->label('Entity')
+                Select::make('selectedPayee')
+                    ->label('Payee')
                     ->options($this->getEntityOptions())
                     ->searchable()
                     ->selectablePlaceholder(false),
@@ -139,7 +139,7 @@ class AccountTransactions extends BaseReportPage
             ->toArray();
 
         $allEntitiesOption = [
-            'All Entities' => ['all' => 'All Entities'],
+            'All Payees' => ['all' => 'All Payees'],
         ];
 
         return $allEntitiesOption + [
@@ -155,7 +155,7 @@ class AccountTransactions extends BaseReportPage
             endDate: $this->getFormattedEndDate(),
             columns: $columns,
             accountId: $this->getFilterState('selectedAccount'),
-            entityId: $this->getFilterState('selectedEntity'),
+            entityId: $this->getFilterState('selectedPayee'),
         );
     }
 

app/Services/AccountService.php

@@ -7,6 +7,8 @@ use App\Models\Accounting\Account;
 use App\Models\Accounting\Bill;
 use App\Models\Accounting\Invoice;
 use App\Models\Accounting\Transaction;
+use App\Models\Common\Client;
+use App\Models\Common\Vendor;
 use App\Repositories\Accounting\JournalEntryRepository;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\ValueObjects\Money;
@@ -128,21 +130,19 @@ class AccountService
                 ->whereBetween('transactions.posted_at', [$startDate, $endDate])
                 ->join('transactions', 'transactions.id', '=', 'journal_entries.transaction_id')
                 ->orderBy('transactions.posted_at')
-                ->with('transaction:id,type,description,posted_at,is_payment,transactionable_id,transactionable_type');
+                ->with('transaction:id,type,description,posted_at,is_payment,payeeable_id,payeeable_type');
 
             if ($entityId) {
                 $entityId = (int) $entityId;
                 if ($entityId < 0) {
                     $query->whereHas('transaction', function ($query) use ($entityId) {
-                        $query->whereHasMorph('transactionable', [Bill::class], function ($query) use ($entityId) {
-                            $query->where('vendor_id', abs($entityId));
-                        });
+                        $query->where('payeeable_type', Vendor::class)
+                            ->where('payeeable_id', abs($entityId));
                     });
                 } else {
                     $query->whereHas('transaction', function ($query) use ($entityId) {
-                        $query->whereHasMorph('transactionable', [Invoice::class], function ($query) use ($entityId) {
-                            $query->where('client_id', $entityId);
-                        });
+                        $query->where('payeeable_type', Client::class)
+                            ->where('payeeable_id', $entityId);
                     });
                 }
             }