wip

app/Filament/Company/Resources/Sales/EstimateResource/Widgets/EstimateOverview.php

@@ -21,6 +21,24 @@ class EstimateOverview extends EnhancedStatsOverviewWidget
 
     protected function getStats(): array
     {
+        $activeTab = $this->activeTab;
+
+        if ($activeTab === 'draft') {
+            return [
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Active Estimates', '-')
+                    ->suffix('')
+                    ->description(''),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Accepted Estimates', '-')
+                    ->suffix('')
+                    ->description(''),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Converted Estimates', '-')
+                    ->suffix('')
+                    ->description(''),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Estimate Total', '-')
+                    ->suffix(''),
+            ];
+        }
+
         $activeEstimates = $this->getPageTableQuery()->active();
 
         $totalActiveCount = $activeEstimates->count();
@@ -36,18 +54,21 @@ class EstimateOverview extends EnhancedStatsOverviewWidget
             ->where('status', EstimateStatus::Converted);
 
         $totalConvertedCount = $convertedEstimates->count();
-        $totalEstimatesCount = $this->getPageTableQuery()->count();
 
-        $percentConverted = $totalEstimatesCount > 0
-            ? Number::percentage(($totalConvertedCount / $totalEstimatesCount) * 100, maxPrecision: 1)
-            : Number::percentage(0, maxPrecision: 1);
+        $validEstimates = $this->getPageTableQuery()
+            ->whereNotIn('status', [
+                EstimateStatus::Draft,
+            ]);
 
-        $totalEstimateAmount = $this->getPageTableQuery()
-            ->get()
-            ->sumMoneyInDefaultCurrency('total');
+        $totalValidEstimatesCount = $validEstimates->count();
+        $totalValidEstimateAmount = $validEstimates->get()->sumMoneyInDefaultCurrency('total');
+
+        $percentConverted = $totalValidEstimatesCount > 0
+            ? Number::percentage(($totalConvertedCount / $totalValidEstimatesCount) * 100, maxPrecision: 1)
+            : Number::percentage(0, maxPrecision: 1);
 
-        $averageEstimateTotal = $totalEstimatesCount > 0
-            ? (int) round($totalEstimateAmount / $totalEstimatesCount)
+        $averageEstimateTotal = $totalValidEstimatesCount > 0
+            ? (int) round($totalValidEstimateAmount / $totalValidEstimatesCount)
             : 0;
 
         return [

app/Models/Accounting/Estimate.php

@@ -124,7 +124,7 @@ class Estimate extends Document
     protected function isCurrentlyExpired(): Attribute
     {
         return Attribute::get(function () {
-            return $this->expiration_date?->isBefore(today()) && $this->canBeExpired();
+            return $this->expiration_date?->isBefore(today());
         });
     }
 
@@ -170,6 +170,7 @@ class Estimate extends Document
             EstimateStatus::Accepted,
             EstimateStatus::Declined,
             EstimateStatus::Converted,
+            EstimateStatus::Expired,
         ]);
     }
 

app/Observers/EstimateObserver.php

@@ -11,7 +11,17 @@ class EstimateObserver
 {
     public function saving(Estimate $estimate): void
     {
-        if ($estimate->approved_at && $estimate->is_currently_expired) {
+        if (! $estimate->wasApproved()) {
+            return;
+        }
+
+        if ($estimate->isDirty('expiration_date') && $estimate->status === EstimateStatus::Expired && ! $estimate->is_currently_expired) {
+            $estimate->status = $estimate->hasBeenSent() ? EstimateStatus::Sent : EstimateStatus::Unsent;
+
+            return;
+        }
+
+        if ($estimate->is_currently_expired && $estimate->canBeExpired()) {
             $estimate->status = EstimateStatus::Expired;
         }
     }