wip

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

@@ -81,10 +81,8 @@ class AdjustmentResource extends Resource
                     ->columns(),
                 Forms\Components\Section::make('Dates')
                     ->schema([
-                        Forms\Components\DateTimePicker::make('start_date')
-                            ->timezone(CompanySettingsService::getDefaultTimezone()),
+                        Forms\Components\DateTimePicker::make('start_date'),
                         Forms\Components\DateTimePicker::make('end_date')
-                            ->timezone(CompanySettingsService::getDefaultTimezone())
                             ->after('start_date'),
                     ])
                     ->columns()

app/Models/Setting/Localization.php

@@ -104,7 +104,7 @@ class Localization extends Model
 
     public function getDateTimeFormatAttribute(): string
     {
-        return $this->date_format . ' ' . $this->time_format;
+        return $this->date_format->value . ' ' . $this->time_format->value;
     }
 
     public static function getAllLanguages(): array

app/Providers/Filament/CompanyPanelProvider.php

@@ -282,7 +282,8 @@ class CompanyPanelProvider extends PanelProvider
         Tables\Actions\DeleteBulkAction::configureUsing(static fn (Tables\Actions\DeleteBulkAction $action) => FilamentComponentConfigurator::configureDeleteAction($action));
 
         Tables\Table::configureUsing(static function (Tables\Table $table): void {
-            $table::$defaultDateDisplayFormat = CompanySettingsService::getDefaultDateFormat(session('current_company_id') ?? auth()->user()->current_company_id);
+            $table::$defaultDateDisplayFormat = CompanySettingsService::getDefaultDateFormat();
+            $table::$defaultDateTimeDisplayFormat = CompanySettingsService::getDefaultDateTimeFormat();
 
             $table
                 ->paginationPageOptions([5, 10, 25, 50, 100])

app/Services/CompanySettingsService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\Enums\Setting\DateFormat;
+use App\Enums\Setting\TimeFormat;
 use App\Enums\Setting\WeekStart;
 use App\Models\Company;
 use App\Models\Setting\Currency;
@@ -43,6 +44,7 @@ class CompanySettingsService
                 'default_timezone' => $company->locale->timezone ?? config('app.timezone'),
                 'default_currency' => $defaultCurrency,
                 'default_date_format' => $company->locale->date_format->value ?? DateFormat::DEFAULT,
+                'default_time_format' => $company->locale->time_format->value ?? TimeFormat::DEFAULT,
                 'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
             ];
         });
@@ -68,6 +70,7 @@ class CompanySettingsService
             'default_timezone' => config('app.timezone'),
             'default_currency' => 'USD',
             'default_date_format' => DateFormat::DEFAULT,
+            'default_time_format' => TimeFormat::DEFAULT,
             'default_week_start' => WeekStart::DEFAULT,
         ];
     }
@@ -103,4 +106,14 @@ class CompanySettingsService
     {
         return self::getSpecificSetting($companyId, 'default_week_start', WeekStart::DEFAULT);
     }
+
+    public static function getDefaultTimeFormat(?int $companyId = null): string
+    {
+        return self::getSpecificSetting($companyId, 'default_time_format', TimeFormat::DEFAULT);
+    }
+
+    public static function getDefaultDateTimeFormat(?int $companyId = null): string
+    {
+        return self::getDefaultDateFormat($companyId) . ' ' . self::getDefaultTimeFormat($companyId);
+    }
 }