ソースを参照

wip timezone handling

3.x
Andrew Wallo 2ヶ月前
コミット
9792718070

+ 1
- 5
app/Concerns/HasTransactionAction.php ファイルの表示

@@ -8,7 +8,6 @@ use App\Filament\Forms\Components\CustomTableRepeater;
8 8
 use App\Models\Accounting\JournalEntry;
9 9
 use App\Models\Accounting\Transaction;
10 10
 use App\Models\Banking\BankAccount;
11
-use App\Services\CompanySettingsService;
12 11
 use App\Utilities\Currency\CurrencyAccessor;
13 12
 use App\Utilities\Currency\CurrencyConverter;
14 13
 use Awcodes\TableRepeater\Header;
@@ -40,7 +39,7 @@ trait HasTransactionAction
40 39
     protected function getFormDefaultsForType(TransactionType $type): array
41 40
     {
42 41
         $commonDefaults = [
43
-            'posted_at' => now(),
42
+            'posted_at' => company_today()->toDateString(),
44 43
         ];
45 44
 
46 45
         return match ($type) {
@@ -84,7 +83,6 @@ trait HasTransactionAction
84 83
             ->schema([
85 84
                 Forms\Components\DatePicker::make('posted_at')
86 85
                     ->label('Date')
87
-                    ->timezone(CompanySettingsService::getDefaultTimezone())
88 86
                     ->required(),
89 87
                 Forms\Components\TextInput::make('description')
90 88
                     ->label('Description'),
@@ -127,7 +125,6 @@ trait HasTransactionAction
127 125
             ->schema([
128 126
                 Forms\Components\DatePicker::make('posted_at')
129 127
                     ->label('Date')
130
-                    ->timezone(CompanySettingsService::getDefaultTimezone())
131 128
                     ->required(),
132 129
                 Forms\Components\TextInput::make('description')
133 130
                     ->label('Description'),
@@ -210,7 +207,6 @@ trait HasTransactionAction
210 207
             ->schema([
211 208
                 Forms\Components\DatePicker::make('posted_at')
212 209
                     ->label('Date')
213
-                    ->timezone(CompanySettingsService::getDefaultTimezone())
214 210
                     ->softRequired(),
215 211
                 Forms\Components\TextInput::make('description')
216 212
                     ->label('Description')

+ 2
- 2
app/Filament/Company/Resources/Accounting/BudgetResource.php ファイルの表示

@@ -50,11 +50,11 @@ class BudgetResource extends Resource
50 50
                             ->live(),
51 51
                         Forms\Components\DatePicker::make('start_date')
52 52
                             ->required()
53
-                            ->default(now()->startOfYear())
53
+                            ->default(company_today()->startOfYear())
54 54
                             ->live(),
55 55
                         Forms\Components\DatePicker::make('end_date')
56 56
                             ->required()
57
-                            ->default(now()->endOfYear())
57
+                            ->default(company_today()->endOfYear())
58 58
                             ->live()
59 59
                             ->disabled(static fn (Forms\Get $get) => blank($get('start_date')))
60 60
                             ->minDate(fn (Forms\Get $get) => match (BudgetIntervalType::parse($get('interval_type'))) {

+ 2
- 2
app/Filament/Company/Resources/Accounting/BudgetResource/Pages/CreateBudget.php ファイルの表示

@@ -117,11 +117,11 @@ class CreateBudget extends CreateRecord
117 117
                         ->live(),
118 118
                     Forms\Components\DatePicker::make('start_date')
119 119
                         ->required()
120
-                        ->default(now()->startOfYear())
120
+                        ->default(company_today()->startOfYear())
121 121
                         ->live(),
122 122
                     Forms\Components\DatePicker::make('end_date')
123 123
                         ->required()
124
-                        ->default(now()->endOfYear())
124
+                        ->default(company_today()->endOfYear())
125 125
                         ->live()
126 126
                         ->disabled(static fn (Forms\Get $get) => blank($get('start_date')))
127 127
                         ->minDate(fn (Forms\Get $get) => match (BudgetIntervalType::parse($get('interval_type'))) {

+ 4
- 1
app/Filament/Forms/Components/CreateAdjustmentSelect.php ファイルの表示

@@ -8,6 +8,7 @@ use App\Enums\Accounting\AdjustmentScope;
8 8
 use App\Enums\Accounting\AdjustmentStatus;
9 9
 use App\Enums\Accounting\AdjustmentType;
10 10
 use App\Models\Accounting\Adjustment;
11
+use App\Services\CompanySettingsService;
11 12
 use Filament\Forms\Components\Actions\Action;
12 13
 use Filament\Forms\Components\Checkbox;
13 14
 use Filament\Forms\Components\DateTimePicker;
@@ -195,8 +196,10 @@ class CreateAdjustmentSelect extends Select
195 196
 
196 197
             Group::make()
197 198
                 ->schema([
198
-                    DateTimePicker::make('start_date'),
199
+                    DateTimePicker::make('start_date')
200
+                        ->timezone(CompanySettingsService::getDefaultTimezone()),
199 201
                     DateTimePicker::make('end_date')
202
+                        ->timezone(CompanySettingsService::getDefaultTimezone())
200 203
                         ->after('start_date'),
201 204
                 ])
202 205
                 ->visible(function (Get $get) {

読み込み中…
キャンセル
保存