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

Development 3.x

app/Concerns/HasTransactionAction.php

@@ -83,7 +83,6 @@ trait HasTransactionAction
             ->schema([
                 Forms\Components\DatePicker::make('posted_at')
                     ->label('Date')
-                    ->native()
                     ->required(),
                 Forms\Components\TextInput::make('description')
                     ->label('Description'),

app/DTO/ReportDTO.php

@@ -7,9 +7,6 @@ use Illuminate\Support\Carbon;
 class ReportDTO
 {
     public function __construct(
-        /**
-         * @var AccountCategoryDTO[]
-         */
         public array $categories,
         public ?AccountBalanceDTO $overallTotal = null,
         public ?AgingBucketDTO $agingSummary = null,

app/Factories/ReportDateFactory.php

@@ -29,24 +29,24 @@ class ReportDateFactory
 
     protected function buildReportDates(): void
     {
-        $fiscalYearStartDate = Carbon::parse($this->company->locale->fiscalYearStartDate())->startOfDay();
-        $fiscalYearEndDate = Carbon::parse($this->company->locale->fiscalYearEndDate())->endOfDay();
-        $defaultDateRange = 'FY-' . now()->year;
-        $defaultStartDate = $fiscalYearStartDate->startOfDay();
-        $defaultEndDate = $fiscalYearEndDate->isFuture() ? now()->endOfDay() : $fiscalYearEndDate->endOfDay();
+        $companyFyStartDate = Carbon::parse($this->company->locale->fiscalYearStartDate());
+        $companyFyEndDate = Carbon::parse($this->company->locale->fiscalYearEndDate())->endOfDay();
+        $dateRange = 'FY-' . company_today()->year;
+        $startDate = $companyFyStartDate->startOfDay();
+        $endDate = $companyFyEndDate->isFuture() ? company_today()->endOfDay() : $companyFyEndDate->endOfDay();
 
         // Calculate the earliest transaction date based on the company's transactions
-        $earliestTransactionDate = $this->company->transactions()->min('posted_at')
+        $earliestDate = $this->company->transactions()->min('posted_at')
             ? Carbon::parse($this->company->transactions()->min('posted_at'))->startOfDay()
-            : $defaultStartDate;
+            : $startDate;
 
         // Assign values to properties
-        $this->fiscalYearStartDate = $fiscalYearStartDate;
-        $this->fiscalYearEndDate = $fiscalYearEndDate;
-        $this->defaultDateRange = $defaultDateRange;
-        $this->defaultStartDate = $defaultStartDate;
-        $this->defaultEndDate = $defaultEndDate;
-        $this->earliestTransactionDate = $earliestTransactionDate;
+        $this->fiscalYearStartDate = $companyFyStartDate;
+        $this->fiscalYearEndDate = $companyFyEndDate;
+        $this->defaultDateRange = $dateRange;
+        $this->defaultStartDate = $startDate;
+        $this->defaultEndDate = $endDate;
+        $this->earliestTransactionDate = $earliestDate;
     }
 
     public function refresh(): self

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

@@ -10,7 +10,6 @@ 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;
@@ -81,10 +80,8 @@ class AdjustmentResource extends Resource
                     ->columns(),
                 Forms\Components\Section::make('Dates')
                     ->schema([
-                        Forms\Components\DateTimePicker::make('start_date')
-                            ->timezone(CompanySettingsService::getDefaultTimezone()),
+                        Forms\Components\DateTimePicker::make('start_date'),
                         Forms\Components\DateTimePicker::make('end_date')
-                            ->timezone(CompanySettingsService::getDefaultTimezone())
                             ->after('start_date'),
                     ])
                     ->columns()
@@ -195,7 +192,6 @@ 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')
@@ -255,7 +251,6 @@ 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/Pages/Concerns/HasDeferredFiltersForm.php

@@ -4,7 +4,6 @@ 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;
@@ -106,19 +105,6 @@ trait HasDeferredFiltersForm
         Arr::set($this->deferredFilters, $name, $value);
     }
 
-    protected function convertDatesToDateTimeString(array $filters): array
-    {
-        if (isset($filters['startDate'])) {
-            $filters['startDate'] = Carbon::parse($filters['startDate'])->startOfDay()->toDateTimeString();
-        }
-
-        if (isset($filters['endDate'])) {
-            $filters['endDate'] = Carbon::parse($filters['endDate'])->endOfDay()->toDateTimeString();
-        }
-
-        return $filters;
-    }
-
     protected function queryStringHasDeferredFiltersForm(): array
     {
         // Get the filter keys dynamically from the filters form
@@ -171,25 +157,9 @@ trait HasDeferredFiltersForm
         $flatFields = $this->getFiltersForm()->getFlatFields();
 
         foreach ($this->filters as $key => $value) {
-            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;
-                }
+            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();
             }
         }
     }

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

@@ -9,7 +9,6 @@ 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;
@@ -92,6 +91,7 @@ abstract class BaseReportPage extends Page
     {
         $flatFields = $this->getFiltersForm()->getFlatFields();
 
+        /** @var DateRangeSelect|null $dateRangeField */
         $dateRangeField = Arr::first($flatFields, static fn ($field) => $field instanceof DateRangeSelect);
 
         if (! $dateRangeField) {
@@ -122,7 +122,7 @@ abstract class BaseReportPage extends Page
         if ($endDateField && ! $startDateField) {
             $this->setFilterState('dateRange', $this->getDefaultDateRange());
             $defaultEndDate = Carbon::parse($this->fiscalYearEndDate);
-            $this->setFilterState($endDateField, $defaultEndDate->isFuture() ? now()->endOfDay()->toDateTimeString() : $defaultEndDate->endOfDay()->toDateTimeString());
+            $this->setFilterState($endDateField, $defaultEndDate->isFuture() ? company_today()->toDateString() : $defaultEndDate->toDateString());
 
             return;
         }
@@ -176,8 +176,8 @@ abstract class BaseReportPage extends Page
 
     public function setDateRange(Carbon $start, Carbon $end): void
     {
-        $this->setFilterState('startDate', $start->startOfDay()->toDateTimeString());
-        $this->setFilterState('endDate', $end->isFuture() ? now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
+        $this->setFilterState('startDate', $start->toDateString());
+        $this->setFilterState('endDate', $end->isFuture() ? company_today()->toDateString() : $end->toDateString());
     }
 
     public function getFormattedStartDate(): string
@@ -254,7 +254,6 @@ 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');
             });
@@ -265,7 +264,6 @@ 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/Forms/Components/CreateAdjustmentSelect.php

@@ -8,7 +8,6 @@ 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;
@@ -196,10 +195,8 @@ class CreateAdjustmentSelect extends Select
 
             Group::make()
                 ->schema([
-                    DateTimePicker::make('start_date')
-                        ->timezone(CompanySettingsService::getDefaultTimezone()),
+                    DateTimePicker::make('start_date'),
                     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 = company_now()->year;
+        $currentYear = company_today()->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 = company_now()->year;
+        $currentYear = company_today()->year;
         $diff = $currentYear - $year;
         $fiscalYearStart = Carbon::parse($this->fiscalYearStartDate)->subYears($diff);
         $quarterStart = $fiscalYearStart->copy()->addMonths(($quarter - 1) * 3);
@@ -130,11 +130,11 @@ class DateRangeSelect extends Select
     public function setDateRange(Carbon $start, Carbon $end, Set $set): void
     {
         if ($this->startDateField) {
-            $set($this->startDateField, $start->startOfDay()->toDateTimeString());
+            $set($this->startDateField, $start->toDateString());
         }
 
         if ($this->endDateField) {
-            $set($this->endDateField, $end->isFuture() ? company_now()->endOfDay()->toDateTimeString() : $end->endOfDay()->toDateTimeString());
+            $set($this->endDateField, $end->isFuture() ? company_today()->toDateString() : $end->toDateString());
         }
     }
 }

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

@@ -8,7 +8,6 @@ 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;
@@ -90,7 +89,6 @@ 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(company_today()->subDays(PlaidService::TRANSACTION_DAYS_REQUESTED)->toDateString())
                     ->maxDate(company_today()->toDateString()),

app/Models/Accounting/RecurringInvoice.php

@@ -22,7 +22,6 @@ 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;
@@ -508,7 +507,6 @@ class RecurringInvoice extends Document
                             ->softRequired()
                             ->live()
                             ->minDate(company_today())
-                            ->timezone(CompanySettingsService::getDefaultTimezone())
                             ->closeOnDateSelection()
                             ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state) {
                                 $handler = new ScheduleHandler($set, $get);
@@ -541,7 +539,6 @@ class RecurringInvoice extends Document
 
                             if ($endType?->isOn()) {
                                 $components[] = Forms\Components\DatePicker::make('end_date')
-                                    ->timezone(CompanySettingsService::getDefaultTimezone())
                                     ->live();
                             }
 

app/Models/Setting/Localization.php

@@ -104,7 +104,7 @@ class Localization extends Model
 
     public function getDateTimeFormatAttribute(): string
     {
-        return $this->date_format . ' ' . $this->time_format;
+        return $this->date_format->value . ' ' . $this->time_format->value;
     }
 
     public static function getAllLanguages(): array

app/Providers/Filament/CompanyPanelProvider.php

@@ -280,12 +280,11 @@ class CompanyPanelProvider extends PanelProvider
         Tables\Actions\CreateAction::configureUsing(static fn (Tables\Actions\CreateAction $action) => FilamentComponentConfigurator::configureActionModals($action));
         Tables\Actions\DeleteAction::configureUsing(static fn (Tables\Actions\DeleteAction $action) => FilamentComponentConfigurator::configureDeleteAction($action));
         Tables\Actions\DeleteBulkAction::configureUsing(static fn (Tables\Actions\DeleteBulkAction $action) => FilamentComponentConfigurator::configureDeleteAction($action));
-        Forms\Components\DateTimePicker::configureUsing(static function (Forms\Components\DateTimePicker $component) {
-            $component->native(false);
-        });
 
         Tables\Table::configureUsing(static function (Tables\Table $table): void {
-            $table::$defaultDateDisplayFormat = CompanySettingsService::getDefaultDateFormat(session('current_company_id') ?? auth()->user()->current_company_id);
+            $table::$defaultDateDisplayFormat = CompanySettingsService::getDefaultDateFormat();
+            $table::$defaultTimeDisplayFormat = CompanySettingsService::getDefaultTimeFormat();
+            $table::$defaultDateTimeDisplayFormat = CompanySettingsService::getDefaultDateTimeFormat();
 
             $table
                 ->paginationPageOptions([5, 10, 25, 50, 100])

app/Providers/MacroServiceProvider.php

@@ -355,7 +355,7 @@ class MacroServiceProvider extends ServiceProvider
                     return null;
                 }
 
-                $timezone ??= $column->getTimezone() ?? CompanySettingsService::getDefaultTimezone();
+                $timezone ??= CompanySettingsService::getDefaultTimezone();
 
                 // Use shiftTimezone to shift UTC calendar date to the specified timezone
                 // Using setTimezone would convert which is wrong for calendar dates
@@ -386,7 +386,7 @@ class MacroServiceProvider extends ServiceProvider
                     return null;
                 }
 
-                $timezone ??= $entry->getTimezone() ?? CompanySettingsService::getDefaultTimezone();
+                $timezone ??= CompanySettingsService::getDefaultTimezone();
 
                 // Use shiftTimezone to shift UTC calendar date to the specified timezone
                 // Using setTimezone would convert which is wrong for calendar dates
@@ -485,9 +485,21 @@ class MacroServiceProvider extends ServiceProvider
         Carbon::macro('toDefaultDateFormat', function () {
             $dateFormat = CompanySettingsService::getDefaultDateFormat();
 
-            $this->format($dateFormat);
+            return $this->format($dateFormat);
+        });
 
-            return $this;
+        Carbon::macro('toCompanyTimezone', function () {
+            $timezone = CompanySettingsService::getDefaultTimezone();
+
+            // This will convert the date to the company's timezone, possibly changing the date and time
+            return $this->setTimezone($timezone);
+        });
+
+        Carbon::macro('asCompanyTimezone', function () {
+            $timezone = CompanySettingsService::getDefaultTimezone();
+
+            // This will only change the timezone without converting the date and time
+            return $this->shiftTimezone($timezone);
         });
 
         ExportColumn::macro('money', function () {

app/Scopes/CurrentCompanyScope.php

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

app/Services/CompanySettingsService.php

@@ -3,6 +3,7 @@
 namespace App\Services;
 
 use App\Enums\Setting\DateFormat;
+use App\Enums\Setting\TimeFormat;
 use App\Enums\Setting\WeekStart;
 use App\Models\Company;
 use App\Models\Setting\Currency;
@@ -43,6 +44,7 @@ class CompanySettingsService
                 'default_timezone' => $company->locale->timezone ?? config('app.timezone'),
                 'default_currency' => $defaultCurrency,
                 'default_date_format' => $company->locale->date_format->value ?? DateFormat::DEFAULT,
+                'default_time_format' => $company->locale->time_format->value ?? TimeFormat::DEFAULT,
                 'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
             ];
         });
@@ -68,6 +70,7 @@ class CompanySettingsService
             'default_timezone' => config('app.timezone'),
             'default_currency' => 'USD',
             'default_date_format' => DateFormat::DEFAULT,
+            'default_time_format' => TimeFormat::DEFAULT,
             'default_week_start' => WeekStart::DEFAULT,
         ];
     }
@@ -103,4 +106,14 @@ class CompanySettingsService
     {
         return self::getSpecificSetting($companyId, 'default_week_start', WeekStart::DEFAULT);
     }
+
+    public static function getDefaultTimeFormat(?int $companyId = null): string
+    {
+        return self::getSpecificSetting($companyId, 'default_time_format', TimeFormat::DEFAULT);
+    }
+
+    public static function getDefaultDateTimeFormat(?int $companyId = null): string
+    {
+        return self::getDefaultDateFormat($companyId) . ' ' . self::getDefaultTimeFormat($companyId);
+    }
 }

app/Services/DateRangeService.php

@@ -29,7 +29,8 @@ class DateRangeService
     private function generateDateRangeOptions(): array
     {
         $earliestDate = Carbon::parse(Accounting::getEarliestTransactionDate());
-        $currentDate = now();
+        $currentDate = company_today();
+        $currentYear = $currentDate->year;
         $fiscalYearStartCurrent = Carbon::parse($this->fiscalYearStartDate);
 
         $options = [
@@ -46,7 +47,7 @@ class DateRangeService
         foreach ($period as $date) {
             $options['Fiscal Year']['FY-' . $date->year] = $date->year;
 
-            $fiscalYearStart = $fiscalYearStartCurrent->copy()->subYears($currentDate->year - $date->year);
+            $fiscalYearStart = $fiscalYearStartCurrent->copy()->subYears($currentYear - $date->year);
 
             for ($i = 0; $i < 4; $i++) {
                 $quarterNumber = $i + 1;
@@ -86,9 +87,9 @@ class DateRangeService
                     continue;
                 }
 
-                $expectedEnd = $expectedEnd->isFuture() ? now()->startOfDay() : $expectedEnd;
+                $expectedEnd = $expectedEnd->isFuture() ? company_today() : $expectedEnd;
 
-                if ($startDate->eq($expectedStart) && $endDate->eq($expectedEnd)) {
+                if ($startDate->isSameDay($expectedStart) && $endDate->isSameDay($expectedEnd)) {
                     return $key; // Return the matching range key (e.g., "FY-2024")
                 }
             }
@@ -99,17 +100,19 @@ class DateRangeService
 
     private function getExpectedDateRange(string $type, string $key): array
     {
+        $currentYear = company_today()->year;
+
         switch ($type) {
             case 'Fiscal Year':
                 $year = (int) substr($key, 3);
-                $start = Carbon::parse($this->fiscalYearStartDate)->subYears(now()->year - $year)->startOfDay();
-                $end = Carbon::parse($this->fiscalYearEndDate)->subYears(now()->year - $year)->startOfDay();
+                $start = Carbon::parse($this->fiscalYearStartDate)->subYears($currentYear - $year)->startOfDay();
+                $end = Carbon::parse($this->fiscalYearEndDate)->subYears($currentYear - $year)->startOfDay();
 
                 break;
 
             case 'Fiscal Quarter':
                 [$quarter, $year] = explode('-', substr($key, 3));
-                $start = Carbon::parse($this->fiscalYearStartDate)->subYears(now()->year - $year)->addMonths(($quarter - 1) * 3)->startOfDay();
+                $start = Carbon::parse($this->fiscalYearStartDate)->subYears($currentYear - $year)->addMonths(($quarter - 1) * 3)->startOfDay();
                 $end = $start->copy()->addMonths(3)->subDay()->startOfDay();
 
                 break;

app/Services/ReportService.php

@@ -38,9 +38,12 @@ class ReportService
     ) {}
 
     /**
-     * @param  class-string<BalanceFormattable>|null  $dtoClass
+     * @template T of BalanceFormattable
+     *
+     * @param  class-string<T>|null  $dtoClass
+     * @return T
      */
-    public function formatBalances(array $balances, ?string $dtoClass = null, bool $formatZeros = true): BalanceFormattable | array
+    public function formatBalances(array $balances, ?string $dtoClass = null, bool $formatZeros = true)
     {
         $dtoClass ??= AccountBalanceDTO::class;
 
@@ -52,10 +55,6 @@ class ReportService
             return CurrencyConverter::formatCentsToMoney($balance);
         }, $balances);
 
-        if (! $dtoClass) {
-            return $formattedBalances;
-        }
-
         return $dtoClass::fromArray($formattedBalances);
     }
 
@@ -355,7 +354,7 @@ class ReportService
         return new ReportDTO(categories: $accountCategories, overallTotal: $formattedReportTotalBalances, fields: $columns, reportType: $trialBalanceType);
     }
 
-    public function getRetainedEarningsBalances(string $startDate, string $endDate): BalanceFormattable | array
+    public function getRetainedEarningsBalances(string $startDate, string $endDate): AccountBalanceDTO
     {
         $retainedEarningsAmount = $this->calculateRetainedEarnings($startDate, $endDate)->getAmount();
 
@@ -498,7 +497,7 @@ class ReportService
         );
     }
 
-    private function calculateTotalCashFlows(array $sections, string $startDate): BalanceFormattable | array
+    private function calculateTotalCashFlows(array $sections, string $startDate): AccountBalanceDTO
     {
         $totalInflow = 0;
         $totalOutflow = 0;

resources/views/components/report-summary-section.blade.php

@@ -4,17 +4,27 @@
     'targetLabel' => null,
 ])
 
+@php
+    use App\Utilities\Currency\CurrencyAccessor;
+@endphp
+
 <div>
     <x-filament::section>
         @if($reportLoaded)
-            <div class="flex flex-col md:flex-row items-center md:items-end text-center justify-center gap-4 md:gap-8">
+            <div @class([
+                'grid grid-cols-1 gap-1 place-content-center items-end text-center max-w-fit mx-auto',
+                'md:grid-cols-[repeat(1,minmax(0,1fr)_minmax(0,4rem))_minmax(0,1fr)]' => count($summaryData) === 2,
+                'md:grid-cols-[repeat(2,minmax(0,1fr)_minmax(0,4rem))_minmax(0,1fr)]' => count($summaryData) === 3,
+                'md:grid-cols-[repeat(3,minmax(0,1fr)_minmax(0,4rem))_minmax(0,1fr)]' => count($summaryData) === 4,
+                'md:grid-cols-[repeat(4,minmax(0,1fr)_minmax(0,4rem))_minmax(0,1fr)]' => count($summaryData) === 5,
+            ])>
                 @foreach($summaryData as $summary)
                     <div class="text-sm">
                         <div class="text-gray-600 dark:text-gray-200 font-medium mb-2">{{ $summary['label'] }}</div>
 
                         @php
                             $isTargetLabel = $summary['label'] === $targetLabel;
-                            $isPositive = money($summary['value'], \App\Utilities\Currency\CurrencyAccessor::getDefaultCurrency())->isPositive();
+                            $isPositive = money($summary['value'], CurrencyAccessor::getDefaultCurrency())->isPositive();
                         @endphp
 
                         <strong
@@ -29,7 +39,7 @@
                     </div>
 
                     @if(! $loop->last)
-                        <div class="flex items-center justify-center px-2">
+                        <div class="flex items-center justify-center">
                             <strong class="text-lg">
                                 {{ $loop->remaining === 1 ? '=' : '-' }}
                             </strong>

resources/views/filament/company/pages/reports/balance-sheet.blade.php

@@ -1,14 +1,16 @@
 <x-filament-panels::page>
     <x-filament::section>
-        <div class="flex flex-col lg:flex-row items-start lg:items-end justify-between gap-4">
+        <div class="flex flex-col lg:flex-row items-start lg:items-end gap-4">
             <!-- Form Container -->
             @if(method_exists($this, 'filtersForm'))
-                {{ $this->filtersForm }}
+                <div class="flex-1 min-w-0">
+                    {{ $this->filtersForm }}
+                </div>
             @endif
 
             <!-- Grouping Button and Column Toggle -->
             @if($this->hasToggleableColumns())
-                <div class="lg:mb-1">
+                <div class="flex-shrink-0 lg:mb-1 mr-4">
                     <x-filament-tables::column-toggle.dropdown
                         :form="$this->getTableColumnToggleForm()"
                         :trigger-action="$this->getToggleColumnsTriggerAction()"
@@ -16,7 +18,7 @@
                 </div>
             @endif
 
-            <div class="inline-flex items-center min-w-0 lg:min-w-[9.5rem] justify-end">
+            <div class="flex-shrink-0 w-[9.5rem] flex justify-end">
                 {{ $this->applyFiltersAction }}
             </div>
         </div>

resources/views/filament/company/pages/reports/cash-flow-statement.blade.php

@@ -1,20 +1,24 @@
 <x-filament-panels::page>
     <x-filament::section>
-        <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4">
+        <div class="flex flex-col md:flex-row items-start md:items-center gap-4">
             <!-- Form Container -->
             @if(method_exists($this, 'filtersForm'))
-                {{ $this->filtersForm }}
+                <div class="flex-1 min-w-0">
+                    {{ $this->filtersForm }}
+                </div>
             @endif
 
             <!-- Grouping Button and Column Toggle -->
             @if($this->hasToggleableColumns())
-                <x-filament-tables::column-toggle.dropdown
-                    :form="$this->getTableColumnToggleForm()"
-                    :trigger-action="$this->getToggleColumnsTriggerAction()"
-                />
+                <div class="flex-shrink-0 mr-4">
+                    <x-filament-tables::column-toggle.dropdown
+                        :form="$this->getTableColumnToggleForm()"
+                        :trigger-action="$this->getToggleColumnsTriggerAction()"
+                    />
+                </div>
             @endif
 
-            <div class="inline-flex items-center min-w-0 md:min-w-[9.5rem] justify-end">
+            <div class="flex-shrink-0 w-[9.5rem] flex justify-end">
                 {{ $this->applyFiltersAction }}
             </div>
         </div>

resources/views/filament/company/pages/reports/detailed-report.blade.php

@@ -1,20 +1,24 @@
 <x-filament-panels::page>
     <x-filament::section>
-        <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4">
+        <div class="flex flex-col md:flex-row items-start md:items-center gap-4">
             <!-- Form Container -->
             @if(method_exists($this, 'filtersForm'))
-                {{ $this->filtersForm }}
+                <div class="flex-1 min-w-0">
+                    {{ $this->filtersForm }}
+                </div>
             @endif
 
             <!-- Grouping Button and Column Toggle -->
             @if($this->hasToggleableColumns())
-                <x-filament-tables::column-toggle.dropdown
-                    :form="$this->getTableColumnToggleForm()"
-                    :trigger-action="$this->getToggleColumnsTriggerAction()"
-                />
+                <div class="flex-shrink-0 mr-4">
+                    <x-filament-tables::column-toggle.dropdown
+                        :form="$this->getTableColumnToggleForm()"
+                        :trigger-action="$this->getToggleColumnsTriggerAction()"
+                    />
+                </div>
             @endif
 
-            <div class="inline-flex items-center min-w-0 md:min-w-[9.5rem] justify-end">
+            <div class="flex-shrink-0 w-[9.5rem] flex justify-end">
                 {{ $this->applyFiltersAction }}
             </div>
         </div>

resources/views/filament/company/pages/reports/income-statement.blade.php

@@ -1,20 +1,24 @@
 <x-filament-panels::page>
     <x-filament::section>
-        <div class="flex flex-col md:flex-row items-start md:items-center justify-between gap-4">
+        <div class="flex flex-col md:flex-row items-start md:items-center gap-4">
             <!-- Form Container -->
             @if(method_exists($this, 'filtersForm'))
-                {{ $this->filtersForm }}
+                <div class="flex-1 min-w-0">
+                    {{ $this->filtersForm }}
+                </div>
             @endif
 
             <!-- Grouping Button and Column Toggle -->
             @if($this->hasToggleableColumns())
-                <x-filament-tables::column-toggle.dropdown
-                    :form="$this->getTableColumnToggleForm()"
-                    :trigger-action="$this->getToggleColumnsTriggerAction()"
-                />
+                <div class="flex-shrink-0 mr-4">
+                    <x-filament-tables::column-toggle.dropdown
+                        :form="$this->getTableColumnToggleForm()"
+                        :trigger-action="$this->getToggleColumnsTriggerAction()"
+                    />
+                </div>
             @endif
 
-            <div class="inline-flex items-center min-w-0 md:min-w-[9.5rem] justify-end">
+            <div class="flex-shrink-0 w-[9.5rem] flex justify-end">
                 {{ $this->applyFiltersAction }}
             </div>
         </div>

resources/views/filament/company/pages/reports/trial-balance.blade.php

@@ -1,14 +1,16 @@
 <x-filament-panels::page>
     <x-filament::section>
-        <div class="flex flex-col lg:flex-row items-start lg:items-end justify-between gap-4">
+        <div class="flex flex-col lg:flex-row items-start lg:items-end gap-4">
             <!-- Form Container -->
             @if(method_exists($this, 'filtersForm'))
-                {{ $this->filtersForm }}
+                <div class="flex-1 min-w-0">
+                    {{ $this->filtersForm }}
+                </div>
             @endif
 
             <!-- Grouping Button and Column Toggle -->
             @if($this->hasToggleableColumns())
-                <div class="lg:mb-1">
+                <div class="flex-shrink-0 lg:mb-1 mr-4">
                     <x-filament-tables::column-toggle.dropdown
                         :form="$this->getTableColumnToggleForm()"
                         :trigger-action="$this->getToggleColumnsTriggerAction()"
@@ -16,7 +18,7 @@
                 </div>
             @endif
 
-            <div class="inline-flex items-center min-w-0 lg:min-w-[9.5rem] justify-end">
+            <div class="flex-shrink-0 w-[9.5rem] flex justify-end">
                 {{ $this->applyFiltersAction }}
             </div>
         </div>

tests/Feature/Accounting/TransactionTest.php

@@ -267,7 +267,7 @@ it('can add a transfer transaction', function () {
     livewire(ListTransactions::class)
         ->mountAction('createTransfer')
         ->assertActionDataSet([
-            'posted_at' => today(),
+            'posted_at' => company_today()->toDateString(),
             'type' => TransactionType::Transfer,
             'bank_account_id' => $sourceBankAccount->id,
             'amount' => '0.00',
@@ -300,7 +300,7 @@ it('can add a journal transaction', function () {
     livewire(ListTransactions::class)
         ->mountAction('createJournalEntry')
         ->assertActionDataSet([
-            'posted_at' => today(),
+            'posted_at' => company_today()->toDateString(),
             'journalEntries' => [
                 ['type' => JournalEntryType::Debit, 'account_id' => $defaultDebitAccount->id, 'amount' => '0.00'],
                 ['type' => JournalEntryType::Credit, 'account_id' => $defaultCreditAccount->id, 'amount' => '0.00'],

tests/Feature/Reports/AccountBalancesReportTest.php

@@ -54,8 +54,8 @@ it('correctly builds an account balances report for the current fiscal year', fu
     livewire(AccountBalances::class)
         ->assertFormSet([
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.startDate' => $defaultStartDate->toDateTimeString(),
-            'deferredFilters.endDate' => $defaultEndDate->toDateTimeString(),
+            'deferredFilters.startDate' => $defaultStartDate->toDateString(),
+            'deferredFilters.endDate' => $defaultEndDate->toDateString(),
         ])
         ->assertSet('filters', [
             'dateRange' => $defaultDateRange,
@@ -120,8 +120,8 @@ it('correctly builds an account balances report for the previous fiscal year', f
     livewire(AccountBalances::class)
         ->assertFormSet([
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.startDate' => $defaultStartDate->toDateTimeString(),
-            'deferredFilters.endDate' => $defaultEndDate->toDateTimeString(),
+            'deferredFilters.startDate' => $defaultStartDate->toDateString(),
+            'deferredFilters.endDate' => $defaultEndDate->toDateString(),
         ])
         ->assertSet('filters', [
             'dateRange' => $defaultDateRange,
@@ -129,8 +129,8 @@ it('correctly builds an account balances report for the previous fiscal year', f
             'endDate' => $defaultEndDate->toDateString(),
         ])
         ->set('deferredFilters', [
-            'startDate' => $defaultStartDate->subYear()->startOfYear()->toDateTimeString(),
-            'endDate' => $defaultEndDate->subYear()->endOfYear()->toDateTimeString(),
+            'startDate' => $defaultStartDate->subYear()->startOfYear()->toDateString(),
+            'endDate' => $defaultEndDate->subYear()->endOfYear()->toDateString(),
         ])
         ->call('applyFilters')
         ->assertSeeTextInOrder([

tests/Feature/Reports/TrialBalanceReportTest.php

@@ -60,7 +60,7 @@ it('correctly builds a standard trial balance report', function () {
         ->assertFormSet([
             'deferredFilters.reportType' => $defaultReportType,
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.asOfDate' => $defaultEndDate->toDateTimeString(),
+            'deferredFilters.asOfDate' => $defaultEndDate->toDateString(),
         ])
         ->assertSet('filters', [
             'reportType' => $defaultReportType,
@@ -125,7 +125,7 @@ it('correctly builds a post-closing trial balance report', function () {
 
     $formattedExpectedBalances = Reporting::formatBalances($calculatedTrialBalances);
 
-    $formattedRetainedEarningsBalances = Reporting::getRetainedEarningsBalances($earliestTransactionDate->toDateTimeString(), $defaultEndDate->toDateTimeString());
+    $formattedRetainedEarningsBalances = Reporting::getRetainedEarningsBalances($earliestTransactionDate->toDateString(), $defaultEndDate->toDateString());
 
     // Use Livewire to assert the report's filters and displayed data
     livewire(TrialBalance::class)
@@ -133,7 +133,7 @@ it('correctly builds a post-closing trial balance report', function () {
         ->assertFormSet([
             'deferredFilters.reportType' => $defaultReportType,
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.asOfDate' => $defaultEndDate->toDateTimeString(),
+            'deferredFilters.asOfDate' => $defaultEndDate->toDateString(),
         ])
         ->call('applyFilters')
         ->assertSet('filters', [