wip Invoice Payments

app/Enums/Accounting/PaymentMethod.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Enums\Accounting;
+
+use Filament\Support\Contracts\HasLabel;
+
+enum PaymentMethod: string implements HasLabel
+{
+    case BankPayment = 'bank_payment';
+    case Cash = 'cash';
+    case Check = 'check';
+    case CreditCard = 'credit_card';
+    case PayPal = 'paypal';
+    case Other = 'other';
+
+    public function getLabel(): ?string
+    {
+        return match ($this) {
+            self::BankPayment => 'Bank Payment',
+            self::Cash => 'Cash',
+            self::Check => 'Check',
+            self::CreditCard => 'Credit Card',
+            self::PayPal => 'PayPal',
+            self::Other => 'Other',
+        };
+    }
+}

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

@@ -296,7 +296,7 @@ class Transactions extends Page implements HasTable
                         }
                     )
                     ->sortable()
-                    ->currency(static fn (Transaction $transaction) => $transaction->bankAccount->account->currency_code ?? CurrencyAccessor::getDefaultCurrency(), true),
+                    ->currency(static fn (Transaction $transaction) => $transaction->bankAccount?->account->currency_code ?? CurrencyAccessor::getDefaultCurrency(), true),
             ])
             ->recordClasses(static fn (Transaction $transaction) => $transaction->reviewed ? 'bg-primary-300/10' : null)
             ->defaultSort('posted_at', 'desc')

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

@@ -4,8 +4,10 @@ namespace App\Filament\Company\Resources\Sales;
 
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\JournalEntryType;
+use App\Enums\Accounting\PaymentMethod;
 use App\Enums\Accounting\TransactionType;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
+use App\Filament\Company\Resources\Sales\InvoiceResource\RelationManagers;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\DocumentLineItem;
@@ -17,10 +19,12 @@ use App\Utilities\Currency\CurrencyConverter;
 use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Carbon\CarbonInterface;
+use Closure;
 use Filament\Forms;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
+use Filament\Support\Enums\Alignment;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
@@ -459,6 +463,7 @@ class InvoiceResource extends Resource
                             $replica->date = now();
                             $replica->due_date = now()->addDays($original->company->defaultInvoice->payment_terms->getDays());
                         })
+                        ->databaseTransaction()
                         ->after(function (Invoice $original, Invoice $replica) {
                             $original->lineItems->each(function (DocumentLineItem $lineItem) use ($replica) {
                                 $replicaLineItem = $lineItem->replicate([
@@ -489,7 +494,9 @@ class InvoiceResource extends Resource
                         ->visible(function (Invoice $record) {
                             return $record->isDraft();
                         })
-                        ->action(function (Invoice $record) {
+                        ->databaseTransaction()
+                        ->successNotificationTitle('Invoice Approved')
+                        ->action(function (Invoice $record, Tables\Actions\Action $action) {
                             $transaction = $record->transactions()->create([
                                 'type' => TransactionType::Journal,
                                 'posted_at' => now(),
@@ -499,7 +506,7 @@ class InvoiceResource extends Resource
 
                             $transaction->journalEntries()->create([
                                 'type' => JournalEntryType::Debit,
-                                'account_id' => Account::where('name', 'Accounts Receivable')->first()->id,
+                                'account_id' => Account::getAccountsReceivableAccount()->id,
                                 'amount' => $record->total,
                                 'description' => $transaction->description,
                             ]);
@@ -525,6 +532,8 @@ class InvoiceResource extends Resource
                             $record->updateQuietly([
                                 'status' => InvoiceStatus::Unsent,
                             ]);
+
+                            $action->success();
                         }),
                     Tables\Actions\Action::make('markAsSent')
                         ->label('Mark as Sent')
@@ -532,13 +541,19 @@ class InvoiceResource extends Resource
                         ->visible(function (Invoice $record) {
                             return $record->status === InvoiceStatus::Unsent;
                         })
-                        ->action(function (Invoice $record) {
+                        ->successNotificationTitle('Invoice Sent')
+                        ->action(function (Invoice $record, Tables\Actions\Action $action) {
                             $record->updateQuietly([
                                 'status' => InvoiceStatus::Sent,
                             ]);
+
+                            $action->success();
                         }),
                     Tables\Actions\Action::make('recordPayment')
-                        ->label('Record Payment')
+                        ->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')
                         ->visible(function (Invoice $record) {
@@ -547,28 +562,58 @@ class InvoiceResource extends Resource
                         ->mountUsing(function (Invoice $record, Form $form) {
                             $form->fill([
                                 'posted_at' => now(),
-                                'amount' => $record->amount_due,
+                                'amount' => $record->status === InvoiceStatus::Overpaid ? ltrim($record->amount_due, '-') : $record->amount_due,
                             ]);
                         })
+                        ->databaseTransaction()
+                        ->successNotificationTitle('Payment Recorded')
                         ->form([
                             Forms\Components\DatePicker::make('posted_at')
-                                ->label('Payment Date'),
+                                ->label('Date'),
                             Forms\Components\TextInput::make('amount')
                                 ->label('Amount')
                                 ->required()
-                                ->money(),
+                                ->money()
+                                ->live(onBlur: true)
+                                ->helperText(function (Invoice $record, $state) {
+                                    if (! CurrencyConverter::isValidAmount($state)) {
+                                        return null;
+                                    }
+
+                                    $amountDue = $record->getRawOriginal('amount_due');
+
+                                    $amount = CurrencyConverter::convertToCents($state);
+
+                                    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),
+                                        $newAmountDue === 0 => 'Invoice will be fully paid',
+                                        default => 'Invoice will be overpaid by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue)),
+                                    };
+                                })
+                                ->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')
-                                ->options([
-                                    'bank_payment' => 'Bank Payment',
-                                    'cash' => 'Cash',
-                                    'check' => 'Check',
-                                    'credit_card' => 'Credit Card',
-                                    'paypal' => 'PayPal',
-                                    'other' => 'Other',
-                                ]),
+                                ->required()
+                                ->options(PaymentMethod::class),
                             Forms\Components\Select::make('bank_account_id')
                                 ->label('Account')
+                                ->required()
                                 ->options(BankAccount::query()
                                     ->get()
                                     ->pluck('account.name', 'id'))
@@ -576,36 +621,10 @@ class InvoiceResource extends Resource
                             Forms\Components\Textarea::make('notes')
                                 ->label('Notes'),
                         ])
-                        ->action(function (Invoice $record, array $data) {
-                            $payment = $record->transactions()->create([
-                                'type' => TransactionType::Deposit,
-                                'is_payment' => true,
-                                'posted_at' => $data['posted_at'],
-                                'amount' => $data['amount'],
-                                'payment_method' => $data['payment_method'],
-                                'bank_account_id' => $data['bank_account_id'],
-                                'account_id' => Account::where('name', 'Accounts Receivable')->first()?->id,
-                                'description' => 'Payment for Invoice #' . $record->invoice_number,
-                                'notes' => $data['notes'] ?? null,
-                            ]);
-
-                            $amountPaid = $record->getRawOriginal('amount_paid');
-                            $paymentAmount = $payment->getRawOriginal('amount');
-                            $totalAmount = $record->getRawOriginal('total');
-
-                            $newAmountPaid = $amountPaid + $paymentAmount;
-
-                            $record->amount_paid = CurrencyConverter::convertCentsToFloat($newAmountPaid);
-
-                            if ($newAmountPaid > $totalAmount) {
-                                $record->status = InvoiceStatus::Overpaid;
-                            } elseif ($newAmountPaid === $totalAmount) {
-                                $record->status = InvoiceStatus::Paid;
-                            } else {
-                                $record->status = InvoiceStatus::Partial;
-                            }
+                        ->action(function (Invoice $record, Tables\Actions\Action $action, array $data) {
+                            $record->recordPayment($data);
 
-                            $record->save();
+                            $action->success();
                         }),
                 ]),
             ])
@@ -619,7 +638,7 @@ class InvoiceResource extends Resource
     public static function getRelations(): array
     {
         return [
-            //
+            RelationManagers\PaymentsRelationManager::class,
         ];
     }
 

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

@@ -5,45 +5,44 @@ namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
+use App\Models\Accounting\Invoice;
 use Carbon\CarbonInterface;
-use Filament\Infolists\Components\Actions\Action;
-use Filament\Infolists\Components\Grid;
+use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
-use Filament\Infolists\Components\ViewEntry;
 use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\FontWeight;
-use Filament\Support\Enums\MaxWidth;
 use Illuminate\Support\Carbon;
 
 class ViewInvoice extends ViewRecord
 {
     protected static string $resource = InvoiceResource::class;
 
+    protected $listeners = [
+        'refresh' => '$refresh',
+    ];
+
     public function infolist(Infolist $infolist): Infolist
     {
         return $infolist
-            ->columns(1)
             ->schema([
-                Grid::make(5)
+                Section::make('Invoice Details')
+                    ->columns(3)
                     ->schema([
                         TextEntry::make('invoice_number')
-                            ->label('Invoice #')
-                            ->size(TextEntry\TextEntrySize::Large),
+                            ->label('Invoice #'),
                         TextEntry::make('status')
-                            ->badge()
-                            ->size(TextEntry\TextEntrySize::Large),
+                            ->badge(),
                         TextEntry::make('client.name')
+                            ->label('Client')
                             ->color('primary')
                             ->weight(FontWeight::SemiBold)
-                            ->size(TextEntry\TextEntrySize::Large)
-                            ->url(fn ($record) => ClientResource::getUrl('edit', ['record' => $record->client_id]), true),
+                            ->url(fn (Invoice $record) => ClientResource::getUrl('edit', ['record' => $record->client_id])),
                         TextEntry::make('amount_due')
                             ->label('Amount Due')
-                            ->money()
-                            ->size(TextEntry\TextEntrySize::Large),
+                            ->money(),
                         TextEntry::make('due_date')
-                            ->label('Due')
+                            ->label('Due Date')
                             ->formatStateUsing(function (TextEntry $entry, mixed $state) {
                                 if (blank($state)) {
                                     return null;
@@ -59,30 +58,7 @@ class ViewInvoice extends ViewRecord
                                 return $date->diffForHumans([
                                     'options' => CarbonInterface::ONE_DAY_WORDS,
                                 ]);
-                            })
-                            ->size(TextEntry\TextEntrySize::Large),
-                    ]),
-                ViewEntry::make('create')
-                    ->view('filament.infolists.invoice-create-step')
-                    ->registerActions([
-                        Action::make('approveDraft')
-                            ->label('Approve Draft')
-                            ->action('approveDraft')
-                            ->visible(fn ($record) => $record->status === InvoiceStatus::Draft),
-                        Action::make('edit')
-                            ->label('Edit')
-                            ->outlined()
-                            ->url(fn ($record) => InvoiceResource::getUrl('edit', ['record' => $record->id]), true),
-                        Action::make('markAsSent')
-                            ->label('Mark as Sent')
-                            ->outlined()
-                            ->action('markAsSent'),
-                        Action::make('sendInvoice')
-                            ->label('Send Invoice')
-                            ->action('sendInvoice'),
-                        Action::make('recordPayment')
-                            ->label('Record Payment')
-                            ->action('recordPayment'),
+                            }),
                     ]),
             ]);
     }
@@ -100,9 +76,4 @@ class ViewInvoice extends ViewRecord
             'status' => InvoiceStatus::Sent,
         ]);
     }
-
-    public function getMaxContentWidth(): MaxWidth | string | null
-    {
-        return MaxWidth::FiveExtraLarge;
-    }
 }

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

@@ -0,0 +1,187 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\InvoiceResource\RelationManagers;
+
+use App\Enums\Accounting\InvoiceStatus;
+use App\Enums\Accounting\PaymentMethod;
+use App\Enums\Accounting\TransactionType;
+use App\Filament\Company\Resources\Sales\InvoiceResource\Pages\ViewInvoice;
+use App\Models\Accounting\Invoice;
+use App\Models\Accounting\Transaction;
+use App\Models\Banking\BankAccount;
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
+use Closure;
+use Filament\Forms;
+use Filament\Forms\Form;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Support\Colors\Color;
+use Filament\Support\Enums\FontWeight;
+use Filament\Support\Enums\MaxWidth;
+use Filament\Tables;
+use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Model;
+
+class PaymentsRelationManager extends RelationManager
+{
+    protected static string $relationship = 'payments';
+
+    protected static ?string $modelLabel = 'Payment';
+
+    protected $listeners = [
+        'refresh' => '$refresh',
+    ];
+
+    public function isReadOnly(): bool
+    {
+        return false;
+    }
+
+    public static function canViewForRecord(Model $ownerRecord, string $pageClass): bool
+    {
+        return $ownerRecord->status !== InvoiceStatus::Draft && $pageClass === ViewInvoice::class;
+    }
+
+    public function form(Form $form): Form
+    {
+        return $form
+            ->columns(1)
+            ->schema([
+                Forms\Components\DatePicker::make('posted_at')
+                    ->label('Date'),
+                Forms\Components\TextInput::make('amount')
+                    ->label('Amount')
+                    ->required()
+                    ->money()
+                    ->live(onBlur: true)
+                    ->helperText(function (RelationManager $livewire, $state, ?Transaction $record) {
+                        if (! CurrencyConverter::isValidAmount($state)) {
+                            return null;
+                        }
+
+                        /** @var Invoice $ownerRecord */
+                        $ownerRecord = $livewire->getOwnerRecord();
+
+                        $amountDue = $ownerRecord->getRawOriginal('amount_due');
+
+                        $amount = CurrencyConverter::convertToCents($state);
+
+                        if ($amount <= 0) {
+                            return 'Please enter a valid positive amount';
+                        }
+
+                        $currentPaymentAmount = $record?->getRawOriginal('amount') ?? 0;
+
+                        if ($ownerRecord->status === InvoiceStatus::Overpaid) {
+                            $newAmountDue = $amountDue + $amount - $currentPaymentAmount;
+                        } else {
+                            $newAmountDue = $amountDue - $amount + $currentPaymentAmount;
+                        }
+
+                        return match (true) {
+                            $newAmountDue > 0 => 'Amount due after payment will be ' . CurrencyConverter::formatCentsToMoney($newAmountDue),
+                            $newAmountDue === 0 => 'Invoice will be fully paid',
+                            default => 'Invoice will be overpaid by ' . CurrencyConverter::formatCentsToMoney(abs($newAmountDue)),
+                        };
+                    })
+                    ->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(BankAccount::query()
+                        ->get()
+                        ->pluck('account.name', 'id'))
+                    ->searchable(),
+                Forms\Components\Textarea::make('notes')
+                    ->label('Notes'),
+            ]);
+    }
+
+    public function table(Table $table): Table
+    {
+        return $table
+            ->recordTitleAttribute('description')
+            ->columns([
+                Tables\Columns\TextColumn::make('posted_at')
+                    ->label('Date')
+                    ->sortable()
+                    ->defaultDateFormat(),
+                Tables\Columns\TextColumn::make('type')
+                    ->label('Type')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true),
+                Tables\Columns\TextColumn::make('description')
+                    ->label('Description')
+                    ->limit(30)
+                    ->toggleable(),
+                Tables\Columns\TextColumn::make('bankAccount.account.name')
+                    ->label('Account')
+                    ->toggleable(),
+                Tables\Columns\TextColumn::make('amount')
+                    ->label('Amount')
+                    ->weight(static fn (Transaction $transaction) => $transaction->reviewed ? null : FontWeight::SemiBold)
+                    ->color(
+                        static fn (Transaction $transaction) => match ($transaction->type) {
+                            TransactionType::Deposit => Color::rgb('rgb(' . Color::Green[700] . ')'),
+                            TransactionType::Journal => 'primary',
+                            default => null,
+                        }
+                    )
+                    ->sortable()
+                    ->currency(static fn (Transaction $transaction) => $transaction->bankAccount?->account->currency_code ?? CurrencyAccessor::getDefaultCurrency(), true),
+            ])
+            ->filters([
+                //
+            ])
+            ->headerActions([
+                Tables\Actions\CreateAction::make()
+                    ->label(fn () => $this->getOwnerRecord()->status === InvoiceStatus::Overpaid ? 'Refund Overpayment' : 'Record Payment')
+                    ->modalHeading(fn (Tables\Actions\CreateAction $action) => $action->getLabel())
+                    ->modalWidth(MaxWidth::TwoExtraLarge)
+                    ->visible(function () {
+                        return $this->getOwnerRecord()->canRecordPayment();
+                    })
+                    ->mountUsing(function (Form $form) {
+                        $record = $this->getOwnerRecord();
+                        $form->fill([
+                            'posted_at' => now(),
+                            'amount' => $record->status === InvoiceStatus::Overpaid ? ltrim($record->amount_due, '-') : $record->amount_due,
+                        ]);
+                    })
+                    ->databaseTransaction()
+                    ->successNotificationTitle('Payment Recorded')
+                    ->action(function (Tables\Actions\CreateAction $action, array $data) {
+                        /** @var Invoice $record */
+                        $record = $this->getOwnerRecord();
+
+                        $record->recordPayment($data);
+
+                        $action->success();
+
+                        $this->dispatch('refresh');
+                    }),
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make()
+                    ->modalWidth(MaxWidth::TwoExtraLarge)
+                    ->after(fn () => $this->dispatch('refresh')),
+                Tables\Actions\DeleteAction::make()
+                    ->after(fn () => $this->dispatch('refresh')),
+            ])
+            ->bulkActions([
+                Tables\Actions\BulkActionGroup::make([
+                    Tables\Actions\DeleteBulkAction::make(),
+                ]),
+            ]);
+    }
+}

app/Models/Accounting/Account.php

@@ -123,6 +123,11 @@ class Account extends Model
         return $this->hasMany(JournalEntry::class, 'account_id');
     }
 
+    public static function getAccountsReceivableAccount(): self
+    {
+        return self::where('name', 'Accounts Receivable')->firstOrFail();
+    }
+
     protected static function newFactory(): Factory
     {
         return AccountFactory::new();

app/Models/Accounting/Bill.php

@@ -85,7 +85,7 @@ class Bill extends Model
     public function approvalTransaction(): MorphOne
     {
         return $this->morphOne(Transaction::class, 'transactionable')
-            ->where('type', TransactionType::Approval);
+            ->where('type', TransactionType::Journal);
     }
 
     public static function getNextDocumentNumber(): string

app/Models/Accounting/Invoice.php

@@ -8,12 +8,15 @@ use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\TransactionType;
 use App\Models\Common\Client;
+use App\Observers\InvoiceObserver;
+use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 
+#[ObservedBy(InvoiceObserver::class)]
 class Invoice extends Model
 {
     use Blamable;
@@ -90,7 +93,7 @@ class Invoice extends Model
     public function approvalTransaction(): MorphOne
     {
         return $this->morphOne(Transaction::class, 'transactionable')
-            ->where('type', TransactionType::Approval);
+            ->where('type', TransactionType::Journal);
     }
 
     public function isDraft(): bool
@@ -103,7 +106,6 @@ class Invoice extends Model
         return ! in_array($this->status, [
             InvoiceStatus::Draft,
             InvoiceStatus::Paid,
-            InvoiceStatus::Overpaid,
             InvoiceStatus::Void,
         ]);
     }
@@ -140,4 +142,30 @@ class Invoice extends Model
             next: $numberNext
         );
     }
+
+    public function recordPayment(array $data): void
+    {
+        $isRefund = $this->status === InvoiceStatus::Overpaid;
+
+        if ($isRefund) {
+            $transactionType = TransactionType::Withdrawal;
+            $transactionDescription = 'Refund for Overpayment on Invoice #' . $this->invoice_number;
+        } else {
+            $transactionType = TransactionType::Deposit;
+            $transactionDescription = 'Payment for Invoice #' . $this->invoice_number;
+        }
+
+        // Create transaction
+        $this->transactions()->create([
+            'type' => $transactionType,
+            'is_payment' => true,
+            'posted_at' => $data['posted_at'],
+            'amount' => $data['amount'],
+            'payment_method' => $data['payment_method'],
+            'bank_account_id' => $data['bank_account_id'],
+            'account_id' => Account::getAccountsReceivableAccount()->id,
+            'description' => $transactionDescription,
+            'notes' => $data['notes'] ?? null,
+        ]);
+    }
 }

app/Models/Accounting/Transaction.php

@@ -5,6 +5,7 @@ namespace App\Models\Accounting;
 use App\Casts\TransactionAmountCast;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\PaymentMethod;
 use App\Enums\Accounting\TransactionType;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Contact;
@@ -48,6 +49,7 @@ class Transaction extends Model
 
     protected $casts = [
         'type' => TransactionType::class,
+        'payment_method' => PaymentMethod::class,
         'amount' => TransactionAmountCast::class,
         'pending' => 'boolean',
         'reviewed' => 'boolean',

app/Models/Banking/BankAccount.php

@@ -66,11 +66,6 @@ class BankAccount extends Model
         return $this->belongsTo(Institution::class, 'institution_id');
     }
 
-    public function payments(): HasMany
-    {
-        return $this->hasMany(Payment::class, 'bank_account_id');
-    }
-
     public function transactions(): HasMany
     {
         return $this->hasMany(Transaction::class, 'bank_account_id');

app/Models/Banking/Payment.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace App\Models\Banking;
-
-use App\Casts\MoneyCast;
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\MorphTo;
-
-class Payment extends Model
-{
-    use Blamable;
-    use CompanyOwned;
-    use HasFactory;
-
-    protected $fillable = [
-        'company_id',
-        'date',
-        'amount',
-        'payment_method',
-        'bank_account_id',
-        'notes',
-        'created_by',
-        'updated_by',
-    ];
-
-    protected $casts = [
-        'date' => 'date',
-        'amount' => MoneyCast::class,
-    ];
-
-    public function payable(): MorphTo
-    {
-        return $this->morphTo();
-    }
-
-    public function bankAccount(): BelongsTo
-    {
-        return $this->belongsTo(BankAccount::class);
-    }
-}

app/Models/Company.php

@@ -152,11 +152,6 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
         return $this->hasOne(Localization::class, 'company_id');
     }
 
-    public function payments(): HasMany
-    {
-        return $this->hasMany(Banking\Payment::class, 'company_id');
-    }
-
     public function profile(): HasOne
     {
         return $this->hasOne(CompanyProfile::class, 'company_id');

app/Observers/InvoiceObserver.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Accounting\DocumentLineItem;
+use App\Models\Accounting\Invoice;
+use App\Models\Accounting\Transaction;
+use Illuminate\Support\Facades\DB;
+
+class InvoiceObserver
+{
+    /**
+     * Handle the Invoice "created" event.
+     */
+    public function created(Invoice $invoice): void
+    {
+        //
+    }
+
+    /**
+     * Handle the Invoice "updated" event.
+     */
+    public function updated(Invoice $invoice): void
+    {
+        //
+    }
+
+    public function deleting(Invoice $invoice): void
+    {
+        DB::transaction(function () use ($invoice) {
+            $invoice->lineItems()->each(function (DocumentLineItem $lineItem) {
+                $lineItem->delete();
+            });
+
+            $invoice->transactions()->each(function (Transaction $transaction) {
+                $transaction->delete();
+            });
+        });
+    }
+
+    /**
+     * Handle the Invoice "deleted" event.
+     */
+    public function deleted(Invoice $invoice): void
+    {
+        //
+    }
+
+    /**
+     * Handle the Invoice "restored" event.
+     */
+    public function restored(Invoice $invoice): void
+    {
+        //
+    }
+
+    /**
+     * Handle the Invoice "force deleted" event.
+     */
+    public function forceDeleted(Invoice $invoice): void
+    {
+        //
+    }
+}

app/Observers/TransactionObserver.php

@@ -2,8 +2,13 @@
 
 namespace App\Observers;
 
+use App\Enums\Accounting\InvoiceStatus;
+use App\Models\Accounting\Invoice;
 use App\Models\Accounting\Transaction;
 use App\Services\TransactionService;
+use App\Utilities\Currency\CurrencyConverter;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
 
 class TransactionObserver
 {
@@ -27,6 +32,16 @@ class TransactionObserver
     public function created(Transaction $transaction): void
     {
         $this->transactionService->createJournalEntries($transaction);
+
+        if (! $transaction->is_payment) {
+            return;
+        }
+
+        $invoice = $transaction->transactionable;
+
+        if ($invoice instanceof Invoice) {
+            $this->updateInvoiceTotals($invoice);
+        }
     }
 
     /**
@@ -37,6 +52,16 @@ class TransactionObserver
         $transaction->refresh(); // DO NOT REMOVE
 
         $this->transactionService->updateJournalEntries($transaction);
+
+        if (! $transaction->is_payment) {
+            return;
+        }
+
+        $invoice = $transaction->transactionable;
+
+        if ($invoice instanceof Invoice) {
+            $this->updateInvoiceTotals($invoice);
+        }
     }
 
     /**
@@ -44,6 +69,48 @@ class TransactionObserver
      */
     public function deleting(Transaction $transaction): void
     {
-        $this->transactionService->deleteJournalEntries($transaction);
+        DB::transaction(function () use ($transaction) {
+            $this->transactionService->deleteJournalEntries($transaction);
+
+            if (! $transaction->is_payment) {
+                return;
+            }
+
+            $invoice = $transaction->transactionable;
+
+            if ($invoice instanceof Invoice) {
+                $this->updateInvoiceTotals($invoice, $transaction);
+            }
+        });
+    }
+
+    public function deleted(Transaction $transaction): void
+    {
+        //
+    }
+
+    protected function updateInvoiceTotals(Invoice $invoice, ?Transaction $excludedTransaction = null): void
+    {
+        $depositTotal = (int) $invoice->deposits()
+            ->when($excludedTransaction, fn (Builder $query) => $query->whereKeyNot($excludedTransaction->getKey()))
+            ->sum('amount');
+
+        $withdrawalTotal = (int) $invoice->withdrawals()
+            ->when($excludedTransaction, fn (Builder $query) => $query->whereKeyNot($excludedTransaction->getKey()))
+            ->sum('amount');
+
+        $totalPaid = $depositTotal - $withdrawalTotal;
+
+        $invoiceTotal = (int) $invoice->getRawOriginal('total');
+
+        $invoice->updateQuietly([
+            'amount_paid' => CurrencyConverter::convertCentsToFloat($totalPaid),
+            'status' => match (true) {
+                $totalPaid > $invoiceTotal => InvoiceStatus::Overpaid,
+                $totalPaid === $invoiceTotal => InvoiceStatus::Paid,
+                $totalPaid === 0 => InvoiceStatus::Sent,
+                default => InvoiceStatus::Partial,
+            },
+        ]);
     }
 }

app/Providers/FilamentCompaniesServiceProvider.php

@@ -256,8 +256,10 @@ class FilamentCompaniesServiceProvider extends PanelProvider
 
         Actions\CreateAction::configureUsing(static fn (Actions\CreateAction $action) => FilamentComponentConfigurator::configureActionModals($action));
         Actions\EditAction::configureUsing(static fn (Actions\EditAction $action) => FilamentComponentConfigurator::configureActionModals($action));
+        Actions\DeleteAction::configureUsing(static fn (Actions\DeleteAction $action) => FilamentComponentConfigurator::configureDeleteAction($action));
         Tables\Actions\EditAction::configureUsing(static fn (Tables\Actions\EditAction $action) => FilamentComponentConfigurator::configureActionModals($action));
         Tables\Actions\CreateAction::configureUsing(static fn (Tables\Actions\CreateAction $action) => FilamentComponentConfigurator::configureActionModals($action));
+        Tables\Actions\DeleteAction::configureUsing(static fn (Tables\Actions\DeleteAction $action) => FilamentComponentConfigurator::configureDeleteAction($action));
         Forms\Components\DateTimePicker::configureUsing(static function (Forms\Components\DateTimePicker $component) {
             $component->native(false);
         });

app/Support/FilamentComponentConfigurator.php

@@ -15,8 +15,13 @@ class FilamentComponentConfigurator
             ->stickyModalFooter()
             ->modalFooterActionsAlignment(Alignment::End);
 
-        if ($action instanceof CreateAction) {
+        if ($action instanceof CreateAction || $action instanceof \Filament\Tables\Actions\CreateAction) {
             $action->createAnother(false);
         }
     }
+
+    public static function configureDeleteAction(MountableAction $action): void
+    {
+        $action->databaseTransaction();
+    }
 }

app/Utilities/Currency/CurrencyConverter.php

@@ -63,6 +63,23 @@ class CurrencyConverter
         return money($amount, $currency)->getValue();
     }
 
+    public static function isValidAmount(?string $amount, ?string $currency = null): bool
+    {
+        $currency ??= CurrencyAccessor::getDefaultCurrency();
+
+        if (blank($amount)) {
+            return false;
+        }
+
+        try {
+            money($amount, $currency);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        return true;
+    }
+
     public static function handleCurrencyChange(Set $set, $state): void
     {
         $currency = currency($state);

database/factories/Banking/PaymentFactory.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace Database\Factories\Banking;
-
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Banking\Payment>
- */
-class PaymentFactory extends Factory
-{
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            //
-        ];
-    }
-}

database/migrations/2024_11_13_215818_create_payments_table.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('payments', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
-            $table->morphs('payable');
-            $table->date('date');
-            $table->integer('amount');
-            $table->string('payment_method');
-            $table->foreignId('bank_account_id')->nullable()->constrained()->nullOnDelete();
-            $table->text('notes')->nullable();
-            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('payments');
-    }
-};

package-lock.json

@@ -10,9 +10,9 @@
                 "autoprefixer": "^10.4.20",
                 "axios": "^1.7.7",
                 "laravel-vite-plugin": "^1.0",
-                "postcss": "^8.4.47",
-                "postcss-nesting": "^13.0.0",
-                "tailwindcss": "^3.4.13",
+                "postcss": "^8.4.49",
+                "postcss-nesting": "^13.0.1",
+                "tailwindcss": "^3.4.15",
                 "vite": "^5.4"
             }
         },

package.json

@@ -11,9 +11,9 @@
         "autoprefixer": "^10.4.20",
         "axios": "^1.7.7",
         "laravel-vite-plugin": "^1.0",
-        "postcss": "^8.4.47",
-        "postcss-nesting": "^13.0.0",
-        "tailwindcss": "^3.4.13",
+        "postcss": "^8.4.49",
+        "postcss-nesting": "^13.0.1",
+        "tailwindcss": "^3.4.15",
         "vite": "^5.4"
     }
 }

resources/css/filament/company/tailwind.config.js

@@ -4,16 +4,13 @@ export default {
     presets: [preset],
     content: [
         './app/Filament/Company/**/*.php',
-        './resources/views/filament/company/**/*.blade.php',
-        './resources/views/filament/forms/**/*.blade.php',
-        './resources/views/filament/infolists/**/*.blade.php',
+        './resources/views/filament/**/*.blade.php',
         './resources/views/livewire/company/**/*.blade.php',
         './resources/views/components/**/*.blade.php',
+        './resources/views/vendor/**/*.blade.php',
         './vendor/filament/**/*.blade.php',
         './vendor/andrewdwallo/filament-companies/resources/views/**/*.blade.php',
         './vendor/andrewdwallo/filament-selectify/resources/views/**/*.blade.php',
-        './resources/views/vendor/**/*.blade.php',
-        './vendor/bezhansalleh/filament-panel-switch/resources/views/panel-switch-menu.blade.php',
         './vendor/awcodes/filament-table-repeater/resources/**/*.blade.php',
         './vendor/jaocero/radio-deck/resources/views/**/*.blade.php',
     ],

resources/css/filament/company/theme.css

@@ -1,8 +1,8 @@
-@import '../../../../vendor/filament/filament/resources/css/theme.css';
+@import '/vendor/filament/filament/resources/css/theme.css';
 @import 'tooltip.css';
-@import '../../../../vendor/awcodes/filament-table-repeater/resources/css/plugin.css';
+@import '/vendor/awcodes/filament-table-repeater/resources/css/plugin.css';
 
-@config './tailwind.config.js';
+@config 'tailwind.config.js';
 
 .fi-fo-repeater.uncontained .fi-fo-repeater-item {
     @apply divide-y-0 rounded-none bg-none shadow-none ring-0 ring-gray-950/5 dark:divide-white/10 dark:bg-white/5 dark:ring-white/10;

resources/views/filament/infolists/invoice-create-step.blade.php

@@ -1,89 +0,0 @@
-@use('App\Utilities\Currency\CurrencyConverter')
-
-<div class="space-y-1">
-    <!-- Create Section -->
-    <x-filament::section>
-        <div class="flex justify-between items-start">
-            <!-- Left section -->
-            <div class="flex items-center space-x-3">
-                <!-- Icon -->
-                <x-filament::icon
-                    icon="heroicon-o-document-text"
-                    class="h-8 w-8 text-primary-600 dark:text-primary-500 flex-shrink-0 mr-4"
-                />
-                <!-- Text content -->
-                <div>
-                    <h1 class="text-lg font-semibold text-gray-900 dark:text-gray-100">Create</h1>
-                    <p class="text-sm text-gray-600 dark:text-gray-400">Created: {{ $getRecord()->created_at->diffForHumans() }}</p>
-                </div>
-            </div>
-
-            <!-- Right section -->
-            <div class="flex flex-row items-center space-x-2">
-                @if($getRecord()->status->value === 'draft')
-                    {{ $getAction('approveDraft') }}
-                @endif
-                {{ $getAction('edit') }}
-            </div>
-        </div>
-    </x-filament::section>
-
-    <div class="border-l-4 h-8 border-solid border-gray-300 dark:border-gray-700 ms-8"></div>
-
-    <!-- Send Section -->
-    <x-filament::section :class="$getRecord()->status->value === 'draft' ? 'opacity-50 pointer-events-none' : ''">
-        <div class="flex justify-between items-start">
-            <!-- Left section -->
-            <div class="flex items-center space-x-3">
-                <!-- Icon -->
-                <x-filament::icon
-                    icon="heroicon-o-paper-airplane"
-                    class="h-8 w-8 text-primary-600 dark:text-primary-500 flex-shrink-0 mr-4"
-                />
-                <!-- Text content -->
-                <div>
-                    <h1 class="text-lg font-semibold text-gray-900 dark:text-gray-100">Send</h1>
-                    <p class="text-sm text-gray-600 dark:text-gray-400">Last Sent: just a moment ago</p>
-                </div>
-            </div>
-
-            <!-- Right section -->
-            @if($getRecord()->status->value !== 'draft')
-                <div class="flex flex-row items-center space-x-2">
-                    @if($getRecord()->status->value !== 'sent')
-                        {{ $getAction('markAsSent') }}
-                    @endif
-                    {{ $getAction('sendInvoice') }}
-                </div>
-            @endif
-        </div>
-    </x-filament::section>
-
-    <div class="border-l-4 h-8 border-solid border-gray-300 dark:border-gray-700 ms-8"></div>
-
-    <!-- Manage Payments Section -->
-    <x-filament::section :class="$getRecord()->status->value === 'draft' ? 'opacity-50 pointer-events-none' : ''">
-        <div class="flex justify-between items-start">
-            <!-- Left section -->
-            <div class="flex items-center space-x-3">
-                <!-- Icon -->
-                <x-filament::icon
-                    icon="heroicon-o-credit-card"
-                    class="h-8 w-8 text-primary-600 dark:text-primary-500 flex-shrink-0 mr-4"
-                />
-                <!-- Text content -->
-                <div>
-                    <h1 class="text-lg font-semibold text-gray-900 dark:text-gray-100">Manage Payments</h1>
-                    <p class="text-sm text-gray-600 dark:text-gray-400">Amount Due: {{ CurrencyConverter::formatToMoney($getRecord()->amount_due) }}</p>
-                </div>
-            </div>
-
-            <!-- Right section -->
-            @if($getRecord()->status->value !== 'draft')
-                <div class="flex flex-row items-center space-x-2">
-                    {{ $getAction('recordPayment') }}
-                </div>
-            @endif
-        </div>
-    </x-filament::section>
-</div>