wip

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

@@ -44,13 +44,6 @@ class ListInvoices extends ListRecords
             'all' => Tab::make()
                 ->label('All'),
 
-            'overdue' => Tab::make()
-                ->label('Overdue')
-                ->modifyQueryUsing(function (Builder $query) {
-                    $query->where('status', InvoiceStatus::Overdue);
-                })
-                ->badge(Invoice::where('status', InvoiceStatus::Overdue)->count()),
-
             'unpaid' => Tab::make()
                 ->label('Unpaid')
                 ->modifyQueryUsing(function (Builder $query) {
@@ -58,12 +51,14 @@ class ListInvoices extends ListRecords
                         InvoiceStatus::Unsent,
                         InvoiceStatus::Sent,
                         InvoiceStatus::Partial,
+                        InvoiceStatus::Overdue,
                     ]);
                 })
                 ->badge(Invoice::whereIn('status', [
                     InvoiceStatus::Unsent,
                     InvoiceStatus::Sent,
                     InvoiceStatus::Partial,
+                    InvoiceStatus::Overdue,
                 ])->count()),
 
             'draft' => Tab::make()

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

@@ -59,16 +59,8 @@ class InvoiceOverview extends BaseWidget
         $averageInvoiceTotal = $totalValidInvoiceCount > 0 ? $totalValidInvoiceAmount / $totalValidInvoiceCount : 0;
 
         $averagePaymentTime = $this->getPageTableQuery()
-            ->withWhereHas('statusHistories', function ($query) {
-                $query->where('new_status', InvoiceStatus::Paid);
-            })
-            ->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, (
-                SELECT changed_at
-                FROM invoice_status_histories
-                WHERE invoice_status_histories.invoice_id = invoices.id
-                AND status = ?
-                LIMIT 1
-            ))) as avg_days', [InvoiceStatus::Paid])
+            ->whereNotNull('paid_at')
+            ->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days')
             ->value('avg_days');
 
         return [

app/Models/Accounting/Invoice.php

@@ -17,7 +17,6 @@ use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Carbon;
@@ -42,6 +41,9 @@ class Invoice extends Model
         'order_number',
         'date',
         'due_date',
+        'approved_at',
+        'paid_at',
+        'last_sent',
         'status',
         'currency_code',
         'subtotal',
@@ -58,6 +60,9 @@ class Invoice extends Model
     protected $casts = [
         'date' => 'date',
         'due_date' => 'date',
+        'approved_at' => 'datetime',
+        'paid_at' => 'datetime',
+        'last_sent' => 'datetime',
         'status' => InvoiceStatus::class,
         'subtotal' => MoneyCast::class,
         'tax_total' => MoneyCast::class,
@@ -97,46 +102,12 @@ class Invoice extends Model
         return $this->transactions()->where('type', TransactionType::Withdrawal)->where('is_payment', true);
     }
 
-    protected function lastSent(): Attribute
-    {
-        return Attribute::get(function () {
-            return $this->getStatusChangedAt(InvoiceStatus::Sent);
-        });
-    }
-
-    protected function approvedAt(): Attribute
-    {
-        return Attribute::get(function () {
-            return $this->getStatusChangedAt(InvoiceStatus::Unsent);
-        });
-    }
-
-    protected function paidAt(): Attribute
-    {
-        return Attribute::get(function () {
-            return $this->getStatusChangedAt(InvoiceStatus::Paid);
-        });
-    }
-
-    protected function getStatusChangedAt(InvoiceStatus $status): ?Carbon
-    {
-        return $this->statusHistories
-            ->where('new_status', $status)
-            ->sortByDesc('changed_at')
-            ->first()?->changed_at;
-    }
-
     public function approvalTransaction(): MorphOne
     {
         return $this->morphOne(Transaction::class, 'transactionable')
             ->where('type', TransactionType::Journal);
     }
 
-    public function statusHistories(): HasMany
-    {
-        return $this->hasMany(InvoiceStatusHistory::class);
-    }
-
     protected function isCurrentlyOverdue(): Attribute
     {
         return Attribute::get(function () {
@@ -233,16 +204,18 @@ class Invoice extends Model
         ]);
     }
 
-    public function approveDraft(): void
+    public function approveDraft(?Carbon $approvedAt = null): void
     {
         if (! $this->isDraft()) {
             throw new \RuntimeException('Invoice is not in draft status.');
         }
 
+        $approvedAt ??= now();
+
         $transaction = $this->transactions()->create([
             'company_id' => $this->company_id,
             'type' => TransactionType::Journal,
-            'posted_at' => now(),
+            'posted_at' => $approvedAt,
             'amount' => $this->total,
             'description' => 'Invoice Approval for Invoice #' . $this->invoice_number,
         ]);
@@ -276,6 +249,7 @@ class Invoice extends Model
         }
 
         $this->update([
+            'approved_at' => $approvedAt,
             'status' => InvoiceStatus::Unsent,
         ]);
     }

app/Models/Accounting/InvoiceStatusHistory.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Models\Accounting;
-
-use App\Concerns\CompanyOwned;
-use App\Enums\Accounting\InvoiceStatus;
-use App\Models\User;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-
-class InvoiceStatusHistory extends Model
-{
-    use CompanyOwned;
-    use HasFactory;
-
-    protected $fillable = [
-        'company_id',
-        'invoice_id',
-        'old_status',
-        'new_status',
-        'changed_by',
-        'changed_at',
-    ];
-
-    protected $casts = [
-        'changed_at' => 'datetime',
-        'old_status' => InvoiceStatus::class,
-        'new_status' => InvoiceStatus::class,
-    ];
-
-    public function invoice(): BelongsTo
-    {
-        return $this->belongsTo(Invoice::class);
-    }
-
-    public function changedBy(): BelongsTo
-    {
-        return $this->belongsTo(User::class, 'changed_by');
-    }
-}

app/Models/Company.php

@@ -171,9 +171,4 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
     {
         return $this->hasMany(Common\Vendor::class, 'company_id');
     }
-
-    public function invoiceStatusHistories(): HasMany
-    {
-        return $this->hasMany(Accounting\InvoiceStatusHistory::class, 'company_id');
-    }
 }

app/Observers/InvoiceObserver.php

@@ -24,12 +24,10 @@ class InvoiceObserver
     public function updated(Invoice $invoice): void
     {
         if ($invoice->wasChanged('status')) {
-            $invoice->statusHistories()->create([
-                'company_id' => $invoice->company_id,
-                'old_status' => $invoice->getOriginal('status'),
-                'new_status' => $invoice->status,
-                'changed_by' => $invoice->updated_by,
-            ]);
+            match ($invoice->status) {
+                InvoiceStatus::Sent => $invoice->updateQuietly(['last_sent' => now()]),
+                default => null,
+            };
         }
     }
 
@@ -40,7 +38,7 @@ class InvoiceObserver
 
     public function saving(Invoice $invoice): void
     {
-        if ($invoice->is_currently_overdue) {
+        if ($invoice->approved_at && $invoice->is_currently_overdue) {
             $invoice->status = InvoiceStatus::Overdue;
         }
     }

app/Observers/TransactionObserver.php

@@ -107,14 +107,24 @@ class TransactionObserver
 
         $invoiceTotal = (int) $invoice->getRawOriginal('total');
 
+        $newStatus = match (true) {
+            $totalPaid > $invoiceTotal => InvoiceStatus::Overpaid,
+            $totalPaid === $invoiceTotal => InvoiceStatus::Paid,
+            default => InvoiceStatus::Partial,
+        };
+
+        $paidAt = $invoice->paid_at;
+
+        if (in_array($newStatus, [InvoiceStatus::Paid, InvoiceStatus::Overpaid]) && ! $paidAt) {
+            $paidAt = $invoice->deposits()
+                ->latest('posted_at')
+                ->value('posted_at');
+        }
+
         $invoice->update([
             'amount_paid' => CurrencyConverter::convertCentsToFloat($totalPaid),
-            'status' => match (true) {
-                $totalPaid > $invoiceTotal => InvoiceStatus::Overpaid,
-                $totalPaid === $invoiceTotal => InvoiceStatus::Paid,
-                $totalPaid === 0 => InvoiceStatus::Sent,
-                default => InvoiceStatus::Partial,
-            },
+            'status' => $newStatus,
+            'paid_at' => $paidAt,
         ]);
     }
 }

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.334.0",
+            "version": "3.334.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "8afe50cb2a93051dafef21eb616e297a449764aa"
+                "reference": "3938b3467f64a30fed7ee1762a6785f808a5ae4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8afe50cb2a93051dafef21eb616e297a449764aa",
-                "reference": "8afe50cb2a93051dafef21eb616e297a449764aa",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3938b3467f64a30fed7ee1762a6785f808a5ae4d",
+                "reference": "3938b3467f64a30fed7ee1762a6785f808a5ae4d",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.334.0"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.334.1"
             },
-            "time": "2024-12-04T19:09:04+00:00"
+            "time": "2024-12-05T01:17:41+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -1664,16 +1664,16 @@
         },
         {
             "name": "filament/actions",
-            "version": "v3.2.127",
+            "version": "v3.2.128",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/actions.git",
-                "reference": "f325e315c365cfcea5c9da96662ddea37e3663fc"
+                "reference": "1ee8b0a890b53e8b0b341134d3ba9bdaeee294d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/actions/zipball/f325e315c365cfcea5c9da96662ddea37e3663fc",
-                "reference": "f325e315c365cfcea5c9da96662ddea37e3663fc",
+                "url": "https://api.github.com/repos/filamentphp/actions/zipball/1ee8b0a890b53e8b0b341134d3ba9bdaeee294d3",
+                "reference": "1ee8b0a890b53e8b0b341134d3ba9bdaeee294d3",
                 "shasum": ""
             },
             "require": {
@@ -1713,20 +1713,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-11-29T09:30:57+00:00"
+            "time": "2024-12-05T08:56:37+00:00"
         },
         {
             "name": "filament/filament",
-            "version": "v3.2.127",
+            "version": "v3.2.128",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/panels.git",
-                "reference": "4aea767e8c872842b624fe47affe078433111259"
+                "reference": "27b834f6f1213c547580443e28e5028dfe125bdd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/panels/zipball/4aea767e8c872842b624fe47affe078433111259",
-                "reference": "4aea767e8c872842b624fe47affe078433111259",
+                "url": "https://api.github.com/repos/filamentphp/panels/zipball/27b834f6f1213c547580443e28e5028dfe125bdd",
+                "reference": "27b834f6f1213c547580443e28e5028dfe125bdd",
                 "shasum": ""
             },
             "require": {
@@ -1778,20 +1778,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-11-29T09:30:58+00:00"
+            "time": "2024-12-05T08:56:42+00:00"
         },
         {
             "name": "filament/forms",
-            "version": "v3.2.127",
+            "version": "v3.2.128",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/forms.git",
-                "reference": "c78071f1aabb63a0d9bf74268005d3294b61dc2a"
+                "reference": "c86af3606b8fd3f908b29a03e3056628e4cea57e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/forms/zipball/c78071f1aabb63a0d9bf74268005d3294b61dc2a",
-                "reference": "c78071f1aabb63a0d9bf74268005d3294b61dc2a",
+                "url": "https://api.github.com/repos/filamentphp/forms/zipball/c86af3606b8fd3f908b29a03e3056628e4cea57e",
+                "reference": "c86af3606b8fd3f908b29a03e3056628e4cea57e",
                 "shasum": ""
             },
             "require": {
@@ -1834,11 +1834,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-11-29T09:30:53+00:00"
+            "time": "2024-12-05T08:56:35+00:00"
         },
         {
             "name": "filament/infolists",
-            "version": "v3.2.127",
+            "version": "v3.2.128",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/infolists.git",
@@ -1889,7 +1889,7 @@
         },
         {
             "name": "filament/notifications",
-            "version": "v3.2.127",
+            "version": "v3.2.128",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/notifications.git",
@@ -1941,16 +1941,16 @@
         },
         {
             "name": "filament/support",
-            "version": "v3.2.127",
+            "version": "v3.2.128",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/support.git",
-                "reference": "a720fb2508a1d84a9b35aedc9991d4b53d18fea6"
+                "reference": "437d4f3305458f29c32ef4de5ef1d9dbdc74c3fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/support/zipball/a720fb2508a1d84a9b35aedc9991d4b53d18fea6",
-                "reference": "a720fb2508a1d84a9b35aedc9991d4b53d18fea6",
+                "url": "https://api.github.com/repos/filamentphp/support/zipball/437d4f3305458f29c32ef4de5ef1d9dbdc74c3fe",
+                "reference": "437d4f3305458f29c32ef4de5ef1d9dbdc74c3fe",
                 "shasum": ""
             },
             "require": {
@@ -1996,20 +1996,20 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-11-29T09:31:13+00:00"
+            "time": "2024-12-05T08:56:49+00:00"
         },
         {
             "name": "filament/tables",
-            "version": "v3.2.127",
+            "version": "v3.2.128",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/tables.git",
-                "reference": "c287a68e084c96c3f2991eaddf1d6b5159af5147"
+                "reference": "4a60fda65574f248e082f109345216a38567093a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filamentphp/tables/zipball/c287a68e084c96c3f2991eaddf1d6b5159af5147",
-                "reference": "c287a68e084c96c3f2991eaddf1d6b5159af5147",
+                "url": "https://api.github.com/repos/filamentphp/tables/zipball/4a60fda65574f248e082f109345216a38567093a",
+                "reference": "4a60fda65574f248e082f109345216a38567093a",
                 "shasum": ""
             },
             "require": {
@@ -2048,11 +2048,11 @@
                 "issues": "https://github.com/filamentphp/filament/issues",
                 "source": "https://github.com/filamentphp/filament"
             },
-            "time": "2024-11-30T09:21:26+00:00"
+            "time": "2024-12-05T08:56:53+00:00"
         },
         {
             "name": "filament/widgets",
-            "version": "v3.2.127",
+            "version": "v3.2.128",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filamentphp/widgets.git",
@@ -4442,16 +4442,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "3.8.0",
+            "version": "3.8.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67"
+                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/32e515fdc02cdafbe4593e30a9350d486b125b67",
-                "reference": "32e515fdc02cdafbe4593e30a9350d486b125b67",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
+                "reference": "aef6ee73a77a66e404dd6540934a9ef1b3c855b4",
                 "shasum": ""
             },
             "require": {
@@ -4529,7 +4529,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/3.8.0"
+                "source": "https://github.com/Seldaek/monolog/tree/3.8.1"
             },
             "funding": [
                 {
@@ -4541,7 +4541,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-12T13:57:08+00:00"
+            "time": "2024-12-05T17:15:07+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -5064,16 +5064,16 @@
         },
         {
             "name": "openspout/openspout",
-            "version": "v4.28.0",
+            "version": "v4.28.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/openspout/openspout.git",
-                "reference": "3e9ef74f13ba5e887e4afc7a4e0110e63559e902"
+                "reference": "229a9c837bd768e8767660671f9fdf429f343a74"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/openspout/openspout/zipball/3e9ef74f13ba5e887e4afc7a4e0110e63559e902",
-                "reference": "3e9ef74f13ba5e887e4afc7a4e0110e63559e902",
+                "url": "https://api.github.com/repos/openspout/openspout/zipball/229a9c837bd768e8767660671f9fdf429f343a74",
+                "reference": "229a9c837bd768e8767660671f9fdf429f343a74",
                 "shasum": ""
             },
             "require": {
@@ -5141,7 +5141,7 @@
             ],
             "support": {
                 "issues": "https://github.com/openspout/openspout/issues",
-                "source": "https://github.com/openspout/openspout/tree/v4.28.0"
+                "source": "https://github.com/openspout/openspout/tree/v4.28.1"
             },
             "funding": [
                 {
@@ -5153,7 +5153,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-29T09:45:53+00:00"
+            "time": "2024-12-05T13:34:00+00:00"
         },
         {
             "name": "paragonie/constant_time_encoding",
@@ -9240,16 +9240,16 @@
     "packages-dev": [
         {
             "name": "brianium/paratest",
-            "version": "v7.6.0",
+            "version": "v7.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paratestphp/paratest.git",
-                "reference": "68ff89a8de47d086588e391a516d2a5b5fde6254"
+                "reference": "9ac8eda68f17acda4dad4aa02ecdcc327d7e6675"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/68ff89a8de47d086588e391a516d2a5b5fde6254",
-                "reference": "68ff89a8de47d086588e391a516d2a5b5fde6254",
+                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/9ac8eda68f17acda4dad4aa02ecdcc327d7e6675",
+                "reference": "9ac8eda68f17acda4dad4aa02ecdcc327d7e6675",
                 "shasum": ""
             },
             "require": {
@@ -9258,26 +9258,26 @@
                 "ext-reflection": "*",
                 "ext-simplexml": "*",
                 "fidry/cpu-core-counter": "^1.2.0",
-                "jean85/pretty-package-versions": "^2.0.6",
+                "jean85/pretty-package-versions": "^2.1.0",
                 "php": "~8.2.0 || ~8.3.0 || ~8.4.0",
                 "phpunit/php-code-coverage": "^11.0.7",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-timer": "^7.0.1",
-                "phpunit/phpunit": "^11.4.1",
+                "phpunit/phpunit": "^11.4.4",
                 "sebastian/environment": "^7.2.0",
-                "symfony/console": "^6.4.11 || ^7.1.5",
-                "symfony/process": "^6.4.8 || ^7.1.5"
+                "symfony/console": "^6.4.14 || ^7.1.7",
+                "symfony/process": "^6.4.14 || ^7.1.7"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0.0",
                 "ext-pcov": "*",
                 "ext-posix": "*",
-                "phpstan/phpstan": "^1.12.6",
-                "phpstan/phpstan-deprecation-rules": "^1.2.1",
-                "phpstan/phpstan-phpunit": "^1.4.0",
-                "phpstan/phpstan-strict-rules": "^1.6.1",
-                "squizlabs/php_codesniffer": "^3.10.3",
-                "symfony/filesystem": "^6.4.9 || ^7.1.5"
+                "phpstan/phpstan": "^2",
+                "phpstan/phpstan-deprecation-rules": "^2",
+                "phpstan/phpstan-phpunit": "^2",
+                "phpstan/phpstan-strict-rules": "^2",
+                "squizlabs/php_codesniffer": "^3.11.1",
+                "symfony/filesystem": "^6.4.13 || ^7.1.6"
             },
             "bin": [
                 "bin/paratest",
@@ -9317,7 +9317,7 @@
             ],
             "support": {
                 "issues": "https://github.com/paratestphp/paratest/issues",
-                "source": "https://github.com/paratestphp/paratest/tree/v7.6.0"
+                "source": "https://github.com/paratestphp/paratest/tree/v7.6.1"
             },
             "funding": [
                 {
@@ -9329,7 +9329,7 @@
                     "type": "paypal"
                 }
             ],
-            "time": "2024-10-15T12:38:31+00:00"
+            "time": "2024-12-05T10:55:39+00:00"
         },
         {
             "name": "fakerphp/faker",
@@ -11766,16 +11766,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "6.1.3",
+            "version": "6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e"
+                "reference": "3473f61172093b2da7de1fb5782e1f24cc036dc3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e",
-                "reference": "c414673eee9a8f9d51bbf8d61fc9e3ef1e85b20e",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/3473f61172093b2da7de1fb5782e1f24cc036dc3",
+                "reference": "3473f61172093b2da7de1fb5782e1f24cc036dc3",
                 "shasum": ""
             },
             "require": {
@@ -11784,7 +11784,7 @@
                 "sebastian/recursion-context": "^6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^11.2"
+                "phpunit/phpunit": "^11.3"
             },
             "type": "library",
             "extra": {
@@ -11832,7 +11832,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
                 "security": "https://github.com/sebastianbergmann/exporter/security/policy",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/6.1.3"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/6.3.0"
             },
             "funding": [
                 {
@@ -11840,7 +11840,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-07-03T04:56:19+00:00"
+            "time": "2024-12-05T09:17:50+00:00"
         },
         {
             "name": "sebastian/global-state",

database/factories/Accounting/InvoiceFactory.php

@@ -10,6 +10,7 @@ use App\Models\Banking\BankAccount;
 use App\Models\Common\Client;
 use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Carbon;
 
 /**
  * @extends Factory<Invoice>
@@ -28,6 +29,8 @@ class InvoiceFactory extends Factory
      */
     public function definition(): array
     {
+        $invoiceDate = $this->faker->dateTimeBetween('-1 year');
+
         return [
             'company_id' => 1,
             'client_id' => Client::inRandomOrder()->value('id'),
@@ -35,8 +38,8 @@ class InvoiceFactory extends Factory
             'subheader' => 'Invoice',
             'invoice_number' => $this->faker->unique()->numerify('INV-#####'),
             'order_number' => $this->faker->unique()->numerify('ORD-#####'),
-            'date' => $this->faker->dateTimeBetween('-1 year'),
-            'due_date' => $this->faker->dateTimeBetween('-2 months', '+2 months'),
+            'date' => $invoiceDate,
+            'due_date' => Carbon::parse($invoiceDate)->addDays($this->faker->numberBetween(14, 60)),
             'status' => InvoiceStatus::Draft,
             'currency_code' => 'USD',
             'terms' => $this->faker->sentence,
@@ -60,7 +63,9 @@ class InvoiceFactory extends Factory
 
             $this->recalculateTotals($invoice);
 
-            $invoice->approveDraft();
+            $approvedAt = Carbon::parse($invoice->date)->addHours($this->faker->numberBetween(1, 24));
+
+            $invoice->approveDraft($approvedAt);
         });
     }
 
@@ -68,10 +73,10 @@ class InvoiceFactory extends Factory
     {
         return $this->afterCreating(function (Invoice $invoice) use ($invoiceStatus, $max, $min) {
             if ($invoice->isDraft()) {
-
                 $this->recalculateTotals($invoice);
 
-                $invoice->approveDraft();
+                $approvedAt = Carbon::parse($invoice->date)->addHours($this->faker->numberBetween(1, 24));
+                $invoice->approveDraft($approvedAt);
             }
 
             $invoice->refresh();
@@ -89,10 +94,12 @@ class InvoiceFactory extends Factory
             }
 
             $paymentCount = $max && $min ? $this->faker->numberBetween($min, $max) : $min;
-
             $paymentAmount = (int) floor($totalAmountDue / $paymentCount);
             $remainingAmount = $totalAmountDue;
 
+            $paymentDate = Carbon::parse($invoice->approved_at);
+            $paymentDates = [];
+
             for ($i = 0; $i < $paymentCount; $i++) {
                 $amount = $i === $paymentCount - 1 ? $remainingAmount : $paymentAmount;
 
@@ -100,8 +107,11 @@ class InvoiceFactory extends Factory
                     break;
                 }
 
+                $postedAt = $paymentDate->copy()->addDays($this->faker->numberBetween(1, 30));
+                $paymentDates[] = $postedAt;
+
                 $data = [
-                    'posted_at' => $invoice->date->addDay(),
+                    'posted_at' => $postedAt,
                     'amount' => CurrencyConverter::convertCentsToFormatSimple($amount, $invoice->currency_code),
                     'payment_method' => $this->faker->randomElement(PaymentMethod::class),
                     'bank_account_id' => BankAccount::inRandomOrder()->value('id'),
@@ -109,9 +119,17 @@ class InvoiceFactory extends Factory
                 ];
 
                 $invoice->recordPayment($data);
-
                 $remainingAmount -= $amount;
             }
+
+            // If it's a paid invoice, use the latest payment date as paid_at
+            if ($invoiceStatus === InvoiceStatus::Paid) {
+                $latestPaymentDate = max($paymentDates);
+                $invoice->updateQuietly([
+                    'status' => InvoiceStatus::Paid,
+                    'paid_at' => $latestPaymentDate,
+                ]);
+            }
         });
     }
 
@@ -128,7 +146,7 @@ class InvoiceFactory extends Factory
 
             $this->recalculateTotals($invoice);
 
-            if ($invoice->is_currently_overdue) {
+            if ($invoice->approved_at && $invoice->is_currently_overdue) {
                 $invoice->updateQuietly([
                     'status' => InvoiceStatus::Overdue,
                 ]);

database/factories/Accounting/InvoiceStatusHistoryFactory.php

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

database/migrations/2024_11_27_223015_create_invoices_table.php

@@ -22,6 +22,9 @@ return new class extends Migration
             $table->string('order_number')->nullable(); // PO, SO, etc.
             $table->date('date')->nullable();
             $table->date('due_date')->nullable();
+            $table->timestamp('approved_at')->nullable();
+            $table->timestamp('paid_at')->nullable();
+            $table->timestamp('last_sent')->nullable();
             $table->string('status')->default('draft');
             $table->string('currency_code')->nullable();
             $table->integer('subtotal')->default(0);

database/migrations/2024_12_05_003805_create_invoice_status_histories_table.php

@@ -1,33 +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('invoice_status_histories', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('company_id')->constrained()->cascadeOnDelete();
-            $table->foreignId('invoice_id')->constrained()->cascadeOnDelete();
-            $table->string('old_status');
-            $table->string('new_status');
-            $table->foreignId('changed_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->timestamp('changed_at')->useCurrent();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('invoice_status_histories');
-    }
-};

package-lock.json

@@ -1204,9 +1204,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.68",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.68.tgz",
-            "integrity": "sha512-FgMdJlma0OzUYlbrtZ4AeXjKxKPk6KT8WOP8BjcqxWtlg8qyJQjRzPJzUtUn5GBg1oQ26hFs7HOOHJMYiJRnvQ==",
+            "version": "1.5.71",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz",
+            "integrity": "sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==",
             "dev": true,
             "license": "ISC"
         },
@@ -2588,9 +2588,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.2.tgz",
-            "integrity": "sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==",
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.3.tgz",
+            "integrity": "sha512-Cmuo5P0ENTN6HxLSo6IHsjCLn/81Vgrp81oaiFFMRa8gGDj5xEjIcEpf2ZymZtZR8oU0P2JX5WuUp/rlXcHkAw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {