wip

app/Filament/Company/Clusters/Settings/Pages/Appearance.php

@@ -8,6 +8,7 @@ use App\Enums\Setting\RecordsPerPage;
 use App\Enums\Setting\TableSortDirection;
 use App\Filament\Company\Clusters\Settings;
 use App\Models\Setting\Appearance as AppearanceModel;
+use App\Services\CompanySettingsService;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Component;
@@ -165,10 +166,21 @@ class Appearance extends Page
             'font',
         ];
 
+        $cachedKeysToWatch = [
+            'primary_color',
+            'font',
+            'table_sort_direction',
+            'records_per_page',
+        ];
+
         if ($record->isDirty($keysToWatch)) {
             $this->dispatch('appearanceUpdated');
         }
 
+        if ($record->isDirty($cachedKeysToWatch)) {
+            CompanySettingsService::invalidateSettings($record->company_id);
+        }
+
         $record->save();
 
         return $record;

app/Filament/Company/Clusters/Settings/Pages/Localization.php

@@ -9,6 +9,7 @@ use App\Enums\Setting\WeekStart;
 use App\Filament\Company\Clusters\Settings;
 use App\Models\Setting\CompanyProfile as CompanyProfileModel;
 use App\Models\Setting\Localization as LocalizationModel;
+use App\Services\CompanySettingsService;
 use App\Utilities\Localization\Timezone;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
@@ -214,6 +215,7 @@ class Localization extends Page
         ];
 
         if ($record->isDirty($keysToWatch)) {
+            CompanySettingsService::invalidateSettings($record->company_id);
             $this->dispatch('localizationUpdated');
         }
 

app/Listeners/ConfigureCompanyDefault.php

@@ -2,13 +2,10 @@
 
 namespace App\Listeners;
 
-use App\Enums\Setting\DateFormat;
-use App\Enums\Setting\Font;
 use App\Enums\Setting\PrimaryColor;
 use App\Enums\Setting\RecordsPerPage;
-use App\Enums\Setting\TableSortDirection;
-use App\Enums\Setting\WeekStart;
 use App\Events\CompanyConfigured;
+use App\Services\CompanySettingsService;
 use App\Utilities\Currency\ConfigureCurrencies;
 use Filament\Facades\Filament;
 use Filament\Forms\Components\DatePicker;
@@ -26,46 +23,39 @@ class ConfigureCompanyDefault
     public function handle(CompanyConfigured $event): void
     {
         $company = $event->company;
+        $companyId = $company->id;
 
-        session([
-            'current_company_id' => $company->id,
-            'default_language' => $company->locale->language ?? config('transmatic.source_locale'),
-            'default_timezone' => $company->locale->timezone ?? config('app.timezone'),
-            'default_pagination_page_option' => $company->appearance->records_per_page->value ?? RecordsPerPage::DEFAULT,
-            'default_sort' => $company->appearance->table_sort_direction->value ?? TableSortDirection::DEFAULT,
-            'default_primary_color' => $company->appearance->primary_color->value ?? PrimaryColor::DEFAULT,
-            'default_font' => $company->appearance->font->value ?? Font::DEFAULT,
-            'default_date_format' => $company->locale->date_format->value ?? DateFormat::DEFAULT,
-            'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
-        ]);
+        session(['current_company_id' => $companyId]);
+
+        $settings = CompanySettingsService::getSettings($companyId);
 
-        app()->setLocale(session('default_language'));
-        locale_set_default(session('default_language'));
-        config(['app.timezone' => session('default_timezone')]);
-        date_default_timezone_set(session('default_timezone'));
+        app()->setLocale($settings['default_language']);
+        locale_set_default($settings['default_language']);
+        config(['app.timezone' => $settings['default_timezone']]);
+        date_default_timezone_set($settings['default_timezone']);
 
         $paginationPageOptions = RecordsPerPage::caseValues();
 
-        Table::configureUsing(static function (Table $table) use ($paginationPageOptions): void {
+        Table::configureUsing(static function (Table $table) use ($settings, $paginationPageOptions): void {
 
             $table
                 ->paginationPageOptions($paginationPageOptions)
-                ->defaultSort(column: 'id', direction: session('default_sort'))
-                ->defaultPaginationPageOption(session('default_pagination_page_option'));
+                ->defaultSort(column: 'id', direction: $settings['default_sort'])
+                ->defaultPaginationPageOption($settings['default_pagination_page_option']);
         }, isImportant: true);
 
         FilamentColor::register([
-            'primary' => PrimaryColor::from(session('default_primary_color'))->getColor(),
+            'primary' => PrimaryColor::from($settings['default_primary_color'])->getColor(),
         ]);
 
         Filament::getPanel('company')
-            ->font(session('default_font'))
+            ->font($settings['default_font'])
             ->brandName($company->name);
 
-        DatePicker::configureUsing(static function (DatePicker $component) {
+        DatePicker::configureUsing(static function (DatePicker $component) use ($settings) {
             $component
-                ->displayFormat(session('default_date_format'))
-                ->firstDayOfWeek(session('default_week_start'));
+                ->displayFormat($settings['default_date_format'])
+                ->firstDayOfWeek($settings['default_week_start']);
         });
 
         Tab::configureUsing(static function (Tab $tab) {

app/Services/CompanySettingsService.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Services;
+
+use App\Enums\Setting\DateFormat;
+use App\Enums\Setting\Font;
+use App\Enums\Setting\PrimaryColor;
+use App\Enums\Setting\RecordsPerPage;
+use App\Enums\Setting\TableSortDirection;
+use App\Enums\Setting\WeekStart;
+use App\Models\Company;
+use Illuminate\Support\Facades\Cache;
+
+class CompanySettingsService
+{
+    public static function getSettings(int $companyId): array
+    {
+        $cacheKey = "company_settings_{$companyId}";
+
+        return Cache::rememberForever($cacheKey, function () use ($companyId) {
+            $company = Company::with(['locale', 'appearance'])->find($companyId);
+
+            if (! $company) {
+                return self::getDefaultSettings();
+            }
+
+            return [
+                'default_language' => $company->locale->language ?? config('transmatic.source_locale'),
+                'default_timezone' => $company->locale->timezone ?? config('app.timezone'),
+                'default_currency' => $company->currency_code ?? 'USD',
+                'default_pagination_page_option' => $company->appearance->records_per_page->value ?? RecordsPerPage::DEFAULT,
+                'default_sort' => $company->appearance->table_sort_direction->value ?? TableSortDirection::DEFAULT,
+                'default_primary_color' => $company->appearance->primary_color->value ?? PrimaryColor::DEFAULT,
+                'default_font' => $company->appearance->font->value ?? Font::DEFAULT,
+                'default_date_format' => $company->locale->date_format->value ?? DateFormat::DEFAULT,
+                'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
+            ];
+        });
+    }
+
+    public static function invalidateSettings(int $companyId): void
+    {
+        $cacheKey = "company_settings_{$companyId}";
+        Cache::forget($cacheKey);
+    }
+
+    public static function getDefaultSettings(): array
+    {
+        return [
+            'default_language' => config('transmatic.source_locale'),
+            'default_timezone' => config('app.timezone'),
+            'default_currency' => 'USD',
+            'default_pagination_page_option' => RecordsPerPage::DEFAULT,
+            'default_sort' => TableSortDirection::DEFAULT,
+            'default_primary_color' => PrimaryColor::DEFAULT,
+            'default_font' => Font::DEFAULT,
+            'default_date_format' => DateFormat::DEFAULT,
+            'default_week_start' => WeekStart::DEFAULT,
+        ];
+    }
+
+    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
+    {
+        return self::getSpecificSetting($companyId, 'default_language', config('transmatic.source_locale'));
+    }
+
+    public static function getDefaultTimezone(int $companyId): string
+    {
+        return self::getSpecificSetting($companyId, 'default_timezone', config('app.timezone'));
+    }
+
+    public static function getDefaultCurrency(int $companyId): string
+    {
+        return self::getSpecificSetting($companyId, 'default_currency', 'USD');
+    }
+
+    public static function getDefaultPaginationOption(int $companyId): int
+    {
+        return self::getSpecificSetting($companyId, 'default_pagination_page_option', RecordsPerPage::DEFAULT);
+    }
+
+    public static function getDefaultPrimaryColor(int $companyId): string
+    {
+        return self::getSpecificSetting($companyId, 'default_primary_color', PrimaryColor::DEFAULT);
+    }
+}

package-lock.json

@@ -1187,9 +1187,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.65",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.65.tgz",
-            "integrity": "sha512-PWVzBjghx7/wop6n22vS2MLU8tKGd4Q91aCEGhG/TYmW6PP5OcSXcdnxTe1NNt0T66N8D6jxh4kC8UsdzOGaIw==",
+            "version": "1.5.67",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.67.tgz",
+            "integrity": "sha512-nz88NNBsD7kQSAGGJyp8hS6xSPtWwqNogA0mjtc2nUYeEf3nURK9qpV18TuBdDmEDgVWotS8Wkzf+V52dSQ/LQ==",
             "dev": true,
             "license": "ISC"
         },