wip

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

@@ -25,17 +25,10 @@ class EstimateOverview extends EnhancedStatsOverviewWidget
 
         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(''),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Active Estimates', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Accepted Estimates', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Converted Estimates', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Estimate Total', '-'),
             ];
         }
 

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

@@ -331,7 +331,7 @@ class InvoiceResource extends Resource
                     ->preload(),
                 Tables\Filters\SelectFilter::make('status')
                     ->options(InvoiceStatus::class)
-                    ->native(false),
+                    ->multiple(),
                 Tables\Filters\TernaryFilter::make('has_payments')
                     ->label('Has payments')
                     ->queries(

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

@@ -24,16 +24,22 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
         $activeTab = $this->activeTab;
 
         if ($activeTab === 'draft') {
+            $draftInvoices = $this->getPageTableQuery();
+
+            $totalDraftCount = $draftInvoices->count();
+            $totalDraftAmount = $draftInvoices->get()->sumMoneyInDefaultCurrency('total');
+
+            $averageDraftTotal = $totalDraftCount > 0
+                ? (int) round($totalDraftAmount / $totalDraftCount)
+                : 0;
+
             return [
-                EnhancedStatsOverviewWidget\EnhancedStat::make('Total Unpaid', '-')
-                    ->suffix('')
-                    ->description(''),
-                EnhancedStatsOverviewWidget\EnhancedStat::make('Due Within 30 Days', '-')
-                    ->suffix(''),
-                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', '-')
-                    ->suffix(''),
-                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Invoice Total', '-')
-                    ->suffix(''),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Total Unpaid', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Due Within 30 Days', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', '-'),
+                EnhancedStatsOverviewWidget\EnhancedStat::make('Average Invoice Total', CurrencyConverter::formatCentsToMoney($averageDraftTotal))
+                    ->suffix(CurrencyAccessor::getDefaultCurrency())
+                    ->description($totalDraftCount . ' draft invoices'),
             ];
         }
 
@@ -67,12 +73,18 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
             ? (int) round($totalValidInvoiceAmount / $totalValidInvoiceCount)
             : 0;
 
-        $averagePaymentTime = $this->getPageTableQuery()
-            ->whereNotNull('paid_at')
-            ->selectRaw('AVG(TIMESTAMPDIFF(DAY, approved_at, paid_at)) as avg_days')
-            ->value('avg_days');
+        $averagePaymentTimeFormatted = '-';
+        $averagePaymentTimeSuffix = null;
 
-        $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);
+        if ($activeTab !== 'unpaid') {
+            $averagePaymentTime = $this->getPageTableQuery()
+                ->whereNotNull('paid_at')
+                ->selectRaw('AVG(TIMESTAMPDIFF(DAY, approved_at, paid_at)) as avg_days')
+                ->value('avg_days');
+
+            $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);
+            $averagePaymentTimeSuffix = 'days';
+        }
 
         return [
             EnhancedStatsOverviewWidget\EnhancedStat::make('Total Unpaid', CurrencyConverter::formatCentsToMoney($amountUnpaid))
@@ -81,7 +93,7 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
             EnhancedStatsOverviewWidget\EnhancedStat::make('Due Within 30 Days', CurrencyConverter::formatCentsToMoney($amountDueWithin30Days))
                 ->suffix(CurrencyAccessor::getDefaultCurrency()),
             EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', $averagePaymentTimeFormatted)
-                ->suffix('days'),
+                ->suffix($averagePaymentTimeSuffix),
             EnhancedStatsOverviewWidget\EnhancedStat::make('Average Invoice Total', CurrencyConverter::formatCentsToMoney($averageInvoiceTotal))
                 ->suffix(CurrencyAccessor::getDefaultCurrency()),
         ];

app/Providers/Filament/CompanyPanelProvider.php

@@ -40,6 +40,7 @@ use App\Http\Middleware\ConfigureCurrentCompany;
 use App\Livewire\UpdatePassword;
 use App\Livewire\UpdateProfileInformation;
 use App\Models\Company;
+use App\Services\CompanySettingsService;
 use App\Support\FilamentComponentConfigurator;
 use Exception;
 use Filament\Actions;
@@ -274,11 +275,13 @@ class CompanyPanelProvider extends PanelProvider
         });
 
         Tables\Table::configureUsing(static function (Tables\Table $table): void {
+            $table::$defaultDateDisplayFormat = CompanySettingsService::getDefaultDateFormat(session('current_company_id') ?? auth()->user()->current_company_id);
+
             $table
                 ->paginationPageOptions([5, 10, 25, 50, 100])
                 ->filtersFormWidth(MaxWidth::Small)
                 ->filtersTriggerAction(fn (Tables\Actions\Action $action) => $action->slideOver());
-        }, isImportant: true);
+        });
 
         Tables\Columns\TextColumn::configureUsing(function (Tables\Columns\TextColumn $column): void {
             $column->placeholder('–');
@@ -296,7 +299,7 @@ class CompanyPanelProvider extends PanelProvider
             $select
                 ->native(false)
                 ->selectablePlaceholder($isSelectable);
-        }, isImportant: true);
+        });
     }
 
     protected function hasRequiredRule(Select $component): bool

app/Services/CompanySettingsService.php

@@ -9,11 +9,21 @@ use Illuminate\Support\Facades\Cache;
 
 class CompanySettingsService
 {
-    public static function getSettings(int $companyId): array
+    protected static array $requestCache = [];
+
+    public static function getSettings(?int $companyId = null): array
     {
+        if (! $companyId) {
+            return self::getDefaultSettings();
+        }
+
+        if (isset(self::$requestCache[$companyId])) {
+            return self::$requestCache[$companyId];
+        }
+
         $cacheKey = "company_settings_{$companyId}";
 
-        return Cache::rememberForever($cacheKey, function () use ($companyId) {
+        $settings = Cache::rememberForever($cacheKey, function () use ($companyId) {
             $company = Company::with(['locale'])->find($companyId);
 
             if (! $company) {
@@ -28,12 +38,19 @@ class CompanySettingsService
                 'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
             ];
         });
+
+        self::$requestCache[$companyId] = $settings;
+
+        return $settings;
     }
 
     public static function invalidateSettings(int $companyId): void
     {
         $cacheKey = "company_settings_{$companyId}";
+
         Cache::forget($cacheKey);
+
+        unset(self::$requestCache[$companyId]);
     }
 
     public static function getDefaultSettings(): array
@@ -47,34 +64,34 @@ class CompanySettingsService
         ];
     }
 
-    public static function getSpecificSetting(int $companyId, string $key, $default = null)
+    public static function getSpecificSetting(?int $companyId, string $key, $default = null)
     {
         $settings = self::getSettings($companyId);
 
         return $settings[$key] ?? $default;
     }
 
-    public static function getDefaultLanguage(int $companyId): string
+    public static function getDefaultLanguage(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_language', config('transmatic.source_locale'));
     }
 
-    public static function getDefaultTimezone(int $companyId): string
+    public static function getDefaultTimezone(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_timezone', config('app.timezone'));
     }
 
-    public static function getDefaultCurrency(int $companyId): string
+    public static function getDefaultCurrency(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_currency', 'USD');
     }
 
-    public static function getDefaultDateFormat(int $companyId): string
+    public static function getDefaultDateFormat(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_date_format', DateFormat::DEFAULT);
     }
 
-    public static function getDefaultWeekStart(int $companyId): string
+    public static function getDefaultWeekStart(?int $companyId = null): string
     {
         return self::getSpecificSetting($companyId, 'default_week_start', WeekStart::DEFAULT);
     }