Andrew Wallo 3 months ago
parent
commit
5a47fccd15

+ 2
- 1
app/Filament/Company/Resources/Purchases/BillResource.php View File

461
                             ->successNotificationTitle('Payment recorded')
461
                             ->successNotificationTitle('Payment recorded')
462
                             ->form([
462
                             ->form([
463
                                 Forms\Components\DatePicker::make('posted_at')
463
                                 Forms\Components\DatePicker::make('posted_at')
464
-                                    ->label('Date'),
464
+                                    ->label('Date')
465
+                                    ->timezone(CompanySettingsService::getDefaultTimezone()),
465
                                 Forms\Components\Grid::make()
466
                                 Forms\Components\Grid::make()
466
                                     ->schema([
467
                                     ->schema([
467
                                         Forms\Components\Select::make('bank_account_id')
468
                                         Forms\Components\Select::make('bank_account_id')

+ 2
- 0
app/Filament/Company/Resources/Purchases/BillResource/Pages/PayBills.php View File

11
 use App\Models\Banking\BankAccount;
11
 use App\Models\Banking\BankAccount;
12
 use App\Models\Common\Vendor;
12
 use App\Models\Common\Vendor;
13
 use App\Models\Setting\Currency;
13
 use App\Models\Setting\Currency;
14
+use App\Services\CompanySettingsService;
14
 use App\Utilities\Currency\CurrencyAccessor;
15
 use App\Utilities\Currency\CurrencyAccessor;
15
 use App\Utilities\Currency\CurrencyConverter;
16
 use App\Utilities\Currency\CurrencyConverter;
16
 use Filament\Actions;
17
 use Filament\Actions;
152
                         Forms\Components\DatePicker::make('posted_at')
153
                         Forms\Components\DatePicker::make('posted_at')
153
                             ->label('Date')
154
                             ->label('Date')
154
                             ->default(now())
155
                             ->default(now())
156
+                            ->timezone(CompanySettingsService::getDefaultTimezone())
155
                             ->softRequired(),
157
                             ->softRequired(),
156
                         Forms\Components\Select::make('payment_method')
158
                         Forms\Components\Select::make('payment_method')
157
                             ->label('Payment method')
159
                             ->label('Payment method')

+ 3
- 1
app/Filament/Company/Resources/Purchases/BillResource/RelationManagers/PaymentsRelationManager.php View File

7
 use App\Models\Accounting\Bill;
7
 use App\Models\Accounting\Bill;
8
 use App\Models\Accounting\Transaction;
8
 use App\Models\Accounting\Transaction;
9
 use App\Models\Banking\BankAccount;
9
 use App\Models\Banking\BankAccount;
10
+use App\Services\CompanySettingsService;
10
 use App\Utilities\Currency\CurrencyAccessor;
11
 use App\Utilities\Currency\CurrencyAccessor;
11
 use App\Utilities\Currency\CurrencyConverter;
12
 use App\Utilities\Currency\CurrencyConverter;
12
 use Closure;
13
 use Closure;
40
             ->columns(1)
41
             ->columns(1)
41
             ->schema([
42
             ->schema([
42
                 Forms\Components\DatePicker::make('posted_at')
43
                 Forms\Components\DatePicker::make('posted_at')
43
-                    ->label('Date'),
44
+                    ->label('Date')
45
+                    ->timezone(CompanySettingsService::getDefaultTimezone()),
44
                 Forms\Components\Grid::make()
46
                 Forms\Components\Grid::make()
45
                     ->schema([
47
                     ->schema([
46
                         Forms\Components\Select::make('bank_account_id')
48
                         Forms\Components\Select::make('bank_account_id')

+ 2
- 0
app/Filament/Company/Resources/Sales/InvoiceResource/Pages/RecordPayments.php View File

11
 use App\Models\Banking\BankAccount;
11
 use App\Models\Banking\BankAccount;
12
 use App\Models\Common\Client;
12
 use App\Models\Common\Client;
13
 use App\Models\Setting\Currency;
13
 use App\Models\Setting\Currency;
14
+use App\Services\CompanySettingsService;
14
 use App\Utilities\Currency\CurrencyAccessor;
15
 use App\Utilities\Currency\CurrencyAccessor;
15
 use App\Utilities\Currency\CurrencyConverter;
16
 use App\Utilities\Currency\CurrencyConverter;
16
 use Filament\Actions;
17
 use Filament\Actions;
202
                         Forms\Components\DatePicker::make('posted_at')
203
                         Forms\Components\DatePicker::make('posted_at')
203
                             ->label('Date')
204
                             ->label('Date')
204
                             ->default(now())
205
                             ->default(now())
206
+                            ->timezone(CompanySettingsService::getDefaultTimezone())
205
                             ->softRequired(),
207
                             ->softRequired(),
206
                         Forms\Components\Select::make('payment_method')
208
                         Forms\Components\Select::make('payment_method')
207
                             ->label('Payment method')
209
                             ->label('Payment method')

+ 3
- 1
app/Filament/Company/Resources/Sales/InvoiceResource/RelationManagers/PaymentsRelationManager.php View File

8
 use App\Models\Accounting\Invoice;
8
 use App\Models\Accounting\Invoice;
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 Closure;
14
 use Closure;
49
             ->columns(1)
50
             ->columns(1)
50
             ->schema([
51
             ->schema([
51
                 Forms\Components\DatePicker::make('posted_at')
52
                 Forms\Components\DatePicker::make('posted_at')
52
-                    ->label('Date'),
53
+                    ->label('Date')
54
+                    ->timezone(CompanySettingsService::getDefaultTimezone()),
53
                 Forms\Components\Grid::make()
55
                 Forms\Components\Grid::make()
54
                     ->schema([
56
                     ->schema([
55
                         Forms\Components\Select::make('bank_account_id')
57
                         Forms\Components\Select::make('bank_account_id')

+ 2
- 0
app/Livewire/Company/Service/ConnectedAccount/ListInstitutions.php View File

8
 use App\Models\Banking\ConnectedBankAccount;
8
 use App\Models\Banking\ConnectedBankAccount;
9
 use App\Models\Banking\Institution;
9
 use App\Models\Banking\Institution;
10
 use App\Models\User;
10
 use App\Models\User;
11
+use App\Services\CompanySettingsService;
11
 use App\Services\PlaidService;
12
 use App\Services\PlaidService;
12
 use Filament\Actions\Action;
13
 use Filament\Actions\Action;
13
 use Filament\Actions\Concerns\InteractsWithActions;
14
 use Filament\Actions\Concerns\InteractsWithActions;
89
                 DatePicker::make('start_date')
90
                 DatePicker::make('start_date')
90
                     ->label('Start date')
91
                     ->label('Start date')
91
                     ->required()
92
                     ->required()
93
+                    ->timezone(CompanySettingsService::getDefaultTimezone())
92
                     ->placeholder('Select a start date for importing transactions.')
94
                     ->placeholder('Select a start date for importing transactions.')
93
                     ->minDate(now()->subDays(PlaidService::TRANSACTION_DAYS_REQUESTED)->toDateString())
95
                     ->minDate(now()->subDays(PlaidService::TRANSACTION_DAYS_REQUESTED)->toDateString())
94
                     ->maxDate(now()->toDateString()),
96
                     ->maxDate(now()->toDateString()),

+ 3
- 0
app/Models/Accounting/RecurringInvoice.php View File

22
 use App\Models\Common\Client;
22
 use App\Models\Common\Client;
23
 use App\Models\Setting\CompanyProfile;
23
 use App\Models\Setting\CompanyProfile;
24
 use App\Observers\RecurringInvoiceObserver;
24
 use App\Observers\RecurringInvoiceObserver;
25
+use App\Services\CompanySettingsService;
25
 use App\Support\ScheduleHandler;
26
 use App\Support\ScheduleHandler;
26
 use App\Utilities\Localization\Timezone;
27
 use App\Utilities\Localization\Timezone;
27
 use Filament\Actions\Action;
28
 use Filament\Actions\Action;
507
                             ->softRequired()
508
                             ->softRequired()
508
                             ->live()
509
                             ->live()
509
                             ->minDate(today())
510
                             ->minDate(today())
511
+                            ->timezone(CompanySettingsService::getDefaultTimezone())
510
                             ->closeOnDateSelection()
512
                             ->closeOnDateSelection()
511
                             ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
513
                             ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
512
                                 $handler = new ScheduleHandler($set, $get);
514
                                 $handler = new ScheduleHandler($set, $get);
539
 
541
 
540
                             if ($endType?->isOn()) {
542
                             if ($endType?->isOn()) {
541
                                 $components[] = Forms\Components\DatePicker::make('end_date')
543
                                 $components[] = Forms\Components\DatePicker::make('end_date')
544
+                                    ->timezone(CompanySettingsService::getDefaultTimezone())
542
                                     ->live();
545
                                     ->live();
543
                             }
546
                             }
544
 
547
 

Loading…
Cancel
Save