wip

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

@@ -152,7 +152,7 @@ class BillResource extends Resource
                                         $date = $get('date');
                                         $paymentTerms = $get('payment_terms');
 
-                                        if (! $date || $paymentTerms === 'custom') {
+                                        if (! $date || $paymentTerms === 'custom' || ! $paymentTerms) {
                                             return;
                                         }
 

app/Models/Accounting/Bill.php

@@ -23,7 +23,6 @@ use Filament\Actions\ReplicateAction;
 use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -130,11 +129,9 @@ class Bill extends Document
         return $this->amount_due;
     }
 
-    protected function isCurrentlyOverdue(): Attribute
+    public function shouldBeOverdue(): bool
     {
-        return Attribute::get(function () {
-            return $this->due_date->isBefore(today()) && $this->canBeOverdue();
-        });
+        return $this->due_date->isBefore(today()) && $this->canBeOverdue();
     }
 
     public function wasInitialized(): bool

app/Models/Accounting/Estimate.php

@@ -130,11 +130,9 @@ class Estimate extends Document
         return $this->total;
     }
 
-    protected function isCurrentlyExpired(): Attribute
+    public function shouldBeExpired(): bool
     {
-        return Attribute::get(function () {
-            return $this->expiration_date?->isBefore(today());
-        });
+        return $this->expiration_date?->isBefore(today()) && $this->canBeExpired();
     }
 
     public function isDraft(): bool

app/Models/Accounting/Invoice.php

@@ -198,11 +198,9 @@ class Invoice extends Document
             ->where('status', InvoiceStatus::Overdue);
     }
 
-    protected function isCurrentlyOverdue(): Attribute
+    public function shouldBeOverdue(): bool
     {
-        return Attribute::get(function () {
-            return $this->due_date->isBefore(today()) && $this->canBeOverdue();
-        });
+        return $this->due_date->isBefore(today()) && $this->canBeOverdue();
     }
 
     public function isDraft(): bool

app/Observers/BillObserver.php

@@ -17,7 +17,13 @@ class BillObserver
 
     public function saving(Bill $bill): void
     {
-        if ($bill->is_currently_overdue) {
+        if ($bill->isDirty('due_date') && $bill->status === BillStatus::Overdue && ! $bill->shouldBeOverdue()) {
+            $bill->status = BillStatus::Open;
+
+            return;
+        }
+
+        if ($bill->shouldBeOverdue()) {
             $bill->status = BillStatus::Overdue;
         }
     }

app/Observers/EstimateObserver.php

@@ -15,13 +15,13 @@ class EstimateObserver
             return;
         }
 
-        if ($estimate->isDirty('expiration_date') && $estimate->status === EstimateStatus::Expired && ! $estimate->is_currently_expired) {
+        if ($estimate->isDirty('expiration_date') && $estimate->status === EstimateStatus::Expired && ! $estimate->shouldBeExpired()) {
             $estimate->status = $estimate->hasBeenSent() ? EstimateStatus::Sent : EstimateStatus::Unsent;
 
             return;
         }
 
-        if ($estimate->is_currently_expired && $estimate->canBeExpired()) {
+        if ($estimate->shouldBeExpired()) {
             $estimate->status = EstimateStatus::Expired;
         }
     }

app/Observers/InvoiceObserver.php

@@ -12,7 +12,17 @@ class InvoiceObserver
 {
     public function saving(Invoice $invoice): void
     {
-        if ($invoice->approved_at && $invoice->is_currently_overdue) {
+        if (! $invoice->wasApproved()) {
+            return;
+        }
+
+        if ($invoice->isDirty('due_date') && $invoice->status === InvoiceStatus::Overdue && ! $invoice->shouldBeOverdue()) {
+            $invoice->status = $invoice->hasBeenSent() ? InvoiceStatus::Sent : InvoiceStatus::Unsent;
+
+            return;
+        }
+
+        if ($invoice->shouldBeOverdue()) {
             $invoice->status = InvoiceStatus::Overdue;
         }
     }

database/factories/Accounting/BillFactory.php

@@ -207,7 +207,7 @@ class BillFactory extends Factory
                 'order_number' => "PO-{$number}",
             ]);
 
-            if ($bill->wasInitialized() && $bill->is_currently_overdue) {
+            if ($bill->wasInitialized() && $bill->shouldBeOverdue()) {
                 $bill->updateQuietly([
                     'status' => BillStatus::Overdue,
                 ]);

database/factories/Accounting/EstimateFactory.php

@@ -181,7 +181,7 @@ class EstimateFactory extends Factory
                 'reference_number' => "REF-{$number}",
             ]);
 
-            if ($estimate->wasApproved() && $estimate->is_currently_expired) {
+            if ($estimate->wasApproved() && $estimate->shouldBeExpired()) {
                 $estimate->updateQuietly([
                     'status' => EstimateStatus::Expired,
                 ]);

database/factories/Accounting/InvoiceFactory.php

@@ -232,7 +232,7 @@ class InvoiceFactory extends Factory
                 'order_number' => "ORD-{$number}",
             ]);
 
-            if ($invoice->wasApproved() && $invoice->is_currently_overdue) {
+            if ($invoice->wasApproved() && $invoice->shouldBeOverdue()) {
                 $invoice->updateQuietly([
                     'status' => InvoiceStatus::Overdue,
                 ]);