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

Development 3.x

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

@@ -37,7 +37,7 @@ class BillOverview extends EnhancedStatsOverviewWidget
 
             if ($driver === 'pgsql') {
                 $query->selectRaw('AVG(EXTRACT(EPOCH FROM (paid_at - date)) / 86400) as avg_days');
-            } elseif ($driver === 'mysql') {
+            } else {
                 $query->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days');
             }
 

app/Filament/Company/Resources/Purchases/VendorResource/Widgets/BillOverview.php

@@ -7,6 +7,7 @@ use App\Filament\Widgets\EnhancedStatsOverviewWidget;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Number;
 
 class BillOverview extends EnhancedStatsOverviewWidget
@@ -32,9 +33,20 @@ class BillOverview extends EnhancedStatsOverviewWidget
             ->get()
             ->sumMoneyInDefaultCurrency('amount_due');
 
-        $averagePaymentTime = $this->record->bills()
-            ->whereNotNull('paid_at')
-            ->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days')
+        $driver = DB::getDriverName();
+
+        $query = $this->record->bills()
+            ->whereNotNull('paid_at');
+
+        if ($driver === 'pgsql') {
+            $query->selectRaw('AVG(EXTRACT(EPOCH FROM (paid_at - date)) / 86400) as avg_days');
+        } else {
+            $query->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days');
+        }
+
+        $averagePaymentTime = $query
+            ->groupBy('company_id')
+            ->reorder()
             ->value('avg_days');
 
         $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);

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

@@ -7,6 +7,7 @@ use App\Filament\Widgets\EnhancedStatsOverviewWidget;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Number;
 
 class InvoiceOverview extends EnhancedStatsOverviewWidget
@@ -43,9 +44,20 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
             ? (int) round($totalValidInvoiceAmount / $totalValidInvoiceCount)
             : 0;
 
-        $averagePaymentTime = $this->record->invoices()
-            ->whereNotNull('paid_at')
-            ->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days')
+        $driver = DB::getDriverName();
+
+        $query = $this->record->invoices()
+            ->whereNotNull('paid_at');
+
+        if ($driver === 'pgsql') {
+            $query->selectRaw('AVG(EXTRACT(EPOCH FROM (paid_at - date)) / 86400) as avg_days');
+        } else {
+            $query->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days');
+        }
+
+        $averagePaymentTime = $query
+            ->groupBy('company_id')
+            ->reorder()
             ->value('avg_days');
 
         $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);