wip

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

@@ -28,7 +28,6 @@ use App\Models\Accounting\DocumentLineItem;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Offering;
 use App\Models\Common\Vendor;
-use App\Services\CompanySettingsService;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
@@ -89,8 +88,7 @@ class BillResource extends Resource
                                     Forms\Components\DatePicker::make('date')
                                         ->label('Bill date')
                                         ->live()
-                                        ->default(now())
-                                        ->timezone(CompanySettingsService::getDefaultTimezone())
+                                        ->default(company_today()->toDateString())
                                         ->disabled(function (?Bill $record) {
                                             return $record?->hasPayments();
                                         })
@@ -139,10 +137,9 @@ 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();
                                     })
-                                    ->timezone(CompanySettingsService::getDefaultTimezone())
                                     ->required()
                                     ->live()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
@@ -453,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,
                                 ]);
                             })
@@ -461,8 +458,7 @@ class BillResource extends Resource
                             ->successNotificationTitle('Payment recorded')
                             ->form([
                                 Forms\Components\DatePicker::make('posted_at')
-                                    ->label('Date')
-                                    ->timezone(CompanySettingsService::getDefaultTimezone()),
+                                    ->label('Date'),
                                 Forms\Components\Grid::make()
                                     ->schema([
                                         Forms\Components\Select::make('bank_account_id')

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

@@ -29,7 +29,6 @@ use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\Estimate;
 use App\Models\Common\Client;
 use App\Models\Common\Offering;
-use App\Services\CompanySettingsService;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
@@ -92,8 +91,7 @@ class EstimateResource extends Resource
                                     Forms\Components\DatePicker::make('date')
                                         ->label('Estimate date')
                                         ->live()
-                                        ->default(now())
-                                        ->timezone(CompanySettingsService::getDefaultTimezone())
+                                        ->default(company_today()->toDateString())
                                         ->columnSpan(2)
                                         ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
                                             $date = Carbon::parse($state)->toDateString();
@@ -139,11 +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();
                                     })
-                                    ->timezone(CompanySettingsService::getDefaultTimezone())
                                     ->minDate(static function (Forms\Get $get) {
-                                        return Carbon::parse($get('date'))->toDateString() ?? now(CompanySettingsService::getDefaultTimezone())->toDateString();
+                                        return Carbon::parse($get('date'))->toDateString() ?? company_today()->toDateString();
                                     })
                                     ->live()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {

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

@@ -29,7 +29,6 @@ use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\Invoice;
 use App\Models\Common\Client;
 use App\Models\Common\Offering;
-use App\Services\CompanySettingsService;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
@@ -96,8 +95,7 @@ class InvoiceResource extends Resource
                                     Forms\Components\DatePicker::make('date')
                                         ->label('Invoice date')
                                         ->live()
-                                        ->default(now())
-                                        ->timezone(CompanySettingsService::getDefaultTimezone())
+                                        ->default(company_today()->toDateString())
                                         ->disabled(function (?Invoice $record) {
                                             return $record?->hasPayments();
                                         })
@@ -147,11 +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();
                                     })
-                                    ->timezone(CompanySettingsService::getDefaultTimezone())
                                     ->minDate(static function (Forms\Get $get) {
-                                        return Carbon::parse($get('date'))->toDateString() ?? now(CompanySettingsService::getDefaultTimezone())->toDateString();
+                                        return Carbon::parse($get('date'))->toDateString() ?? company_today()->toDateString();
                                     })
                                     ->live()
                                     ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {

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/Providers/MacroServiceProvider.php

@@ -357,21 +357,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 +395,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' => ', ',
                 ]);
             });
 
@@ -473,9 +494,8 @@ class MacroServiceProvider extends ServiceProvider
         Carbon::macro('toDefaultDateFormat', function () {
             $companyId = auth()->user()?->current_company_id;
             $dateFormat = CompanySettingsService::getDefaultDateFormat($companyId);
-            $timezone = CompanySettingsService::getDefaultTimezone($companyId);
 
-            return $this->setTimezone($timezone)->format($dateFormat);
+            return $this->format($dateFormat);
         });
 
         ExportColumn::macro('money', function () {