Merge pull request #197 from andrewdwallo/development-3.x

Development 3.x

app/Concerns/CompanyOwned.php

@@ -2,6 +2,8 @@
 
 namespace App\Concerns;
 
+use App\Models\Notification;
+use App\Models\User;
 use App\Scopes\CurrentCompanyScope;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
@@ -17,11 +19,18 @@ trait CompanyOwned
             if (empty($model->company_id)) {
                 $companyId = session('current_company_id');
 
-                if (! $companyId && Auth::check()) {
-                    $companyId = Auth::user()->currentCompany->id;
+                if (! $companyId && ($user = Auth::user()) && ($companyId = $user->current_company_id)) {
                     session(['current_company_id' => $companyId]);
                 }
 
+                // For notifications in job context, get company_id from the notifiable user
+                if (! $companyId && $model instanceof Notification && $model->notifiable_type === User::class) {
+                    $notifiable = $model->notifiable;
+                    if ($notifiable instanceof User) {
+                        $companyId = $notifiable->current_company_id;
+                    }
+                }
+
                 if ($companyId) {
                     $model->company_id = $companyId;
                 } else {

app/Concerns/HasTransactionAction.php

@@ -39,7 +39,7 @@ trait HasTransactionAction
     protected function getFormDefaultsForType(TransactionType $type): array
     {
         $commonDefaults = [
-            'posted_at' => today(),
+            'posted_at' => company_today()->toDateString(),
         ];
 
         return match ($type) {
@@ -83,6 +83,7 @@ trait HasTransactionAction
             ->schema([
                 Forms\Components\DatePicker::make('posted_at')
                     ->label('Date')
+                    ->native()
                     ->required(),
                 Forms\Components\TextInput::make('description')
                     ->label('Description'),
@@ -203,12 +204,11 @@ trait HasTransactionAction
 
     protected function getTransactionDetailsGrid(): Forms\Components\Grid
     {
-        return Forms\Components\Grid::make(8)
+        return Forms\Components\Grid::make(6)
             ->schema([
                 Forms\Components\DatePicker::make('posted_at')
                     ->label('Date')
-                    ->softRequired()
-                    ->displayFormat('Y-m-d'),
+                    ->softRequired(),
                 Forms\Components\TextInput::make('description')
                     ->label('Description')
                     ->columnSpan(2),

app/Enums/Setting/DateFormat.php

@@ -36,6 +36,6 @@ enum DateFormat: string implements HasLabel
 
     public function getLabel(): ?string
     {
-        return now()->translatedFormat($this->value);
+        return company_today()->translatedFormat($this->value);
     }
 }

app/Enums/Setting/PaymentTerms.php

@@ -43,6 +43,6 @@ enum PaymentTerms: string implements HasLabel
     {
         $days = $this->getDays() ?? 0;
 
-        return now()->addDays($days)->translatedFormat($format);
+        return company_today()->addDays($days)->translatedFormat($format);
     }
 }

app/Enums/Setting/WeekStart.php

@@ -18,6 +18,6 @@ enum WeekStart: int implements HasLabel
 
     public function getLabel(): ?string
     {
-        return today()->isoWeekday($this->value)->dayName;
+        return company_today()->isoWeekday($this->value)->dayName;
     }
 }

app/Filament/Company/Clusters/Settings/Pages/Localization.php

@@ -177,7 +177,7 @@ class Localization extends Page
                         Cluster::make([
                             Select::make('fiscal_year_end_month')
                                 ->softRequired()
-                                ->options(array_combine(range(1, 12), array_map(static fn ($month) => now()->month($month)->monthName, range(1, 12))))
+                                ->options(array_combine(range(1, 12), array_map(static fn ($month) => company_today()->month($month)->monthName, range(1, 12))))
                                 ->afterStateUpdated(static fn (Set $set) => $set('fiscal_year_end_day', null))
                                 ->columnSpan(2)
                                 ->live(),
@@ -188,7 +188,7 @@ class Localization extends Page
                                 ->options(function (Get $get) {
                                     $month = (int) $get('fiscal_year_end_month');
 
-                                    $daysInMonth = now()->month($month)->daysInMonth;
+                                    $daysInMonth = company_today()->month($month)->daysInMonth;
 
                                     return array_combine(range(1, $daysInMonth), range(1, $daysInMonth));
                                 })

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

@@ -10,6 +10,7 @@ use App\Enums\Accounting\AdjustmentType;
 use App\Filament\Company\Clusters\Settings;
 use App\Filament\Company\Clusters\Settings\Resources\AdjustmentResource\Pages;
 use App\Models\Accounting\Adjustment;
+use App\Services\CompanySettingsService;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
@@ -80,8 +81,10 @@ class AdjustmentResource extends Resource
                     ->columns(),
                 Forms\Components\Section::make('Dates')
                     ->schema([
-                        Forms\Components\DateTimePicker::make('start_date'),
+                        Forms\Components\DateTimePicker::make('start_date')
+                            ->timezone(CompanySettingsService::getDefaultTimezone()),
                         Forms\Components\DateTimePicker::make('end_date')
+                            ->timezone(CompanySettingsService::getDefaultTimezone())
                             ->after('start_date'),
                     ])
                     ->columns()
@@ -192,6 +195,7 @@ class AdjustmentResource extends Resource
                         ->form([
                             Forms\Components\DateTimePicker::make('paused_until')
                                 ->label('Auto-resume date')
+                                ->timezone(CompanySettingsService::getDefaultTimezone())
                                 ->helperText('When should this adjustment automatically resume? Leave empty to keep paused indefinitely.')
                                 ->after('now'),
                             Forms\Components\Textarea::make('status_reason')
@@ -251,6 +255,7 @@ class AdjustmentResource extends Resource
                         ->form([
                             Forms\Components\DateTimePicker::make('paused_until')
                                 ->label('Auto-resume date')
+                                ->timezone(CompanySettingsService::getDefaultTimezone())
                                 ->helperText('When should these adjustments automatically resume? Leave empty to keep paused indefinitely.')
                                 ->after('now'),
                             Forms\Components\Textarea::make('status_reason')

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

@@ -100,7 +100,8 @@ class DocumentDefaultResource extends Resource
                             ->loadingIndicatorPosition('left')
                             ->removeUploadedFileButtonPosition('right'),
                         Forms\Components\Checkbox::make('show_logo')
-                            ->localizeLabel(),
+                            ->localizeLabel()
+                            ->hidden(is_demo_environment()),
                         Forms\Components\ColorPicker::make('accent_color')
                             ->localizeLabel(),
                         Forms\Components\Select::make('font')

app/Filament/Company/Pages/Concerns/HasDeferredFiltersForm.php

@@ -4,6 +4,7 @@ namespace App\Filament\Company\Pages\Concerns;
 
 use Filament\Actions\Action;
 use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\DateTimePicker;
 use Filament\Forms\Form;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Carbon;
@@ -170,9 +171,25 @@ trait HasDeferredFiltersForm
         $flatFields = $this->getFiltersForm()->getFlatFields();
 
         foreach ($this->filters as $key => $value) {
-            if (isset($flatFields[$key]) && $flatFields[$key] instanceof DatePicker) {
-                // TODO: Submit a PR to Filament to address DatePicker being dehydrated as a datetime string in filters
-                $this->filters[$key] = Carbon::parse($value)->toDateString();
+            if (! isset($flatFields[$key]) || blank($value)) {
+                continue;
+            }
+
+            $field = $flatFields[$key];
+
+            // Reproduce underlying conversion to UTC for DateTimePicker and DatePicker
+            if ($field instanceof DateTimePicker && $field->getTimezone() !== config('app.timezone')) {
+                try {
+                    $carbonValue = Carbon::parse($value, $field->getTimezone());
+
+                    // Shift back to UTC and format according to field type
+                    $this->filters[$key] = $carbonValue
+                        ->setTimezone(config('app.timezone'))
+                        ->format($field->getFormat());
+
+                } catch (\Exception $e) {
+                    continue;
+                }
             }
         }
     }

app/Filament/Company/Pages/Reports/BaseReportPage.php

@@ -9,6 +9,7 @@ use App\Filament\Company\Pages\Concerns\HasTableColumnToggleForm;
 use App\Filament\Company\Pages\Reports;
 use App\Filament\Forms\Components\DateRangeSelect;
 use App\Models\Company;
+use App\Services\CompanySettingsService;
 use App\Services\DateRangeService;
 use App\Support\Column;
 use Filament\Actions\Action;
@@ -253,6 +254,7 @@ abstract class BaseReportPage extends Page
         return DatePicker::make('startDate')
             ->label('Start date')
             ->live()
+            ->timezone(CompanySettingsService::getDefaultTimezone())
             ->afterStateUpdated(static function ($state, Set $set) {
                 $set('dateRange', 'Custom');
             });
@@ -263,6 +265,7 @@ abstract class BaseReportPage extends Page
         return DatePicker::make('endDate')
             ->label('End date')
             ->live()
+            ->timezone(CompanySettingsService::getDefaultTimezone())
             ->afterStateUpdated(static function (Set $set) {
                 $set('dateRange', 'Custom');
             });

app/Filament/Company/Resources/Accounting/BudgetResource.php

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

app/Filament/Company/Resources/Accounting/BudgetResource/Pages/CreateBudget.php

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

app/Filament/Company/Resources/Purchases/BillResource.php

@@ -88,14 +88,14 @@ class BillResource extends Resource
                                     Forms\Components\DatePicker::make('date')
                                         ->label('Bill date')
                                         ->live()
-                                        ->default(now())
+                                        ->default(company_today()->toDateString())
                                         ->disabled(function (?Bill $record) {
                                             return $record?->hasPayments();
                                         })
                                         ->columnSpan(2)
                                         ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
-                                            $date = $state;
-                                            $dueDate = $get('due_date');
+                                            $date = Carbon::parse($state)->toDateString();
+                                            $dueDate = Carbon::parse($get('due_date'))->toDateString();
 
                                             if ($date && $dueDate && $date > $dueDate) {
                                                 $set('due_date', $date);
@@ -137,8 +137,8 @@ class BillResource extends Resource
                                     ->columns(3),
                                 Forms\Components\DatePicker::make('due_date')
                                     ->label('Due date')
-                                    ->default(function () use ($company) {
-                                        return now()->addDays($company->defaultBill->payment_terms->getDays());
+                                    ->default(function () use ($settings) {
+                                        return company_today()->addDays($settings->payment_terms->getDays())->toDateString();
                                     })
                                     ->required()
                                     ->live()
@@ -450,7 +450,7 @@ class BillResource extends Resource
                             })
                             ->mountUsing(function (Bill $record, Form $form) {
                                 $form->fill([
-                                    'posted_at' => now(),
+                                    'posted_at' => company_today()->toDateString(),
                                     'amount' => $record->amount_due,
                                 ]);
                             })
@@ -614,8 +614,8 @@ class BillResource extends Resource
                         ->beforeReplicaSaved(function (Bill $replica) {
                             $replica->status = BillStatus::Open;
                             $replica->bill_number = Bill::getNextDocumentNumber();
-                            $replica->date = now();
-                            $replica->due_date = now()->addDays($replica->company->defaultBill->payment_terms->getDays());
+                            $replica->date = company_today();
+                            $replica->due_date = company_today()->addDays($replica->company->defaultBill->payment_terms->getDays());
                         })
                         ->withReplicatedRelationships(['lineItems'])
                         ->withExcludedRelationshipAttributes('lineItems', [

app/Filament/Company/Resources/Purchases/BillResource/Pages/PayBills.php

@@ -151,7 +151,7 @@ class PayBills extends ListRecords
                             ->softRequired(),
                         Forms\Components\DatePicker::make('posted_at')
                             ->label('Date')
-                            ->default(now())
+                            ->default(company_today()->toDateString())
                             ->softRequired(),
                         Forms\Components\Select::make('payment_method')
                             ->label('Payment method')

app/Filament/Company/Resources/Purchases/BillResource/RelationManagers/PaymentsRelationManager.php

@@ -224,7 +224,7 @@ class PaymentsRelationManager extends RelationManager
                     ->mountUsing(function (Form $form) {
                         $record = $this->getOwnerRecord();
                         $form->fill([
-                            'posted_at' => now(),
+                            'posted_at' => company_today()->toDateString(),
                             'amount' => $record->amount_due,
                         ]);
                     })

app/Filament/Company/Resources/Purchases/BillResource/Widgets/BillOverview.php

@@ -51,8 +51,8 @@ class BillOverview extends EnhancedStatsOverviewWidget
 
             $lastMonthPaid = $this->getPageTableQuery()
                 ->whereBetween('date', [
-                    today()->subMonth()->startOfMonth(),
-                    today()->subMonth()->endOfMonth(),
+                    company_today()->subMonth()->startOfMonth(),
+                    company_today()->subMonth()->endOfMonth(),
                 ])
                 ->get()
                 ->sumMoneyInDefaultCurrency('amount_paid');
@@ -85,7 +85,7 @@ class BillOverview extends EnhancedStatsOverviewWidget
 
         $amountDueWithin7Days = $unpaidBills
             ->clone()
-            ->whereBetween('due_date', [today(), today()->addWeek()])
+            ->whereBetween('due_date', [company_today(), company_today()->addWeek()])
             ->get()
             ->sumMoneyInDefaultCurrency('amount_due');
 

app/Filament/Company/Resources/Purchases/VendorResource/Widgets/BillOverview.php

@@ -29,7 +29,7 @@ class BillOverview extends EnhancedStatsOverviewWidget
 
         $amountDueWithin7Days = $unpaidBills
             ->clone()
-            ->whereBetween('due_date', [today(), today()->addWeek()])
+            ->whereBetween('due_date', [company_today(), company_today()->addWeek()])
             ->get()
             ->sumMoneyInDefaultCurrency('amount_due');
 
@@ -54,8 +54,8 @@ class BillOverview extends EnhancedStatsOverviewWidget
         $lastMonthTotal = $this->record->bills()
             ->where('status', BillStatus::Paid)
             ->whereBetween('date', [
-                today()->subMonth()->startOfMonth(),
-                today()->subMonth()->endOfMonth(),
+                company_today()->subMonth()->startOfMonth(),
+                company_today()->subMonth()->endOfMonth(),
             ])
             ->get()
             ->sumMoneyInDefaultCurrency('amount_paid');

app/Filament/Company/Resources/Sales/ClientResource/Widgets/InvoiceOverview.php

@@ -26,7 +26,7 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
             ->sumMoneyInDefaultCurrency('amount_due');
 
         $amountDueWithin30Days = $unpaidInvoices->clone()
-            ->whereBetween('due_date', [today(), today()->addMonth()])
+            ->whereBetween('due_date', [company_today(), company_today()->addMonth()])
             ->get()
             ->sumMoneyInDefaultCurrency('amount_due');
 

app/Filament/Company/Resources/Sales/EstimateResource.php

@@ -91,11 +91,11 @@ class EstimateResource extends Resource
                                     Forms\Components\DatePicker::make('date')
                                         ->label('Estimate date')
                                         ->live()
-                                        ->default(now())
+                                        ->default(company_today()->toDateString())
                                         ->columnSpan(2)
                                         ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
-                                            $date = $state;
-                                            $expirationDate = $get('expiration_date');
+                                            $date = Carbon::parse($state)->toDateString();
+                                            $expirationDate = Carbon::parse($get('expiration_date'))->toDateString();
 
                                             if ($date && $expirationDate && $date > $expirationDate) {
                                                 $set('expiration_date', $date);
@@ -137,10 +137,10 @@ class EstimateResource extends Resource
                                 Forms\Components\DatePicker::make('expiration_date')
                                     ->label('Expiration date')
                                     ->default(function () use ($settings) {
-                                        return now()->addDays($settings->payment_terms->getDays());
+                                        return company_today()->addDays($settings->payment_terms->getDays())->toDateString();
                                     })
                                     ->minDate(static function (Forms\Get $get) {
-                                        return $get('date') ?? now();
+                                        return Carbon::parse($get('date'))->toDateString() ?? company_today()->toDateString();
                                     })
                                     ->live()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
@@ -470,8 +470,8 @@ class EstimateResource extends Resource
                         ->beforeReplicaSaved(function (Estimate $replica) {
                             $replica->status = EstimateStatus::Draft;
                             $replica->estimate_number = Estimate::getNextDocumentNumber();
-                            $replica->date = now();
-                            $replica->expiration_date = now()->addDays($replica->company->defaultInvoice->payment_terms->getDays());
+                            $replica->date = company_today();
+                            $replica->expiration_date = company_today()->addDays($replica->company->defaultInvoice->payment_terms->getDays());
                         })
                         ->withReplicatedRelationships(['lineItems'])
                         ->withExcludedRelationshipAttributes('lineItems', [

app/Filament/Company/Resources/Sales/InvoiceResource.php

@@ -95,14 +95,14 @@ class InvoiceResource extends Resource
                                     Forms\Components\DatePicker::make('date')
                                         ->label('Invoice date')
                                         ->live()
-                                        ->default(now())
+                                        ->default(company_today()->toDateString())
                                         ->disabled(function (?Invoice $record) {
                                             return $record?->hasPayments();
                                         })
                                         ->columnSpan(2)
                                         ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
-                                            $date = $state;
-                                            $dueDate = $get('due_date');
+                                            $date = Carbon::parse($state)->toDateString();
+                                            $dueDate = Carbon::parse($get('due_date'))->toDateString();
 
                                             if ($date && $dueDate && $date > $dueDate) {
                                                 $set('due_date', $date);
@@ -145,10 +145,10 @@ class InvoiceResource extends Resource
                                 Forms\Components\DatePicker::make('due_date')
                                     ->label('Payment due')
                                     ->default(function () use ($settings) {
-                                        return now()->addDays($settings->payment_terms->getDays());
+                                        return company_today()->addDays($settings->payment_terms->getDays())->toDateString();
                                     })
                                     ->minDate(static function (Forms\Get $get) {
-                                        return $get('date') ?? now();
+                                        return Carbon::parse($get('date'))->toDateString() ?? company_today()->toDateString();
                                     })
                                     ->live()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
@@ -538,8 +538,8 @@ class InvoiceResource extends Resource
                         ->beforeReplicaSaved(function (Invoice $replica) {
                             $replica->status = InvoiceStatus::Draft;
                             $replica->invoice_number = Invoice::getNextDocumentNumber();
-                            $replica->date = now();
-                            $replica->due_date = now()->addDays($replica->company->defaultInvoice->payment_terms->getDays());
+                            $replica->date = company_today();
+                            $replica->due_date = company_today()->addDays($replica->company->defaultInvoice->payment_terms->getDays());
                         })
                         ->withReplicatedRelationships(['lineItems'])
                         ->withExcludedRelationshipAttributes('lineItems', [

app/Filament/Company/Resources/Sales/InvoiceResource/Pages/RecordPayments.php

@@ -201,7 +201,7 @@ class RecordPayments extends ListRecords
                             ->softRequired(),
                         Forms\Components\DatePicker::make('posted_at')
                             ->label('Date')
-                            ->default(now())
+                            ->default(company_today()->toDateString())
                             ->softRequired(),
                         Forms\Components\Select::make('payment_method')
                             ->label('Payment method')

app/Filament/Company/Resources/Sales/InvoiceResource/RelationManagers/PaymentsRelationManager.php

@@ -237,7 +237,7 @@ class PaymentsRelationManager extends RelationManager
                     ->mountUsing(function (Form $form) {
                         $record = $this->getOwnerRecord();
                         $form->fill([
-                            'posted_at' => now(),
+                            'posted_at' => company_today()->toDateString(),
                             'amount' => abs($record->amount_due),
                         ]);
                     })

app/Filament/Company/Resources/Sales/InvoiceResource/Widgets/InvoiceOverview.php

@@ -54,7 +54,7 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
 
         $amountDueWithin30Days = $unpaidInvoices
             ->clone()
-            ->whereBetween('due_date', [today(), today()->addMonth()])
+            ->whereBetween('due_date', [company_today(), company_today()->addMonth()])
             ->get()
             ->sumMoneyInDefaultCurrency('amount_due');
 

app/Filament/Forms/Components/CreateAdjustmentSelect.php

@@ -8,6 +8,7 @@ use App\Enums\Accounting\AdjustmentScope;
 use App\Enums\Accounting\AdjustmentStatus;
 use App\Enums\Accounting\AdjustmentType;
 use App\Models\Accounting\Adjustment;
+use App\Services\CompanySettingsService;
 use Filament\Forms\Components\Actions\Action;
 use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\DateTimePicker;
@@ -195,8 +196,10 @@ class CreateAdjustmentSelect extends Select
 
             Group::make()
                 ->schema([
-                    DateTimePicker::make('start_date'),
+                    DateTimePicker::make('start_date')
+                        ->timezone(CompanySettingsService::getDefaultTimezone()),
                     DateTimePicker::make('end_date')
+                        ->timezone(CompanySettingsService::getDefaultTimezone())
                         ->after('start_date'),
                 ])
                 ->visible(function (Get $get) {

app/Filament/Forms/Components/DateRangeSelect.php

@@ -88,7 +88,7 @@ class DateRangeSelect extends Select
 
     public function processFiscalYear($year, Set $set): void
     {
-        $currentYear = now()->year;
+        $currentYear = company_now()->year;
         $diff = $currentYear - $year;
         $fiscalYearStart = Carbon::parse($this->fiscalYearStartDate)->subYears($diff);
         $fiscalYearEnd = Carbon::parse($this->fiscalYearEndDate)->subYears($diff);
@@ -97,7 +97,7 @@ class DateRangeSelect extends Select
 
     public function processFiscalQuarter($quarter, $year, Set $set): void
     {
-        $currentYear = now()->year;
+        $currentYear = company_now()->year;
         $diff = $currentYear - $year;
         $fiscalYearStart = Carbon::parse($this->fiscalYearStartDate)->subYears($diff);
         $quarterStart = $fiscalYearStart->copy()->addMonths(($quarter - 1) * 3);
@@ -134,7 +134,7 @@ class DateRangeSelect extends Select
         }
 
         if ($this->endDateField) {
-            $set($this->endDateField, $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
+            $set($this->endDateField, $end->isFuture() ? company_now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
         }
     }
 }

app/Helpers/helpers.php

@@ -3,7 +3,9 @@
 use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Setting\NumberFormat;
 use App\Models\Setting\Localization;
+use App\Services\CompanySettingsService;
 use Filament\Support\RawJs;
+use Illuminate\Support\Carbon;
 
 if (! function_exists('generateJsCode')) {
     function generateJsCode(string $precision, ?string $currency = null): string
@@ -129,3 +131,17 @@ if (! function_exists('is_demo_environment')) {
         return app()->environment('demo');
     }
 }
+
+if (! function_exists('company_today')) {
+    function company_today(): Carbon
+    {
+        return today(CompanySettingsService::getDefaultTimezone());
+    }
+}
+
+if (! function_exists('company_now')) {
+    function company_now(): Carbon
+    {
+        return now(CompanySettingsService::getDefaultTimezone());
+    }
+}

app/Jobs/ProcessTransactionImport.php

@@ -30,7 +30,7 @@ class ProcessTransactionImport implements ShouldQueue
     public function handle(PlaidService $plaid, TransactionService $transactionService): void
     {
         $accessToken = $this->connectedBankAccount->access_token;
-        $endDate = Carbon::now()->toDateString();
+        $endDate = company_now()->toDateString();
         $startDate = Carbon::parse($this->startDate)->toDateString();
         $allTransactions = [];
         $offset = 0;
@@ -64,7 +64,7 @@ class ProcessTransactionImport implements ShouldQueue
             $transactionService->storeTransactions($this->company, $this->bankAccount, $newTransactions);
 
             $this->connectedBankAccount->update([
-                'last_imported_at' => Carbon::now(),
+                'last_imported_at' => company_now(),
             ]);
         }
     }

app/Jobs/ProcessTransactionUpdate.php

@@ -39,7 +39,7 @@ class ProcessTransactionUpdate implements ShouldQueue
             $bufferDays = 15;
             $lastImportedAtDate = Carbon::parse($connectedBankAccount->last_imported_at);
             $startDate = $lastImportedAtDate->subDays($bufferDays)->toDateString();
-            $endDate = Carbon::now()->toDateString();
+            $endDate = company_today()->toDateString();
 
             $transactionsResponse = $plaidService->getTransactions($accessToken, $startDate, $endDate, [
                 'account_ids' => [$connectedBankAccount->external_account_id],
@@ -67,7 +67,7 @@ class ProcessTransactionUpdate implements ShouldQueue
                 $transactionService->storeTransactions($this->company, $bankAccount, $newTransactions);
 
                 $connectedBankAccount->update([
-                    'last_imported_at' => Carbon::now(),
+                    'last_imported_at' => company_now(),
                 ]);
             }
         }

app/Listeners/UpdateAccountBalances.php

@@ -58,7 +58,7 @@ class UpdateAccountBalances
                         'type' => $transactionType,
                         'amount' => $formattedSimpleDifference,
                         'payment_channel' => 'other',
-                        'posted_at' => today(),
+                        'posted_at' => company_today(),
                         'description' => $description,
                         'pending' => false,
                         'reviewed' => false,

app/Livewire/Company/Service/ConnectedAccount/ListInstitutions.php

@@ -8,6 +8,7 @@ use App\Models\Banking\BankAccount;
 use App\Models\Banking\ConnectedBankAccount;
 use App\Models\Banking\Institution;
 use App\Models\User;
+use App\Services\CompanySettingsService;
 use App\Services\PlaidService;
 use Filament\Actions\Action;
 use Filament\Actions\Concerns\InteractsWithActions;
@@ -89,9 +90,10 @@ class ListInstitutions extends Component implements HasActions, HasForms
                 DatePicker::make('start_date')
                     ->label('Start date')
                     ->required()
+                    ->timezone(CompanySettingsService::getDefaultTimezone())
                     ->placeholder('Select a start date for importing transactions.')
-                    ->minDate(now()->subDays(PlaidService::TRANSACTION_DAYS_REQUESTED)->toDateString())
-                    ->maxDate(now()->toDateString()),
+                    ->minDate(company_today()->subDays(PlaidService::TRANSACTION_DAYS_REQUESTED)->toDateString())
+                    ->maxDate(company_today()->toDateString()),
             ])
             ->action(function (array $data, ConnectedBankAccount $connectedBankAccount) {
                 $selectedBankAccountId = $data['bank_account_id'] ?? $connectedBankAccount->bank_account_id;

app/Models/Accounting/Adjustment.php

@@ -126,11 +126,11 @@ class Adjustment extends Model
 
     public function calculateNaturalStatus(): AdjustmentStatus
     {
-        if ($this->start_date?->isFuture()) {
+        if ($this->start_date?->isAfter(company_now())) {
             return AdjustmentStatus::Upcoming;
         }
 
-        if ($this->end_date?->isPast()) {
+        if ($this->end_date?->isBefore(company_now())) {
             return AdjustmentStatus::Expired;
         }
 
@@ -144,7 +144,7 @@ class Adjustment extends Model
         }
 
         return $this->update([
-            'paused_at' => now(),
+            'paused_at' => company_now(),
             'paused_until' => $untilDate,
             'status' => AdjustmentStatus::Paused,
             'status_reason' => $reason,
@@ -172,7 +172,7 @@ class Adjustment extends Model
         }
 
         return $this->update([
-            'archived_at' => now(),
+            'archived_at' => company_now(),
             'status' => AdjustmentStatus::Archived,
             'status_reason' => $reason,
         ]);
@@ -182,7 +182,7 @@ class Adjustment extends Model
     {
         return $this->status === AdjustmentStatus::Paused &&
             $this->paused_until !== null &&
-            $this->paused_until->isPast();
+            $this->paused_until->isBefore(company_now());
     }
 
     public function refreshStatus(): bool

app/Models/Accounting/Bill.php

@@ -131,7 +131,7 @@ class Bill extends Document
 
     public function shouldBeOverdue(): bool
     {
-        return $this->due_date->isBefore(today()) && $this->canBeOverdue();
+        return $this->due_date->isBefore(company_today()) && $this->canBeOverdue();
     }
 
     public function wasInitialized(): bool
@@ -426,8 +426,8 @@ class Bill extends Document
             ->beforeReplicaSaved(function (self $original, self $replica) {
                 $replica->status = BillStatus::Open;
                 $replica->bill_number = self::getNextDocumentNumber();
-                $replica->date = now();
-                $replica->due_date = now()->addDays($original->company->defaultBill->payment_terms->getDays());
+                $replica->date = company_today();
+                $replica->due_date = company_today()->addDays($original->company->defaultBill->payment_terms->getDays());
             })
             ->databaseTransaction()
             ->after(function (self $original, self $replica) {

app/Models/Accounting/Budget.php

@@ -154,14 +154,14 @@ class Budget extends Model
     public function scopeCurrentlyActive(Builder $query): Builder
     {
         return $query->active()
-            ->where('start_date', '<=', now())
-            ->where('end_date', '>=', now());
+            ->where('start_date', '<=', company_now())
+            ->where('end_date', '>=', company_now());
     }
 
     protected function isCurrentlyInPeriod(): Attribute
     {
         return Attribute::get(function () {
-            return now()->between($this->start_date, $this->end_date);
+            return company_now()->between($this->start_date, $this->end_date);
         });
     }
 
@@ -174,7 +174,7 @@ class Budget extends Model
             throw new \RuntimeException('Budget cannot be approved.');
         }
 
-        $approvedAt ??= now();
+        $approvedAt ??= company_now();
 
         $this->update([
             'status' => BudgetStatus::Active,
@@ -191,7 +191,7 @@ class Budget extends Model
             throw new \RuntimeException('Budget cannot be closed.');
         }
 
-        $closedAt ??= now();
+        $closedAt ??= company_now();
 
         $this->update([
             'status' => BudgetStatus::Closed,

app/Models/Accounting/BudgetAllocation.php

@@ -38,6 +38,6 @@ class BudgetAllocation extends Model
 
     public function isCurrentPeriod(): bool
     {
-        return now()->between($this->start_date, $this->end_date);
+        return company_now()->between($this->start_date, $this->end_date);
     }
 }

app/Models/Accounting/Estimate.php

@@ -132,7 +132,7 @@ class Estimate extends Document
 
     public function shouldBeExpired(): bool
     {
-        return $this->expiration_date?->isBefore(today()) && $this->canBeExpired();
+        return $this->expiration_date?->isBefore(company_today()) && $this->canBeExpired();
     }
 
     public function isDraft(): bool
@@ -257,7 +257,7 @@ class Estimate extends Document
             throw new \RuntimeException('Estimate is not in draft status.');
         }
 
-        $approvedAt ??= now();
+        $approvedAt ??= company_now();
 
         $this->update([
             'approved_at' => $approvedAt,
@@ -316,7 +316,7 @@ class Estimate extends Document
 
     public function markAsSent(?Carbon $sentAt = null): void
     {
-        $sentAt ??= now();
+        $sentAt ??= company_now();
 
         $this->update([
             'status' => EstimateStatus::Sent,
@@ -326,7 +326,7 @@ class Estimate extends Document
 
     public function markAsViewed(?Carbon $viewedAt = null): void
     {
-        $viewedAt ??= now();
+        $viewedAt ??= company_now();
 
         $this->update([
             'status' => EstimateStatus::Viewed,
@@ -357,8 +357,8 @@ class Estimate extends Document
             ->beforeReplicaSaved(function (self $original, self $replica) {
                 $replica->status = EstimateStatus::Draft;
                 $replica->estimate_number = self::getNextDocumentNumber();
-                $replica->date = now();
-                $replica->expiration_date = now()->addDays($original->company->defaultInvoice->payment_terms->getDays());
+                $replica->date = company_today();
+                $replica->expiration_date = company_today()->addDays($original->company->defaultInvoice->payment_terms->getDays());
             })
             ->databaseTransaction()
             ->after(function (self $original, self $replica) {
@@ -388,7 +388,7 @@ class Estimate extends Document
 
     public function markAsAccepted(?Carbon $acceptedAt = null): void
     {
-        $acceptedAt ??= now();
+        $acceptedAt ??= company_now();
 
         $this->update([
             'status' => EstimateStatus::Accepted,
@@ -417,7 +417,7 @@ class Estimate extends Document
 
     public function markAsDeclined(?Carbon $declinedAt = null): void
     {
-        $declinedAt ??= now();
+        $declinedAt ??= company_now();
 
         $this->update([
             'status' => EstimateStatus::Declined,
@@ -458,8 +458,8 @@ class Estimate extends Document
             'header' => $this->company->defaultInvoice->header,
             'subheader' => $this->company->defaultInvoice->subheader,
             'invoice_number' => Invoice::getNextDocumentNumber($this->company),
-            'date' => now(),
-            'due_date' => now()->addDays($this->company->defaultInvoice->payment_terms->getDays()),
+            'date' => company_today(),
+            'due_date' => company_today()->addDays($this->company->defaultInvoice->payment_terms->getDays()),
             'status' => InvoiceStatus::Draft,
             'currency_code' => $this->currency_code,
             'discount_method' => $this->discount_method,
@@ -477,7 +477,7 @@ class Estimate extends Document
 
         $this->replicateLineItems($invoice);
 
-        $convertedAt ??= now();
+        $convertedAt ??= company_now();
 
         $this->update([
             'status' => EstimateStatus::Converted,

app/Models/Accounting/Invoice.php

@@ -206,7 +206,7 @@ class Invoice extends Document
 
     public function shouldBeOverdue(): bool
     {
-        return $this->due_date->isBefore(today()) && $this->canBeOverdue();
+        return $this->due_date->isBefore(company_today()) && $this->canBeOverdue();
     }
 
     public function isDraft(): bool
@@ -369,7 +369,7 @@ class Invoice extends Document
 
         $this->createApprovalTransaction();
 
-        $approvedAt ??= now();
+        $approvedAt ??= company_now();
 
         $this->update([
             'approved_at' => $approvedAt,
@@ -613,7 +613,7 @@ class Invoice extends Document
 
     public function markAsSent(?Carbon $sentAt = null): void
     {
-        $sentAt ??= now();
+        $sentAt ??= company_now();
 
         $this->update([
             'status' => InvoiceStatus::Sent,
@@ -623,7 +623,7 @@ class Invoice extends Document
 
     public function markAsViewed(?Carbon $viewedAt = null): void
     {
-        $viewedAt ??= now();
+        $viewedAt ??= company_now();
 
         $this->update([
             'status' => InvoiceStatus::Viewed,
@@ -654,8 +654,8 @@ class Invoice extends Document
             ->beforeReplicaSaved(function (self $original, self $replica) {
                 $replica->status = InvoiceStatus::Draft;
                 $replica->invoice_number = self::getNextDocumentNumber();
-                $replica->date = now();
-                $replica->due_date = now()->addDays($original->company->defaultInvoice->payment_terms->getDays());
+                $replica->date = company_today();
+                $replica->due_date = company_today()->addDays($original->company->defaultInvoice->payment_terms->getDays());
             })
             ->databaseTransaction()
             ->after(function (self $original, self $replica) {

app/Models/Accounting/RecurringInvoice.php

@@ -22,6 +22,7 @@ use App\Filament\Forms\Components\CustomSection;
 use App\Models\Common\Client;
 use App\Models\Setting\CompanyProfile;
 use App\Observers\RecurringInvoiceObserver;
+use App\Services\CompanySettingsService;
 use App\Support\ScheduleHandler;
 use App\Utilities\Localization\Timezone;
 use Filament\Actions\Action;
@@ -208,7 +209,7 @@ class RecurringInvoice extends Document
         }
 
         // For unapproved/draft invoices, start date must be today or in the future
-        return $this->start_date?->gte(today()) ?? false;
+        return $this->start_date?->gte(company_today()) ?? false;
     }
 
     public function getScheduleDescription(): ?string
@@ -401,7 +402,7 @@ class RecurringInvoice extends Document
                 $data = $record->attributesToArray();
 
                 $data['day_of_month'] ??= DayOfMonth::First;
-                $data['start_date'] ??= now()->addMonth()->startOfMonth();
+                $data['start_date'] ??= company_today()->addMonth()->startOfMonth();
 
                 $form->fill($data);
             })
@@ -506,7 +507,8 @@ class RecurringInvoice extends Document
                             ->label('First invoice date')
                             ->softRequired()
                             ->live()
-                            ->minDate(today())
+                            ->minDate(company_today())
+                            ->timezone(CompanySettingsService::getDefaultTimezone())
                             ->closeOnDateSelection()
                             ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
                                 $handler = new ScheduleHandler($set, $get);
@@ -525,7 +527,7 @@ class RecurringInvoice extends Document
                                     $endType = EndType::parse($state);
 
                                     $set('max_occurrences', $endType?->isAfter() ? 1 : null);
-                                    $set('end_date', $endType?->isOn() ? now()->addMonth()->startOfMonth() : null);
+                                    $set('end_date', $endType?->isOn() ? company_today()->addMonth()->startOfMonth() : null);
                                 });
 
                             $endType = EndType::parse($get('end_type'));
@@ -539,6 +541,7 @@ class RecurringInvoice extends Document
 
                             if ($endType?->isOn()) {
                                 $components[] = Forms\Components\DatePicker::make('end_date')
+                                    ->timezone(CompanySettingsService::getDefaultTimezone())
                                     ->live();
                             }
 
@@ -603,7 +606,7 @@ class RecurringInvoice extends Document
             throw new \RuntimeException('Invoice is not in draft status.');
         }
 
-        $approvedAt ??= now();
+        $approvedAt ??= company_now();
 
         $this->update([
             'approved_at' => $approvedAt,
@@ -690,7 +693,7 @@ class RecurringInvoice extends Document
 
         $nextDate = $this->calculateNextDate();
 
-        if (! $nextDate || $nextDate->startOfDay()->isFuture()) {
+        if (! $nextDate || $nextDate->startOfDay()->isAfter(company_now())) {
             return false;
         }
 

app/Models/Export.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use App\Concerns\CompanyOwned;
+use Filament\Actions\Exports\Models\Export as BaseExport;
+
+class Export extends BaseExport
+{
+    use CompanyOwned;
+}

app/Models/Import.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use App\Concerns\CompanyOwned;
+use Filament\Actions\Imports\Models\Import as BaseImport;
+
+class Import extends BaseImport
+{
+    use CompanyOwned;
+}

app/Models/Notification.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Models;
+
+use App\Concerns\CompanyOwned;
+use Illuminate\Notifications\DatabaseNotification;
+
+class Notification extends DatabaseNotification
+{
+    use CompanyOwned;
+}

app/Models/Setting/Localization.php

@@ -63,7 +63,7 @@ class Localization extends Model
     public static function getWeekStart(string $locale): int
     {
         /** @var Carbon $date */
-        $date = now()->locale($locale);
+        $date = company_now()->locale($locale);
 
         $firstDay = $date->startOfWeek()->dayOfWeekIso;
 
@@ -91,7 +91,7 @@ class Localization extends Model
     public function fiscalYearEndDate(): string
     {
         return once(function () {
-            $today = now();
+            $today = company_now();
             $fiscalYearEndThisYear = Carbon::createFromDate($today->year, $this->fiscal_year_end_month, $this->fiscal_year_end_day);
 
             if ($today->gt($fiscalYearEndThisYear)) {

app/Models/User.php

@@ -124,4 +124,9 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, HasDefaul
 
         return true;
     }
+
+    public function notifications(): MorphMany
+    {
+        return $this->morphMany(Notification::class, 'notifiable')->latest();
+    }
 }

app/Observers/AdjustmentObserver.php

@@ -78,7 +78,7 @@ class AdjustmentObserver
 
         // Ensure consistency between paused status and paused_at field
         if ($adjustment->status === AdjustmentStatus::Paused && ! $adjustment->paused_at) {
-            $adjustment->paused_at = now();
+            $adjustment->paused_at = company_now();
         }
     }
 }

app/Observers/RecurringInvoiceObserver.php

@@ -20,7 +20,7 @@ class RecurringInvoiceObserver
 
         if ($recurringInvoice->end_type?->isAfter() && $recurringInvoice->occurrences_count >= $recurringInvoice->max_occurrences) {
             $recurringInvoice->status = RecurringInvoiceStatus::Ended;
-            $recurringInvoice->ended_at = now();
+            $recurringInvoice->ended_at = company_now();
         }
     }
 

app/Providers/AppServiceProvider.php

@@ -3,12 +3,18 @@
 namespace App\Providers;
 
 use App\Http\Responses\LoginRedirectResponse;
+use App\Models\Export;
+use App\Models\Import;
+use App\Models\Notification;
 use App\Services\DateRangeService;
+use Filament\Actions\Exports\Models\Export as BaseExport;
+use Filament\Actions\Imports\Models\Import as BaseImport;
 use Filament\Http\Responses\Auth\Contracts\LoginResponse;
 use Filament\Notifications\Livewire\Notifications;
 use Filament\Support\Assets\Js;
 use Filament\Support\Enums\Alignment;
 use Filament\Support\Facades\FilamentAsset;
+use Illuminate\Notifications\DatabaseNotification;
 use Illuminate\Support\ServiceProvider;
 
 class AppServiceProvider extends ServiceProvider
@@ -27,6 +33,13 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot(): void
     {
+        // Bind custom Import and Export models
+        $this->app->bind(BaseImport::class, Import::class);
+        $this->app->bind(BaseExport::class, Export::class);
+
+        // Bind custom Notification model
+        $this->app->bind(DatabaseNotification::class, Notification::class);
+
         Notifications::alignment(Alignment::Center);
 
         FilamentAsset::register([

app/Providers/Filament/CompanyPanelProvider.php

@@ -268,6 +268,11 @@ class CompanyPanelProvider extends PanelProvider
     {
         $this->configureSelect();
 
+        Forms\Components\FileUpload::configureUsing(function (Forms\Components\FileUpload $component): void {
+            $component
+                ->hidden(is_demo_environment());
+        });
+
         Actions\CreateAction::configureUsing(static fn (Actions\CreateAction $action) => FilamentComponentConfigurator::configureActionModals($action));
         Actions\EditAction::configureUsing(static fn (Actions\EditAction $action) => FilamentComponentConfigurator::configureActionModals($action));
         Actions\DeleteAction::configureUsing(static fn (Actions\DeleteAction $action) => FilamentComponentConfigurator::configureDeleteAction($action));

app/Providers/MacroServiceProvider.php

@@ -5,9 +5,7 @@ namespace App\Providers;
 use Akaunting\Money\Currency;
 use Akaunting\Money\Money;
 use App\Enums\Accounting\AdjustmentComputation;
-use App\Enums\Setting\DateFormat;
 use App\Models\Accounting\AccountSubtype;
-use App\Models\Setting\Localization;
 use App\Services\CompanySettingsService;
 use App\Utilities\Accounting\AccountCode;
 use App\Utilities\Currency\CurrencyAccessor;
@@ -173,24 +171,17 @@ class MacroServiceProvider extends ServiceProvider
         });
 
         TextColumn::macro('defaultDateFormat', function (): static {
-            $localization = Localization::firstOrFail();
+            $dateFormat = CompanySettingsService::getDefaultDateFormat();
 
-            $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
-            $timezone = $localization->timezone ?? Carbon::now()->timezoneName;
-
-            $this->date($dateFormat, $timezone);
+            $this->date($dateFormat);
 
             return $this;
         });
 
         DatePicker::macro('defaultDateFormat', function (): static {
-            $localization = Localization::firstOrFail();
-
-            $dateFormat = $localization->date_format->value ?? DateFormat::DEFAULT;
-            $timezone = $localization->timezone ?? Carbon::now()->timezoneName;
+            $dateFormat = CompanySettingsService::getDefaultDateFormat();
 
-            $this->displayFormat($dateFormat)
-                ->timezone($timezone);
+            $this->displayFormat($dateFormat);
 
             return $this;
         });
@@ -357,21 +348,32 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
+        // In your macro - simpler logic
         TextColumn::macro('asRelativeDay', function (?string $timezone = null): static {
             $this->formatStateUsing(function (TextColumn $column, mixed $state) use ($timezone) {
                 if (blank($state)) {
                     return null;
                 }
 
-                $date = Carbon::parse($state)
-                    ->setTimezone($timezone ?? $column->getTimezone());
+                $timezone ??= $column->getTimezone() ?? CompanySettingsService::getDefaultTimezone();
+
+                // Use shiftTimezone to shift UTC calendar date to the specified timezone
+                // Using setTimezone would convert which is wrong for calendar dates
+                $date = Carbon::parse($state)->shiftTimezone($timezone);
 
                 if ($date->isToday()) {
                     return 'Today';
+                } elseif ($date->isTomorrow()) {
+                    return 'Tomorrow';
+                } elseif ($date->isYesterday()) {
+                    return 'Yesterday';
                 }
 
                 return $date->diffForHumans([
                     'options' => CarbonInterface::ONE_DAY_WORDS,
+                    'skip' => ['month', 'week'], // Skip larger units, force days and years only
+                    'parts' => 2,
+                    'join' => ', ',
                 ]);
             });
 
@@ -384,15 +386,25 @@ class MacroServiceProvider extends ServiceProvider
                     return null;
                 }
 
-                $date = Carbon::parse($state)
-                    ->setTimezone($timezone ?? $entry->getTimezone());
+                $timezone ??= $entry->getTimezone() ?? CompanySettingsService::getDefaultTimezone();
+
+                // Use shiftTimezone to shift UTC calendar date to the specified timezone
+                // Using setTimezone would convert which is wrong for calendar dates
+                $date = Carbon::parse($state)->shiftTimezone($timezone);
 
                 if ($date->isToday()) {
                     return 'Today';
+                } elseif ($date->isTomorrow()) {
+                    return 'Tomorrow';
+                } elseif ($date->isYesterday()) {
+                    return 'Yesterday';
                 }
 
                 return $date->diffForHumans([
                     'options' => CarbonInterface::ONE_DAY_WORDS,
+                    'skip' => ['month', 'week'], // Skip larger units, force days and years only
+                    'parts' => 2,
+                    'join' => ', ',
                 ]);
             });
 
@@ -471,11 +483,11 @@ class MacroServiceProvider extends ServiceProvider
         });
 
         Carbon::macro('toDefaultDateFormat', function () {
-            $companyId = auth()->user()?->current_company_id;
-            $dateFormat = CompanySettingsService::getDefaultDateFormat($companyId);
-            $timezone = CompanySettingsService::getDefaultTimezone($companyId);
+            $dateFormat = CompanySettingsService::getDefaultDateFormat();
+
+            $this->format($dateFormat);
 
-            return $this->setTimezone($timezone)->format($dateFormat);
+            return $this;
         });
 
         ExportColumn::macro('money', function () {

app/Scopes/CurrentCompanyScope.php

@@ -16,19 +16,14 @@ class CurrentCompanyScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        $companyId = session('current_company_id');
-
-        if (! $companyId && app()->runningInConsole()) {
+        if (app()->runningInConsole()) {
             return;
         }
 
-        if (! $companyId && Auth::check() && Auth::user()->currentCompany) {
-            $companyId = Auth::user()->currentCompany->id;
-            session(['current_company_id' => $companyId]);
-        }
+        $companyId = session('current_company_id');
 
-        if (! $companyId) {
-            $companyId = Auth::user()->currentCompany->id;
+        if (! $companyId && ($user = Auth::user()) && ($companyId = $user->current_company_id)) {
+            session(['current_company_id' => $companyId]);
         }
 
         if ($companyId) {

app/Services/AccountService.php

@@ -372,12 +372,12 @@ class AccountService
     {
         $earliestDate = Transaction::min('posted_at');
 
-        return $earliestDate ?? today()->toDateTimeString();
+        return $earliestDate ?? company_today()->toDateTimeString();
     }
 
     public function getUnpaidClientInvoices(?string $asOfDate = null): Builder
     {
-        $asOfDate = $asOfDate ?? now()->toDateString();
+        $asOfDate = $asOfDate ?? company_today()->toDateString();
         $driver = DB::getDriverName();
 
         $datediff = $driver === 'pgsql'
@@ -400,7 +400,7 @@ class AccountService
 
     public function getUnpaidVendorBills(?string $asOfDate = null): Builder
     {
-        $asOfDate = $asOfDate ?? now()->toDateString();
+        $asOfDate = $asOfDate ?? company_today()->toDateString();
         $driver = DB::getDriverName();
 
         $datediff = $driver === 'pgsql'

app/Services/CompanySettingsService.php

@@ -14,6 +14,8 @@ class CompanySettingsService
 
     public static function getSettings(?int $companyId = null): array
     {
+        $companyId ??= session('current_company_id');
+
         if (! $companyId) {
             return self::getDefaultSettings();
         }

app/Services/ExportService.php

@@ -28,7 +28,7 @@ class ExportService
             $dateLabel = $formattedAsOfDate;
         }
 
-        $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
+        $timestamp = company_now()->format('Y-m-d_H-i-s');
 
         $filename = $company->name . ' ' . $report->getTitle() . ' ' . $dateLabel . ' ' . $timestamp . '.csv';
 
@@ -269,7 +269,7 @@ class ExportService
             $dateLabel = $formattedAsOfDate;
         }
 
-        $timestamp = Carbon::now()->format('Y-m-d_H-i-s');
+        $timestamp = company_now()->format('Y-m-d_H-i-s');
 
         $filename = $company->name . ' ' . $report->getTitle() . ' ' . $dateLabel . ' ' . $timestamp . '.pdf';
 

app/Support/ScheduleHandler.php

@@ -22,7 +22,7 @@ class ScheduleHandler
 
     public function __construct(Set $set, ?Get $get = null)
     {
-        $this->today = today()->toImmutable();
+        $this->today = company_today()->toImmutable();
         $this->set = $set;
         $this->get = $get;
     }

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.351.4",
+            "version": "3.351.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "19dfd2db0f6ce35e1947e8bff4d956614b4aaaaf"
+                "reference": "9506d7fdb3cb84f8d7b175c594db9993264814be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/19dfd2db0f6ce35e1947e8bff4d956614b4aaaaf",
-                "reference": "19dfd2db0f6ce35e1947e8bff4d956614b4aaaaf",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/9506d7fdb3cb84f8d7b175c594db9993264814be",
+                "reference": "9506d7fdb3cb84f8d7b175c594db9993264814be",
                 "shasum": ""
             },
             "require": {
@@ -588,9 +588,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.351.4"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.351.7"
             },
-            "time": "2025-07-22T18:12:04+00:00"
+            "time": "2025-07-25T18:06:34+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -3516,16 +3516,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.22.0",
+            "version": "v5.23.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "99d0fe750a7c68e5b60d8b1850de2554f3ea4072"
+                "reference": "e9e0fc83b9d8d71c8385a5da20e5b95ca6234cf5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/99d0fe750a7c68e5b60d8b1850de2554f3ea4072",
-                "reference": "99d0fe750a7c68e5b60d8b1850de2554f3ea4072",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/e9e0fc83b9d8d71c8385a5da20e5b95ca6234cf5",
+                "reference": "e9e0fc83b9d8d71c8385a5da20e5b95ca6234cf5",
                 "shasum": ""
             },
             "require": {
@@ -3584,7 +3584,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2025-07-08T22:07:57+00:00"
+            "time": "2025-07-23T14:16:08+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -4448,16 +4448,16 @@
         },
         {
             "name": "masterminds/html5",
-            "version": "2.9.0",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Masterminds/html5-php.git",
-                "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6"
+                "reference": "fcf91eb64359852f00d921887b219479b4f21251"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
-                "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6",
+                "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251",
+                "reference": "fcf91eb64359852f00d921887b219479b4f21251",
                 "shasum": ""
             },
             "require": {
@@ -4509,9 +4509,9 @@
             ],
             "support": {
                 "issues": "https://github.com/Masterminds/html5-php/issues",
-                "source": "https://github.com/Masterminds/html5-php/tree/2.9.0"
+                "source": "https://github.com/Masterminds/html5-php/tree/2.10.0"
             },
-            "time": "2024-03-31T07:05:07+00:00"
+            "time": "2025-07-25T09:04:22+00:00"
         },
         {
             "name": "matomo/device-detector",

database/migrations/2025_07_13_042000_add_company_id_to_notifications_table.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Clear existing notifications since we're adding company scoping
+        DB::table('notifications')->truncate();
+
+        Schema::table('notifications', function (Blueprint $table) {
+            $table->foreignId('company_id')
+                ->after('notifiable_id')
+                ->nullable()
+                ->constrained()
+                ->cascadeOnDelete();
+
+            $table->index(['company_id', 'created_at']);
+            $table->index(['company_id', 'notifiable_type', 'notifiable_id']);
+        });
+    }
+};

database/migrations/2025_07_13_043000_add_company_id_to_imports_exports_tables.php

@@ -0,0 +1,42 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        // Disable foreign key checks and clear existing data
+        DB::statement('SET FOREIGN_KEY_CHECKS=0;');
+        DB::table('failed_import_rows')->truncate();
+        DB::table('exports')->truncate();
+        DB::table('imports')->truncate();
+        DB::statement('SET FOREIGN_KEY_CHECKS=1;');
+
+        Schema::table('imports', function (Blueprint $table) {
+            $table->foreignId('company_id')
+                ->after('id')
+                ->nullable()
+                ->constrained()
+                ->cascadeOnDelete();
+
+            $table->index(['company_id', 'created_at']);
+        });
+
+        Schema::table('exports', function (Blueprint $table) {
+            $table->foreignId('company_id')
+                ->after('id')
+                ->nullable()
+                ->constrained()
+                ->cascadeOnDelete();
+
+            $table->index(['company_id', 'created_at']);
+        });
+    }
+};

package-lock.json

@@ -4,6 +4,7 @@
     "requires": true,
     "packages": {
         "": {
+            "name": "erpsaas",
             "devDependencies": {
                 "@tailwindcss/forms": "^0.5.9",
                 "@tailwindcss/typography": "^0.5.15",
@@ -1022,9 +1023,9 @@
             }
         },
         "node_modules/brace-expansion": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-            "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1483,15 +1484,16 @@
             }
         },
         "node_modules/form-data": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-            "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+            "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "asynckit": "^0.4.0",
                 "combined-stream": "^1.0.8",
                 "es-set-tostringtag": "^2.1.0",
+                "hasown": "^2.0.2",
                 "mime-types": "^2.1.12"
             },
             "engines": {

tests/Feature/Accounting/TransactionTest.php

@@ -233,7 +233,7 @@ it('can add an income or expense transaction', function (TransactionType $transa
     livewire(ListTransactions::class)
         ->mountAction($actionName)
         ->assertActionDataSet([
-            'posted_at' => today(),
+            'posted_at' => company_today()->toDateString(),
             'type' => $transactionType,
             'bank_account_id' => $defaultBankAccount->id,
             'amount' => '0.00',