wip

app/Concerns/ManagesLineItems.php

@@ -81,7 +81,7 @@ trait ManagesLineItems
 
     protected function updateDocumentTotals(Model $record, array $data): array
     {
-        $currencyCode = $data['currency_code'] ?? CurrencyAccessor::getDefaultCurrency();
+        $currencyCode = $data['currency_code'] ?? $record->currency_code ?? CurrencyAccessor::getDefaultCurrency();
         $subtotalCents = $record->lineItems()->sum('subtotal');
         $taxTotalCents = $record->lineItems()->sum('tax_total');
         $discountTotalCents = $this->calculateDiscountTotal(

app/DTO/ClientDTO.php

@@ -25,9 +25,31 @@ readonly class ClientDTO
             addressLine1: $address?->address_line_1 ?? '',
             addressLine2: $address?->address_line_2 ?? '',
             city: $address?->city ?? '',
-            state: $address?->state ?? '',
+            state: $address?->state?->name ?? '',
             postalCode: $address?->postal_code ?? '',
-            country: $address?->country ?? '',
+            country: $address?->country?->name ?? '',
         );
     }
+
+    public function getFormattedAddressHtml(): ?string
+    {
+        if (empty($this->addressLine1)) {
+            return null;
+        }
+
+        $lines = array_filter([
+            $this->addressLine1,
+            $this->addressLine2,
+            implode(', ', array_filter([
+                $this->city,
+                $this->state,
+                $this->postalCode,
+            ])),
+            $this->country,
+        ]);
+
+        return collect($lines)
+            ->map(static fn ($line) => "<p>{$line}</p>")
+            ->join('');
+    }
 }

app/DTO/CompanyDTO.php

@@ -8,24 +8,49 @@ readonly class CompanyDTO
 {
     public function __construct(
         public string $name,
-        public string $address,
+        public string $addressLine1,
+        public string $addressLine2,
         public string $city,
         public string $state,
-        public string $zipCode,
+        public string $postalCode,
         public string $country,
     ) {}
 
     public static function fromModel(Company $company): self
     {
         $profile = $company->profile;
+        $address = $profile->address ?? null;
 
         return new self(
             name: $company->name,
-            address: $profile->address ?? '',
-            city: $profile->city?->name ?? '',
-            state: $profile->state?->name ?? '',
-            zipCode: $profile->zip_code ?? '',
-            country: $profile->state?->country->name ?? '',
+            addressLine1: $address?->address_line_1 ?? '',
+            addressLine2: $address?->address_line_2 ?? '',
+            city: $address?->city ?? '',
+            state: $address?->state?->name ?? '',
+            postalCode: $address?->postal_code ?? '',
+            country: $address?->country?->name ?? '',
         );
     }
+
+    public function getFormattedAddressHtml(): ?string
+    {
+        if (empty($this->addressLine1)) {
+            return null;
+        }
+
+        $lines = array_filter([
+            $this->addressLine1,
+            $this->addressLine2,
+            implode(', ', array_filter([
+                $this->city,
+                $this->state,
+                $this->postalCode,
+            ])),
+            $this->country,
+        ]);
+
+        return collect($lines)
+            ->map(static fn ($line) => "<p>{$line}</p>")
+            ->join('');
+    }
 }

app/Enums/Accounting/DayOfMonth.php

@@ -100,4 +100,9 @@ enum DayOfMonth: int implements HasLabel
 
         return $date->day(min($this->value, $date->daysInMonth));
     }
+
+    public function mayExceedMonthLength(): bool
+    {
+        return $this->value > 28;
+    }
 }

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

@@ -5,9 +5,9 @@ namespace App\Filament\Company\Clusters\Settings\Pages;
 use App\Enums\Setting\EntityType;
 use App\Filament\Company\Clusters\Settings;
 use App\Filament\Forms\Components\AddressFields;
+use App\Filament\Forms\Components\Banner;
 use App\Models\Setting\CompanyProfile as CompanyProfileModel;
 use App\Utilities\Localization\Timezone;
-use CodeWithDennis\SimpleAlert\Components\Forms\SimpleAlert;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Component;
@@ -185,10 +185,8 @@ class CompanyProfile extends Page
 
     protected function getNeedsAddressCompletionAlert(): Component
     {
-        return SimpleAlert::make('needsAddressCompletion')
+        return Banner::make('needsAddressCompletion')
             ->warning()
-            ->border()
-            ->icon('heroicon-o-exclamation-triangle')
             ->title('Address Information Incomplete')
             ->description('Please complete the required address information for proper business operations.')
             ->visible(fn (CompanyProfileModel $record) => $record->address->isIncomplete())

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

@@ -130,7 +130,7 @@ class Localization extends Page
                 Select::make('timezone')
                     ->softRequired()
                     ->localizeLabel()
-                    ->options(Timezone::getTimezoneOptions(CompanyProfileModel::first()->address->country))
+                    ->options(Timezone::getTimezoneOptions(CompanyProfileModel::first()->address->country_code))
                     ->searchable(),
             ])->columns();
     }

app/Filament/Company/Resources/Sales/ClientResource/Pages/CreateClient.php

@@ -48,7 +48,7 @@ class CreateClient extends CreateRecord
                 'parent_address_id' => $billingAddress->id,
                 'address_line_1' => $billingAddress->address_line_1,
                 'address_line_2' => $billingAddress->address_line_2,
-                'country' => $billingAddress->country,
+                'country_code' => $billingAddress->country_code,
                 'state_id' => $billingAddress->state_id,
                 'city' => $billingAddress->city,
                 'postal_code' => $billingAddress->postal_code,
@@ -58,7 +58,7 @@ class CreateClient extends CreateRecord
                 ...$shippingAddress,
                 'address_line_1' => $shippingData['address_line_1'],
                 'address_line_2' => $shippingData['address_line_2'],
-                'country' => $shippingData['country'],
+                'country_code' => $shippingData['country_code'],
                 'state_id' => $shippingData['state_id'],
                 'city' => $shippingData['city'],
                 'postal_code' => $shippingData['postal_code'],

app/Filament/Company/Resources/Sales/ClientResource/Pages/EditClient.php

@@ -53,7 +53,7 @@ class EditClient extends EditRecord
                 'parent_address_id' => $billingAddress->id,
                 'address_line_1' => $billingAddress->address_line_1,
                 'address_line_2' => $billingAddress->address_line_2,
-                'country' => $billingAddress->country,
+                'country_code' => $billingAddress->country_code,
                 'state_id' => $billingAddress->state_id,
                 'city' => $billingAddress->city,
                 'postal_code' => $billingAddress->postal_code,
@@ -64,7 +64,7 @@ class EditClient extends EditRecord
                 'parent_address_id' => null,
                 'address_line_1' => $shippingData['address_line_1'],
                 'address_line_2' => $shippingData['address_line_2'],
-                'country' => $shippingData['country'],
+                'country_code' => $shippingData['country_code'],
                 'state_id' => $shippingData['state_id'],
                 'city' => $shippingData['city'],
                 'postal_code' => $shippingData['postal_code'],

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

@@ -115,7 +115,10 @@ class InvoiceResource extends Resource
                                             $set('currency_code', $currencyCode);
                                         }
                                     }),
-                                CreateCurrencySelect::make('currency_code'),
+                                CreateCurrencySelect::make('currency_code')
+                                    ->disabled(function (?Invoice $record) {
+                                        return $record?->hasPayments();
+                                    }),
                             ]),
                             Forms\Components\Group::make([
                                 Forms\Components\TextInput::make('invoice_number')

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

@@ -6,9 +6,11 @@ use App\Concerns\ManagesLineItems;
 use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
+use App\Models\Common\Client;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
 use Illuminate\Database\Eloquent\Model;
+use Livewire\Attributes\Url;
 
 class CreateInvoice extends CreateRecord
 {
@@ -17,14 +19,19 @@ class CreateInvoice extends CreateRecord
 
     protected static string $resource = InvoiceResource::class;
 
+    #[Url(as: 'client')]
+    public ?int $clientId = null;
+
     public function mount(): void
     {
         parent::mount();
 
-        $clientId = request()->query('client');
+        if ($this->clientId) {
+            $this->data['client_id'] = $this->clientId;
 
-        if ($clientId) {
-            $this->data['client_id'] = $clientId;
+            if ($currencyCode = Client::find($this->clientId)?->currency_code) {
+                $this->data['currency_code'] = $currencyCode;
+            }
         }
     }
 

app/Filament/Company/Resources/Sales/RecurringInvoiceResource/Pages/ViewRecurringInvoice.php

@@ -6,9 +6,9 @@ use App\Enums\Accounting\DocumentType;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Pages\ListInvoices;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
+use App\Filament\Infolists\Components\BannerEntry;
 use App\Filament\Infolists\Components\DocumentPreview;
 use App\Models\Accounting\RecurringInvoice;
-use CodeWithDennis\SimpleAlert\Components\Infolists\SimpleAlert;
 use Filament\Actions;
 use Filament\Infolists\Components\Actions\Action;
 use Filament\Infolists\Components\Grid;
@@ -54,10 +54,8 @@ class ViewRecurringInvoice extends ViewRecord
     {
         return $infolist
             ->schema([
-                SimpleAlert::make('scheduleIsNotSet')
+                BannerEntry::make('scheduleIsNotSet')
                     ->info()
-                    ->border()
-                    ->icon('heroicon-o-information-circle')
                     ->title('Schedule Not Set')
                     ->description('The schedule for this recurring invoice has not been set. You must set a schedule before you can approve this draft and start creating invoices.')
                     ->visible(fn (RecurringInvoice $record) => ! $record->hasValidStartDate())
@@ -66,7 +64,7 @@ class ViewRecurringInvoice extends ViewRecord
                         RecurringInvoice::getUpdateScheduleAction(Action::class)
                             ->outlined(),
                     ]),
-                SimpleAlert::make('readyToApprove')
+                BannerEntry::make('readyToApprove')
                     ->info()
                     ->title('Ready to Approve')
                     ->description('This recurring invoice is ready for approval. Review the details, and approve it when you’re ready to start generating invoices.')

app/Filament/Forms/Components/AddressFields.php

@@ -22,7 +22,7 @@ class AddressFields extends Grid
             TextInput::make('address_line_2')
                 ->label('Address Line 2')
                 ->maxLength(255),
-            CountrySelect::make('country')
+            CountrySelect::make('country_code')
                 ->clearStateField()
                 ->required(),
             StateSelect::make('state_id'),

app/Filament/Forms/Components/Banner.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use CodeWithDennis\SimpleAlert\Components\Forms\SimpleAlert;
+
+class Banner extends SimpleAlert
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->border();
+    }
+
+    public function danger(): static
+    {
+        $this->color = 'danger';
+        $this->icon = 'heroicon-o-x-circle';
+
+        return $this;
+    }
+
+    public function info(): static
+    {
+        $this->color = 'info';
+        $this->icon = 'heroicon-o-information-circle';
+
+        return $this;
+    }
+
+    public function success(): static
+    {
+        $this->color = 'success';
+        $this->icon = 'heroicon-o-check-circle';
+
+        return $this;
+    }
+
+    public function warning(): static
+    {
+        $this->color = 'warning';
+        $this->icon = 'heroicon-o-exclamation-triangle';
+
+        return $this;
+    }
+}

app/Filament/Forms/Components/StateSelect.php

@@ -15,6 +15,9 @@ class StateSelect extends Select
         $this
             ->localizeLabel('State / Province')
             ->searchable()
-            ->options(static fn (Get $get) => State::getStateOptions($get('country')));
+            ->options(static fn (Get $get) => State::getStateOptions($get('country_code')))
+            ->getSearchResultsUsing(static function (string $search, Get $get): array {
+                return State::getSearchResultsUsing($search, $get('country_code'));
+            });
     }
 }

app/Filament/Infolists/Components/BannerEntry.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Filament\Infolists\Components;
+
+use CodeWithDennis\SimpleAlert\Components\Infolists\SimpleAlert;
+
+class BannerEntry extends SimpleAlert
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->border();
+    }
+
+    public function danger(): static
+    {
+        $this->color = 'danger';
+        $this->icon = 'heroicon-o-x-circle';
+
+        return $this;
+    }
+
+    public function info(): static
+    {
+        $this->color = 'info';
+        $this->icon = 'heroicon-o-information-circle';
+
+        return $this;
+    }
+
+    public function success(): static
+    {
+        $this->color = 'success';
+        $this->icon = 'heroicon-o-check-circle';
+
+        return $this;
+    }
+
+    public function warning(): static
+    {
+        $this->color = 'warning';
+        $this->icon = 'heroicon-o-exclamation-triangle';
+
+        return $this;
+    }
+}

app/Models/Accounting/RecurringInvoice.php

@@ -17,13 +17,13 @@ use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\Month;
 use App\Enums\Accounting\RecurringInvoiceStatus;
 use App\Enums\Setting\PaymentTerms;
+use App\Filament\Forms\Components\Banner;
 use App\Filament\Forms\Components\CustomSection;
 use App\Models\Common\Client;
 use App\Models\Setting\CompanyProfile;
 use App\Observers\RecurringInvoiceObserver;
 use App\Support\ScheduleHandler;
 use App\Utilities\Localization\Timezone;
-use CodeWithDennis\SimpleAlert\Components\Forms\SimpleAlert;
 use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
 use Filament\Forms;
@@ -311,19 +311,25 @@ class RecurringInvoice extends Document
         return $nextDate;
     }
 
-    public function calculateNextWeeklyDate(Carbon $lastDate): ?Carbon
+    public function calculateNextWeeklyDate(Carbon $lastDate, int $interval = 1): ?Carbon
     {
-        return $lastDate->copy()->next($this->day_of_week->name);
+        return $lastDate->copy()
+            ->addWeeks($interval - 1)
+            ->next($this->day_of_week->value);
     }
 
-    public function calculateNextMonthlyDate(Carbon $lastDate): ?Carbon
+    public function calculateNextMonthlyDate(Carbon $lastDate, int $interval = 1): ?Carbon
     {
-        return $this->day_of_month->resolveDate($lastDate->copy()->addMonth());
+        return $this->day_of_month->resolveDate(
+            $lastDate->copy()->addMonthsNoOverflow($interval)
+        );
     }
 
-    public function calculateNextYearlyDate(Carbon $lastDate): ?Carbon
+    public function calculateNextYearlyDate(Carbon $lastDate, int $interval = 1): ?Carbon
     {
-        return $this->day_of_month->resolveDate($lastDate->copy()->addYear()->month($this->month->value));
+        return $this->day_of_month->resolveDate(
+            $lastDate->copy()->addYears($interval)->month($this->month->value)
+        );
     }
 
     protected function calculateCustomNextDate(Carbon $lastDate): ?Carbon
@@ -333,11 +339,11 @@ class RecurringInvoice extends Document
         return match ($this->interval_type) {
             IntervalType::Day => $lastDate->copy()->addDays($interval),
 
-            IntervalType::Week => $lastDate->copy()->addWeeks($interval),
+            IntervalType::Week => $this->calculateNextWeeklyDate($lastDate, $interval),
 
-            IntervalType::Month => $this->day_of_month->resolveDate($lastDate->copy()->addMonths($interval)),
+            IntervalType::Month => $this->calculateNextMonthlyDate($lastDate, $interval),
 
-            IntervalType::Year => $this->day_of_month->resolveDate($lastDate->copy()->addYears($interval)->month($this->month->value)),
+            IntervalType::Year => $this->calculateNextYearlyDate($lastDate, $interval),
 
             default => null
         };
@@ -408,7 +414,6 @@ class RecurringInvoice extends Document
                                     $handler->handleFrequencyChange($state);
                                 }),
 
-                            // Custom frequency fields in a nested grid
                             Cluster::make([
                                 Forms\Components\TextInput::make('interval_value')
                                     ->softRequired()
@@ -430,7 +435,6 @@ class RecurringInvoice extends Document
                                 ->markAsRequired(false)
                                 ->visible($frequency->isCustom()),
 
-                            // Specific schedule details
                             Forms\Components\Select::make('month')
                                 ->label('Month')
                                 ->options(Month::class)
@@ -463,18 +467,19 @@ class RecurringInvoice extends Document
                                     $handler->handleDateChange('day_of_month', $state);
                                 }),
 
-                            SimpleAlert::make('dayOfMonthNotice')
-                                ->title(function () use ($dayOfMonth) {
-                                    return "The invoice will be created on the {$dayOfMonth->getLabel()} day of each month, or on the last day for months ending earlier.";
+                            Banner::make('dayOfMonthNotice')
+                                ->info()
+                                ->title(static function () use ($dayOfMonth) {
+                                    return "For months with fewer than {$dayOfMonth->value} days, the last day of the month will be used.";
                                 })
                                 ->columnSpanFull()
-                                ->visible($dayOfMonth?->value > 28),
+                                ->visible($dayOfMonth?->mayExceedMonthLength() && ($frequency->isMonthly() || $intervalType?->isMonth())),
 
                             Forms\Components\Select::make('day_of_week')
                                 ->label('Day of Week')
                                 ->options(DayOfWeek::class)
                                 ->softRequired()
-                                ->visible($frequency->isWeekly() || $intervalType?->isWeek())
+                                ->visible(($frequency->isWeekly() || $intervalType?->isWeek()) ?? false)
                                 ->live()
                                 ->afterStateUpdated(function (Forms\Set $set, $state) {
                                     $handler = new ScheduleHandler($set);

app/Models/Common/Address.php

@@ -33,7 +33,7 @@ class Address extends Model
         'city',
         'state_id',
         'postal_code',
-        'country',
+        'country_code',
         'notes',
         'created_by',
         'updated_by',
@@ -60,7 +60,7 @@ class Address extends Model
 
     public function country(): BelongsTo
     {
-        return $this->belongsTo(Country::class, 'country', 'id');
+        return $this->belongsTo(Country::class, 'country_code', 'id');
     }
 
     public function state(): BelongsTo
@@ -80,7 +80,7 @@ class Address extends Model
                 implode(', ', $street), // Street 1 & 2 on same line if both exist
                 implode(', ', array_filter([
                     $this->city,
-                    $this->state->state_code,
+                    $this->state->name,
                     $this->postal_code,
                 ])),
             ]);

app/Models/Locale/Country.php

@@ -51,7 +51,7 @@ class Country extends Model
 
     public function addresses(): HasMany
     {
-        return $this->hasMany(Address::class, 'country', 'id');
+        return $this->hasMany(Address::class, 'country_code', 'id');
     }
 
     public function states(): HasMany
@@ -101,8 +101,10 @@ class Country extends Model
     {
         return self::query()
             ->select(['id', 'name', 'flag'])
-            ->whereLike('name', "%{$search}%")
-            ->orWhereLike('id', "%{$search}%")
+            ->where(static function ($query) use ($search) {
+                $query->whereLike('name', "%{$search}%")
+                    ->orWhereLike('id', "%{$search}%");
+            })
             ->orderByRaw('
                 CASE
                     WHEN id = ? THEN 1
@@ -113,7 +115,7 @@ class Country extends Model
             ', [$search, $search . '%', $search . '%'])
             ->limit(50)
             ->get()
-            ->mapWithKeys(static fn ($country) => [
+            ->mapWithKeys(static fn (self $country) => [
                 $country->id => $country->name . ' ' . $country->flag,
             ])
             ->toArray();
@@ -121,7 +123,7 @@ class Country extends Model
 
     public static function getLanguagesByCountryCode(?string $code = null): array
     {
-        if ($code === null) {
+        if (! $code) {
             return Locales::getNames();
         }
 

app/Models/Locale/State.php

@@ -4,7 +4,6 @@ namespace App\Models\Locale;
 
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Support\Collection;
 use Squire\Model;
 
 /**
@@ -28,13 +27,44 @@ class State extends Model
         'longitude' => 'float',
     ];
 
-    public static function getStateOptions(?string $code = null): Collection
+    public static function getStateOptions(?string $code = null): array
     {
-        if ($code === null) {
-            return collect();
+        if (! $code) {
+            return [];
         }
 
-        return self::where('country_id', $code)->get()->pluck('name', 'id');
+        return self::query()
+            ->where('country_id', $code)
+            ->orderBy('name')
+            ->get()
+            ->pluck('name', 'id')
+            ->toArray();
+    }
+
+    public static function getSearchResultsUsing(string $search, ?string $countryCode = null): array
+    {
+        if (! $countryCode) {
+            return [];
+        }
+
+        return self::query()
+            ->where('country_id', $countryCode)
+            ->where(static function ($query) use ($search) {
+                $query->whereLike('name', "%{$search}%")
+                    ->orWhereLike('state_code', "%{$search}%");
+            })
+            ->orderByRaw('
+                CASE
+                    WHEN state_code = ? THEN 1
+                    WHEN state_code LIKE ? THEN 2
+                    WHEN name LIKE ? THEN 3
+                    ELSE 4
+                END
+            ', [$search, $search . '%', $search . '%'])
+            ->limit(50)
+            ->get()
+            ->pluck('name', 'id')
+            ->toArray();
     }
 
     public function country(): BelongsTo

app/Providers/MacroServiceProvider.php

@@ -211,12 +211,19 @@ class MacroServiceProvider extends ServiceProvider
                 }
 
                 $currency = $column->evaluate($currency);
+                $showCurrency = $currency !== CurrencyAccessor::getDefaultCurrency();
 
                 if ($convertFromCents) {
-                    return CurrencyConverter::formatCentsToMoney($state, $currency);
+                    $balanceInCents = $state;
+                } else {
+                    $balanceInCents = CurrencyConverter::convertToCents($state, $currency);
                 }
 
-                return CurrencyConverter::formatToMoney($state, $currency);
+                if ($balanceInCents < 0) {
+                    return '(' . CurrencyConverter::formatCentsToMoney(abs($balanceInCents), $currency, $showCurrency) . ')';
+                }
+
+                return CurrencyConverter::formatCentsToMoney($balanceInCents, $currency, $showCurrency);
             });
 
             $this->description(static function (TextColumn $column, $state) use ($currency, $convertFromCents): ?string {
@@ -239,6 +246,10 @@ class MacroServiceProvider extends ServiceProvider
 
                 $convertedBalanceInCents = CurrencyConverter::convertBalance($balanceInCents, $oldCurrency, $newCurrency);
 
+                if ($convertedBalanceInCents < 0) {
+                    return '(' . CurrencyConverter::formatCentsToMoney(abs($convertedBalanceInCents), $newCurrency, true) . ')';
+                }
+
                 return CurrencyConverter::formatCentsToMoney($convertedBalanceInCents, $newCurrency, true);
             });
 

app/Utilities/Currency/CurrencyConverter.php

@@ -62,11 +62,17 @@ class CurrencyConverter
         return $money->format();
     }
 
-    public static function formatToMoney(string | float $amount, ?string $currency = null): string
+    public static function formatToMoney(string | float $amount, ?string $currency = null, bool $withCode = false): string
     {
         $currency ??= CurrencyAccessor::getDefaultCurrency();
 
-        return money($amount, $currency, true)->format();
+        $money = money($amount, $currency, true);
+
+        if ($withCode) {
+            return $money->formatWithCode();
+        }
+
+        return $money->format();
     }
 
     public static function convertCentsToFloat(int $amount, ?string $currency = null): float

composer.lock

@@ -1029,16 +1029,16 @@
         },
         {
             "name": "codewithdennis/filament-simple-alert",
-            "version": "v3.0.15",
+            "version": "v3.0.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/CodeWithDennis/filament-simple-alert.git",
-                "reference": "8fd7dfa48bb98061bcc3f5fbaacb82dce7a09c7b"
+                "reference": "f29677d3a0d2b6fd9b1c3627152cd0107d2db337"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/CodeWithDennis/filament-simple-alert/zipball/8fd7dfa48bb98061bcc3f5fbaacb82dce7a09c7b",
-                "reference": "8fd7dfa48bb98061bcc3f5fbaacb82dce7a09c7b",
+                "url": "https://api.github.com/repos/CodeWithDennis/filament-simple-alert/zipball/f29677d3a0d2b6fd9b1c3627152cd0107d2db337",
+                "reference": "f29677d3a0d2b6fd9b1c3627152cd0107d2db337",
                 "shasum": ""
             },
             "require": {
@@ -1098,7 +1098,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-03T16:17:47+00:00"
+            "time": "2025-01-19T17:37:34+00:00"
         },
         {
             "name": "danharrin/date-format-converter",
@@ -10149,16 +10149,16 @@
         },
         {
             "name": "pestphp/pest",
-            "version": "v3.7.1",
+            "version": "v3.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pestphp/pest.git",
-                "reference": "bf3178473dcaa53b0458f21dfdb271306ea62512"
+                "reference": "709ecb1ba2641fc0c4653ebe1fd8a402bbf4d18b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/bf3178473dcaa53b0458f21dfdb271306ea62512",
-                "reference": "bf3178473dcaa53b0458f21dfdb271306ea62512",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/709ecb1ba2641fc0c4653ebe1fd8a402bbf4d18b",
+                "reference": "709ecb1ba2641fc0c4653ebe1fd8a402bbf4d18b",
                 "shasum": ""
             },
             "require": {
@@ -10169,17 +10169,17 @@
                 "pestphp/pest-plugin-arch": "^3.0.0",
                 "pestphp/pest-plugin-mutate": "^3.0.5",
                 "php": "^8.2.0",
-                "phpunit/phpunit": "^11.5.1"
+                "phpunit/phpunit": "^11.5.3"
             },
             "conflict": {
                 "filp/whoops": "<2.16.0",
-                "phpunit/phpunit": ">11.5.1",
+                "phpunit/phpunit": ">11.5.3",
                 "sebastian/exporter": "<6.0.0",
                 "webmozart/assert": "<1.11.0"
             },
             "require-dev": {
                 "pestphp/pest-dev-tools": "^3.3.0",
-                "pestphp/pest-plugin-type-coverage": "^3.2.0",
+                "pestphp/pest-plugin-type-coverage": "^3.2.3",
                 "symfony/process": "^7.2.0"
             },
             "bin": [
@@ -10245,7 +10245,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v3.7.1"
+                "source": "https://github.com/pestphp/pest/tree/v3.7.2"
             },
             "funding": [
                 {
@@ -10257,7 +10257,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-12T11:52:01+00:00"
+            "time": "2025-01-19T17:35:09+00:00"
         },
         {
             "name": "pestphp/pest-plugin",
@@ -11202,16 +11202,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.5.1",
+            "version": "11.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "2b94d4f2450b9869fa64a46fd8a6a41997aef56a"
+                "reference": "30e319e578a7b5da3543073e30002bf82042f701"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2b94d4f2450b9869fa64a46fd8a6a41997aef56a",
-                "reference": "2b94d4f2450b9869fa64a46fd8a6a41997aef56a",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/30e319e578a7b5da3543073e30002bf82042f701",
+                "reference": "30e319e578a7b5da3543073e30002bf82042f701",
                 "shasum": ""
             },
             "require": {
@@ -11225,14 +11225,14 @@
                 "phar-io/manifest": "^2.0.4",
                 "phar-io/version": "^3.2.1",
                 "php": ">=8.2",
-                "phpunit/php-code-coverage": "^11.0.7",
+                "phpunit/php-code-coverage": "^11.0.8",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-invoker": "^5.0.1",
                 "phpunit/php-text-template": "^4.0.1",
                 "phpunit/php-timer": "^7.0.1",
                 "sebastian/cli-parser": "^3.0.2",
-                "sebastian/code-unit": "^3.0.1",
-                "sebastian/comparator": "^6.2.1",
+                "sebastian/code-unit": "^3.0.2",
+                "sebastian/comparator": "^6.3.0",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.0",
                 "sebastian/exporter": "^6.3.0",
@@ -11283,7 +11283,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.1"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.3"
             },
             "funding": [
                 {
@@ -11299,7 +11299,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-11T10:52:48+00:00"
+            "time": "2025-01-13T09:36:00+00:00"
         },
         {
             "name": "pimple/pimple",

database/factories/Accounting/RecurringInvoiceFactory.php

@@ -90,7 +90,7 @@ class RecurringInvoiceFactory extends Factory
         });
     }
 
-    protected function withDailySchedule(Carbon $startDate, EndType $endType): static
+    public function withDailySchedule(Carbon $startDate, EndType $endType): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
             $this->ensureLineItems($recurringInvoice);
@@ -103,7 +103,7 @@ class RecurringInvoiceFactory extends Factory
         });
     }
 
-    protected function withWeeklySchedule(Carbon $startDate, EndType $endType): static
+    public function withWeeklySchedule(Carbon $startDate, EndType $endType): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
             $this->ensureLineItems($recurringInvoice);
@@ -117,7 +117,7 @@ class RecurringInvoiceFactory extends Factory
         });
     }
 
-    protected function withMonthlySchedule(Carbon $startDate, EndType $endType): static
+    public function withMonthlySchedule(Carbon $startDate, EndType $endType): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
             $this->ensureLineItems($recurringInvoice);
@@ -131,7 +131,7 @@ class RecurringInvoiceFactory extends Factory
         });
     }
 
-    protected function withYearlySchedule(Carbon $startDate, EndType $endType): static
+    public function withYearlySchedule(Carbon $startDate, EndType $endType): static
     {
         return $this->afterCreating(function (RecurringInvoice $recurringInvoice) use ($startDate, $endType) {
             $this->ensureLineItems($recurringInvoice);
@@ -146,7 +146,7 @@ class RecurringInvoiceFactory extends Factory
         });
     }
 
-    protected function withCustomSchedule(
+    public function withCustomSchedule(
         Carbon $startDate,
         EndType $endType,
         ?IntervalType $intervalType = null,

database/factories/Common/AddressFactory.php

@@ -33,7 +33,7 @@ class AddressFactory extends Factory
             'city' => $this->faker->city,
             'state_id' => $this->faker->state('US'),
             'postal_code' => $this->faker->postcode,
-            'country' => 'US',
+            'country_code' => 'US',
             'notes' => $this->faker->sentence,
             'created_by' => 1,
             'updated_by' => 1,

database/factories/CompanyFactory.php

@@ -52,7 +52,7 @@ class CompanyFactory extends Factory
     public function withCompanyDefaults(): self
     {
         return $this->afterCreating(function (Company $company) {
-            $countryCode = $company->profile->address->country;
+            $countryCode = $company->profile->address->country_code;
             $companyDefaultService = app(CompanyDefaultService::class);
             $companyDefaultService->createCompanyDefaults($company, $company->owner, 'USD', $countryCode, 'en');
         });

database/migrations/2024_11_19_225812_create_addresses_table.php

@@ -24,7 +24,7 @@ return new class extends Migration
             $table->string('city')->nullable();
             $table->smallInteger('state_id')->nullable();
             $table->string('postal_code')->nullable();
-            $table->string('country');
+            $table->string('country_code');
             $table->text('notes')->nullable();
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();

package-lock.json

@@ -575,9 +575,9 @@
             }
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.30.1.tgz",
-            "integrity": "sha512-pSWY+EVt3rJ9fQ3IqlrEUtXh3cGqGtPDH1FQlNZehO2yYxCHEX1SPsz1M//NXwYfbTlcKr9WObLnJX9FsS9K1Q==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz",
+            "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==",
             "cpu": [
                 "arm"
             ],
@@ -589,9 +589,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.30.1.tgz",
-            "integrity": "sha512-/NA2qXxE3D/BRjOJM8wQblmArQq1YoBVJjrjoTSBS09jgUisq7bqxNHJ8kjCHeV21W/9WDGwJEWSN0KQ2mtD/w==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz",
+            "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==",
             "cpu": [
                 "arm64"
             ],
@@ -603,9 +603,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.30.1.tgz",
-            "integrity": "sha512-r7FQIXD7gB0WJ5mokTUgUWPl0eYIH0wnxqeSAhuIwvnnpjdVB8cRRClyKLQr7lgzjctkbp5KmswWszlwYln03Q==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
+            "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
             "cpu": [
                 "arm64"
             ],
@@ -617,9 +617,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.30.1.tgz",
-            "integrity": "sha512-x78BavIwSH6sqfP2xeI1hd1GpHL8J4W2BXcVM/5KYKoAD3nNsfitQhvWSw+TFtQTLZ9OmlF+FEInEHyubut2OA==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz",
+            "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==",
             "cpu": [
                 "x64"
             ],
@@ -631,9 +631,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.30.1.tgz",
-            "integrity": "sha512-HYTlUAjbO1z8ywxsDFWADfTRfTIIy/oUlfIDmlHYmjUP2QRDTzBuWXc9O4CXM+bo9qfiCclmHk1x4ogBjOUpUQ==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
+            "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
             "cpu": [
                 "arm64"
             ],
@@ -645,9 +645,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.30.1.tgz",
-            "integrity": "sha512-1MEdGqogQLccphhX5myCJqeGNYTNcmTyaic9S7CG3JhwuIByJ7J05vGbZxsizQthP1xpVx7kd3o31eOogfEirw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
+            "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
             "cpu": [
                 "x64"
             ],
@@ -659,9 +659,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.30.1.tgz",
-            "integrity": "sha512-PaMRNBSqCx7K3Wc9QZkFx5+CX27WFpAMxJNiYGAXfmMIKC7jstlr32UhTgK6T07OtqR+wYlWm9IxzennjnvdJg==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz",
+            "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==",
             "cpu": [
                 "arm"
             ],
@@ -673,9 +673,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.30.1.tgz",
-            "integrity": "sha512-B8Rcyj9AV7ZlEFqvB5BubG5iO6ANDsRKlhIxySXcF1axXYUyqwBok+XZPgIYGBgs7LDXfWfifxhw0Ik57T0Yug==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz",
+            "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==",
             "cpu": [
                 "arm"
             ],
@@ -687,9 +687,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.30.1.tgz",
-            "integrity": "sha512-hqVyueGxAj3cBKrAI4aFHLV+h0Lv5VgWZs9CUGqr1z0fZtlADVV1YPOij6AhcK5An33EXaxnDLmJdQikcn5NEw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz",
+            "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==",
             "cpu": [
                 "arm64"
             ],
@@ -701,9 +701,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.30.1.tgz",
-            "integrity": "sha512-i4Ab2vnvS1AE1PyOIGp2kXni69gU2DAUVt6FSXeIqUCPIR3ZlheMW3oP2JkukDfu3PsexYRbOiJrY+yVNSk9oA==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz",
+            "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==",
             "cpu": [
                 "arm64"
             ],
@@ -715,9 +715,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.30.1.tgz",
-            "integrity": "sha512-fARcF5g296snX0oLGkVxPmysetwUk2zmHcca+e9ObOovBR++9ZPOhqFUM61UUZ2EYpXVPN1redgqVoBB34nTpQ==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz",
+            "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==",
             "cpu": [
                 "loong64"
             ],
@@ -729,9 +729,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.30.1.tgz",
-            "integrity": "sha512-GLrZraoO3wVT4uFXh67ElpwQY0DIygxdv0BNW9Hkm3X34wu+BkqrDrkcsIapAY+N2ATEbvak0XQ9gxZtCIA5Rw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz",
+            "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==",
             "cpu": [
                 "ppc64"
             ],
@@ -743,9 +743,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.30.1.tgz",
-            "integrity": "sha512-0WKLaAUUHKBtll0wvOmh6yh3S0wSU9+yas923JIChfxOaaBarmb/lBKPF0w/+jTVozFnOXJeRGZ8NvOxvk/jcw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz",
+            "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==",
             "cpu": [
                 "riscv64"
             ],
@@ -757,9 +757,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.30.1.tgz",
-            "integrity": "sha512-GWFs97Ruxo5Bt+cvVTQkOJ6TIx0xJDD/bMAOXWJg8TCSTEK8RnFeOeiFTxKniTc4vMIaWvCplMAFBt9miGxgkA==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz",
+            "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==",
             "cpu": [
                 "s390x"
             ],
@@ -771,9 +771,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.30.1.tgz",
-            "integrity": "sha512-UtgGb7QGgXDIO+tqqJ5oZRGHsDLO8SlpE4MhqpY9Llpzi5rJMvrK6ZGhsRCST2abZdBqIBeXW6WPD5fGK5SDwg==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz",
+            "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==",
             "cpu": [
                 "x64"
             ],
@@ -785,9 +785,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.30.1.tgz",
-            "integrity": "sha512-V9U8Ey2UqmQsBT+xTOeMzPzwDzyXmnAoO4edZhL7INkwQcaW1Ckv3WJX3qrrp/VHaDkEWIBWhRwP47r8cdrOow==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz",
+            "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==",
             "cpu": [
                 "x64"
             ],
@@ -799,9 +799,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.30.1.tgz",
-            "integrity": "sha512-WabtHWiPaFF47W3PkHnjbmWawnX/aE57K47ZDT1BXTS5GgrBUEpvOzq0FI0V/UYzQJgdb8XlhVNH8/fwV8xDjw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz",
+            "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==",
             "cpu": [
                 "arm64"
             ],
@@ -813,9 +813,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.30.1.tgz",
-            "integrity": "sha512-pxHAU+Zv39hLUTdQQHUVHf4P+0C47y/ZloorHpzs2SXMRqeAWmGghzAhfOlzFHHwjvgokdFAhC4V+6kC1lRRfw==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz",
+            "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==",
             "cpu": [
                 "ia32"
             ],
@@ -827,9 +827,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.30.1.tgz",
-            "integrity": "sha512-D6qjsXGcvhTjv0kI4fU8tUuBDF/Ueee4SVX79VfNDXZa64TfCW1Slkb6Z7O1p7vflqZjcmOVdZlqf8gvJxc6og==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz",
+            "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==",
             "cpu": [
                 "x64"
             ],
@@ -2242,9 +2242,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.30.1",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.30.1.tgz",
-            "integrity": "sha512-mlJ4glW020fPuLi7DkM/lN97mYEZGWeqBnrljzN0gs7GLctqX3lNWxKQ7Gl712UAX+6fog/L3jh4gb7R6aVi3w==",
+            "version": "4.31.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
+            "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -2258,25 +2258,25 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.30.1",
-                "@rollup/rollup-android-arm64": "4.30.1",
-                "@rollup/rollup-darwin-arm64": "4.30.1",
-                "@rollup/rollup-darwin-x64": "4.30.1",
-                "@rollup/rollup-freebsd-arm64": "4.30.1",
-                "@rollup/rollup-freebsd-x64": "4.30.1",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.30.1",
-                "@rollup/rollup-linux-arm-musleabihf": "4.30.1",
-                "@rollup/rollup-linux-arm64-gnu": "4.30.1",
-                "@rollup/rollup-linux-arm64-musl": "4.30.1",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.30.1",
-                "@rollup/rollup-linux-powerpc64le-gnu": "4.30.1",
-                "@rollup/rollup-linux-riscv64-gnu": "4.30.1",
-                "@rollup/rollup-linux-s390x-gnu": "4.30.1",
-                "@rollup/rollup-linux-x64-gnu": "4.30.1",
-                "@rollup/rollup-linux-x64-musl": "4.30.1",
-                "@rollup/rollup-win32-arm64-msvc": "4.30.1",
-                "@rollup/rollup-win32-ia32-msvc": "4.30.1",
-                "@rollup/rollup-win32-x64-msvc": "4.30.1",
+                "@rollup/rollup-android-arm-eabi": "4.31.0",
+                "@rollup/rollup-android-arm64": "4.31.0",
+                "@rollup/rollup-darwin-arm64": "4.31.0",
+                "@rollup/rollup-darwin-x64": "4.31.0",
+                "@rollup/rollup-freebsd-arm64": "4.31.0",
+                "@rollup/rollup-freebsd-x64": "4.31.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.31.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.31.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.31.0",
+                "@rollup/rollup-linux-arm64-musl": "4.31.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.31.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.31.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.31.0",
+                "@rollup/rollup-linux-x64-gnu": "4.31.0",
+                "@rollup/rollup-linux-x64-musl": "4.31.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.31.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.31.0",
+                "@rollup/rollup-win32-x64-msvc": "4.31.0",
                 "fsevents": "~2.3.2"
             }
         },

resources/views/filament/infolists/components/document-preview.blade.php

@@ -26,10 +26,8 @@
         <x-company.invoice.metadata class="modern-template-metadata space-y-8">
             <div class="text-sm">
                 <h2 class="text-lg font-semibold">{{ $document->company->name }}</h2>
-                @if($document->company->address && $document->company->city && $document->company->state && $document->company->zipCode)
-                    <p>{{ $document->company->address }}</p>
-                    <p>{{ $document->company->city }}, {{ $document->company->state }} {{ $document->company->zipCode }}</p>
-                    <p>{{ $document->company->country }}</p>
+                @if($formattedAddress = $document->company->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
                 @endif
             </div>
 
@@ -40,19 +38,8 @@
                     <p class="text-base font-bold"
                        style="color: {{ $document->accentColor }}">{{ $document->client->name }}</p>
 
-                    @if($document->client->addressLine1)
-                        <p>{{ $document->client->addressLine1 }}</p>
-
-                        @if($document->client->addressLine2)
-                            <p>{{ $document->client->addressLine2 }}</p>
-                        @endif
-                        <p>
-                            {{ $document->client->city }}{{ $document->client->state ? ', ' . $document->client->state: '' }}
-                            {{ $document->client->postalCode }}
-                        </p>
-                        @if($document->client->country)
-                            <p>{{ $document->client->country }}</p>
-                        @endif
+                    @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                        {!! $formattedAddress !!}
                     @endif
                 </div>
 

resources/views/vendor/filament-simple-alert/components/simple-alert-entry.blade.php

@@ -1,15 +0,0 @@
-<x-dynamic-component :component="$getEntryWrapperView()" :entry="$entry">
-    <x-filament-simple-alert::simple-alert
-            :icon="$getIcon()"
-            :icon-vertical-alignment="$getIconVerticalAlignment()"
-            :color="$getColor()"
-            :title="$getTitle()"
-            :description="$getDescription()"
-            :link="$getLink()"
-            :link-label="$getLinkLabel()"
-            :link-blank="$getLinkBlank()"
-            :actions-vertical-alignment="$getActionsVerticalAlignment()"
-            :actions="$getActions()"
-            :border="$getBorder()"
-    />
-</x-dynamic-component>

resources/views/vendor/filament-simple-alert/components/simple-alert-field.blade.php

@@ -1,15 +0,0 @@
-<x-dynamic-component :component="$getFieldWrapperView()" :field="$field">
-    <x-filament-simple-alert::simple-alert
-            :icon="$getIcon()"
-            :icon-vertical-alignment="$getIconVerticalAlignment()"
-            :color="$getColor()"
-            :title="$getTitle()"
-            :description="$getDescription()"
-            :link="$getLink()"
-            :link-label="$getLinkLabel()"
-            :link-blank="$getLinkBlank()"
-            :actions-vertical-alignment="$getActionsVerticalAlignment()"
-            :actions="$getActions()"
-            :border="$getBorder()"
-    />
-</x-dynamic-component>

resources/views/vendor/filament-simple-alert/components/simple-alert.blade.php

@@ -1,84 +0,0 @@
-@props([
-    'actions' => null,
-    'actionsVerticalAlignment' => 'center',
-    'border' => false,
-    'color' => null,
-    'description' => null,
-    'icon' => null,
-    'iconVerticalAlignment' => 'center',
-    'link' => null,
-    'linkBlank' => false,
-    'linkLabel' => null,
-    'title' => null,
-])
-
-@php
-    use function Filament\Support\get_color_css_variables;
-
-    $colors = \Illuminate\Support\Arr::toCssStyles([
-           get_color_css_variables($color, shades: [50, 100, 400, 500, 700, 800]),
-   ]);
-@endphp
-
-<div x-data="{}"
-     @class([
-       'filament-simple-alert rounded-md bg-custom-50 p-4 dark:bg-custom-400/10',
-       'ring-1 ring-custom-100 dark:ring-custom-500/70' => $border,
-     ])
-     style="{{ $colors }}">
-    <div class="flex gap-3">
-        @if($icon)
-            <div @class([
-                'flex-shrink-0',
-                $iconVerticalAlignment === 'start' ? 'self-start' : 'self-center',
-            ])>
-                <x-filament::icon
-                        :icon="$icon"
-                        class="h-5 w-5 text-custom-400"
-                />
-            </div>
-        @endif
-        <div class="items-center flex-1 md:flex md:justify-between space-y-3 md:space-y-0 md:gap-3">
-            @if($title || $description)
-                <div class="space-y-0.5">
-                    @if($title)
-                        <p class="text-sm font-medium text-custom-800 dark:text-white">
-                            {{ $title }}
-                        </p>
-                    @endif
-                    @if($description)
-                        <p class="text-sm text-custom-700 dark:text-white">
-                            {{ $description }}
-                        </p>
-                    @endif
-                </div>
-            @endif
-            @if($link || $actions)
-                <div @class([
-                  'flex items-center gap-3',
-                    $actionsVerticalAlignment === 'start' ? 'self-start' : 'self-center',
-                ])>
-                    <div class="flex items-center whitespace-nowrap gap-3">
-                        @if($link)
-                            <p class="text-sm md:mt-0 self-center">
-                                <a href="{{ $link }}" {{ $linkBlank ? 'target="_blank"' : '' }} class="whitespace-nowrap font-medium text-custom-400 hover:text-custom-500">
-                                    {{ $linkLabel }}
-                                    <span aria-hidden="true"> &rarr;</span>
-                                </a>
-                            </p>
-                        @endif
-                        @if($actions)
-                            <div class="gap-3 flex items-center justify-start">
-                                @foreach ($actions as $action)
-                                    @if ($action->isVisible())
-                                        {{ $action }}
-                                    @endif
-                                @endforeach
-                            </div>
-                        @endif
-                    </div>
-                </div>
-            @endif
-        </div>
-    </div>
-</div>

tests/Feature/Accounting/RecurringInvoiceTest.php

@@ -1,29 +1,203 @@
 <?php
 
+use App\Enums\Accounting\EndType;
+use App\Enums\Accounting\Frequency;
 use App\Enums\Accounting\IntervalType;
 use App\Models\Accounting\RecurringInvoice;
+use Illuminate\Support\Carbon;
 
-test('example', function () {
+beforeEach(function () {
+    $this->withOfferings();
+});
+
+test('recurring invoice properly handles months with fewer days for monthly frequency', function () {
+    // Start from January 31st
+    Carbon::setTestNow('2024-01-31');
+
+    RecurringInvoice::unsetEventDispatcher();
+
+    // Create a recurring invoice set for the 31st of each month
     $recurringInvoice = RecurringInvoice::factory()
-        ->custom(IntervalType::Week, 2)
-        ->create([
-            'start_date' => today(),
-            'day_of_week' => today()->dayOfWeek,
-        ]);
+        ->withLineItems()
+        ->withSchedule(
+            frequency: Frequency::Monthly,
+            startDate: Carbon::now(),
+        )
+        ->approved()
+        ->create();
+
+    // First invoice should be the start date
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-01-31');
+
+    // Now set last_date to simulate first invoice being generated
+    $recurringInvoice->update(['last_date' => '2024-01-31']);
+    $recurringInvoice->refresh();
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-02-29');
+
+    // Update last_date to Feb 29 and check next date (should be March 31)
+    $recurringInvoice->update(['last_date' => '2024-02-29']);
+    $recurringInvoice->refresh();
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-03-31');
+
+    // Update last_date to March 31 and check next date (should be April 30)
+    $recurringInvoice->update(['last_date' => '2024-03-31']);
+    $recurringInvoice->refresh();
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-04-30');
+
+    // Update last_date to April 30 and check next date (should be May 31)
+    $recurringInvoice->update(['last_date' => '2024-04-30']);
+    $recurringInvoice->refresh();
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-05-31');
+});
+
+test('recurring invoice properly handles months with fewer days for yearly frequency', function () {
+    // Start from January 31st
+    Carbon::setTestNow('2024-02-29');
+
+    RecurringInvoice::unsetEventDispatcher();
+
+    // Create a recurring invoice set for the 31st of each month
+    $recurringInvoice = RecurringInvoice::factory()
+        ->withLineItems()
+        ->withSchedule(
+            frequency: Frequency::Yearly,
+            startDate: Carbon::now(),
+        )
+        ->approved()
+        ->create();
+
+    // First invoice should be the start date
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-02-29');
+
+    // Next date should be Feb 28, 2025 (non-leap year)
+    $recurringInvoice->update(['last_date' => '2024-02-29']);
+    $recurringInvoice->refresh();
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2025-02-28');
 
+    // Next date should be Feb 29, 2026 (leap year)
+    $recurringInvoice->update(['last_date' => '2025-02-28']);
     $recurringInvoice->refresh();
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2026-02-28');
+});
+
+test('recurring invoice properly handles weekly frequency and custom weekly intervals', function () {
+    Carbon::setTestNow('2024-01-31'); // Wednesday
 
-    $nextInvoiceDate = $recurringInvoice->calculateNextDate();
+    RecurringInvoice::unsetEventDispatcher();
 
-    expect($nextInvoiceDate)->toEqual(today());
+    // Test regular weekly frequency
+    $recurringInvoice = RecurringInvoice::factory()
+        ->withLineItems()
+        ->withSchedule(
+            frequency: Frequency::Weekly,
+            startDate: Carbon::now(),
+        )
+        ->approved()
+        ->create();
 
-    $recurringInvoice->update([
-        'last_date' => $nextInvoiceDate,
-    ]);
+    // First invoice should be the start date
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-01-31');
 
+    // Next date should be that Friday
+    $recurringInvoice->update(['last_date' => '2024-01-31']);
     $recurringInvoice->refresh();
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-02-07');
+
+    // Test custom weekly frequency (every 2 weeks)
+    $recurringInvoice = RecurringInvoice::factory()
+        ->withLineItems()
+        ->withCustomSchedule(
+            startDate: Carbon::now(), // Wednesday
+            endType: EndType::Never,
+            intervalType: IntervalType::Week,
+            intervalValue: 2,
+        )
+        ->approved()
+        ->create();
+
+    // First invoice should be the start date
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-01-31');
+
+    // Next date should be two weeks from start, on Friday
+    $recurringInvoice->update(['last_date' => '2024-01-31']);
+    $recurringInvoice->refresh();
+    expect($recurringInvoice->calculateNextDate())
+        ->toBeInstanceOf(Carbon::class)
+        ->toDateString()->toBe('2024-02-14');
+});
+
+test('recurring invoice generates correct sequence of invoices across different month lengths', function () {
+    Carbon::setTestNow('2024-01-31');
+
+    $recurringInvoice = RecurringInvoice::factory()
+        ->withLineItems()
+        ->withSchedule(
+            frequency: Frequency::Monthly,
+            startDate: Carbon::now(),
+        )
+        ->approved()
+        ->create();
+
+    // Generate first invoice
+    $recurringInvoice->generateDueInvoices();
+
+    $invoices = $recurringInvoice->invoices()
+        ->orderBy('date')
+        ->get();
+
+    expect($invoices)->toHaveCount(1)
+        ->and($invoices->pluck('date')->map->toDateString()->toArray())->toBe([
+            '2024-01-31',
+        ]);
+
+    // Move time forward to February (leap year)
+    Carbon::setTestNow('2024-02-29');
+    $recurringInvoice->generateDueInvoices();
 
-    $nextInvoiceDate = $recurringInvoice->calculateNextDate();
+    $invoices = $recurringInvoice->invoices()
+        ->orderBy('date')
+        ->get();
 
-    expect($nextInvoiceDate)->toEqual(today()->addWeeks(2));
+    expect($invoices)->toHaveCount(2)
+        ->and($invoices->pluck('date')->map->toDateString()->toArray())->toBe([
+            '2024-01-31',
+            '2024-02-29',
+        ]);
+
+    // Move time forward to March
+    Carbon::setTestNow('2024-03-31');
+    $recurringInvoice->generateDueInvoices();
+
+    $invoices = $recurringInvoice->invoices()
+        ->orderBy('date')
+        ->get();
+
+    expect($invoices)->toHaveCount(3)
+        ->and($invoices->pluck('date')->map->toDateString()->toArray())->toBe([
+            '2024-01-31',
+            '2024-02-29',
+            '2024-03-31',
+        ]);
 });

tests/TestCase.php

@@ -2,6 +2,7 @@
 
 namespace Tests;
 
+use App\Models\Common\Offering;
 use App\Models\Company;
 use App\Models\User;
 use App\Testing\TestsReport;
@@ -45,4 +46,17 @@ abstract class TestCase extends BaseTestCase
 
         Filament::setTenant($this->testCompany);
     }
+
+    public function withOfferings(): static
+    {
+        Offering::factory()
+            ->for($this->testCompany)
+            ->sellable()
+            ->withSalesAdjustments()
+            ->purchasable()
+            ->withPurchaseAdjustments()
+            ->create();
+
+        return $this;
+    }
 }