Andrew Wallo 3 个月前
父节点
当前提交
66a97e0793

+ 7
- 4
app/Concerns/HasTransactionAction.php 查看文件

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

+ 3
- 0
app/Filament/Company/Resources/Purchases/BillResource.php 查看文件

28
 use App\Models\Banking\BankAccount;
28
 use App\Models\Banking\BankAccount;
29
 use App\Models\Common\Offering;
29
 use App\Models\Common\Offering;
30
 use App\Models\Common\Vendor;
30
 use App\Models\Common\Vendor;
31
+use App\Services\CompanySettingsService;
31
 use App\Utilities\Currency\CurrencyAccessor;
32
 use App\Utilities\Currency\CurrencyAccessor;
32
 use App\Utilities\Currency\CurrencyConverter;
33
 use App\Utilities\Currency\CurrencyConverter;
33
 use App\Utilities\RateCalculator;
34
 use App\Utilities\RateCalculator;
89
                                         ->label('Bill date')
90
                                         ->label('Bill date')
90
                                         ->live()
91
                                         ->live()
91
                                         ->default(now())
92
                                         ->default(now())
93
+                                        ->timezone(CompanySettingsService::getDefaultTimezone())
92
                                         ->disabled(function (?Bill $record) {
94
                                         ->disabled(function (?Bill $record) {
93
                                             return $record?->hasPayments();
95
                                             return $record?->hasPayments();
94
                                         })
96
                                         })
140
                                     ->default(function () use ($company) {
142
                                     ->default(function () use ($company) {
141
                                         return now()->addDays($company->defaultBill->payment_terms->getDays());
143
                                         return now()->addDays($company->defaultBill->payment_terms->getDays());
142
                                     })
144
                                     })
145
+                                    ->timezone(CompanySettingsService::getDefaultTimezone())
143
                                     ->required()
146
                                     ->required()
144
                                     ->live()
147
                                     ->live()
145
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
148
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {

+ 1
- 0
app/Filament/Company/Resources/Sales/EstimateResource.php 查看文件

141
                                     ->default(function () use ($settings) {
141
                                     ->default(function () use ($settings) {
142
                                         return now()->addDays($settings->payment_terms->getDays());
142
                                         return now()->addDays($settings->payment_terms->getDays());
143
                                     })
143
                                     })
144
+                                    ->timezone(CompanySettingsService::getDefaultTimezone())
144
                                     ->minDate(static function (Forms\Get $get) {
145
                                     ->minDate(static function (Forms\Get $get) {
145
                                         return $get('date') ?? now();
146
                                         return $get('date') ?? now();
146
                                     })
147
                                     })

+ 3
- 0
app/Filament/Company/Resources/Sales/InvoiceResource.php 查看文件

29
 use App\Models\Accounting\Invoice;
29
 use App\Models\Accounting\Invoice;
30
 use App\Models\Common\Client;
30
 use App\Models\Common\Client;
31
 use App\Models\Common\Offering;
31
 use App\Models\Common\Offering;
32
+use App\Services\CompanySettingsService;
32
 use App\Utilities\Currency\CurrencyAccessor;
33
 use App\Utilities\Currency\CurrencyAccessor;
33
 use App\Utilities\Currency\CurrencyConverter;
34
 use App\Utilities\Currency\CurrencyConverter;
34
 use App\Utilities\RateCalculator;
35
 use App\Utilities\RateCalculator;
96
                                         ->label('Invoice date')
97
                                         ->label('Invoice date')
97
                                         ->live()
98
                                         ->live()
98
                                         ->default(now())
99
                                         ->default(now())
100
+                                        ->timezone(CompanySettingsService::getDefaultTimezone())
99
                                         ->disabled(function (?Invoice $record) {
101
                                         ->disabled(function (?Invoice $record) {
100
                                             return $record?->hasPayments();
102
                                             return $record?->hasPayments();
101
                                         })
103
                                         })
147
                                     ->default(function () use ($settings) {
149
                                     ->default(function () use ($settings) {
148
                                         return now()->addDays($settings->payment_terms->getDays());
150
                                         return now()->addDays($settings->payment_terms->getDays());
149
                                     })
151
                                     })
152
+                                    ->timezone(CompanySettingsService::getDefaultTimezone())
150
                                     ->minDate(static function (Forms\Get $get) {
153
                                     ->minDate(static function (Forms\Get $get) {
151
                                         return $get('date') ?? now();
154
                                         return $get('date') ?? now();
152
                                     })
155
                                     })

正在加载...
取消
保存