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

Batch Payment Processing

app/Enums/Accounting/BillStatus.php

@@ -36,4 +36,21 @@ enum BillStatus: string implements HasColor, HasLabel
             self::Open,
         ];
     }
+
+    public static function unpaidStatuses(): array
+    {
+        return [
+            self::Open,
+            self::Partial,
+            self::Overdue,
+        ];
+    }
+
+    public static function getUnpaidOptions(): array
+    {
+        return collect(self::cases())
+            ->filter(fn (self $case) => in_array($case, self::unpaidStatuses()))
+            ->mapWithKeys(fn (self $case) => [$case->value => $case->getLabel()])
+            ->toArray();
+    }
 }

app/Enums/Accounting/InvoiceStatus.php

@@ -46,4 +46,22 @@ enum InvoiceStatus: string implements HasColor, HasLabel
             self::Unsent,
         ];
     }
+
+    public static function unpaidStatuses(): array
+    {
+        return [
+            self::Unsent,
+            self::Sent,
+            self::Viewed,
+            self::Partial,
+            self::Overdue,
+        ];
+    }
+
+    public static function getUnpaidOptions(): array
+    {
+        return collect(self::unpaidStatuses())
+            ->mapWithKeys(fn (self $case) => [$case->value => $case->getLabel()])
+            ->toArray();
+    }
 }

app/Filament/Company/Resources/Accounting/BudgetResource/RelationManagers/BudgetItemsRelationManager.php

@@ -2,7 +2,7 @@
 
 namespace App\Filament\Company\Resources\Accounting\BudgetResource\RelationManagers;
 
-use App\Filament\Tables\Columns\DeferredTextInputColumn;
+use App\Filament\Tables\Columns\CustomTextInputColumn;
 use App\Models\Accounting\Budget;
 use App\Models\Accounting\BudgetAllocation;
 use App\Models\Accounting\BudgetItem;
@@ -144,7 +144,7 @@ class BudgetItemsRelationManager extends RelationManager
                     ->titlePrefixedWithLabel(false)
                     ->collapsible(),
             ])
-            ->recordClasses(['budget-items-relation-manager'])
+            ->recordClasses(['is-spreadsheet'])
             ->defaultGroup('account.category')
             ->headerActions([
                 Action::make('saveBatchChanges')
@@ -157,7 +157,7 @@ class BudgetItemsRelationManager extends RelationManager
                     ->label('Account')
                     ->limit(30)
                     ->searchable(),
-                DeferredTextInputColumn::make(self::TOTAL_COLUMN)
+                CustomTextInputColumn::make(self::TOTAL_COLUMN)
                     ->label('Total')
                     ->alignRight()
                     ->mask(RawJs::make('$money($input)'))
@@ -173,7 +173,8 @@ class BudgetItemsRelationManager extends RelationManager
 
                         return CurrencyConverter::convertCentsToFormatSimple($total);
                     })
-                    ->batchMode()
+                    ->deferred()
+                    ->navigable()
                     ->summarize(
                         Summarizer::make()
                             ->using(function (\Illuminate\Database\Query\Builder $query) {
@@ -258,10 +259,11 @@ class BudgetItemsRelationManager extends RelationManager
                 ...$allocationPeriods->map(function (BudgetAllocation $period) {
                     $alias = $period->start_date->format('Y_m_d');
 
-                    return DeferredTextInputColumn::make($alias)
+                    return CustomTextInputColumn::make($alias)
                         ->label($period->period)
                         ->alignRight()
-                        ->batchMode()
+                        ->deferred()
+                        ->navigable()
                         ->mask(RawJs::make('$money($input)'))
                         ->getStateUsing(function ($record) use ($alias) {
                             $key = "{$record->getKey()}.{$alias}";

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

@@ -34,15 +34,12 @@ use Awcodes\TableRepeater\Header;
 use Closure;
 use Filament\Forms;
 use Filament\Forms\Form;
-use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
-use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
 
@@ -440,11 +437,9 @@ class BillResource extends Resource
                         Bill::getReplicateAction(Tables\Actions\ReplicateAction::class),
                         Tables\Actions\Action::make('recordPayment')
                             ->label('Record payment')
-                            ->stickyModalHeader()
-                            ->stickyModalFooter()
-                            ->modalFooterActionsAlignment(Alignment::End)
+                            ->slideOver()
                             ->modalWidth(MaxWidth::TwoExtraLarge)
-                            ->icon('heroicon-o-credit-card')
+                            ->icon('heroicon-m-credit-card')
                             ->visible(function (Bill $record) {
                                 return $record->canRecordPayment();
                             })
@@ -459,54 +454,122 @@ class BillResource extends Resource
                             ->form([
                                 Forms\Components\DatePicker::make('posted_at')
                                     ->label('Date'),
-                                Forms\Components\TextInput::make('amount')
-                                    ->label('Amount')
-                                    ->required()
-                                    ->money(fn (Bill $record) => $record->currency_code)
-                                    ->live(onBlur: true)
-                                    ->helperText(function (Bill $record, $state) {
+                                Forms\Components\Grid::make()
+                                    ->schema([
+                                        Forms\Components\Select::make('bank_account_id')
+                                            ->label('Account')
+                                            ->required()
+                                            ->live()
+                                            ->options(function () {
+                                                return BankAccount::query()
+                                                    ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
+                                                    ->select(['bank_accounts.id', 'accounts.name', 'accounts.currency_code'])
+                                                    ->get()
+                                                    ->mapWithKeys(function ($account) {
+                                                        $label = $account->name;
+                                                        if ($account->currency_code) {
+                                                            $label .= " ({$account->currency_code})";
+                                                        }
+
+                                                        return [$account->id => $label];
+                                                    })
+                                                    ->toArray();
+                                            })
+                                            ->searchable(),
+                                        Forms\Components\TextInput::make('amount')
+                                            ->label('Amount')
+                                            ->required()
+                                            ->money(fn (Bill $record) => $record->currency_code)
+                                            ->live(onBlur: true)
+                                            ->helperText(function (Bill $record, $state) {
+                                                $billCurrency = $record->currency_code;
+
+                                                if (! CurrencyConverter::isValidAmount($state, 'USD')) {
+                                                    return null;
+                                                }
+
+                                                $amountDue = $record->amount_due;
+
+                                                $amount = CurrencyConverter::convertToCents($state, 'USD');
+
+                                                if ($amount <= 0) {
+                                                    return 'Please enter a valid positive amount';
+                                                }
+
+                                                $newAmountDue = $amountDue - $amount;
+
+                                                return match (true) {
+                                                    $newAmountDue > 0 => 'Amount due after payment will be ' . CurrencyConverter::formatCentsToMoney($newAmountDue, $billCurrency),
+                                                    $newAmountDue === 0 => 'Bill will be fully paid',
+                                                    default => 'Amount exceeds bill total by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue), $billCurrency),
+                                                };
+                                            })
+                                            ->rules([
+                                                static fn (): Closure => static function (string $attribute, $value, Closure $fail) {
+                                                    if (! CurrencyConverter::isValidAmount($value, 'USD')) {
+                                                        $fail('Please enter a valid amount');
+                                                    }
+                                                },
+                                            ]),
+                                    ])->columns(2),
+                                Forms\Components\Placeholder::make('currency_conversion')
+                                    ->label('Currency Conversion')
+                                    ->content(function (Forms\Get $get, Bill $record) {
+                                        $amount = $get('amount');
+                                        $bankAccountId = $get('bank_account_id');
+
                                         $billCurrency = $record->currency_code;
-                                        if (! CurrencyConverter::isValidAmount($state, 'USD')) {
+
+                                        if (empty($amount) || empty($bankAccountId) || ! CurrencyConverter::isValidAmount($amount, 'USD')) {
+                                            return null;
+                                        }
+
+                                        $bankAccount = BankAccount::with('account')->find($bankAccountId);
+                                        if (! $bankAccount) {
                                             return null;
                                         }
 
-                                        $amountDue = $record->amount_due;
-                                        $amount = CurrencyConverter::convertToCents($state, 'USD');
+                                        $bankCurrency = $bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
 
-                                        if ($amount <= 0) {
-                                            return 'Please enter a valid positive amount';
+                                        // If currencies are the same, no conversion needed
+                                        if ($billCurrency === $bankCurrency) {
+                                            return null;
                                         }
 
-                                        $newAmountDue = $amountDue - $amount;
+                                        // Convert amount from bill currency to bank currency
+                                        $amountInBillCurrencyCents = CurrencyConverter::convertToCents($amount, 'USD');
+                                        $amountInBankCurrencyCents = CurrencyConverter::convertBalance(
+                                            $amountInBillCurrencyCents,
+                                            $billCurrency,
+                                            $bankCurrency
+                                        );
+
+                                        $formattedBankAmount = CurrencyConverter::formatCentsToMoney($amountInBankCurrencyCents, $bankCurrency);
 
-                                        return match (true) {
-                                            $newAmountDue > 0 => 'Amount due after payment will be ' . CurrencyConverter::formatCentsToMoney($newAmountDue, $billCurrency),
-                                            $newAmountDue === 0 => 'Bill will be fully paid',
-                                            default => 'Amount exceeds bill total by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue), $billCurrency),
-                                        };
+                                        return "Payment will be recorded as {$formattedBankAmount} in the bank account's currency ({$bankCurrency}).";
                                     })
-                                    ->rules([
-                                        static fn (): Closure => static function (string $attribute, $value, Closure $fail) {
-                                            if (! CurrencyConverter::isValidAmount($value, 'USD')) {
-                                                $fail('Please enter a valid amount');
-                                            }
-                                        },
-                                    ]),
+                                    ->hidden(function (Forms\Get $get, Bill $record) {
+                                        $bankAccountId = $get('bank_account_id');
+                                        if (empty($bankAccountId)) {
+                                            return true;
+                                        }
+
+                                        $billCurrency = $record->currency_code;
+
+                                        $bankAccount = BankAccount::with('account')->find($bankAccountId);
+                                        if (! $bankAccount) {
+                                            return true;
+                                        }
+
+                                        $bankCurrency = $bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+
+                                        // Hide if currencies are the same
+                                        return $billCurrency === $bankCurrency;
+                                    }),
                                 Forms\Components\Select::make('payment_method')
                                     ->label('Payment method')
                                     ->required()
                                     ->options(PaymentMethod::class),
-                                Forms\Components\Select::make('bank_account_id')
-                                    ->label('Account')
-                                    ->required()
-                                    ->options(function () {
-                                        return BankAccount::query()
-                                            ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
-                                            ->select(['bank_accounts.id', 'accounts.name'])
-                                            ->pluck('accounts.name', 'bank_accounts.id')
-                                            ->toArray();
-                                    })
-                                    ->searchable(),
                                 Forms\Components\Textarea::make('notes')
                                     ->label('Notes'),
                             ])
@@ -558,108 +621,6 @@ class BillResource extends Resource
                             'created_at',
                             'updated_at',
                         ]),
-                    Tables\Actions\BulkAction::make('recordPayments')
-                        ->label('Record payments')
-                        ->icon('heroicon-o-credit-card')
-                        ->stickyModalHeader()
-                        ->stickyModalFooter()
-                        ->modalFooterActionsAlignment(Alignment::End)
-                        ->modalWidth(MaxWidth::TwoExtraLarge)
-                        ->databaseTransaction()
-                        ->successNotificationTitle('Payments recorded')
-                        ->failureNotificationTitle('Failed to record payments')
-                        ->deselectRecordsAfterCompletion()
-                        ->beforeFormFilled(function (Collection $records, Tables\Actions\BulkAction $action) {
-                            $isInvalid = $records->contains(fn (Bill $bill) => ! $bill->canRecordPayment());
-
-                            if ($isInvalid) {
-                                Notification::make()
-                                    ->title('Payment recording failed')
-                                    ->body('Bills that are either paid, voided, or are in a foreign currency cannot be processed through bulk payments. Please adjust your selection and try again.')
-                                    ->persistent()
-                                    ->danger()
-                                    ->send();
-
-                                $action->cancel(true);
-                            }
-                        })
-                        ->mountUsing(function (Collection $records, Form $form) {
-                            $totalAmountDue = $records->sum('amount_due');
-
-                            $form->fill([
-                                'posted_at' => now(),
-                                'amount' => $totalAmountDue,
-                            ]);
-                        })
-                        ->form([
-                            Forms\Components\DatePicker::make('posted_at')
-                                ->label('Date'),
-                            Forms\Components\TextInput::make('amount')
-                                ->label('Amount')
-                                ->required()
-                                ->money()
-                                ->rules([
-                                    static fn (): Closure => static function (string $attribute, $value, Closure $fail) {
-                                        if (! CurrencyConverter::isValidAmount($value)) {
-                                            $fail('Please enter a valid amount');
-                                        }
-                                    },
-                                ]),
-                            Forms\Components\Select::make('payment_method')
-                                ->label('Payment method')
-                                ->required()
-                                ->options(PaymentMethod::class),
-                            Forms\Components\Select::make('bank_account_id')
-                                ->label('Account')
-                                ->required()
-                                ->options(function () {
-                                    return BankAccount::query()
-                                        ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
-                                        ->select(['bank_accounts.id', 'accounts.name'])
-                                        ->pluck('accounts.name', 'bank_accounts.id')
-                                        ->toArray();
-                                })
-                                ->searchable(),
-                            Forms\Components\Textarea::make('notes')
-                                ->label('Notes'),
-                        ])
-                        ->before(function (Collection $records, Tables\Actions\BulkAction $action, array $data) {
-                            $totalPaymentAmount = $data['amount'] ?? 0;
-                            $totalAmountDue = $records->sum('amount_due');
-
-                            if ($totalPaymentAmount > $totalAmountDue) {
-                                $formattedTotalAmountDue = CurrencyConverter::formatCentsToMoney($totalAmountDue);
-
-                                Notification::make()
-                                    ->title('Excess payment amount')
-                                    ->body("The payment amount exceeds the total amount due of {$formattedTotalAmountDue}. Please adjust the payment amount and try again.")
-                                    ->persistent()
-                                    ->warning()
-                                    ->send();
-
-                                $action->halt(true);
-                            }
-                        })
-                        ->action(function (Collection $records, Tables\Actions\BulkAction $action, array $data) {
-                            $totalPaymentAmount = $data['amount'] ?? 0;
-                            $remainingAmount = $totalPaymentAmount;
-
-                            $records->each(function (Bill $record) use (&$remainingAmount, $data) {
-                                $amountDue = $record->amount_due;
-
-                                if ($amountDue <= 0 || $remainingAmount <= 0) {
-                                    return;
-                                }
-
-                                $paymentAmount = min($amountDue, $remainingAmount);
-                                $data['amount'] = $paymentAmount;
-
-                                $record->recordPayment($data);
-                                $remainingAmount -= $paymentAmount;
-                            });
-
-                            $action->success();
-                        }),
                 ]),
             ]);
     }
@@ -668,6 +629,7 @@ class BillResource extends Resource
     {
         return [
             'index' => Pages\ListBills::route('/'),
+            'pay-bills' => Pages\PayBills::route('/pay-bills'),
             'create' => Pages\CreateBill::route('/create'),
             'view' => Pages\ViewBill::route('/{record}'),
             'edit' => Pages\EditBill::route('/{record}/edit'),

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

@@ -20,6 +20,9 @@ class ListBills extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
+            Actions\Action::make('payBills')
+                ->outlined()
+                ->url(PayBills::getUrl()),
             Actions\CreateAction::make(),
         ];
     }

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

@@ -0,0 +1,379 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
+
+use App\Enums\Accounting\BillStatus;
+use App\Enums\Accounting\PaymentMethod;
+use App\Filament\Company\Resources\Purchases\BillResource;
+use App\Filament\Tables\Columns\CustomTextInputColumn;
+use App\Models\Accounting\Bill;
+use App\Models\Accounting\Transaction;
+use App\Models\Banking\BankAccount;
+use App\Models\Common\Vendor;
+use App\Models\Setting\Currency;
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
+use Filament\Actions;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Notifications\Notification;
+use Filament\Resources\Pages\ListRecords;
+use Filament\Support\RawJs;
+use Filament\Tables;
+use Filament\Tables\Columns\Summarizers\Summarizer;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Str;
+use Livewire\Attributes\Computed;
+
+/**
+ * @property Form $form
+ */
+class PayBills extends ListRecords
+{
+    protected static string $resource = BillResource::class;
+
+    protected static string $view = 'filament.company.resources.purchases.bill-resource.pages.pay-bills';
+
+    public array $paymentAmounts = [];
+
+    public ?array $data = [];
+
+    public function getBreadcrumb(): ?string
+    {
+        return 'Pay';
+    }
+
+    public function getTitle(): string | Htmlable
+    {
+        return 'Pay Bills';
+    }
+
+    public function mount(): void
+    {
+        parent::mount();
+
+        $this->form->fill();
+
+        $this->reset('tableFilters');
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\Action::make('processPayments')
+                ->color('primary')
+                ->requiresConfirmation()
+                ->modalHeading('Confirm payments')
+                ->modalDescription(function () {
+                    $billCount = collect($this->paymentAmounts)->filter(fn ($amount) => $amount > 0)->count();
+                    $totalAmount = array_sum($this->paymentAmounts);
+                    $currencyCode = $this->getTableFilterState('currency_code')['value'];
+                    $totalFormatted = CurrencyConverter::formatCentsToMoney($totalAmount, $currencyCode, true);
+
+                    return "You are about to pay {$billCount} " . Str::plural('bill', $billCount) . " for a total of {$totalFormatted}. This action cannot be undone.";
+                })
+                ->action(function () {
+                    $data = $this->data;
+                    $tableRecords = $this->getTableRecords();
+                    $paidCount = 0;
+                    $totalPaid = 0;
+
+                    /** @var Bill $bill */
+                    foreach ($tableRecords as $bill) {
+                        if (! $bill->canRecordPayment()) {
+                            continue;
+                        }
+
+                        // Get the payment amount from our component state
+                        $paymentAmount = $this->getPaymentAmount($bill);
+
+                        if ($paymentAmount <= 0) {
+                            continue;
+                        }
+
+                        $paymentData = [
+                            'posted_at' => $data['posted_at'],
+                            'payment_method' => $data['payment_method'],
+                            'bank_account_id' => $data['bank_account_id'],
+                            'amount' => $paymentAmount,
+                        ];
+
+                        $bill->recordPayment($paymentData);
+                        $paidCount++;
+                        $totalPaid += $paymentAmount;
+                    }
+
+                    $currencyCode = $this->getTableFilterState('currency_code')['value'];
+                    $totalFormatted = CurrencyConverter::formatCentsToMoney($totalPaid, $currencyCode, true);
+
+                    Notification::make()
+                        ->title('Bills paid successfully')
+                        ->body("Paid {$paidCount} " . Str::plural('bill', $paidCount) . " for a total of {$totalFormatted}")
+                        ->success()
+                        ->send();
+
+                    $this->reset('paymentAmounts');
+
+                    $this->resetTable();
+                }),
+        ];
+    }
+
+    /**
+     * @return array<int | string, string | Form>
+     */
+    protected function getForms(): array
+    {
+        return [
+            'form',
+        ];
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->live()
+            ->schema([
+                Forms\Components\Grid::make(3)
+                    ->schema([
+                        Forms\Components\Select::make('bank_account_id')
+                            ->label('Account')
+                            ->options(static function () {
+                                return Transaction::getBankAccountOptionsFlat();
+                            })
+                            ->default(fn () => BankAccount::where('enabled', true)->first()?->id)
+                            ->selectablePlaceholder(false)
+                            ->searchable()
+                            ->softRequired(),
+                        Forms\Components\DatePicker::make('posted_at')
+                            ->label('Date')
+                            ->default(now())
+                            ->softRequired(),
+                        Forms\Components\Select::make('payment_method')
+                            ->label('Payment method')
+                            ->selectablePlaceholder(false)
+                            ->options(PaymentMethod::class)
+                            ->default(PaymentMethod::BankPayment)
+                            ->softRequired(),
+                    ]),
+            ])->statePath('data');
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->query(
+                Bill::query()
+                    ->with(['vendor'])
+                    ->unpaid()
+            )
+            ->recordClasses(['is-spreadsheet'])
+            ->defaultSort('due_date')
+            ->paginated(false)
+            ->columns([
+                TextColumn::make('vendor.name')
+                    ->label('Vendor')
+                    ->sortable(),
+                TextColumn::make('bill_number')
+                    ->label('Bill number')
+                    ->sortable(),
+                TextColumn::make('due_date')
+                    ->label('Due date')
+                    ->defaultDateFormat()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('status')
+                    ->badge()
+                    ->sortable(),
+                TextColumn::make('amount_due')
+                    ->label('Amount due')
+                    ->currency(static fn (Bill $record) => $record->currency_code)
+                    ->alignEnd()
+                    ->sortable()
+                    ->summarize([
+                        Summarizer::make()
+                            ->using(function (Builder $query) {
+                                $totalAmountDue = $query->sum('amount_due');
+                                $bankAccountCurrency = $this->getSelectedBankAccount()->account->currency_code;
+                                $activeCurrency = $this->getTableFilterState('currency_code')['value'] ?? $bankAccountCurrency;
+
+                                if ($activeCurrency !== $bankAccountCurrency) {
+                                    $totalAmountDue = CurrencyConverter::convertBalance($totalAmountDue, $activeCurrency, $bankAccountCurrency);
+                                }
+
+                                return CurrencyConverter::formatCentsToMoney($totalAmountDue, $bankAccountCurrency, true);
+                            }),
+                        Summarizer::make()
+                            ->using(function (Builder $query) {
+                                $totalAmountDue = $query->sum('amount_due');
+                                $currencyCode = $this->getTableFilterState('currency_code')['value'];
+
+                                return CurrencyConverter::formatCentsToMoney($totalAmountDue, $currencyCode, true);
+                            })
+                            ->visible(function () {
+                                $activeCurrency = $this->getTableFilterState('currency_code')['value'] ?? null;
+                                $bankAccountCurrency = $this->getSelectedBankAccount()->account->currency_code;
+
+                                return $activeCurrency && $activeCurrency !== $bankAccountCurrency;
+                            }),
+                    ]),
+                Tables\Columns\IconColumn::make('applyFullAmountAction')
+                    ->icon('heroicon-m-chevron-double-right')
+                    ->color('primary')
+                    ->label('')
+                    ->default('')
+                    ->alignCenter()
+                    ->width('3rem')
+                    ->tooltip('Apply full amount')
+                    ->action(
+                        Tables\Actions\Action::make('applyFullPayment')
+                            ->action(function (Bill $record) {
+                                $this->paymentAmounts[$record->id] = $record->amount_due;
+                            }),
+                    ),
+                CustomTextInputColumn::make('payment_amount')
+                    ->label('Payment amount')
+                    ->alignEnd()
+                    ->navigable()
+                    ->mask(RawJs::make('$money($input)'))
+                    ->updateStateUsing(function (Bill $record, $state) {
+                        if (! CurrencyConverter::isValidAmount($state, 'USD')) {
+                            $this->paymentAmounts[$record->id] = 0;
+
+                            return '0.00';
+                        }
+
+                        $paymentCents = CurrencyConverter::convertToCents($state, 'USD');
+
+                        if ($paymentCents > $record->amount_due) {
+                            $paymentCents = $record->amount_due;
+                        }
+
+                        $this->paymentAmounts[$record->id] = $paymentCents;
+
+                        return $state;
+                    })
+                    ->getStateUsing(function (Bill $record) {
+                        $paymentAmount = $this->paymentAmounts[$record->id] ?? 0;
+
+                        return CurrencyConverter::convertCentsToFormatSimple($paymentAmount, 'USD');
+                    })
+                    ->summarize([
+                        Summarizer::make()
+                            ->using(function () {
+                                $total = array_sum($this->paymentAmounts);
+                                $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
+                                $activeCurrency = $this->getTableFilterState('currency_code')['value'] ?? $defaultCurrency;
+
+                                if ($activeCurrency !== $defaultCurrency) {
+                                    $total = CurrencyConverter::convertBalance($total, $activeCurrency, $defaultCurrency);
+                                }
+
+                                return CurrencyConverter::formatCentsToMoney($total, $defaultCurrency, true);
+                            }),
+                        Summarizer::make()
+                            ->using(fn () => $this->totalPaymentAmount)
+                            ->visible(function () {
+                                $activeCurrency = $this->getTableFilterState('currency_code')['value'] ?? null;
+                                $defaultCurrency = CurrencyAccessor::getDefaultCurrency();
+
+                                return $activeCurrency && $activeCurrency !== $defaultCurrency;
+                            }),
+                    ]),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkAction::make('applyFullAmounts')
+                    ->label('Apply full amounts')
+                    ->icon('heroicon-o-banknotes')
+                    ->color('primary')
+                    ->deselectRecordsAfterCompletion()
+                    ->action(function (Collection $records) {
+                        $records->each(function (Bill $bill) {
+                            $this->paymentAmounts[$bill->id] = $bill->amount_due;
+                        });
+                    }),
+                Tables\Actions\BulkAction::make('clearAmounts')
+                    ->label('Clear amounts')
+                    ->icon('heroicon-o-x-mark')
+                    ->color('gray')
+                    ->deselectRecordsAfterCompletion()
+                    ->action(function (Collection $records) {
+                        $records->each(function (Bill $bill) {
+                            $this->paymentAmounts[$bill->id] = 0;
+                        });
+                    }),
+            ])
+            ->filters([
+                Tables\Filters\SelectFilter::make('currency_code')
+                    ->label('Currency')
+                    ->selectablePlaceholder(false)
+                    ->default(CurrencyAccessor::getDefaultCurrency())
+                    ->options(Currency::query()->pluck('name', 'code')->toArray())
+                    ->searchable()
+                    ->resetState([
+                        'value' => CurrencyAccessor::getDefaultCurrency(),
+                    ])
+                    ->indicateUsing(function (Tables\Filters\SelectFilter $filter, array $state) {
+                        if (blank($state['value'] ?? null)) {
+                            return [];
+                        }
+
+                        $label = collect($filter->getOptions())
+                            ->mapWithKeys(fn (string | array $label, string $value): array => is_array($label) ? $label : [$value => $label])
+                            ->get($state['value']);
+
+                        if (blank($label)) {
+                            return [];
+                        }
+
+                        $indicator = $filter->getLabel();
+
+                        return Tables\Filters\Indicator::make("{$indicator}: {$label}")->removable(false);
+                    }),
+                Tables\Filters\SelectFilter::make('vendor_id')
+                    ->label('Vendor')
+                    ->options(fn () => Vendor::query()->pluck('name', 'id')->toArray())
+                    ->searchable(),
+                Tables\Filters\SelectFilter::make('status')
+                    ->multiple()
+                    ->options(BillStatus::getUnpaidOptions()),
+            ]);
+    }
+
+    protected function getPaymentAmount(Bill $record): int
+    {
+        return $this->paymentAmounts[$record->id] ?? 0;
+    }
+
+    #[Computed]
+    public function totalPaymentAmount(): string
+    {
+        $total = array_sum($this->paymentAmounts);
+
+        $currencyCode = $this->getTableFilterState('currency_code')['value'];
+
+        return CurrencyConverter::formatCentsToMoney($total, $currencyCode, true);
+    }
+
+    public function getSelectedBankAccount(): BankAccount
+    {
+        $bankAccountId = $this->data['bank_account_id'];
+
+        $bankAccount = BankAccount::find($bankAccountId);
+
+        return $bankAccount ?: BankAccount::where('enabled', true)->first();
+    }
+
+    protected function handleTableFilterUpdates(): void
+    {
+        parent::handleTableFilterUpdates();
+
+        $visibleBillIds = $this->getTableRecords()->pluck('id')->toArray();
+        $visibleBillKeys = array_flip($visibleBillIds);
+
+        $this->paymentAmounts = array_intersect_key($this->paymentAmounts, $visibleBillKeys);
+    }
+}

app/Filament/Company/Resources/Purchases/BillResource/RelationManagers/PaymentsRelationManager.php

@@ -216,6 +216,7 @@ class PaymentsRelationManager extends RelationManager
                 Tables\Actions\CreateAction::make()
                     ->label('Record payment')
                     ->modalHeading(fn (Tables\Actions\CreateAction $action) => $action->getLabel())
+                    ->slideOver()
                     ->modalWidth(MaxWidth::TwoExtraLarge)
                     ->visible(function () {
                         return $this->getOwnerRecord()->canRecordPayment();

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

@@ -2,14 +2,12 @@
 
 namespace App\Filament\Company\Resources\Sales;
 
-use App\Collections\Accounting\DocumentCollection;
 use App\Enums\Accounting\AdjustmentCategory;
 use App\Enums\Accounting\AdjustmentStatus;
 use App\Enums\Accounting\AdjustmentType;
 use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\InvoiceStatus;
-use App\Enums\Accounting\PaymentMethod;
 use App\Enums\Setting\PaymentTerms;
 use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\InvoicesRelationManager;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
@@ -28,19 +26,16 @@ use App\Filament\Tables\Filters\DateRangeFilter;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\Invoice;
-use App\Models\Banking\BankAccount;
 use App\Models\Common\Client;
 use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
 use Awcodes\TableRepeater\Header;
-use Closure;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
-use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -492,87 +487,19 @@ class InvoiceResource extends Resource
                         Invoice::getApproveDraftAction(Tables\Actions\Action::class),
                         Invoice::getMarkAsSentAction(Tables\Actions\Action::class),
                         Tables\Actions\Action::make('recordPayment')
-                            ->label(fn (Invoice $record) => $record->status === InvoiceStatus::Overpaid ? 'Refund Overpayment' : 'Record Payment')
-                            ->stickyModalHeader()
-                            ->stickyModalFooter()
-                            ->modalFooterActionsAlignment(Alignment::End)
-                            ->modalWidth(MaxWidth::TwoExtraLarge)
-                            ->icon('heroicon-o-credit-card')
+                            ->label('Record Payment')
+                            ->icon('heroicon-m-credit-card')
                             ->visible(function (Invoice $record) {
                                 return $record->canRecordPayment();
                             })
-                            ->mountUsing(function (Invoice $record, Form $form) {
-                                $form->fill([
-                                    'posted_at' => now(),
-                                    'amount' => $record->status === InvoiceStatus::Overpaid ? ltrim($record->amount_due, '-') : $record->amount_due,
-                                ]);
-                            })
-                            ->databaseTransaction()
-                            ->successNotificationTitle('Payment recorded')
-                            ->form([
-                                Forms\Components\DatePicker::make('posted_at')
-                                    ->label('Date'),
-                                Forms\Components\TextInput::make('amount')
-                                    ->label('Amount')
-                                    ->required()
-                                    ->money(fn (Invoice $record) => $record->currency_code)
-                                    ->live(onBlur: true)
-                                    ->helperText(function (Invoice $record, $state) {
-                                        $invoiceCurrency = $record->currency_code;
-                                        if (! CurrencyConverter::isValidAmount($state, 'USD')) {
-                                            return null;
-                                        }
-
-                                        $amountDue = $record->amount_due;
-
-                                        $amount = CurrencyConverter::convertToCents($state, 'USD');
-
-                                        if ($amount <= 0) {
-                                            return 'Please enter a valid positive amount';
-                                        }
-
-                                        if ($record->status === InvoiceStatus::Overpaid) {
-                                            $newAmountDue = $amountDue + $amount;
-                                        } else {
-                                            $newAmountDue = $amountDue - $amount;
-                                        }
-
-                                        return match (true) {
-                                            $newAmountDue > 0 => 'Amount due after payment will be ' . CurrencyConverter::formatCentsToMoney($newAmountDue, $invoiceCurrency),
-                                            $newAmountDue === 0 => 'Invoice will be fully paid',
-                                            default => 'Invoice will be overpaid by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue), $invoiceCurrency),
-                                        };
-                                    })
-                                    ->rules([
-                                        static fn (): Closure => static function (string $attribute, $value, Closure $fail) {
-                                            if (! CurrencyConverter::isValidAmount($value, 'USD')) {
-                                                $fail('Please enter a valid amount');
-                                            }
-                                        },
-                                    ]),
-                                Forms\Components\Select::make('payment_method')
-                                    ->label('Payment method')
-                                    ->required()
-                                    ->options(PaymentMethod::class),
-                                Forms\Components\Select::make('bank_account_id')
-                                    ->label('Account')
-                                    ->required()
-                                    ->options(function () {
-                                        return BankAccount::query()
-                                            ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
-                                            ->select(['bank_accounts.id', 'accounts.name'])
-                                            ->pluck('accounts.name', 'bank_accounts.id')
-                                            ->toArray();
-                                    })
-                                    ->searchable(),
-                                Forms\Components\Textarea::make('notes')
-                                    ->label('Notes'),
-                            ])
-                            ->action(function (Invoice $record, Tables\Actions\Action $action, array $data) {
-                                $record->recordPayment($data);
-
-                                $action->success();
-                            }),
+                            ->url(fn (Invoice $record) => Pages\RecordPayments::getUrl([
+                                'tableFilters' => [
+                                    'client_id' => ['value' => $record->client_id],
+                                    'currency_code' => ['value' => $record->currency_code],
+                                ],
+                                'invoiceId' => $record->id,
+                            ]))
+                            ->openUrlInNewTab(false),
                     ])->dropdown(false),
                     Tables\Actions\DeleteAction::make(),
                 ]),
@@ -670,111 +597,6 @@ class InvoiceResource extends Resource
                                 $record->markAsSent();
                             });
 
-                            $action->success();
-                        }),
-                    Tables\Actions\BulkAction::make('recordPayments')
-                        ->label('Record payments')
-                        ->icon('heroicon-o-credit-card')
-                        ->stickyModalHeader()
-                        ->stickyModalFooter()
-                        ->modalFooterActionsAlignment(Alignment::End)
-                        ->modalWidth(MaxWidth::TwoExtraLarge)
-                        ->databaseTransaction()
-                        ->successNotificationTitle('Payments recorded')
-                        ->failureNotificationTitle('Failed to Record Payments')
-                        ->deselectRecordsAfterCompletion()
-                        ->beforeFormFilled(function (Collection $records, Tables\Actions\BulkAction $action) {
-                            $isInvalid = $records->contains(fn (Invoice $record) => ! $record->canBulkRecordPayment());
-
-                            if ($isInvalid) {
-                                Notification::make()
-                                    ->title('Payment recording failed')
-                                    ->body('Invoices that are either draft, paid, overpaid, voided, or are in a foreign currency cannot be processed through bulk payments. Please adjust your selection and try again.')
-                                    ->persistent()
-                                    ->danger()
-                                    ->send();
-
-                                $action->cancel(true);
-                            }
-                        })
-                        ->mountUsing(function (DocumentCollection $records, Form $form) {
-                            $totalAmountDue = $records->sum('amount_due');
-
-                            $form->fill([
-                                'posted_at' => now(),
-                                'amount' => $totalAmountDue,
-                            ]);
-                        })
-                        ->form([
-                            Forms\Components\DatePicker::make('posted_at')
-                                ->label('Date'),
-                            Forms\Components\TextInput::make('amount')
-                                ->label('Amount')
-                                ->required()
-                                ->money()
-                                ->rules([
-                                    static fn (): Closure => static function (string $attribute, $value, Closure $fail) {
-                                        if (! CurrencyConverter::isValidAmount($value)) {
-                                            $fail('Please enter a valid amount');
-                                        }
-                                    },
-                                ]),
-                            Forms\Components\Select::make('payment_method')
-                                ->label('Payment method')
-                                ->required()
-                                ->options(PaymentMethod::class),
-                            Forms\Components\Select::make('bank_account_id')
-                                ->label('Account')
-                                ->required()
-                                ->options(function () {
-                                    return BankAccount::query()
-                                        ->join('accounts', 'bank_accounts.account_id', '=', 'accounts.id')
-                                        ->select(['bank_accounts.id', 'accounts.name'])
-                                        ->pluck('accounts.name', 'bank_accounts.id')
-                                        ->toArray();
-                                })
-                                ->searchable(),
-                            Forms\Components\Textarea::make('notes')
-                                ->label('Notes'),
-                        ])
-                        ->before(function (DocumentCollection $records, Tables\Actions\BulkAction $action, array $data) {
-                            $totalPaymentAmount = $data['amount'] ?? 0;
-                            $totalAmountDue = $records->sum('amount_due');
-
-                            if ($totalPaymentAmount > $totalAmountDue) {
-                                $formattedTotalAmountDue = CurrencyConverter::formatCentsToMoney($totalAmountDue);
-
-                                Notification::make()
-                                    ->title('Excess payment amount')
-                                    ->body("The payment amount exceeds the total amount due of {$formattedTotalAmountDue}. Please adjust the payment amount and try again.")
-                                    ->persistent()
-                                    ->warning()
-                                    ->send();
-
-                                $action->halt(true);
-                            }
-                        })
-                        ->action(function (DocumentCollection $records, Tables\Actions\BulkAction $action, array $data) {
-                            $totalPaymentAmount = $data['amount'] ?? 0;
-
-                            $remainingAmount = $totalPaymentAmount;
-
-                            $records->each(function (Invoice $record) use (&$remainingAmount, $data) {
-                                $amountDue = $record->amount_due;
-
-                                if ($amountDue <= 0 || $remainingAmount <= 0) {
-                                    return;
-                                }
-
-                                $paymentAmount = min($amountDue, $remainingAmount);
-
-                                $data['amount'] = $paymentAmount;
-
-                                $record->recordPayment($data);
-
-                                $remainingAmount -= $paymentAmount;
-                            });
-
                             $action->success();
                         }),
                 ]),
@@ -785,6 +607,7 @@ class InvoiceResource extends Resource
     {
         return [
             'index' => Pages\ListInvoices::route('/'),
+            'record-payments' => Pages\RecordPayments::route('/record-payments'),
             'create' => Pages\CreateInvoice::route('/create'),
             'view' => Pages\ViewInvoice::route('/{record}'),
             'edit' => Pages\EditInvoice::route('/{record}/edit'),

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

@@ -7,8 +7,8 @@ use App\Enums\Accounting\InvoiceStatus;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Widgets;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages\ViewRecurringInvoice;
+use App\Filament\Infolists\Components\BannerEntry;
 use App\Models\Accounting\RecurringInvoice;
-use CodeWithDennis\SimpleAlert\Components\Infolists\SimpleAlert;
 use Filament\Actions;
 use Filament\Infolists\Components\Actions\Action;
 use Filament\Infolists\Infolist;
@@ -37,7 +37,7 @@ class ListInvoices extends ListRecords
     {
         return $infolist
             ->schema([
-                SimpleAlert::make('recurringInvoiceFilter')
+                BannerEntry::make('recurringInvoiceFilter')
                     ->info()
                     ->title(function () {
                         if (empty($this->recurringInvoice)) {
@@ -79,6 +79,9 @@ class ListInvoices extends ListRecords
     protected function getHeaderActions(): array
     {
         return [
+            Actions\Action::make('recordPayments')
+                ->outlined()
+                ->url(RecordPayments::getUrl()),
             Actions\CreateAction::make(),
         ];
     }

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

@@ -0,0 +1,518 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
+
+use App\Enums\Accounting\InvoiceStatus;
+use App\Enums\Accounting\PaymentMethod;
+use App\Filament\Company\Resources\Sales\InvoiceResource;
+use App\Filament\Tables\Columns\CustomTextInputColumn;
+use App\Models\Accounting\Invoice;
+use App\Models\Accounting\Transaction;
+use App\Models\Banking\BankAccount;
+use App\Models\Common\Client;
+use App\Models\Setting\Currency;
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
+use Filament\Actions;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Notifications\Notification;
+use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\MaxWidth;
+use Filament\Support\RawJs;
+use Filament\Tables;
+use Filament\Tables\Columns\Summarizers\Summarizer;
+use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Table;
+use Illuminate\Contracts\Support\Htmlable;
+use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Str;
+use Livewire\Attributes\Computed;
+use Livewire\Attributes\Url;
+
+/**
+ * @property Form $form
+ */
+class RecordPayments extends ListRecords
+{
+    protected static string $resource = InvoiceResource::class;
+
+    protected static string $view = 'filament.company.resources.sales.invoice-resource.pages.record-payments';
+
+    public array $paymentAmounts = [];
+
+    public ?array $data = [];
+
+    public ?int $allocationAmount = null;
+
+    #[Url(except: '')]
+    public string $invoiceId = '';
+
+    public function getBreadcrumb(): ?string
+    {
+        return 'Record Payments';
+    }
+
+    public function getTitle(): string | Htmlable
+    {
+        return 'Record Payments';
+    }
+
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return 'max-w-8xl';
+    }
+
+    public function mount(): void
+    {
+        parent::mount();
+
+        $preservedClientId = $this->tableFilters['client_id']['value'] ?? null;
+        $preservedCurrencyCode = $this->tableFilters['currency_code']['value'] ?? CurrencyAccessor::getDefaultCurrency();
+
+        $this->tableFilters = [
+            'client_id' => $preservedClientId ? ['value' => $preservedClientId] : [],
+            'currency_code' => ['value' => $preservedCurrencyCode],
+        ];
+
+        if ($invoiceId = (int) $this->invoiceId) {
+            $invoice = Invoice::find($invoiceId);
+            if ($invoice && $invoice->client_id == $preservedClientId) {
+                $this->paymentAmounts[$invoiceId] = $invoice->amount_due;
+            }
+        }
+
+        $this->form->fill();
+    }
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\Action::make('processPayments')
+                ->color('primary')
+                ->requiresConfirmation()
+                ->modalHeading('Confirm payments')
+                ->modalDescription(function () {
+                    $invoiceCount = collect($this->paymentAmounts)->filter(fn ($amount) => $amount > 0)->count();
+                    $totalAmount = array_sum($this->paymentAmounts);
+                    $currencyCode = $this->getTableFilterState('currency_code')['value'];
+                    $totalFormatted = CurrencyConverter::formatCentsToMoney($totalAmount, $currencyCode, true);
+
+                    return "You are about to pay {$invoiceCount} " . Str::plural('invoice', $invoiceCount) . " for a total of {$totalFormatted}. This action cannot be undone.";
+                })
+                ->action(function () {
+                    $data = $this->data;
+                    $tableRecords = $this->getTableRecords();
+                    $paidCount = 0;
+                    $totalPaid = 0;
+
+                    /** @var Invoice $invoice */
+                    foreach ($tableRecords as $invoice) {
+                        if (! $invoice->canRecordPayment()) {
+                            continue;
+                        }
+
+                        // Get the payment amount from our component state
+                        $paymentAmount = $this->getPaymentAmount($invoice);
+
+                        if ($paymentAmount <= 0) {
+                            continue;
+                        }
+
+                        $paymentData = [
+                            'posted_at' => $data['posted_at'],
+                            'payment_method' => $data['payment_method'],
+                            'bank_account_id' => $data['bank_account_id'],
+                            'amount' => $paymentAmount,
+                        ];
+
+                        $invoice->recordPayment($paymentData);
+                        $paidCount++;
+                        $totalPaid += $paymentAmount;
+                    }
+
+                    $currencyCode = $this->getTableFilterState('currency_code')['value'];
+                    $totalFormatted = CurrencyConverter::formatCentsToMoney($totalPaid, $currencyCode, true);
+
+                    Notification::make()
+                        ->title('Payments recorded successfully')
+                        ->body("Recorded {$paidCount} " . Str::plural('payment', $paidCount) . " for a total of {$totalFormatted}")
+                        ->success()
+                        ->send();
+
+                    $this->reset('paymentAmounts', 'allocationAmount');
+
+                    $this->resetTable();
+                }),
+        ];
+    }
+
+    protected function allocateOldestFirst(Collection $invoices, int $amountInCents): void
+    {
+        $remainingAmount = $amountInCents;
+
+        $sortedInvoices = $invoices->sortBy('due_date');
+
+        foreach ($sortedInvoices as $invoice) {
+            if ($remainingAmount <= 0) {
+                break;
+            }
+
+            $amountDue = $invoice->amount_due;
+            $allocation = min($remainingAmount, $amountDue);
+
+            $this->paymentAmounts[$invoice->id] = $allocation;
+            $remainingAmount -= $allocation;
+        }
+    }
+
+    protected function hasSelectedClient(): bool
+    {
+        return ! empty($this->getTableFilterState('client_id')['value']);
+    }
+
+    /**
+     * @return array<int | string, string | Form>
+     */
+    protected function getForms(): array
+    {
+        return [
+            'form',
+        ];
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->live()
+            ->schema([
+                Forms\Components\Grid::make(2) // Changed from 3 to 4
+                    ->schema([
+                        Forms\Components\Select::make('bank_account_id')
+                            ->label('Account')
+                            ->options(static function () {
+                                return Transaction::getBankAccountOptionsFlat();
+                            })
+                            ->default(fn () => BankAccount::where('enabled', true)->first()?->id)
+                            ->selectablePlaceholder(false)
+                            ->searchable()
+                            ->softRequired(),
+                        Forms\Components\DatePicker::make('posted_at')
+                            ->label('Date')
+                            ->default(now())
+                            ->softRequired(),
+                        Forms\Components\Select::make('payment_method')
+                            ->label('Payment method')
+                            ->selectablePlaceholder(false)
+                            ->options(PaymentMethod::class)
+                            ->default(PaymentMethod::BankPayment)
+                            ->softRequired(),
+                        Forms\Components\TextInput::make('allocation_amount')
+                            ->label('Allocate Payment Amount')
+                            ->default(array_sum($this->paymentAmounts))
+                            ->money($this->getTableFilterState('currency_code')['value'])
+                            ->extraAlpineAttributes([
+                                'x-on:keydown.enter.prevent' => '$refs.allocate.click()',
+                            ])
+                            ->suffixAction(
+                                Forms\Components\Actions\Action::make('allocate')
+                                    ->icon('heroicon-m-calculator')
+                                    ->extraAttributes([
+                                        'x-ref' => 'allocate',
+                                    ])
+                                    ->action(function ($state) {
+                                        $this->allocationAmount = CurrencyConverter::convertToCents($state, 'USD');
+                                        if ($this->allocationAmount && $this->hasSelectedClient()) {
+                                            $this->allocateOldestFirst($this->getTableRecords(), $this->allocationAmount);
+                                        }
+                                    }),
+                            ),
+                    ]),
+            ])->statePath('data');
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->query(
+                Invoice::query()
+                    ->with(['client'])
+                    ->unpaid()
+            )
+            ->recordClasses(['is-spreadsheet'])
+            ->defaultSort('due_date')
+            ->paginated(false)
+            ->emptyStateHeading('No client selected')
+            ->emptyStateDescription('Select a client from the filters above to view and process invoice payments.')
+            ->columns([
+                TextColumn::make('client.name')
+                    ->label('Client')
+                    ->sortable(),
+                TextColumn::make('invoice_number')
+                    ->label('Invoice number')
+                    ->sortable(),
+                TextColumn::make('due_date')
+                    ->label('Due date')
+                    ->defaultDateFormat()
+                    ->sortable(),
+                Tables\Columns\TextColumn::make('status')
+                    ->badge()
+                    ->sortable(),
+                TextColumn::make('amount_due')
+                    ->label('Amount due')
+                    ->currency(static fn (Invoice $record) => $record->currency_code)
+                    ->alignEnd()
+                    ->sortable()
+                    ->summarize([
+                        Summarizer::make()
+                            ->using(function (Builder $query) {
+                                $totalAmountDue = $query->sum('amount_due');
+                                $bankAccountCurrency = $this->getSelectedBankAccount()->account->currency_code;
+                                $activeCurrency = $this->getTableFilterState('currency_code')['value'] ?? $bankAccountCurrency;
+
+                                if ($activeCurrency !== $bankAccountCurrency) {
+                                    $totalAmountDue = CurrencyConverter::convertBalance($totalAmountDue, $activeCurrency, $bankAccountCurrency);
+                                }
+
+                                return CurrencyConverter::formatCentsToMoney($totalAmountDue, $bankAccountCurrency, true);
+                            }),
+                        Summarizer::make()
+                            ->using(function (Builder $query) {
+                                $totalAmountDue = $query->sum('amount_due');
+                                $currencyCode = $this->getTableFilterState('currency_code')['value'];
+
+                                return CurrencyConverter::formatCentsToMoney($totalAmountDue, $currencyCode, true);
+                            })
+                            ->visible(function () {
+                                $activeCurrency = $this->getTableFilterState('currency_code')['value'] ?? null;
+                                $bankAccountCurrency = $this->getSelectedBankAccount()->account->currency_code;
+
+                                return $activeCurrency && $activeCurrency !== $bankAccountCurrency;
+                            }),
+                    ]),
+                Tables\Columns\IconColumn::make('applyFullAmountAction')
+                    ->icon('heroicon-m-chevron-double-right')
+                    ->color('primary')
+                    ->label('')
+                    ->default('')
+                    ->alignCenter()
+                    ->width('3rem')
+                    ->tooltip('Apply full amount')
+                    ->action(
+                        Tables\Actions\Action::make('applyFullPayment')
+                            ->action(function (Invoice $record) {
+                                $this->paymentAmounts[$record->id] = $record->amount_due;
+                            }),
+                    ),
+                CustomTextInputColumn::make('payment_amount')
+                    ->label('Payment amount')
+                    ->alignEnd()
+                    ->navigable()
+                    ->mask(RawJs::make('$money($input)'))
+                    ->updateStateUsing(function (Invoice $record, $state) {
+                        if (! CurrencyConverter::isValidAmount($state, 'USD')) {
+                            $this->paymentAmounts[$record->id] = 0;
+
+                            return '0.00';
+                        }
+
+                        $paymentCents = CurrencyConverter::convertToCents($state, 'USD');
+
+                        if ($paymentCents > $record->amount_due) {
+                            $paymentCents = $record->amount_due;
+                        }
+
+                        $this->paymentAmounts[$record->id] = $paymentCents;
+
+                        return $state;
+                    })
+                    ->getStateUsing(function (Invoice $record) {
+                        $paymentAmount = $this->paymentAmounts[$record->id] ?? 0;
+
+                        return CurrencyConverter::convertCentsToFormatSimple($paymentAmount, 'USD');
+                    })
+                    ->summarize([
+                        Summarizer::make()
+                            ->using(function () {
+                                $total = array_sum($this->paymentAmounts);
+                                $bankAccountCurrency = $this->getSelectedBankAccount()->account->currency_code;
+                                $activeCurrency = $this->getTableFilterState('currency_code')['value'] ?? $bankAccountCurrency;
+
+                                if ($activeCurrency !== $bankAccountCurrency) {
+                                    $total = CurrencyConverter::convertBalance($total, $activeCurrency, $bankAccountCurrency);
+                                }
+
+                                return CurrencyConverter::formatCentsToMoney($total, $bankAccountCurrency, true);
+                            }),
+                        Summarizer::make()
+                            ->using(fn () => $this->totalPaymentAmount)
+                            ->visible(function () {
+                                $activeCurrency = $this->getTableFilterState('currency_code')['value'] ?? null;
+                                $bankAccountCurrency = $this->getSelectedBankAccount()->account->currency_code;
+
+                                return $activeCurrency && $activeCurrency !== $bankAccountCurrency;
+                            }),
+                    ]),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkAction::make('applyFullAmounts')
+                    ->label('Apply full amounts')
+                    ->icon('heroicon-o-banknotes')
+                    ->color('primary')
+                    ->deselectRecordsAfterCompletion()
+                    ->action(function (Collection $records) {
+                        $records->each(function (Invoice $invoice) {
+                            $this->paymentAmounts[$invoice->id] = $invoice->amount_due;
+                        });
+                    }),
+                Tables\Actions\BulkAction::make('clearAmounts')
+                    ->label('Clear amounts')
+                    ->icon('heroicon-o-x-mark')
+                    ->color('gray')
+                    ->deselectRecordsAfterCompletion()
+                    ->action(function (Collection $records) {
+                        $records->each(function (Invoice $invoice) {
+                            $this->paymentAmounts[$invoice->id] = 0;
+                        });
+                    }),
+            ])
+            ->filters([
+                Tables\Filters\SelectFilter::make('currency_code')
+                    ->label('Currency')
+                    ->selectablePlaceholder(false)
+                    ->default(CurrencyAccessor::getDefaultCurrency())
+                    ->options(Currency::query()->pluck('name', 'code')->toArray())
+                    ->searchable()
+                    ->resetState([
+                        'value' => CurrencyAccessor::getDefaultCurrency(),
+                    ])
+                    ->indicateUsing(function (Tables\Filters\SelectFilter $filter, array $state) {
+                        if (blank($state['value'] ?? null)) {
+                            return [];
+                        }
+
+                        $label = collect($filter->getOptions())
+                            ->mapWithKeys(fn (string | array $label, string $value): array => is_array($label) ? $label : [$value => $label])
+                            ->get($state['value']);
+
+                        if (blank($label)) {
+                            return [];
+                        }
+
+                        $indicator = $filter->getLabel();
+
+                        return Tables\Filters\Indicator::make("{$indicator}: {$label}")->removable(false);
+                    }),
+                Tables\Filters\SelectFilter::make('client_id')
+                    ->label('Client')
+                    ->selectablePlaceholder(false)
+                    ->options(fn () => Client::query()->pluck('name', 'id')->toArray())
+                    ->searchable()
+                    ->query(function (EloquentBuilder $query, array $data) {
+                        if (blank($data['value'] ?? null)) {
+                            return $query->whereRaw('1 = 0'); // No results if no client is selected
+                        }
+
+                        return $query->where('client_id', $data['value']);
+                    }),
+                Tables\Filters\Filter::make('invoice_lookup')
+                    ->label('Find Invoice')
+                    ->form([
+                        Forms\Components\TextInput::make('invoice_number')
+                            ->label('Invoice Number')
+                            ->placeholder('Enter invoice number')
+                            ->suffixAction(
+                                Forms\Components\Actions\Action::make('findInvoice')
+                                    ->icon('heroicon-m-magnifying-glass')
+                                    ->keyBindings(['enter'])
+                                    ->action(function ($state, Forms\Set $set) {
+                                        if (blank($state)) {
+                                            return;
+                                        }
+
+                                        $invoice = Invoice::byNumber($state)
+                                            ->unpaid()
+                                            ->first();
+
+                                        if ($invoice) {
+                                            $set('tableFilters.client_id.value', $invoice->client_id, true);
+                                            $this->paymentAmounts[$invoice->id] = $invoice->amount_due;
+
+                                            Notification::make()
+                                                ->title('Invoice found')
+                                                ->body("Found invoice {$invoice->invoice_number} for {$invoice->client->name}")
+                                                ->success()
+                                                ->send();
+                                        } else {
+                                            Notification::make()
+                                                ->title('Invoice not found')
+                                                ->body("No unpaid invoice found with number: {$state}")
+                                                ->warning()
+                                                ->send();
+                                        }
+                                    })
+                            ),
+                    ])
+                    ->query(null)
+                    ->indicateUsing(null),
+                Tables\Filters\SelectFilter::make('status')
+                    ->multiple()
+                    ->options(InvoiceStatus::getUnpaidOptions()),
+            ]);
+    }
+
+    protected function getPaymentAmount(Invoice $record): int
+    {
+        return $this->paymentAmounts[$record->id] ?? 0;
+    }
+
+    #[Computed]
+    public function totalPaymentAmount(): string
+    {
+        $total = array_sum($this->paymentAmounts);
+
+        $currencyCode = $this->getTableFilterState('currency_code')['value'];
+
+        return CurrencyConverter::formatCentsToMoney($total, $currencyCode, true);
+    }
+
+    public function getSelectedBankAccount(): BankAccount
+    {
+        $bankAccountId = $this->data['bank_account_id'];
+
+        $bankAccount = BankAccount::find($bankAccountId);
+
+        return $bankAccount ?: BankAccount::where('enabled', true)->first();
+    }
+
+    public function resetTableFiltersForm(): void
+    {
+        parent::resetTableFiltersForm();
+
+        $this->invoiceId = '';
+        $this->paymentAmounts = [];
+        $this->allocationAmount = null;
+    }
+
+    public function removeTableFilters(): void
+    {
+        parent::removeTableFilters();
+
+        $this->invoiceId = '';
+        $this->paymentAmounts = [];
+        $this->allocationAmount = null;
+    }
+
+    protected function handleTableFilterUpdates(): void
+    {
+        parent::handleTableFilterUpdates();
+
+        $visibleInvoiceIds = $this->getTableRecords()->pluck('id')->toArray();
+        $visibleInvoiceKeys = array_flip($visibleInvoiceIds);
+
+        $this->paymentAmounts = array_intersect_key($this->paymentAmounts, $visibleInvoiceKeys);
+        $this->allocationAmount = null;
+    }
+}

app/Filament/Company/Resources/Sales/InvoiceResource/RelationManagers/PaymentsRelationManager.php

@@ -115,11 +115,8 @@ class PaymentsRelationManager extends RelationManager
                                 };
                             })
                             ->rules([
-                                static fn (RelationManager $livewire): Closure => static function (string $attribute, $value, Closure $fail) use ($livewire) {
-                                    /** @var Invoice $invoice */
-                                    $invoice = $livewire->getOwnerRecord();
-
-                                    if (! CurrencyConverter::isValidAmount($value, $invoice->currency_code)) {
+                                static fn (): Closure => static function (string $attribute, $value, Closure $fail) {
+                                    if (! CurrencyConverter::isValidAmount($value, 'USD')) {
                                         $fail('Please enter a valid amount');
                                     }
                                 },
@@ -232,6 +229,7 @@ class PaymentsRelationManager extends RelationManager
                 Tables\Actions\CreateAction::make()
                     ->label(fn () => $this->getOwnerRecord()->status === InvoiceStatus::Overpaid ? 'Refund Overpayment' : 'Record Payment')
                     ->modalHeading(fn (Tables\Actions\CreateAction $action) => $action->getLabel())
+                    ->slideOver()
                     ->modalWidth(MaxWidth::TwoExtraLarge)
                     ->visible(function () {
                         return $this->getOwnerRecord()->canRecordPayment();
@@ -240,7 +238,7 @@ class PaymentsRelationManager extends RelationManager
                         $record = $this->getOwnerRecord();
                         $form->fill([
                             'posted_at' => now(),
-                            'amount' => $record->status === InvoiceStatus::Overpaid ? ltrim($record->amount_due, '-') : $record->amount_due,
+                            'amount' => abs($record->amount_due),
                         ]);
                     })
                     ->databaseTransaction()

app/Filament/Tables/Columns/CustomTextInputColumn.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use Closure;
+use Filament\Tables\Columns\TextInputColumn;
+
+class CustomTextInputColumn extends TextInputColumn
+{
+    protected string $view = 'filament.tables.columns.custom-text-input-column';
+
+    protected bool | Closure $isDeferred = false;
+
+    protected bool | Closure $isNavigable = false;
+
+    public function deferred(bool | Closure $condition = true): static
+    {
+        $this->isDeferred = $condition;
+
+        return $this;
+    }
+
+    public function navigable(bool | Closure $condition = true): static
+    {
+        $this->isNavigable = $condition;
+
+        return $this;
+    }
+
+    public function isDeferred(): bool
+    {
+        return (bool) $this->evaluate($this->isDeferred);
+    }
+
+    public function isNavigable(): bool
+    {
+        return (bool) $this->evaluate($this->isNavigable);
+    }
+}

app/Filament/Tables/Columns/DeferredTextInputColumn.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace App\Filament\Tables\Columns;
-
-use Closure;
-use Filament\Tables\Columns\TextInputColumn;
-
-class DeferredTextInputColumn extends TextInputColumn
-{
-    protected string $view = 'filament.tables.columns.deferred-text-input-column';
-
-    protected bool | Closure $batchMode = false;
-
-    public function batchMode(bool | Closure $condition = true): static
-    {
-        $this->batchMode = $condition;
-
-        return $this;
-    }
-
-    public function getBatchMode(): bool
-    {
-        return $this->evaluate($this->batchMode);
-    }
-}

app/Models/Accounting/Invoice.php

@@ -183,12 +183,18 @@ class Invoice extends Document
 
     public function scopeUnpaid(Builder $query): Builder
     {
-        return $query->whereNotIn('status', [
-            InvoiceStatus::Paid,
-            InvoiceStatus::Void,
-            InvoiceStatus::Draft,
-            InvoiceStatus::Overpaid,
-        ]);
+        return $query->whereIn('status', InvoiceStatus::unpaidStatuses());
+    }
+
+    // TODO: Consider storing the numeric part of the invoice number separately
+    public function scopeByNumber(Builder $query, string $number): Builder
+    {
+        $invoicePrefix = DocumentDefault::invoice()->first()->number_prefix ?? '';
+
+        return $query->where(function ($q) use ($number, $invoicePrefix) {
+            $q->where('invoice_number', $number)
+                ->orWhere('invoice_number', $invoicePrefix . $number);
+        });
     }
 
     public function scopeOverdue(Builder $query): Builder

app/Models/Accounting/Transaction.php

@@ -113,6 +113,26 @@ class Transaction extends Model
         }
     }
 
+    public static function getBankAccountOptionsFlat(?int $excludedAccountId = null, ?int $currentBankAccountId = null, bool $excludeArchived = true): array
+    {
+        return BankAccount::query()
+            ->whereHas('account', function (Builder $query) use ($excludeArchived) {
+                if ($excludeArchived) {
+                    $query->where('archived', false);
+                }
+            })
+            ->with(['account' => function ($query) use ($excludeArchived) {
+                if ($excludeArchived) {
+                    $query->where('archived', false);
+                }
+            }])
+            ->when($excludedAccountId, fn (Builder $query) => $query->where('account_id', '!=', $excludedAccountId))
+            ->when($currentBankAccountId, fn (Builder $query) => $query->orWhere('id', $currentBankAccountId))
+            ->get()
+            ->pluck('account.name', 'id')
+            ->toArray();
+    }
+
     public static function getBankAccountOptions(?int $excludedAccountId = null, ?int $currentBankAccountId = null, bool $excludeArchived = true): array
     {
         return BankAccount::query()

app/Models/Setting/DocumentDefault.php

@@ -75,7 +75,7 @@ class DocumentDefault extends Model
 
     public function scopeType(Builder $query, string | DocumentType $type): Builder
     {
-        return $query->where($this->qualifyColumn('type'), $type);
+        return $query->where('type', $type);
     }
 
     public function scopeInvoice(Builder $query): Builder

app/Providers/Filament/CompanyPanelProvider.php

@@ -284,7 +284,12 @@ class CompanyPanelProvider extends PanelProvider
             $table
                 ->paginationPageOptions([5, 10, 25, 50, 100])
                 ->filtersFormWidth(MaxWidth::Small)
-                ->filtersTriggerAction(fn (Tables\Actions\Action $action) => $action->slideOver());
+                ->filtersTriggerAction(
+                    fn (Tables\Actions\Action $action) => $action
+                        ->button()
+                        ->label('Filters')
+                        ->slideOver()
+                );
         });
 
         Tables\Columns\TextColumn::configureUsing(function (Tables\Columns\TextColumn $column): void {

resources/css/filament/company/theme.css

@@ -66,7 +66,7 @@
     z-index: -1;
 }
 
-.fi-ta-table:has(.budget-items-relation-manager) {
+.fi-ta-table:has(.is-spreadsheet) {
     .fi-ta-row {
         @apply divide-x divide-gray-200 dark:divide-gray-700;
     }
@@ -102,7 +102,7 @@
         }
     }
 
-    .fi-ta-cell:focus-within {
+    .fi-ta-cell:has(.fi-ta-text-input):focus-within {
         outline: 2px solid #2563eb;
         outline-offset: -2px;
         z-index: 1;

resources/views/filament/company/resources/purchases/bill-resource/pages/pay-bills.blade.php

@@ -0,0 +1,32 @@
+<x-filament-panels::page
+    @class([
+        'fi-resource-list-records-page',
+        'fi-resource-' . str_replace('/', '-', $this->getResource()::getSlug()),
+    ])
+>
+    <div class="flex flex-col gap-y-6">
+        <x-filament::section>
+            <div class="flex items-center justify-between">
+                <div>
+                    {{ $this->form }}
+                </div>
+                <div class="text-right">
+                    <div class="text-xs font-medium text-gray-500 dark:text-gray-400">
+                        Total Payment Amount
+                    </div>
+                    <div class="text-3xl font-bold text-gray-900 dark:text-white tabular-nums">
+                        {{ $this->totalPaymentAmount }}
+                    </div>
+                </div>
+            </div>
+        </x-filament::section>
+
+        <x-filament-panels::resources.tabs />
+
+        {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::RESOURCE_PAGES_LIST_RECORDS_TABLE_BEFORE, scopes: $this->getRenderHookScopes()) }}
+
+        {{ $this->table }}
+
+        {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::RESOURCE_PAGES_LIST_RECORDS_TABLE_AFTER, scopes: $this->getRenderHookScopes()) }}
+    </div>
+</x-filament-panels::page>

resources/views/filament/company/resources/sales/invoice-resource/pages/record-payments.blade.php

@@ -0,0 +1,30 @@
+<x-filament-panels::page
+    @class([
+        'fi-resource-list-records-page',
+        'fi-resource-' . str_replace('/', '-', $this->getResource()::getSlug()),
+    ])
+>
+    <div class="flex flex-col gap-y-6">
+        <x-filament::section>
+            <div class="flex items-start justify-between">
+                <div>
+                    {{ $this->form }}
+                </div>
+                <div class="text-right">
+                    <div class="text-xs font-medium text-gray-500 dark:text-gray-400">
+                        Total Payment Amount
+                    </div>
+                    <div class="text-3xl font-bold text-gray-900 dark:text-white tabular-nums">{{ $this->totalPaymentAmount }}</div>
+                </div>
+            </div>
+        </x-filament::section>
+
+        <x-filament-panels::resources.tabs />
+
+        {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::RESOURCE_PAGES_LIST_RECORDS_TABLE_BEFORE, scopes: $this->getRenderHookScopes()) }}
+
+        {{ $this->table }}
+
+        {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::RESOURCE_PAGES_LIST_RECORDS_TABLE_AFTER, scopes: $this->getRenderHookScopes()) }}
+    </div>
+</x-filament-panels::page>

resources/views/filament/tables/columns/deferred-text-input-column.blade.php → resources/views/filament/tables/columns/custom-text-input-column.blade.php

@@ -4,7 +4,8 @@
     $isDisabled = $isDisabled();
     $state = $getState();
     $mask = $getMask();
-    $batchMode = $getBatchMode();
+    $isDeferred = $isDeferred();
+    $isNavigable = $isNavigable();
 
     $alignment = $getAlignment() ?? Alignment::Start;
 
@@ -32,6 +33,42 @@
         recordKey: @js($recordKey),
 
         state: @js($state),
+
+        navigateToRow(direction) {
+            const currentRow = $el.closest('tr');
+            const currentCell = $el.closest('td');
+            const currentColumnIndex = Array.from(currentRow.children).indexOf(currentCell);
+
+            const targetRow = direction === 'next'
+                ? currentRow.nextElementSibling
+                : currentRow.previousElementSibling;
+
+            if (targetRow && targetRow.children[currentColumnIndex]) {
+                const targetInput = targetRow.children[currentColumnIndex].querySelector('input[x-model=\'state\']');
+                if (targetInput) {
+                    targetInput.focus();
+                    targetInput.select();
+                }
+            }
+        },
+
+        navigateToColumn(direction) {
+            const currentCell = $el.closest('td');
+            const currentRow = $el.closest('tr');
+            const currentColumnIndex = Array.from(currentRow.children).indexOf(currentCell);
+
+            const targetCell = direction === 'next'
+                ? currentRow.children[currentColumnIndex + 1]
+                : currentRow.children[currentColumnIndex - 1];
+
+            if (targetCell) {
+                const targetInput = targetCell.querySelector('input[x-model=\'state\']');
+                if (targetInput) {
+                    targetInput.focus();
+                    targetInput.select();
+                }
+            }
+        }
     }"
     x-init="
         () => {
@@ -105,7 +142,7 @@
                 \Filament\Support\prepare_inherited_attributes(
                     $getExtraInputAttributeBag()
                         ->merge([
-                            'x-on:change' . ($type === 'number' ? '.debounce.1s' : null) => $batchMode ? '
+                            'x-on:change' . ($type === 'number' ? '.debounce.1s' : null) => $isDeferred ? '
                                 $wire.handleBatchColumnChanged({
                                     name: name,
                                     recordKey: recordKey,
@@ -128,7 +165,7 @@
 
                                 isLoading = false
                             ',
-                            'x-on:keydown.enter' => $batchMode ? '
+                            'x-on:keydown.enter' => $isDeferred ? '
                                 $wire.handleBatchColumnChanged({
                                     name: name,
                                     recordKey: recordKey,
@@ -138,7 +175,11 @@
                                 $nextTick(() => {
                                     $wire.saveBatchChanges();
                                 });
-                            ' : null,
+                            ' : ($isNavigable ? 'navigateToRow(\'next\')' : null),
+                            'x-on:keydown.arrow-down.prevent' => $isNavigable ? 'navigateToRow(\'next\')' : null,
+                            'x-on:keydown.arrow-up.prevent' => $isNavigable ? 'navigateToRow(\'prev\')' : null,
+                            'x-on:keydown.arrow-left.prevent' => $isNavigable ? 'navigateToColumn(\'prev\')' : null,
+                            'x-on:keydown.arrow-right.prevent' => $isNavigable ? 'navigateToColumn(\'next\')' : null,
                             'x-mask' . ($mask instanceof \Filament\Support\RawJs ? ':dynamic' : '') => filled($mask) ? $mask : null,
                         ])
                         ->class([