wip refactor

app/Concerns/CompanyOwned.php

@@ -17,15 +17,11 @@ trait CompanyOwned
             if (empty($model->company_id)) {
                 $companyId = session('current_company_id');
 
-                if (! $companyId && Auth::check() && Auth::user()->currentCompany) {
+                if (! $companyId && Auth::check()) {
                     $companyId = Auth::user()->currentCompany->id;
                     session(['current_company_id' => $companyId]);
                 }
 
-                if (! $companyId) {
-                    $companyId = Auth::user()->currentCompany->id;
-                }
-
                 if ($companyId) {
                     $model->company_id = $companyId;
                 } else {

app/Concerns/HandlesResourceRecordCreation.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Concerns;
-
-use App\Models\User;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-trait HandlesResourceRecordCreation
-{
-    protected function handleRecordCreationWithUniqueField(array $data, Model $model, User $user, ?string $uniqueField = null, ?array $evaluatedTypes = null): Model
-    {
-        // If evaluatedTypes is provided, ensure the unique field value is within the allowed types
-        if ($uniqueField && $evaluatedTypes && ! in_array($data[$uniqueField] ?? '', $evaluatedTypes, true)) {
-            $data['enabled'] = false;
-            $instance = $model->newInstance($data);
-            $instance->save();
-
-            return $instance;
-        }
-
-        $companyId = $user->currentCompany->id;
-        $shouldBeEnabled = (bool) ($data['enabled'] ?? false);
-
-        $query = $model::query()
-            ->where('company_id', $companyId)
-            ->where('enabled', true);
-
-        if ($uniqueField && array_key_exists($uniqueField, $data)) {
-            $query->where($uniqueField, $data[$uniqueField]);
-        }
-
-        $this->toggleRecords($query, $shouldBeEnabled);
-
-        $data['enabled'] = $shouldBeEnabled;
-        $instance = $model->newInstance($data);
-        $instance->save();
-
-        return $instance;
-    }
-
-    private function toggleRecords(Builder $query, bool &$shouldBeEnabled): void
-    {
-        if ($shouldBeEnabled) {
-            $existingEnabledRecord = $query->first();
-            $existingEnabledRecord?->update(['enabled' => false]);
-        } elseif ($query->doesntExist()) {
-            $shouldBeEnabled = true;
-        }
-    }
-}

app/Concerns/HandlesResourceRecordUpdate.php

@@ -1,80 +0,0 @@
-<?php
-
-namespace App\Concerns;
-
-use App\Models\User;
-use BackedEnum;
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-
-trait HandlesResourceRecordUpdate
-{
-    protected function handleRecordUpdateWithUniqueField(Model $record, array $data, User $user, ?string $uniqueField = null, ?array $evaluatedTypes = null): Model
-    {
-        if (is_array($evaluatedTypes)) {
-            $evaluatedTypes = $this->ensureUpdateEnumValues($evaluatedTypes);
-        }
-
-        if ($uniqueField && ! in_array($data[$uniqueField] ?? '', $evaluatedTypes ?? [], true)) {
-            $data['enabled'] = false;
-
-            return tap($record)->update($data);
-        }
-
-        $companyId = $user->currentCompany->id;
-        $oldValue = $uniqueField ? $record->{$uniqueField} : null;
-        $newValue = $uniqueField ? $data[$uniqueField] : null;
-        $enabled = (bool) ($data['enabled'] ?? false);
-        $wasOriginallyEnabled = (bool) $record->getAttribute('enabled');
-
-        if ($oldValue instanceof BackedEnum) {
-            $oldValue = $oldValue->value;
-        }
-
-        if ($newValue instanceof BackedEnum) {
-            $newValue = $newValue->value;
-        }
-
-        if ($uniqueField && $oldValue !== $newValue && $wasOriginallyEnabled) {
-            $newValue = $oldValue;
-            $data[$uniqueField] = $oldValue;
-        }
-
-        if ($enabled === true && ! $wasOriginallyEnabled) {
-            $this->toggleRecord($companyId, $record, $uniqueField, $newValue, true, false);
-        } elseif ($enabled === false && $wasOriginallyEnabled) {
-            $enabled = true;
-        }
-
-        $data['enabled'] = $enabled;
-
-        return tap($record)->update($data);
-    }
-
-    private function ensureUpdateEnumValues(array $evaluatedTypes): array
-    {
-        return array_map(static function ($type) {
-            return $type instanceof BackedEnum ? $type->value : $type;
-        }, $evaluatedTypes);
-    }
-
-    protected function toggleRecord(int $companyId, Model $record, ?string $uniqueField, $value, bool $enabled, bool $newStatus): void
-    {
-        $query = $this->buildQuery($companyId, $record, $uniqueField, $value, $enabled);
-
-        if ($newStatus && ($otherRecord = $query->first())) {
-            $otherRecord->update(['enabled' => true]);
-        } else {
-            $query->update(['enabled' => false]);
-        }
-    }
-
-    protected function buildQuery(int $companyId, Model $record, ?string $uniqueField, $value, bool $enabled): Builder
-    {
-        return $record::query()
-            ->where('company_id', $companyId)
-            ->where('id', '!=', $record->getKey())
-            ->where('enabled', $enabled)
-            ->when($uniqueField, static fn ($q) => $q->where($uniqueField, $value));
-    }
-}

app/Concerns/HasDefault.php

@@ -2,6 +2,9 @@
 
 namespace App\Concerns;
 
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Model;
+
 trait HasDefault
 {
     public function isEnabled(): bool
@@ -23,4 +26,29 @@ trait HasDefault
     {
         return translate('No');
     }
+
+    public static function bootHasDefault(): void
+    {
+        static::saving(function (Model $model) {
+            if ($model->isDirty(['enabled', $model->evaluatedDefault])) {
+                if ($model->enabled === true) {
+                    static::query()
+                        ->whereKeyNot($model->getKey())
+                        ->where('enabled', true)
+                        ->when(filled($model->evaluatedDefault), static fn (Builder $query) => $query->where($model->evaluatedDefault, $model->{$model->evaluatedDefault}))
+                        ->update(['enabled' => false]);
+                } else {
+                    $enabledRecordDoesNotExist = static::query()
+                        ->whereKeyNot($model->getKey())
+                        ->where('enabled', true)
+                        ->when(filled($model->evaluatedDefault), static fn (Builder $query) => $query->where($model->evaluatedDefault, $model->{$model->evaluatedDefault}))
+                        ->doesntExist();
+
+                    if ($enabledRecordDoesNotExist) {
+                        $model->enabled = true;
+                    }
+                }
+            }
+        });
+    }
 }

app/Filament/Company/Clusters/Settings/Resources/DiscountResource.php

@@ -50,13 +50,13 @@ class DiscountResource extends Resource
                             ->localizeLabel()
                             ->maxLength(255)
                             ->rule(static function (Forms\Get $get, Forms\Components\Component $component): Closure {
-                                return static function (string $attribute, $value, Closure $fail) use ($get, $component) {
-                                    $existingDiscount = Discount::where('company_id', auth()->user()->currentCompany->id)
-                                        ->where('name', $value)
+                                return static function (string $attribute, $value, Closure $fail) use ($component, $get) {
+                                    $existingDiscount = Discount::where('name', $value)
+                                        ->whereKeyNot($component->getRecord()?->getKey())
                                         ->where('type', $get('type'))
                                         ->first();
 
-                                    if ($existingDiscount && $existingDiscount->getKey() !== $component->getRecord()?->getKey()) {
+                                    if ($existingDiscount) {
                                         $message = translate('The :Type :record ":name" already exists.', [
                                             'Type' => $existingDiscount->type->getLabel(),
                                             'record' => strtolower(static::getModelLabel()),
@@ -90,35 +90,13 @@ class DiscountResource extends Resource
                             ->nullable(),
                         Forms\Components\DateTimePicker::make('start_date')
                             ->localizeLabel()
-                            ->minDate(static function ($context, ?Discount $record = null) {
-                                if ($context === 'create' || $record?->start_date?->isFuture()) {
-                                    return today()->addDay();
-                                }
-
-                                return $record?->start_date;
-                            })
-                            ->maxDate(static function (callable $get, ?Discount $record = null) {
-                                $end_date = $get('end_date') ?? $record?->end_date;
-
-                                return $end_date ?: today()->addYear();
-                            })
-                            ->format('Y-m-d H:i:s')
-                            ->displayFormat('F d, Y H:i')
+                            ->beforeOrEqual('end_date')
                             ->seconds(false)
-                            ->live()
-                            ->disabled(static fn ($context, ?Discount $record = null) => $context === 'edit' && $record?->start_date?->isPast() ?? false)
+                            ->disabled(static fn (string $operation, ?Discount $record = null) => $operation === 'edit' && $record?->start_date?->isPast() ?? false)
                             ->helperText(static fn (Forms\Components\DateTimePicker $component) => $component->isDisabled() ? 'Start date cannot be changed after the discount has begun.' : null),
                         Forms\Components\DateTimePicker::make('end_date')
-                            ->live()
                             ->localizeLabel()
-                            ->minDate(static function (callable $get, ?Discount $record = null) {
-                                $start_date = $get('start_date') ?? $record?->start_date;
-
-                                return $start_date ?: today()->addDay();
-                            })
-                            ->maxDate(today()->addYear())
-                            ->format('Y-m-d H:i:s')
-                            ->displayFormat('F d, Y H:i')
+                            ->afterOrEqual('start_date')
                             ->seconds(false),
                         ToggleButton::make('enabled')
                             ->localizeLabel('Default')
@@ -137,12 +115,14 @@ class DiscountResource extends Resource
                     ->weight(FontWeight::Medium)
                     ->icon(static fn (Discount $record) => $record->isEnabled() ? 'heroicon-o-lock-closed' : null)
                     ->tooltip(static function (Discount $record) {
-                        $tooltipMessage = translate('Default :Type :Record', [
+                        if ($record->isDisabled()) {
+                            return null;
+                        }
+
+                        return translate('Default :Type :Record', [
                             'Type' => $record->type->getLabel(),
                             'Record' => static::getModelLabel(),
                         ]);
-
-                        return $record->isEnabled() ? $tooltipMessage : null;
                     })
                     ->iconPosition('after')
                     ->searchable()

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/CreateDiscount.php

@@ -2,45 +2,15 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\DiscountResource\Pages;
 
-use App\Concerns\HandlesResourceRecordCreation;
-use App\Enums\Setting\DiscountType;
 use App\Filament\Company\Clusters\Settings\Resources\DiscountResource;
-use App\Models\Setting\Discount;
 use Filament\Resources\Pages\CreateRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
 
 class CreateDiscount extends CreateRecord
 {
-    use HandlesResourceRecordCreation;
-
     protected static string $resource = DiscountResource::class;
 
     protected function getRedirectUrl(): string
     {
         return $this->getResource()::getUrl('index');
     }
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        $data['enabled'] = (bool) $data['enabled'];
-
-        return $data;
-    }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordCreation(array $data): Model
-    {
-        $user = auth()->user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        $evaluatedTypes = [DiscountType::Sales, DiscountType::Purchase];
-
-        return $this->handleRecordCreationWithUniqueField($data, new Discount, $user, 'type', $evaluatedTypes);
-    }
 }

app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/EditDiscount.php

@@ -2,18 +2,12 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\DiscountResource\Pages;
 
-use App\Concerns\HandlesResourceRecordUpdate;
-use App\Enums\Setting\DiscountType;
 use App\Filament\Company\Clusters\Settings\Resources\DiscountResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
 
 class EditDiscount extends EditRecord
 {
-    use HandlesResourceRecordUpdate;
-
     protected static string $resource = DiscountResource::class;
 
     protected function getHeaderActions(): array
@@ -27,27 +21,4 @@ class EditDiscount extends EditRecord
     {
         return $this->getResource()::getUrl('index');
     }
-
-    protected function mutateFormDataBeforeSave(array $data): array
-    {
-        $data['enabled'] = (bool) $data['enabled'];
-
-        return $data;
-    }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordUpdate(Model $record, array $data): Model
-    {
-        $user = auth()->user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        $evaluatedTypes = [DiscountType::Sales, DiscountType::Purchase];
-
-        return $this->handleRecordUpdateWithUniqueField($record, $data, $user, 'type', $evaluatedTypes);
-    }
 }

app/Filament/Company/Clusters/Settings/Resources/TaxResource.php

@@ -47,13 +47,13 @@ class TaxResource extends Resource
                             ->localizeLabel()
                             ->maxLength(255)
                             ->rule(static function (Forms\Get $get, Forms\Components\Component $component): Closure {
-                                return static function (string $attribute, $value, Closure $fail) use ($get, $component) {
-                                    $existingTax = Tax::where('company_id', auth()->user()->currentCompany->id)
-                                        ->where('name', $value)
+                                return static function (string $attribute, $value, Closure $fail) use ($component, $get) {
+                                    $existingTax = Tax::where('name', $value)
+                                        ->whereKeyNot($component->getRecord()?->getKey())
                                         ->where('type', $get('type'))
                                         ->first();
 
-                                    if ($existingTax && $existingTax->getKey() !== $component->getRecord()?->getKey()) {
+                                    if ($existingTax) {
                                         $message = translate('The :Type :record ":name" already exists.', [
                                             'Type' => $existingTax->type->getLabel(),
                                             'record' => strtolower(static::getModelLabel()),
@@ -100,12 +100,14 @@ class TaxResource extends Resource
                     ->weight(FontWeight::Medium)
                     ->icon(static fn (Tax $record) => $record->isEnabled() ? 'heroicon-o-lock-closed' : null)
                     ->tooltip(static function (Tax $record) {
-                        $tooltipMessage = translate('Default :Type :Record', [
+                        if ($record->isDisabled()) {
+                            return null;
+                        }
+
+                        return translate('Default :Type :Record', [
                             'Type' => $record->type->getLabel(),
                             'Record' => static::getModelLabel(),
                         ]);
-
-                        return $record->isEnabled() ? $tooltipMessage : null;
                     })
                     ->iconPosition('after')
                     ->searchable()

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/CreateTax.php

@@ -2,45 +2,15 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\TaxResource\Pages;
 
-use App\Concerns\HandlesResourceRecordCreation;
-use App\Enums\Setting\TaxType;
 use App\Filament\Company\Clusters\Settings\Resources\TaxResource;
-use App\Models\Setting\Tax;
 use Filament\Resources\Pages\CreateRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
 
 class CreateTax extends CreateRecord
 {
-    use HandlesResourceRecordCreation;
-
     protected static string $resource = TaxResource::class;
 
     protected function getRedirectUrl(): string
     {
         return $this->getResource()::getUrl('index');
     }
-
-    protected function mutateFormDataBeforeCreate(array $data): array
-    {
-        $data['enabled'] = (bool) $data['enabled'];
-
-        return $data;
-    }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordCreation(array $data): Model
-    {
-        $user = auth()->user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        $evaluatedTypes = [TaxType::Sales, TaxType::Purchase];
-
-        return $this->handleRecordCreationWithUniqueField($data, new Tax, $user, 'type', $evaluatedTypes);
-    }
 }

app/Filament/Company/Clusters/Settings/Resources/TaxResource/Pages/EditTax.php

@@ -2,18 +2,12 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources\TaxResource\Pages;
 
-use App\Concerns\HandlesResourceRecordUpdate;
-use App\Enums\Setting\TaxType;
 use App\Filament\Company\Clusters\Settings\Resources\TaxResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
 
 class EditTax extends EditRecord
 {
-    use HandlesResourceRecordUpdate;
-
     protected static string $resource = TaxResource::class;
 
     protected function getHeaderActions(): array
@@ -27,27 +21,4 @@ class EditTax extends EditRecord
     {
         return $this->getResource()::getUrl('index');
     }
-
-    protected function mutateFormDataBeforeSave(array $data): array
-    {
-        $data['enabled'] = (bool) $data['enabled'];
-
-        return $data;
-    }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordUpdate(Model $record, array $data): Model
-    {
-        $user = auth()->user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        $evaluatedTypes = [TaxType::Sales, TaxType::Purchase];
-
-        return $this->handleRecordUpdateWithUniqueField($record, $data, $user, 'type', $evaluatedTypes);
-    }
 }

app/Filament/Company/Pages/CreateCompany.php

@@ -21,6 +21,8 @@ use Wallo\FilamentCompanies\Pages\Company\CreateCompany as FilamentCreateCompany
 
 class CreateCompany extends FilamentCreateCompany
 {
+    protected bool $hasTopbar = false;
+
     public function form(Form $form): Form
     {
         return $form
@@ -85,7 +87,7 @@ class CreateCompany extends FilamentCreateCompany
 
             $user?->switchCompany($company);
 
-            $companyDefaultService = app()->make(CompanyDefaultService::class);
+            $companyDefaultService = app(CompanyDefaultService::class);
             $user = $company->owner ?? $user;
             $companyDefaultService->createCompanyDefaults($company, $user, $data['currencies']['code'], $data['profile']['country'], $data['locale']['language']);
 

app/Filament/Company/Resources/Banking/AccountResource/Pages/CreateAccount.php

@@ -2,18 +2,11 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
-use App\Concerns\HandlesResourceRecordCreation;
 use App\Filament\Company\Resources\Banking\AccountResource;
-use App\Models\Banking\BankAccount;
 use Filament\Resources\Pages\CreateRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Auth;
 
 class CreateAccount extends CreateRecord
 {
-    use HandlesResourceRecordCreation;
-
     protected static string $resource = AccountResource::class;
 
     protected function getRedirectUrl(): string
@@ -27,18 +20,4 @@ class CreateAccount extends CreateRecord
 
         return $data;
     }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordCreation(array $data): Model
-    {
-        $user = Auth::user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        return $this->handleRecordCreationWithUniqueField($data, new BankAccount, $user);
-    }
 }

app/Filament/Company/Resources/Banking/AccountResource/Pages/EditAccount.php

@@ -2,17 +2,11 @@
 
 namespace App\Filament\Company\Resources\Banking\AccountResource\Pages;
 
-use App\Concerns\HandlesResourceRecordUpdate;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use Filament\Resources\Pages\EditRecord;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Auth;
 
 class EditAccount extends EditRecord
 {
-    use HandlesResourceRecordUpdate;
-
     protected static string $resource = AccountResource::class;
 
     protected function getHeaderActions(): array
@@ -33,18 +27,4 @@ class EditAccount extends EditRecord
 
         return $data;
     }
-
-    /**
-     * @throws Halt
-     */
-    protected function handleRecordUpdate(Model $record, array $data): Model
-    {
-        $user = Auth::user();
-
-        if (! $user) {
-            throw new Halt('No authenticated user found');
-        }
-
-        return $this->handleRecordUpdateWithUniqueField($record, $data, $user);
-    }
 }

app/Models/Setting/Discount.php

@@ -51,6 +51,8 @@ class Discount extends Model
         'enabled' => 'boolean',
     ];
 
+    protected ?string $evaluatedDefault = 'type';
+
     public function defaultSalesDiscount(): HasOne
     {
         return $this->hasOne(CompanyDefault::class, 'sales_discount_id');

app/Models/Setting/Tax.php

@@ -47,6 +47,8 @@ class Tax extends Model
         'enabled' => 'boolean',
     ];
 
+    protected ?string $evaluatedDefault = 'type';
+
     public function defaultSalesTax(): HasOne
     {
         return $this->hasOne(CompanyDefault::class, 'sales_tax_id');

app/Repositories/Setting/CurrencyRepository.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace App\Repositories\Setting;
-
-use App\Models\Company;
-use App\Models\Setting\Currency;
-
-class CurrencyRepository
-{
-    public function ensureCurrencyExists(Company $company, string $currencyCode): Currency
-    {
-        $hasDefaultCurrency = $this->hasDefaultCurrency($company);
-
-        $currency = currency($currencyCode);
-
-        return $company->currencies()
-            ->firstOrCreate([
-                'code' => $currencyCode,
-            ], [
-                'name' => $currency->getName(),
-                'rate' => $currency->getRate(),
-                'precision' => $currency->getPrecision(),
-                'symbol' => $currency->getSymbol(),
-                'symbol_first' => $currency->isSymbolFirst(),
-                'decimal_mark' => $currency->getDecimalMark(),
-                'thousands_separator' => $currency->getThousandsSeparator(),
-                'enabled' => ! $hasDefaultCurrency,
-            ]);
-    }
-
-    public function getDefaultCurrency(Company $company): ?Currency
-    {
-        return $company->currencies()
-            ->where('enabled', true)
-            ->first();
-    }
-
-    public function hasDefaultCurrency(Company $company): bool
-    {
-        return $this->getDefaultCurrency($company) !== null;
-    }
-}

app/Services/ChartOfAccountsService.php

@@ -4,11 +4,11 @@ namespace App\Services;
 
 use App\Enums\Accounting\AccountType;
 use App\Enums\Banking\BankAccountType;
-use App\Models\Accounting\Account;
 use App\Models\Accounting\AccountSubtype;
 use App\Models\Banking\BankAccount;
 use App\Models\Company;
 use App\Utilities\Currency\CurrencyAccessor;
+use Exception;
 
 class ChartOfAccountsService
 {
@@ -18,16 +18,27 @@ class ChartOfAccountsService
 
         foreach ($chartOfAccounts as $type => $subtypes) {
             foreach ($subtypes as $subtypeName => $subtypeConfig) {
-                $subtype = AccountSubtype::create([
-                    'company_id' => $company->id,
-                    'multi_currency' => $subtypeConfig['multi_currency'] ?? false,
-                    'category' => AccountType::from($type)->getCategory()->value,
-                    'type' => $type,
-                    'name' => $subtypeName,
-                    'description' => $subtypeConfig['description'] ?? 'No description available.',
-                ]);
+                $subtype = $company->accountSubtypes()
+                    ->createQuietly([
+                        'multi_currency' => $subtypeConfig['multi_currency'] ?? false,
+                        'category' => AccountType::from($type)->getCategory()->value,
+                        'type' => $type,
+                        'name' => $subtypeName,
+                        'description' => $subtypeConfig['description'] ?? 'No description available.',
+                    ]);
+
+                try {
+                    $this->createDefaultAccounts($company, $subtype, $subtypeConfig);
+                } catch (Exception $e) {
+                    // Log the error
+                    logger()->alert('Failed to create a company with its defaults, blocking critical business functionality.', [
+                        'error' => $e->getMessage(),
+                        'userId' => $company->owner->id,
+                        'companyId' => $company->id,
+                    ]);
 
-                $this->createDefaultAccounts($company, $subtype, $subtypeConfig);
+                    throw $e;
+                }
             }
         }
     }
@@ -37,6 +48,12 @@ class ChartOfAccountsService
         if (isset($subtypeConfig['accounts']) && is_array($subtypeConfig['accounts'])) {
             $baseCode = $subtypeConfig['base_code'];
 
+            $defaultCurrencyCode = CurrencyAccessor::getDefaultCurrency();
+
+            if (empty($defaultCurrencyCode)) {
+                throw new Exception('No default currency available for creating accounts.');
+            }
+
             foreach ($subtypeConfig['accounts'] as $accountName => $accountDetails) {
                 $bankAccount = null;
 
@@ -44,46 +61,32 @@ class ChartOfAccountsService
                     $bankAccount = $this->createBankAccountForMultiCurrency($company, $subtypeConfig['bank_account_type']);
                 }
 
-                $account = Account::create([
-                    'company_id' => $company->id,
+                $company->accounts()->createQuietly([
+                    'bank_account_id' => $bankAccount?->id,
                     'subtype_id' => $subtype->id,
                     'category' => $subtype->type->getCategory()->value,
                     'type' => $subtype->type->value,
                     'code' => $baseCode++,
                     'name' => $accountName,
-                    'currency_code' => CurrencyAccessor::getDefaultCurrency(),
+                    'currency_code' => $defaultCurrencyCode,
                     'description' => $accountDetails['description'] ?? 'No description available.',
                     'default' => true,
                     'created_by' => $company->owner->id,
                     'updated_by' => $company->owner->id,
                 ]);
-
-                if ($bankAccount) {
-                    $account->bankAccount()->associate($bankAccount);
-                }
-
-                $account->save();
             }
         }
     }
 
     private function createBankAccountForMultiCurrency(Company $company, string $bankAccountType): BankAccount
     {
-        $bankAccountType = BankAccountType::from($bankAccountType) ?? BankAccountType::Other;
+        $noDefaultBankAccount = $company->bankAccounts()->where('enabled', true)->doesntExist();
 
-        return BankAccount::create([
-            'company_id' => $company->id,
-            'institution_id' => null,
-            'type' => $bankAccountType,
-            'number' => null,
-            'enabled' => BankAccount::where('company_id', $company->id)->where('enabled', true)->doesntExist(),
+        return $company->bankAccounts()->createQuietly([
+            'type' => BankAccountType::from($bankAccountType) ?? BankAccountType::Other,
+            'enabled' => $noDefaultBankAccount,
             'created_by' => $company->owner->id,
             'updated_by' => $company->owner->id,
         ]);
     }
-
-    public function getDefaultBankAccount(Company $company): ?BankAccount
-    {
-        return $company->bankAccounts()->where('enabled', true)->first();
-    }
 }

app/Services/CompanyDefaultService.php

@@ -13,21 +13,18 @@ class CompanyDefaultService
     {
         DB::transaction(function () use ($user, $company, $currencyCode, $countryCode, $language) {
             // Create the company defaults
-            $companyDefaultFactory = CompanyDefault::factory()->withDefault($user, $company, $currencyCode, $countryCode, $language);
-            $companyDefaults = $companyDefaultFactory->make()->toArray();
-
-            $companyDefault = CompanyDefault::create($companyDefaults);
+            $companyDefaultInstance = CompanyDefault::factory()->withDefault($user, $company, $currencyCode, $countryCode, $language);
 
             // Create Chart of Accounts
-            $chartOfAccountsService = app()->make(ChartOfAccountsService::class);
+            $chartOfAccountsService = app(ChartOfAccountsService::class);
             $chartOfAccountsService->createChartOfAccounts($company);
 
             // Get the default bank account and update the company default record
-            $defaultBankAccount = $chartOfAccountsService->getDefaultBankAccount($company);
+            $defaultBankAccount = $company->bankAccounts()->where('enabled', true)->firstOrFail();
 
-            $companyDefault->update([
-                'bank_account_id' => $defaultBankAccount?->id,
-            ]);
-        }, 5);
+            $companyDefaultInstance->state([
+                'bank_account_id' => $defaultBankAccount->id,
+            ])->createQuietly();
+        });
     }
 }

app/Services/TransactionService.php

@@ -229,6 +229,8 @@ class TransactionService
                 'type' => JournalEntryType::Debit,
                 'amount' => $convertedTransactionAmount,
                 'description' => $transaction->description,
+                'created_by' => $transaction->created_by,
+                'updated_by' => $transaction->updated_by,
             ]);
 
             $creditAccount->journalEntries()->create([
@@ -237,6 +239,8 @@ class TransactionService
                 'type' => JournalEntryType::Credit,
                 'amount' => $convertedTransactionAmount,
                 'description' => $transaction->description,
+                'created_by' => $transaction->created_by,
+                'updated_by' => $transaction->updated_by,
             ]);
         });
     }

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.322.8",
+            "version": "3.323.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "fb5099160e49b676277ae787ff721628e5e4dd5a"
+                "reference": "1b393c41a73e1ef4c493c60c5eee0bb4b0632264"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fb5099160e49b676277ae787ff721628e5e4dd5a",
-                "reference": "fb5099160e49b676277ae787ff721628e5e4dd5a",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1b393c41a73e1ef4c493c60c5eee0bb4b0632264",
+                "reference": "1b393c41a73e1ef4c493c60c5eee0bb4b0632264",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.322.8"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.323.1"
             },
-            "time": "2024-09-30T19:09:25+00:00"
+            "time": "2024-10-04T18:07:17+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -2903,16 +2903,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.25.0",
+            "version": "v11.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "b487a9089c0b1c71ac63bb6bc44fb4b00dc6da2e"
+                "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/b487a9089c0b1c71ac63bb6bc44fb4b00dc6da2e",
-                "reference": "b487a9089c0b1c71ac63bb6bc44fb4b00dc6da2e",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b",
+                "reference": "b8cb8998701d5b3cfe68539d3c3da1fc59ddd82b",
                 "shasum": ""
             },
             "require": {
@@ -2931,7 +2931,7 @@
                 "fruitcake/php-cors": "^1.3",
                 "guzzlehttp/guzzle": "^7.8",
                 "guzzlehttp/uri-template": "^1.0",
-                "laravel/prompts": "^0.1.18|^0.2.0",
+                "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
                 "laravel/serializable-closure": "^1.3",
                 "league/commonmark": "^2.2.1",
                 "league/flysystem": "^3.8.0",
@@ -3108,7 +3108,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-09-26T11:21:58+00:00"
+            "time": "2024-10-01T14:29:34+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3170,16 +3170,16 @@
         },
         {
             "name": "laravel/sanctum",
-            "version": "v4.0.2",
+            "version": "v4.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "9cfc0ce80cabad5334efff73ec856339e8ec1ac1"
+                "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/9cfc0ce80cabad5334efff73ec856339e8ec1ac1",
-                "reference": "9cfc0ce80cabad5334efff73ec856339e8ec1ac1",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/54aea9d13743ae8a6cdd3c28dbef128a17adecab",
+                "reference": "54aea9d13743ae8a6cdd3c28dbef128a17adecab",
                 "shasum": ""
             },
             "require": {
@@ -3230,7 +3230,7 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2024-04-10T19:39:58+00:00"
+            "time": "2024-09-27T14:55:41+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -4686,24 +4686,24 @@
         },
         {
             "name": "nette/schema",
-            "version": "v1.3.0",
+            "version": "v1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nette/schema.git",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188"
+                "reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nette/schema/zipball/a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
-                "reference": "a6d3a6d1f545f01ef38e60f375d1cf1f4de98188",
+                "url": "https://api.github.com/repos/nette/schema/zipball/9522dad6211c4d995a01a9ac529da88d0b0ba7b5",
+                "reference": "9522dad6211c4d995a01a9ac529da88d0b0ba7b5",
                 "shasum": ""
             },
             "require": {
                 "nette/utils": "^4.0",
-                "php": "8.1 - 8.3"
+                "php": "8.1 - 8.4"
             },
             "require-dev": {
-                "nette/tester": "^2.4",
+                "nette/tester": "^2.5.2",
                 "phpstan/phpstan-nette": "^1.0",
                 "tracy/tracy": "^2.8"
             },
@@ -4742,9 +4742,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nette/schema/issues",
-                "source": "https://github.com/nette/schema/tree/v1.3.0"
+                "source": "https://github.com/nette/schema/tree/v1.3.1"
             },
-            "time": "2023-12-11T11:54:22+00:00"
+            "time": "2024-10-05T03:01:50+00:00"
         },
         {
             "name": "nette/utils",
@@ -9154,16 +9154,16 @@
     "packages-dev": [
         {
             "name": "brianium/paratest",
-            "version": "v7.5.5",
+            "version": "v7.5.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paratestphp/paratest.git",
-                "reference": "f29c7d671afc5c4e1140bd7b9f2749e827902a1e"
+                "reference": "8134d62d5b6f98b145f00db1421f39eb1fd0687b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/f29c7d671afc5c4e1140bd7b9f2749e827902a1e",
-                "reference": "f29c7d671afc5c4e1140bd7b9f2749e827902a1e",
+                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/8134d62d5b6f98b145f00db1421f39eb1fd0687b",
+                "reference": "8134d62d5b6f98b145f00db1421f39eb1fd0687b",
                 "shasum": ""
             },
             "require": {
@@ -9187,10 +9187,10 @@
                 "ext-pcov": "*",
                 "ext-posix": "*",
                 "infection/infection": "^0.29.6",
-                "phpstan/phpstan": "^1.12.4",
+                "phpstan/phpstan": "^1.12.5",
                 "phpstan/phpstan-deprecation-rules": "^1.2.1",
                 "phpstan/phpstan-phpunit": "^1.4.0",
-                "phpstan/phpstan-strict-rules": "^1.6.0",
+                "phpstan/phpstan-strict-rules": "^1.6.1",
                 "squizlabs/php_codesniffer": "^3.10.3",
                 "symfony/filesystem": "^6.4.9 || ^7.1.2"
             },
@@ -9232,7 +9232,7 @@
             ],
             "support": {
                 "issues": "https://github.com/paratestphp/paratest/issues",
-                "source": "https://github.com/paratestphp/paratest/tree/v7.5.5"
+                "source": "https://github.com/paratestphp/paratest/tree/v7.5.6"
             },
             "funding": [
                 {
@@ -9244,7 +9244,7 @@
                     "type": "paypal"
                 }
             ],
-            "time": "2024-09-20T12:57:46+00:00"
+            "time": "2024-10-02T05:22:28+00:00"
         },
         {
             "name": "fakerphp/faker",
@@ -9619,16 +9619,16 @@
         },
         {
             "name": "laravel/sail",
-            "version": "v1.33.0",
+            "version": "v1.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "d54af9d5745e3680d8a6463ffd9f314aa53eb2d1"
+                "reference": "511e9c95b0f3ee778dc9e11e242bcd2af8e002cd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/d54af9d5745e3680d8a6463ffd9f314aa53eb2d1",
-                "reference": "d54af9d5745e3680d8a6463ffd9f314aa53eb2d1",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/511e9c95b0f3ee778dc9e11e242bcd2af8e002cd",
+                "reference": "511e9c95b0f3ee778dc9e11e242bcd2af8e002cd",
                 "shasum": ""
             },
             "require": {
@@ -9678,7 +9678,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2024-09-22T19:04:21+00:00"
+            "time": "2024-09-27T14:58:09+00:00"
         },
         {
             "name": "mockery/mockery",
@@ -9922,16 +9922,16 @@
         },
         {
             "name": "pestphp/pest",
-            "version": "v3.2.4",
+            "version": "v3.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pestphp/pest.git",
-                "reference": "5fe79d9c18a674e9cce2f36f365516c26ae87b49"
+                "reference": "1e0bb88b734b3b5999a38fa479683c5dc3ee6f2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/5fe79d9c18a674e9cce2f36f365516c26ae87b49",
-                "reference": "5fe79d9c18a674e9cce2f36f365516c26ae87b49",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/1e0bb88b734b3b5999a38fa479683c5dc3ee6f2f",
+                "reference": "1e0bb88b734b3b5999a38fa479683c5dc3ee6f2f",
                 "shasum": ""
             },
             "require": {
@@ -9951,7 +9951,7 @@
             },
             "require-dev": {
                 "pestphp/pest-dev-tools": "^3.0.0",
-                "pestphp/pest-plugin-type-coverage": "^3.0.0",
+                "pestphp/pest-plugin-type-coverage": "^3.0.1",
                 "symfony/process": "^7.1.5"
             },
             "bin": [
@@ -10017,7 +10017,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v3.2.4"
+                "source": "https://github.com/pestphp/pest/tree/v3.2.5"
             },
             "funding": [
                 {
@@ -10029,7 +10029,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-26T22:53:39+00:00"
+            "time": "2024-10-01T10:55:18+00:00"
         },
         {
             "name": "pestphp/pest-plugin",
@@ -11260,21 +11260,21 @@
         },
         {
             "name": "rector/rector",
-            "version": "1.2.5",
+            "version": "1.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/rectorphp/rector.git",
-                "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339"
+                "reference": "6ca85da28159dbd3bb36211c5104b7bc91278e99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/rectorphp/rector/zipball/e98aa793ca3fcd17e893cfaf9103ac049775d339",
-                "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339",
+                "url": "https://api.github.com/repos/rectorphp/rector/zipball/6ca85da28159dbd3bb36211c5104b7bc91278e99",
+                "reference": "6ca85da28159dbd3bb36211c5104b7bc91278e99",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.2|^8.0",
-                "phpstan/phpstan": "^1.12.2"
+                "phpstan/phpstan": "^1.12.5"
             },
             "conflict": {
                 "rector/rector-doctrine": "*",
@@ -11307,7 +11307,7 @@
             ],
             "support": {
                 "issues": "https://github.com/rectorphp/rector/issues",
-                "source": "https://github.com/rectorphp/rector/tree/1.2.5"
+                "source": "https://github.com/rectorphp/rector/tree/1.2.6"
             },
             "funding": [
                 {
@@ -11315,7 +11315,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-09-08T17:43:24+00:00"
+            "time": "2024-10-03T08:56:44+00:00"
         },
         {
             "name": "sebastian/cli-parser",

database/factories/Accounting/TransactionFactory.php

@@ -9,9 +9,7 @@ use App\Models\Accounting\Transaction;
 use App\Models\Banking\BankAccount;
 use App\Models\Company;
 use App\Models\Setting\CompanyDefault;
-use App\Services\TransactionService;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Facades\DB;
 
 /**
  * @extends Factory<Transaction>
@@ -45,15 +43,6 @@ class TransactionFactory extends Factory
         ];
     }
 
-    public function configure(): static
-    {
-        return $this->afterCreating(function (Transaction $transaction) {
-            if (DB::getDefaultConnection() === 'sqlite') {
-                app(TransactionService::class)->createJournalEntries($transaction);
-            }
-        });
-    }
-
     public function forCompanyAndBankAccount(Company $company, BankAccount $bankAccount): static
     {
         return $this->state(function (array $attributes) use ($bankAccount, $company) {

database/factories/CompanyFactory.php

@@ -2,13 +2,12 @@
 
 namespace Database\Factories;
 
+use App\Models\Accounting\Transaction;
 use App\Models\Company;
 use App\Models\Setting\CompanyProfile;
 use App\Models\User;
 use App\Services\CompanyDefaultService;
-use Database\Factories\Accounting\TransactionFactory;
 use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Support\Facades\DB;
 
 class CompanyFactory extends Factory
 {
@@ -36,7 +35,7 @@ class CompanyFactory extends Factory
     public function withCompanyProfile(): self
     {
         return $this->afterCreating(function (Company $company) {
-            CompanyProfile::factory()->forCompany($company)->create();
+            CompanyProfile::factory()->forCompany($company)->withCountry('US')->create();
         });
     }
 
@@ -46,11 +45,9 @@ class CompanyFactory extends Factory
     public function withCompanyDefaults(): self
     {
         return $this->afterCreating(function (Company $company) {
-            DB::transaction(function () use ($company) {
-                $countryCode = $company->profile->country;
-                $companyDefaultService = app(CompanyDefaultService::class);
-                $companyDefaultService->createCompanyDefaults($company, $company->owner, 'USD', $countryCode, 'en');
-            });
+            $countryCode = $company->profile->country;
+            $companyDefaultService = app(CompanyDefaultService::class);
+            $companyDefaultService->createCompanyDefaults($company, $company->owner, 'USD', $countryCode, 'en');
         });
     }
 
@@ -59,10 +56,10 @@ class CompanyFactory extends Factory
         return $this->afterCreating(function (Company $company) use ($count) {
             $defaultBankAccount = $company->default->bankAccount;
 
-            TransactionFactory::new()
+            Transaction::factory()
                 ->forCompanyAndBankAccount($company, $defaultBankAccount)
                 ->count($count)
-                ->createQuietly([
+                ->create([
                     'created_by' => $company->user_id,
                     'updated_by' => $company->user_id,
                 ]);

database/factories/Setting/CompanyDefaultFactory.php

@@ -70,7 +70,7 @@ class CompanyDefaultFactory extends Factory
 
     private function createCurrency(Company $company, User $user, string $currencyCode): Currency
     {
-        return Currency::factory()->forCurrency($currencyCode)->create([
+        return Currency::factory()->forCurrency($currencyCode)->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
@@ -79,7 +79,7 @@ class CompanyDefaultFactory extends Factory
 
     private function createSalesTax(Company $company, User $user): Tax
     {
-        return Tax::factory()->salesTax()->create([
+        return Tax::factory()->salesTax()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
@@ -88,7 +88,7 @@ class CompanyDefaultFactory extends Factory
 
     private function createPurchaseTax(Company $company, User $user): Tax
     {
-        return Tax::factory()->purchaseTax()->create([
+        return Tax::factory()->purchaseTax()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
@@ -97,7 +97,7 @@ class CompanyDefaultFactory extends Factory
 
     private function createSalesDiscount(Company $company, User $user): Discount
     {
-        return Discount::factory()->salesDiscount()->create([
+        return Discount::factory()->salesDiscount()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
@@ -106,7 +106,7 @@ class CompanyDefaultFactory extends Factory
 
     private function createPurchaseDiscount(Company $company, User $user): Discount
     {
-        return Discount::factory()->purchaseDiscount()->create([
+        return Discount::factory()->purchaseDiscount()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
@@ -115,7 +115,7 @@ class CompanyDefaultFactory extends Factory
 
     private function createAppearance(Company $company, User $user): void
     {
-        Appearance::factory()->create([
+        Appearance::factory()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
@@ -124,13 +124,13 @@ class CompanyDefaultFactory extends Factory
 
     private function createDocumentDefaults(Company $company, User $user): void
     {
-        DocumentDefault::factory()->invoice()->create([
+        DocumentDefault::factory()->invoice()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
         ]);
 
-        DocumentDefault::factory()->bill()->create([
+        DocumentDefault::factory()->bill()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
@@ -139,7 +139,7 @@ class CompanyDefaultFactory extends Factory
 
     private function createLocalization(Company $company, User $user, string $countryCode, string $language): void
     {
-        Localization::factory()->withCountry($countryCode, $language)->create([
+        Localization::factory()->withCountry($countryCode, $language)->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,

database/factories/Setting/DiscountFactory.php

@@ -7,6 +7,7 @@ use App\Enums\Setting\DiscountScope;
 use App\Enums\Setting\DiscountType;
 use App\Models\Setting\Discount;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Carbon;
 
 /**
  * @extends Factory<Discount>
@@ -26,16 +27,26 @@ class DiscountFactory extends Factory
     public function definition(): array
     {
         $startDate = $this->faker->dateTimeBetween('now', '+1 year');
-        $endDate = $this->faker->dateTimeBetween($startDate, strtotime('+1 year'));
+        $endDate = $this->faker->dateTimeBetween($startDate, Carbon::parse($startDate)->addYear());
+
+        $computation = $this->faker->randomElement(DiscountComputation::class);
+
+        if ($computation === DiscountComputation::Fixed) {
+            $rate = $this->faker->numberBetween(5, 100) * 100; // $5 - $100
+        } else {
+            $rate = $this->faker->numberBetween(3, 50) * 10000; // 3% - 50%
+        }
 
         return [
+            'name' => $this->faker->unique()->word,
             'description' => $this->faker->sentence,
-            'rate' => $this->faker->biasedNumberBetween(300, 5000) * 100, // 3% - 50%
-            'computation' => $this->faker->randomElement(DiscountComputation::class),
+            'rate' => $rate,
+            'computation' => $computation,
+            'type' => $this->faker->randomElement(DiscountType::class),
             'scope' => $this->faker->randomElement(DiscountScope::class),
             'start_date' => $startDate,
             'end_date' => $endDate,
-            'enabled' => true,
+            'enabled' => false,
         ];
     }
 
@@ -43,7 +54,6 @@ class DiscountFactory extends Factory
     {
         return $this->state([
             'name' => 'Summer Sale',
-            'rate' => $this->faker->biasedNumberBetween(300, 1200) * 100, // 3% - 12%
             'type' => DiscountType::Sales,
         ]);
     }
@@ -52,7 +62,6 @@ class DiscountFactory extends Factory
     {
         return $this->state([
             'name' => 'Bulk Purchase',
-            'rate' => $this->faker->biasedNumberBetween(300, 1200) * 100, // 3% - 12%
             'type' => DiscountType::Purchase,
         ]);
     }

database/factories/Setting/TaxFactory.php

@@ -25,12 +25,22 @@ class TaxFactory extends Factory
      */
     public function definition(): array
     {
+        $computation = $this->faker->randomElement(TaxComputation::class);
+
+        if ($computation === TaxComputation::Fixed) {
+            $rate = $this->faker->biasedNumberBetween(1, 10) * 100; // $1 - $10
+        } else {
+            $rate = $this->faker->biasedNumberBetween(3, 25) * 10000; // 3% - 25%
+        }
+
         return [
+            'name' => $this->faker->unique()->word,
             'description' => $this->faker->sentence,
-            'rate' => $this->faker->biasedNumberBetween(300, 5000) * 100, // 3% - 50%
-            'computation' => $this->faker->randomElement(TaxComputation::class),
+            'rate' => $rate,
+            'computation' => $computation,
+            'type' => $this->faker->randomElement(TaxType::class),
             'scope' => $this->faker->randomElement(TaxScope::class),
-            'enabled' => true,
+            'enabled' => false,
         ];
     }
 
@@ -38,7 +48,6 @@ class TaxFactory extends Factory
     {
         return $this->state([
             'name' => 'State Sales Tax',
-            'rate' => $this->faker->biasedNumberBetween(300, 1200) * 100, // 3% - 12%
             'type' => TaxType::Sales,
         ]);
     }
@@ -47,7 +56,6 @@ class TaxFactory extends Factory
     {
         return $this->state([
             'name' => 'State Purchase Tax',
-            'rate' => $this->faker->biasedNumberBetween(300, 1200) * 100, // 3% - 12%
             'type' => TaxType::Purchase,
         ]);
     }

database/seeders/DatabaseSeeder.php

@@ -14,22 +14,19 @@ class DatabaseSeeder extends Seeder
     public function run(): void
     {
         // Create a single admin user and their personal company
-        $adminUser = User::factory()
+        User::factory()
             ->withPersonalCompany(function (CompanyFactory $factory) {
-                return $factory->withTransactions();
+                return $factory
+                    ->state([
+                        'name' => 'ERPSAAS',
+                    ])
+                    ->withTransactions();
             })
             ->create([
                 'name' => 'Admin',
                 'email' => 'admin@gmail.com',
                 'password' => bcrypt('password'),
                 'current_company_id' => 1,  // Assuming this will be the ID of the created company
-                'created_at' => now(),
             ]);
-
-        // Optionally, set additional properties or create related entities specific to this company
-        $adminUser->ownedCompanies->first()->update([
-            'name' => 'ERPSAAS',
-            'created_at' => now(),
-        ]);
     }
 }

database/seeders/TestDatabaseSeeder.php

@@ -3,15 +3,18 @@
 namespace Database\Seeders;
 
 use App\Models\User;
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
 
 class TestDatabaseSeeder extends Seeder
 {
+    use WithoutModelEvents;
+
     public function run(): void
     {
         User::factory()
             ->withPersonalCompany()
-            ->createQuietly([
+            ->create([
                 'name' => 'Test Company Owner',
                 'email' => 'test@gmail.com',
                 'password' => bcrypt('password'),

package-lock.json

@@ -541,9 +541,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.22.5.tgz",
-            "integrity": "sha512-SU5cvamg0Eyu/F+kLeMXS7GoahL+OoizlclVFX3l5Ql6yNlywJJ0OuqTzUx0v+aHhPHEB/56CT06GQrRrGNYww==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.24.0.tgz",
+            "integrity": "sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==",
             "cpu": [
                 "arm"
             ],
@@ -555,9 +555,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.22.5.tgz",
-            "integrity": "sha512-S4pit5BP6E5R5C8S6tgU/drvgjtYW76FBuG6+ibG3tMvlD1h9LHVF9KmlmaUBQ8Obou7hEyS+0w+IR/VtxwNMQ==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.24.0.tgz",
+            "integrity": "sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==",
             "cpu": [
                 "arm64"
             ],
@@ -569,9 +569,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.22.5.tgz",
-            "integrity": "sha512-250ZGg4ipTL0TGvLlfACkIxS9+KLtIbn7BCZjsZj88zSg2Lvu3Xdw6dhAhfe/FjjXPVNCtcSp+WZjVsD3a/Zlw==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.24.0.tgz",
+            "integrity": "sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==",
             "cpu": [
                 "arm64"
             ],
@@ -583,9 +583,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.22.5.tgz",
-            "integrity": "sha512-D8brJEFg5D+QxFcW6jYANu+Rr9SlKtTenmsX5hOSzNYVrK5oLAEMTUgKWYJP+wdKyCdeSwnapLsn+OVRFycuQg==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.24.0.tgz",
+            "integrity": "sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==",
             "cpu": [
                 "x64"
             ],
@@ -597,9 +597,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.22.5.tgz",
-            "integrity": "sha512-PNqXYmdNFyWNg0ma5LdY8wP+eQfdvyaBAojAXgO7/gs0Q/6TQJVXAXe8gwW9URjbS0YAammur0fynYGiWsKlXw==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.24.0.tgz",
+            "integrity": "sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==",
             "cpu": [
                 "arm"
             ],
@@ -611,9 +611,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.22.5.tgz",
-            "integrity": "sha512-kSSCZOKz3HqlrEuwKd9TYv7vxPYD77vHSUvM2y0YaTGnFc8AdI5TTQRrM1yIp3tXCKrSL9A7JLoILjtad5t8pQ==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.24.0.tgz",
+            "integrity": "sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==",
             "cpu": [
                 "arm"
             ],
@@ -625,9 +625,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.22.5.tgz",
-            "integrity": "sha512-oTXQeJHRbOnwRnRffb6bmqmUugz0glXaPyspp4gbQOPVApdpRrY/j7KP3lr7M8kTfQTyrBUzFjj5EuHAhqH4/w==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.24.0.tgz",
+            "integrity": "sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==",
             "cpu": [
                 "arm64"
             ],
@@ -639,9 +639,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.22.5.tgz",
-            "integrity": "sha512-qnOTIIs6tIGFKCHdhYitgC2XQ2X25InIbZFor5wh+mALH84qnFHvc+vmWUpyX97B0hNvwNUL4B+MB8vJvH65Fw==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.24.0.tgz",
+            "integrity": "sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==",
             "cpu": [
                 "arm64"
             ],
@@ -653,9 +653,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.22.5.tgz",
-            "integrity": "sha512-TMYu+DUdNlgBXING13rHSfUc3Ky5nLPbWs4bFnT+R6Vu3OvXkTkixvvBKk8uO4MT5Ab6lC3U7x8S8El2q5o56w==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.24.0.tgz",
+            "integrity": "sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==",
             "cpu": [
                 "ppc64"
             ],
@@ -667,9 +667,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.22.5.tgz",
-            "integrity": "sha512-PTQq1Kz22ZRvuhr3uURH+U/Q/a0pbxJoICGSprNLAoBEkyD3Sh9qP5I0Asn0y0wejXQBbsVMRZRxlbGFD9OK4A==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.24.0.tgz",
+            "integrity": "sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==",
             "cpu": [
                 "riscv64"
             ],
@@ -681,9 +681,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.22.5.tgz",
-            "integrity": "sha512-bR5nCojtpuMss6TDEmf/jnBnzlo+6n1UhgwqUvRoe4VIotC7FG1IKkyJbwsT7JDsF2jxR+NTnuOwiGv0hLyDoQ==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.24.0.tgz",
+            "integrity": "sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==",
             "cpu": [
                 "s390x"
             ],
@@ -695,9 +695,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.22.5.tgz",
-            "integrity": "sha512-N0jPPhHjGShcB9/XXZQWuWBKZQnC1F36Ce3sDqWpujsGjDz/CQtOL9LgTrJ+rJC8MJeesMWrMWVLKKNR/tMOCA==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.24.0.tgz",
+            "integrity": "sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==",
             "cpu": [
                 "x64"
             ],
@@ -709,9 +709,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.22.5.tgz",
-            "integrity": "sha512-uBa2e28ohzNNwjr6Uxm4XyaA1M/8aTgfF2T7UIlElLaeXkgpmIJ2EitVNQxjO9xLLLy60YqAgKn/AqSpCUkE9g==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.24.0.tgz",
+            "integrity": "sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==",
             "cpu": [
                 "x64"
             ],
@@ -723,9 +723,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.22.5.tgz",
-            "integrity": "sha512-RXT8S1HP8AFN/Kr3tg4fuYrNxZ/pZf1HemC5Tsddc6HzgGnJm0+Lh5rAHJkDuW3StI0ynNXukidROMXYl6ew8w==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.24.0.tgz",
+            "integrity": "sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==",
             "cpu": [
                 "arm64"
             ],
@@ -737,9 +737,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.22.5.tgz",
-            "integrity": "sha512-ElTYOh50InL8kzyUD6XsnPit7jYCKrphmddKAe1/Ytt74apOxDq5YEcbsiKs0fR3vff3jEneMM+3I7jbqaMyBg==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.24.0.tgz",
+            "integrity": "sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==",
             "cpu": [
                 "ia32"
             ],
@@ -751,9 +751,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.22.5.tgz",
-            "integrity": "sha512-+lvL/4mQxSV8MukpkKyyvfwhH266COcWlXE/1qxwN08ajovta3459zrjLghYMgDerlzNwLAcFpvU+WWE5y6nAQ==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.24.0.tgz",
+            "integrity": "sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==",
             "cpu": [
                 "x64"
             ],
@@ -998,9 +998,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001664",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001664.tgz",
-            "integrity": "sha512-AmE7k4dXiNKQipgn7a2xg558IRqPN3jMQY/rOsbxDhrd0tyChwbITBfiwtnqz8bi2M5mIWbxAYBvk7W7QBUS2g==",
+            "version": "1.0.30001667",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001667.tgz",
+            "integrity": "sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==",
             "dev": true,
             "funding": [
                 {
@@ -1159,9 +1159,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.30",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.30.tgz",
-            "integrity": "sha512-sXI35EBN4lYxzc/pIGorlymYNzDBOqkSlVRe6MkgBsW/hW1tpC/HDJ2fjG7XnjakzfLEuvdmux0Mjs6jHq4UOA==",
+            "version": "1.5.32",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.32.tgz",
+            "integrity": "sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==",
             "dev": true,
             "license": "ISC"
         },
@@ -2171,9 +2171,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.22.5",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.22.5.tgz",
-            "integrity": "sha512-WoinX7GeQOFMGznEcWA1WrTQCd/tpEbMkc3nuMs9BT0CPjMdSjPMTVClwWd4pgSQwJdP65SK9mTCNvItlr5o7w==",
+            "version": "4.24.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.24.0.tgz",
+            "integrity": "sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2187,22 +2187,22 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.22.5",
-                "@rollup/rollup-android-arm64": "4.22.5",
-                "@rollup/rollup-darwin-arm64": "4.22.5",
-                "@rollup/rollup-darwin-x64": "4.22.5",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.22.5",
-                "@rollup/rollup-linux-arm-musleabihf": "4.22.5",
-                "@rollup/rollup-linux-arm64-gnu": "4.22.5",
-                "@rollup/rollup-linux-arm64-musl": "4.22.5",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.22.5",
-                "@rollup/rollup-linux-riscv64-gnu": "4.22.5",
-                "@rollup/rollup-linux-s390x-gnu": "4.22.5",
-                "@rollup/rollup-linux-x64-gnu": "4.22.5",
-                "@rollup/rollup-linux-x64-musl": "4.22.5",
-                "@rollup/rollup-win32-arm64-msvc": "4.22.5",
-                "@rollup/rollup-win32-ia32-msvc": "4.22.5",
-                "@rollup/rollup-win32-x64-msvc": "4.22.5",
+                "@rollup/rollup-android-arm-eabi": "4.24.0",
+                "@rollup/rollup-android-arm64": "4.24.0",
+                "@rollup/rollup-darwin-arm64": "4.24.0",
+                "@rollup/rollup-darwin-x64": "4.24.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.24.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.24.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.24.0",
+                "@rollup/rollup-linux-arm64-musl": "4.24.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.24.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.24.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.24.0",
+                "@rollup/rollup-linux-x64-gnu": "4.24.0",
+                "@rollup/rollup-linux-x64-musl": "4.24.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.24.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.24.0",
+                "@rollup/rollup-win32-x64-msvc": "4.24.0",
                 "fsevents": "~2.3.2"
             }
         },

resources/views/components/panel-shift-dropdown.blade.php

@@ -61,11 +61,11 @@
                         <x-panel-shift-dropdown.content-handler :item="$item"/>
                     @endforeach
                 @endif
-                @if($panelId === 'company-settings')
+                @if($panelId === 'company-settings' && $currentTenant)
                     <x-panel-shift-dropdown.company-settings :current-tenant="$currentTenant"
                                                              icon="heroicon-m-building-office-2"/>
                 @endif
-                @if($panelId === 'company-switcher')
+                @if($panelId === 'company-switcher' && $currentTenant)
                     <x-panel-shift-dropdown.company-switcher :current-tenant="$currentTenant"
                                                              icon="heroicon-m-adjustments-horizontal"/>
                 @endif