wip

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

@@ -65,7 +65,7 @@ class CompanyDefault extends Page
     public function mount(): void
     {
         $this->record = CompanyDefaultModel::firstOrNew([
-            'company_id' => auth()->user()->currentCompany->id,
+            'company_id' => auth()->user()->current_company_id,
         ]);
 
         abort_unless(static::canView($this->record), 404);

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

@@ -68,7 +68,7 @@ class CompanyProfile extends Page
     public function mount(): void
     {
         $this->record = CompanyProfileModel::firstOrNew([
-            'company_id' => auth()->user()->currentCompany->id,
+            'company_id' => auth()->user()->current_company_id,
         ]);
 
         abort_unless(static::canView($this->record), 404);

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

@@ -69,7 +69,7 @@ class Localization extends Page
     public function mount(): void
     {
         $this->record = LocalizationModel::firstOrNew([
-            'company_id' => auth()->user()->currentCompany->id,
+            'company_id' => auth()->user()->current_company_id,
         ]);
 
         abort_unless(static::canView($this->record), 404);

app/Listeners/SyncWithCompanyDefaults.php

@@ -34,7 +34,7 @@ class SyncWithCompanyDefaults
             return;
         }
 
-        $companyId = auth()->user()->currentCompany->id;
+        $companyId = auth()->user()->current_company_id;
 
         if (! $companyId) {
             return;
@@ -47,6 +47,7 @@ class SyncWithCompanyDefaults
     {
         $modelName = class_basename($model);
 
+        /** @var CompanyDefault $default */
         $default = CompanyDefault::firstOrNew([
             'company_id' => $companyId,
         ]);

app/Providers/MacroServiceProvider.php

@@ -8,6 +8,7 @@ use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Setting\DateFormat;
 use App\Models\Accounting\AccountSubtype;
 use App\Models\Setting\Localization;
+use App\Services\CompanySettingsService;
 use App\Utilities\Accounting\AccountCode;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
@@ -433,10 +434,9 @@ class MacroServiceProvider extends ServiceProvider
         });
 
         Carbon::macro('toDefaultDateFormat', function () {
-            $localization = Localization::firstOrFail();
-
-            $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
-            $timezone = $localization->timezone ?? Carbon::now()->timezoneName;
+            $companyId = auth()->user()?->current_company_id;
+            $dateFormat = CompanySettingsService::getDefaultDateFormat($companyId);
+            $timezone = CompanySettingsService::getDefaultTimezone($companyId);
 
             return $this->setTimezone($timezone)->format($dateFormat);
         });

app/Services/CompanySettingsService.php

@@ -5,6 +5,7 @@ namespace App\Services;
 use App\Enums\Setting\DateFormat;
 use App\Enums\Setting\WeekStart;
 use App\Models\Company;
+use App\Models\Setting\Currency;
 use Illuminate\Support\Facades\Cache;
 
 class CompanySettingsService
@@ -30,10 +31,15 @@ class CompanySettingsService
                 return self::getDefaultSettings();
             }
 
+            $defaultCurrency = Currency::query()
+                ->where('company_id', $companyId)
+                ->where('enabled', true)
+                ->value('code') ?? 'USD';
+
             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_currency' => $defaultCurrency,
                 'default_date_format' => $company->locale->date_format->value ?? DateFormat::DEFAULT,
                 'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
             ];

app/Utilities/Currency/CurrencyAccessor.php

@@ -5,7 +5,7 @@ namespace App\Utilities\Currency;
 use Akaunting\Money\Currency as ISOCurrencies;
 use App\Facades\Forex;
 use App\Models\Setting\Currency;
-use Illuminate\Support\Facades\Cache;
+use App\Services\CompanySettingsService;
 
 class CurrencyAccessor
 {
@@ -53,17 +53,12 @@ class CurrencyAccessor
 
     public static function getDefaultCurrency(): ?string
     {
-        $companyId = auth()->user()?->currentCompany?->id;
-        $cacheKey = "default_currency_{$companyId}";
+        $companyId = auth()->user()?->current_company_id;
 
         if ($companyId === null) {
             return 'USD';
         }
 
-        return Cache::rememberForever($cacheKey, function () {
-            return Currency::query()
-                ->where('enabled', true)
-                ->value('code');
-        });
+        return CompanySettingsService::getDefaultCurrency($companyId);
     }
 }