Andrew Wallo 3 mēnešus atpakaļ
vecāks
revīzija
66a97e0793

+ 7
- 4
app/Concerns/HasTransactionAction.php Parādīt failu

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

+ 3
- 0
app/Filament/Company/Resources/Purchases/BillResource.php Parādīt failu

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

+ 1
- 0
app/Filament/Company/Resources/Sales/EstimateResource.php Parādīt failu

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

+ 3
- 0
app/Filament/Company/Resources/Sales/InvoiceResource.php Parādīt failu

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

Notiek ielāde…
Atcelt
Saglabāt