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

Development 3.x

app/Concerns/HasTabSpecificColumnToggles.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Concerns;
+
+trait HasTabSpecificColumnToggles
+{
+    public function getTableColumnToggleFormStateSessionKey(): string
+    {
+        $table = class_basename($this::class);
+        $tab = $this->activeTab;
+
+        return "tables.{$table}_{$tab}_toggled_columns";
+    }
+
+    public function updatedActiveTab(): void
+    {
+        parent::updatedActiveTab();
+
+        // Load saved state for new tab or fall back to defaults
+        $this->toggledTableColumns = session(
+            $this->getTableColumnToggleFormStateSessionKey(),
+            $this->getDefaultTableColumnToggleState()
+        );
+
+        $this->updatedToggledTableColumns();
+    }
+}

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/ClientPreviewDTO.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\DTO;
+
+readonly class ClientPreviewDTO extends ClientDTO
+{
+    public static function fake(): self
+    {
+        return new self(
+            name: 'John Doe',
+            addressLine1: '1234 Elm St',
+            addressLine2: 'Suite 123',
+            city: 'Springfield',
+            state: 'Illinois',
+            postalCode: '62701',
+            country: 'United States',
+        );
+    }
+}

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/DTO/DocumentColumnLabelDTO.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App\DTO;
+
+use App\Models\Setting\DocumentDefault;
+
+readonly class DocumentColumnLabelDTO
+{
+    public function __construct(
+        public string $items = 'Items',
+        public string $units = 'Quantity',
+        public string $price = 'Price',
+        public string $amount = 'Amount',
+    ) {}
+
+    public function toArray(): array
+    {
+        return [
+            'items' => $this->items,
+            'units' => $this->units,
+            'price' => $this->price,
+            'amount' => $this->amount,
+        ];
+    }
+
+    public static function fromModel(DocumentDefault $settings): self
+    {
+        return new self(
+            items: $settings->resolveColumnLabel('item_name', 'Items'),
+            units: $settings->resolveColumnLabel('unit_name', 'Quantity'),
+            price: $settings->resolveColumnLabel('price_name', 'Price'),
+            amount: $settings->resolveColumnLabel('amount_name', 'Amount'),
+        );
+    }
+
+    public static function getDefaultLabels(): self
+    {
+        return new self;
+    }
+}

app/DTO/DocumentDTO.php

@@ -2,10 +2,13 @@
 
 namespace App\DTO;
 
+use App\Enums\Setting\Font;
 use App\Models\Accounting\Document;
 use App\Models\Setting\DocumentDefault;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
+use Filament\FontProviders\BunnyFontProvider;
+use Illuminate\Contracts\Support\Htmlable;
 
 readonly class DocumentDTO
 {
@@ -13,7 +16,8 @@ readonly class DocumentDTO
      * @param  LineItemDTO[]  $lineItems
      */
     public function __construct(
-        public ?string $header,
+        public string $header,
+        public ?string $subheader,
         public ?string $footer,
         public ?string $terms,
         public ?string $logo,
@@ -23,16 +27,18 @@ readonly class DocumentDTO
         public string $dueDate,
         public string $currencyCode,
         public string $subtotal,
-        public string $discount,
-        public string $tax,
+        public ?string $discount,
+        public ?string $tax,
         public string $total,
         public string $amountDue,
         public CompanyDTO $company,
         public ClientDTO $client,
         public iterable $lineItems,
         public DocumentLabelDTO $label,
+        public DocumentColumnLabelDTO $columnLabel,
         public string $accentColor = '#000000',
         public bool $showLogo = true,
+        public Font $font = Font::Inter,
     ) {}
 
     public static function fromModel(Document $document): self
@@ -40,8 +46,11 @@ readonly class DocumentDTO
         /** @var DocumentDefault $settings */
         $settings = $document->company->defaultInvoice;
 
+        $currencyCode = $document->currency_code ?? CurrencyAccessor::getDefaultCurrency();
+
         return new self(
             header: $document->header,
+            subheader: $document->subheader,
             footer: $document->footer,
             terms: $document->terms,
             logo: $document->logo,
@@ -49,23 +58,30 @@ readonly class DocumentDTO
             referenceNumber: $document->referenceNumber(),
             date: $document->documentDate(),
             dueDate: $document->dueDate(),
-            currencyCode: $document->currency_code ?? CurrencyAccessor::getDefaultCurrency(),
-            subtotal: self::formatToMoney($document->subtotal, $document->currency_code),
-            discount: self::formatToMoney($document->discount_total, $document->currency_code),
-            tax: self::formatToMoney($document->tax_total, $document->currency_code),
-            total: self::formatToMoney($document->total, $document->currency_code),
-            amountDue: self::formatToMoney($document->amountDue(), $document->currency_code),
+            currencyCode: $currencyCode,
+            subtotal: self::formatToMoney($document->subtotal, $currencyCode),
+            discount: self::formatToMoney($document->discount_total, $currencyCode),
+            tax: self::formatToMoney($document->tax_total, $currencyCode),
+            total: self::formatToMoney($document->total, $currencyCode),
+            amountDue: self::formatToMoney($document->amountDue(), $currencyCode),
             company: CompanyDTO::fromModel($document->company),
             client: ClientDTO::fromModel($document->client),
             lineItems: $document->lineItems->map(fn ($item) => LineItemDTO::fromModel($item)),
             label: $document->documentType()->getLabels(),
+            columnLabel: DocumentColumnLabelDTO::fromModel($settings),
             accentColor: $settings->accent_color ?? '#000000',
             showLogo: $settings->show_logo ?? false,
+            font: $settings->font ?? Font::Inter,
         );
     }
 
-    private static function formatToMoney(float | string $value, ?string $currencyCode): string
+    protected static function formatToMoney(float | string $value, ?string $currencyCode): string
     {
         return CurrencyConverter::formatToMoney($value, $currencyCode);
     }
+
+    public function getFontHtml(): Htmlable
+    {
+        return app(BunnyFontProvider::class)->getHtml($this->font->getLabel());
+    }
 }

app/DTO/DocumentPreviewDTO.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace App\DTO;
+
+use App\Enums\Accounting\DocumentType;
+use App\Enums\Setting\Font;
+use App\Enums\Setting\PaymentTerms;
+use App\Models\Setting\DocumentDefault;
+use App\Utilities\Currency\CurrencyAccessor;
+
+readonly class DocumentPreviewDTO extends DocumentDTO
+{
+    public static function fromSettings(DocumentDefault $settings, ?array $data = null): self
+    {
+        $company = $settings->company;
+
+        $paymentTerms = PaymentTerms::parse($data['payment_terms']) ?? $settings->payment_terms;
+
+        return new self(
+            header: $data['header'] ?? $settings->header ?? 'Invoice',
+            subheader: $data['subheader'] ?? $settings->subheader,
+            footer: $data['footer'] ?? $settings->footer,
+            terms: $data['terms'] ?? $settings->terms,
+            logo: $settings->logo_url,
+            number: self::generatePreviewNumber($settings, $data),
+            referenceNumber: 'ORD-00001',
+            date: $company->locale->date_format->getLabel(),
+            dueDate: $paymentTerms->getDueDate($company->locale->date_format->value),
+            currencyCode: CurrencyAccessor::getDefaultCurrency(),
+            subtotal: self::formatToMoney('1000', null),
+            discount: self::formatToMoney('100', null),
+            tax: self::formatToMoney('50', null),
+            total: self::formatToMoney('950', null),
+            amountDue: self::formatToMoney('950', null),
+            company: CompanyDTO::fromModel($company),
+            client: ClientPreviewDTO::fake(),
+            lineItems: LineItemPreviewDTO::fakeItems(),
+            label: DocumentType::Invoice->getLabels(),
+            columnLabel: self::generateColumnLabels($settings, $data),
+            accentColor: $data['accent_color'] ?? $settings->accent_color ?? '#000000',
+            showLogo: $data['show_logo'] ?? $settings->show_logo ?? true,
+            font: Font::tryFrom($data['font']) ?? $settings->font ?? Font::Inter,
+        );
+    }
+
+    protected static function generatePreviewNumber(DocumentDefault $settings, ?array $data): string
+    {
+        $prefix = $data['number_prefix'] ?? $settings->number_prefix ?? 'INV-';
+        $digits = $data['number_digits'] ?? $settings->number_digits ?? 5;
+        $next = $data['number_next'] ?? $settings->number_next;
+
+        return $settings->getNumberNext(padded: true, format: true, prefix: $prefix, digits: $digits, next: $next);
+    }
+
+    protected static function generateColumnLabels(DocumentDefault $settings, ?array $data): DocumentColumnLabelDTO
+    {
+        return new DocumentColumnLabelDTO(
+            items: $settings->resolveColumnLabel('item_name', 'Items', $data),
+            units: $settings->resolveColumnLabel('unit_name', 'Quantity', $data),
+            price: $settings->resolveColumnLabel('price_name', 'Price', $data),
+            amount: $settings->resolveColumnLabel('amount_name', 'Amount', $data),
+        );
+    }
+}

app/DTO/LineItemDTO.php

@@ -26,7 +26,7 @@ readonly class LineItemDTO
         );
     }
 
-    private static function formatToMoney(float | string $value, ?string $currencyCode): string
+    protected static function formatToMoney(float | string $value, ?string $currencyCode): string
     {
         return CurrencyConverter::formatToMoney($value, $currencyCode);
     }

app/DTO/LineItemPreviewDTO.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\DTO;
+
+readonly class LineItemPreviewDTO extends LineItemDTO
+{
+    public static function fakeItems(): array
+    {
+        return [
+            new self(
+                name: 'Item 1',
+                description: 'Sample item description',
+                quantity: 2,
+                unitPrice: self::formatToMoney(150.00, null),
+                subtotal: self::formatToMoney(300.00, null),
+            ),
+            new self(
+                name: 'Item 2',
+                description: 'Another sample item description',
+                quantity: 3,
+                unitPrice: self::formatToMoney(200.00, null),
+                subtotal: self::formatToMoney(600.00, null),
+            ),
+            new self(
+                name: 'Item 3',
+                description: 'Yet another sample item description',
+                quantity: 1,
+                unitPrice: self::formatToMoney(180.00, null),
+                subtotal: self::formatToMoney(180.00, null),
+            ),
+        ];
+    }
+}

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/Enums/Concerns/ParsesEnum.php

@@ -4,16 +4,16 @@ namespace App\Enums\Concerns;
 
 trait ParsesEnum
 {
-    public static function parse(string | self | null $value): ?self
+    public static function parse(string | self | null $value): ?static
     {
-        if ($value === null) {
+        if (! $value) {
             return null;
         }
 
-        if ($value instanceof self) {
+        if ($value instanceof static) {
             return $value;
         }
 
-        return self::from($value);
+        return static::tryFrom($value);
     }
 }

app/Enums/Setting/PaymentTerms.php

@@ -2,10 +2,13 @@
 
 namespace App\Enums\Setting;
 
+use App\Enums\Concerns\ParsesEnum;
 use Filament\Support\Contracts\HasLabel;
 
 enum PaymentTerms: string implements HasLabel
 {
+    use ParsesEnum;
+
     case DueUponReceipt = 'due_upon_receipt';
     case Net7 = 'net_7';
     case Net10 = 'net_10';

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

@@ -4,9 +4,8 @@ namespace App\Filament\Company\Clusters\Settings\Pages;
 
 use App\Enums\Setting\EntityType;
 use App\Filament\Company\Clusters\Settings;
-use App\Models\Locale\City;
-use App\Models\Locale\Country;
-use App\Models\Locale\State;
+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 Filament\Actions\Action;
@@ -14,12 +13,11 @@ use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Form;
-use Filament\Forms\Get;
-use Filament\Forms\Set;
 use Filament\Notifications\Notification;
 use Filament\Pages\Concerns\InteractsWithFormActions;
 use Filament\Pages\Page;
@@ -95,18 +93,7 @@ class CompanyProfile extends Page
             return;
         }
 
-        $countryChanged = $this->record->wasChanged('country');
-        $stateChanged = $this->record->wasChanged('state_id');
-
         $this->getSavedNotification()->send();
-
-        if ($countryChanged || $stateChanged) {
-            if ($countryChanged) {
-                $this->updateTimezone($this->record->country);
-            }
-
-            $this->getTimezoneChangeNotification()->send();
-        }
     }
 
     protected function updateTimezone(string $countryCode): void
@@ -149,6 +136,7 @@ class CompanyProfile extends Page
         return $form
             ->schema([
                 $this->getIdentificationSection(),
+                $this->getNeedsAddressCompletionAlert(),
                 $this->getLocationDetailsSection(),
                 $this->getLegalAndComplianceSection(),
             ])
@@ -167,10 +155,9 @@ class CompanyProfile extends Page
                             ->email()
                             ->localizeLabel()
                             ->maxLength(255)
-                            ->required(),
+                            ->softRequired(),
                         TextInput::make('phone_number')
                             ->tel()
-                            ->nullable()
                             ->localizeLabel(),
                     ])->columns(1),
                 FileUpload::make('logo')
@@ -196,41 +183,27 @@ class CompanyProfile extends Page
             ])->columns();
     }
 
+    protected function getNeedsAddressCompletionAlert(): Component
+    {
+        return Banner::make('needsAddressCompletion')
+            ->warning()
+            ->title('Address Information Incomplete')
+            ->description('Please complete the required address information for proper business operations.')
+            ->visible(fn (CompanyProfileModel $record) => $record->address->isIncomplete())
+            ->columnSpanFull();
+    }
+
     protected function getLocationDetailsSection(): Component
     {
-        return Section::make('Location Details')
+        return Section::make('Address Information')
+            ->relationship('address')
             ->schema([
-                Select::make('country')
-                    ->searchable()
-                    ->localizeLabel()
-                    ->live()
-                    ->options(Country::getAvailableCountryOptions())
-                    ->afterStateUpdated(static function (Set $set) {
-                        $set('state_id', null);
-                        $set('city_id', null);
-                    })
-                    ->required(),
-                Select::make('state_id')
-                    ->localizeLabel('State / Province')
-                    ->searchable()
-                    ->live()
-                    ->options(static fn (Get $get) => State::getStateOptions($get('country')))
-                    ->afterStateUpdated(static fn (Set $set) => $set('city_id', null))
-                    ->nullable(),
-                TextInput::make('address')
-                    ->localizeLabel('Street Address')
-                    ->maxLength(255)
-                    ->nullable(),
-                Select::make('city_id')
-                    ->localizeLabel('City / Town')
-                    ->searchable()
-                    ->options(static fn (Get $get) => City::getCityOptions($get('country'), $get('state_id')))
-                    ->nullable(),
-                TextInput::make('zip_code')
-                    ->localizeLabel('Zip / Postal Code')
-                    ->maxLength(20)
-                    ->nullable(),
-            ])->columns();
+                Hidden::make('type')
+                    ->default('general'),
+                AddressFields::make()
+                    ->softRequired(),
+            ])
+            ->columns(2);
     }
 
     protected function getLegalAndComplianceSection(): Component
@@ -240,11 +213,10 @@ class CompanyProfile extends Page
                 Select::make('entity_type')
                     ->localizeLabel()
                     ->options(EntityType::class)
-                    ->required(),
+                    ->softRequired(),
                 TextInput::make('tax_id')
                     ->localizeLabel('Tax ID')
-                    ->maxLength(50)
-                    ->nullable(),
+                    ->maxLength(50),
             ])->columns();
     }
 

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()->country))
+                    ->options(Timezone::getTimezoneOptions(CompanyProfileModel::first()->address->country_code))
                     ->searchable(),
             ])->columns();
     }

app/Filament/Company/Pages/CreateCompany.php

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Company\Pages;
 
+use App\Enums\Common\AddressType;
 use App\Enums\Setting\EntityType;
 use App\Models\Company;
 use App\Models\Locale\Country;
@@ -66,6 +67,8 @@ class CreateCompany extends FilamentCreateCompany
                     ->live()
                     ->searchable()
                     ->options(Country::getAvailableCountryOptions())
+                    ->getSearchResultsUsing(fn (string $search): array => Country::getSearchResultsUsing($search))
+                    ->getOptionLabelUsing(fn ($value): ?string => Country::find($value)?->name . ' ' . Country::find($value)?->flag)
                     ->softRequired(),
                 Select::make('locale.language')
                     ->label('Language')
@@ -101,10 +104,15 @@ class CreateCompany extends FilamentCreateCompany
                 'personal_company' => $personalCompany,
             ]);
 
-            $company->profile()->create([
+            $profile = $company->profile()->create([
                 'email' => $data['profile']['email'],
                 'entity_type' => $data['profile']['entity_type'],
-                'country' => $data['profile']['country'],
+            ]);
+
+            $profile->address()->create([
+                'company_id' => $company->id,
+                'type' => AddressType::General,
+                'country_code' => $data['profile']['country'],
             ]);
 
             $user?->switchCompany($company);

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

@@ -7,9 +7,11 @@ use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\PaymentMethod;
 use App\Filament\Company\Resources\Purchases\BillResource\Pages;
+use App\Filament\Company\Resources\Purchases\VendorResource\RelationManagers\BillsRelationManager;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
+use App\Filament\Tables\Columns;
 use App\Filament\Tables\Filters\DateRangeFilter;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\Bill;
@@ -234,11 +236,7 @@ class BillResource extends Resource
         return $table
             ->defaultSort('due_date')
             ->columns([
-                Tables\Columns\TextColumn::make('id')
-                    ->label('ID')
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true)
-                    ->searchable(),
+                Columns::id(),
                 Tables\Columns\TextColumn::make('status')
                     ->badge()
                     ->searchable(),
@@ -254,7 +252,9 @@ class BillResource extends Resource
                     ->searchable()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('vendor.name')
-                    ->sortable(),
+                    ->sortable()
+                    ->searchable()
+                    ->hiddenOn(BillsRelationManager::class),
                 Tables\Columns\TextColumn::make('total')
                     ->currencyWithConversion(static fn (Bill $record) => $record->currency_code)
                     ->sortable()

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

@@ -6,9 +6,11 @@ use App\Concerns\ManagesLineItems;
 use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Accounting\Bill;
+use App\Models\Common\Vendor;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
 use Illuminate\Database\Eloquent\Model;
+use Livewire\Attributes\Url;
 
 class CreateBill extends CreateRecord
 {
@@ -17,6 +19,22 @@ class CreateBill extends CreateRecord
 
     protected static string $resource = BillResource::class;
 
+    #[Url(as: 'vendor')]
+    public ?int $vendorId = null;
+
+    public function mount(): void
+    {
+        parent::mount();
+
+        if ($this->vendorId) {
+            $this->data['vendor_id'] = $this->vendorId;
+
+            if ($currencyCode = Vendor::find($this->vendorId)?->currency_code) {
+                $this->data['currency_code'] = $currencyCode;
+            }
+        }
+    }
+
     public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::Full;

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

@@ -2,18 +2,23 @@
 
 namespace App\Filament\Company\Resources\Purchases;
 
+use App\Enums\Accounting\BillStatus;
 use App\Enums\Common\ContractorType;
 use App\Enums\Common\VendorType;
 use App\Filament\Company\Resources\Purchases\VendorResource\Pages;
+use App\Filament\Forms\Components\AddressFields;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CustomSection;
 use App\Filament\Forms\Components\PhoneBuilder;
+use App\Filament\Tables\Columns;
 use App\Models\Common\Vendor;
+use App\Utilities\Currency\CurrencyConverter;
 use Filament\Forms;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 
 class VendorResource extends Resource
 {
@@ -41,12 +46,12 @@ class VendorResource extends Resource
                                     ->columnSpanFull(),
                                 CreateCurrencySelect::make('currency_code')
                                     ->nullable()
-                                    ->visible(fn (Forms\Get $get) => VendorType::parse($get('type')) === VendorType::Regular),
+                                    ->visible(static fn (Forms\Get $get) => VendorType::parse($get('type')) === VendorType::Regular),
                                 Forms\Components\Select::make('contractor_type')
                                     ->label('Contractor Type')
                                     ->required()
                                     ->live()
-                                    ->visible(fn (Forms\Get $get) => VendorType::parse($get('type')) === VendorType::Contractor)
+                                    ->visible(static fn (Forms\Get $get) => VendorType::parse($get('type')) === VendorType::Contractor)
                                     ->options(ContractorType::class),
                                 Forms\Components\TextInput::make('ssn')
                                     ->label('Social Security Number')
@@ -55,7 +60,7 @@ class VendorResource extends Resource
                                     ->mask('999-99-9999')
                                     ->stripCharacters('-')
                                     ->maxLength(11)
-                                    ->visible(fn (Forms\Get $get) => ContractorType::parse($get('contractor_type')) === ContractorType::Individual)
+                                    ->visible(static fn (Forms\Get $get) => ContractorType::parse($get('contractor_type')) === ContractorType::Individual)
                                     ->maxLength(255),
                                 Forms\Components\TextInput::make('ein')
                                     ->label('Employer Identification Number')
@@ -64,7 +69,7 @@ class VendorResource extends Resource
                                     ->mask('99-9999999')
                                     ->stripCharacters('-')
                                     ->maxLength(10)
-                                    ->visible(fn (Forms\Get $get) => ContractorType::parse($get('contractor_type')) === ContractorType::Business)
+                                    ->visible(static fn (Forms\Get $get) => ContractorType::parse($get('contractor_type')) === ContractorType::Business)
                                     ->maxLength(255),
                                 Forms\Components\TextInput::make('account_number')
                                     ->maxLength(255),
@@ -141,29 +146,7 @@ class VendorResource extends Resource
                     ->schema([
                         Forms\Components\Hidden::make('type')
                             ->default('general'),
-                        Forms\Components\TextInput::make('address_line_1')
-                            ->label('Address Line 1')
-                            ->required()
-                            ->maxLength(255),
-                        Forms\Components\TextInput::make('address_line_2')
-                            ->label('Address Line 2')
-                            ->maxLength(255),
-                        Forms\Components\TextInput::make('city')
-                            ->label('City')
-                            ->required()
-                            ->maxLength(255),
-                        Forms\Components\TextInput::make('state')
-                            ->label('State')
-                            ->required()
-                            ->maxLength(255),
-                        Forms\Components\TextInput::make('postal_code')
-                            ->label('Postal Code / Zip Code')
-                            ->required()
-                            ->maxLength(255),
-                        Forms\Components\TextInput::make('country')
-                            ->label('Country')
-                            ->required()
-                            ->maxLength(255),
+                        AddressFields::make(),
                     ])
                     ->columns(2),
             ]);
@@ -173,24 +156,65 @@ class VendorResource extends Resource
     {
         return $table
             ->columns([
+                Columns::id(),
                 Tables\Columns\TextColumn::make('type')
                     ->badge()
-                    ->searchable(),
+                    ->searchable()
+                    ->sortable(),
                 Tables\Columns\TextColumn::make('name')
                     ->searchable()
-                    ->description(fn (Vendor $vendor) => $vendor->contact?->full_name),
+                    ->sortable()
+                    ->description(static fn (Vendor $vendor) => $vendor->contact?->full_name),
                 Tables\Columns\TextColumn::make('contact.email')
                     ->label('Email')
                     ->searchable(),
-                Tables\Columns\TextColumn::make('primaryContact.phones')
+                Tables\Columns\TextColumn::make('contact.first_available_phone')
                     ->label('Phone')
-                    ->state(fn (Vendor $vendor) => $vendor->contact?->first_available_phone),
+                    ->state(static fn (Vendor $vendor) => $vendor->contact?->first_available_phone),
+                Tables\Columns\TextColumn::make('address.address_string')
+                    ->label('Address')
+                    ->searchable()
+                    ->toggleable(isToggledHiddenByDefault: true)
+                    ->listWithLineBreaks(),
+                Tables\Columns\TextColumn::make('payable_balance')
+                    ->label('Payable Balance')
+                    ->getStateUsing(function (Vendor $vendor) {
+                        return $vendor->bills()
+                            ->outstanding()
+                            ->get()
+                            ->sumMoneyInDefaultCurrency('amount_due');
+                    })
+                    ->coloredDescription(function (Vendor $vendor) {
+                        $overdue = $vendor->bills()
+                            ->where('status', BillStatus::Overdue)
+                            ->get()
+                            ->sumMoneyInDefaultCurrency('amount_due');
+
+                        if ($overdue <= 0) {
+                            return null;
+                        }
+
+                        $formattedOverdue = CurrencyConverter::formatCentsToMoney($overdue);
+
+                        return "Overdue: {$formattedOverdue}";
+                    })
+                    ->sortable(query: function (Builder $query, string $direction) {
+                        return $query
+                            ->withSum(['bills' => fn (Builder $query) => $query->outstanding()], 'amount_due')
+                            ->orderBy('bills_sum_amount_due', $direction);
+                    })
+                    ->currency(convert: false)
+                    ->alignEnd(),
+
             ])
             ->filters([
                 //
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
+                Tables\Actions\ActionGroup::make([
+                    Tables\Actions\EditAction::make(),
+                    Tables\Actions\ViewAction::make(),
+                ]),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
@@ -211,6 +235,7 @@ class VendorResource extends Resource
         return [
             'index' => Pages\ListVendors::route('/'),
             'create' => Pages\CreateVendor::route('/create'),
+            'view' => Pages\ViewVendor::route('/{record}'),
             'edit' => Pages\EditVendor::route('/{record}/edit'),
         ];
     }

app/Filament/Company/Resources/Purchases/VendorResource/Pages/ViewVendor.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases\VendorResource\Pages;
+
+use App\Filament\Company\Resources\Purchases\VendorResource;
+use App\Filament\Company\Resources\Purchases\VendorResource\RelationManagers;
+use Filament\Infolists\Components\Section;
+use Filament\Infolists\Components\TextEntry;
+use Filament\Infolists\Infolist;
+use Filament\Resources\Pages\ViewRecord;
+
+class ViewVendor extends ViewRecord
+{
+    protected static string $resource = VendorResource::class;
+
+    public function getRelationManagers(): array
+    {
+        return [
+            RelationManagers\BillsRelationManager::class,
+        ];
+    }
+
+    public function getTitle(): string
+    {
+        return $this->record->name;
+    }
+
+    protected function getHeaderWidgets(): array
+    {
+        return [
+            VendorResource\Widgets\BillOverview::class,
+        ];
+    }
+
+    public function infolist(Infolist $infolist): Infolist
+    {
+        return $infolist
+            ->schema([
+                Section::make('General')
+                    ->columns()
+                    ->schema([
+                        TextEntry::make('contact.full_name')
+                            ->label('Contact'),
+                        TextEntry::make('contact.email')
+                            ->label('Email'),
+                        TextEntry::make('contact.first_available_phone')
+                            ->label('Primary Phone'),
+                        TextEntry::make('website')
+                            ->label('Website')
+                            ->url(static fn ($state) => $state, true),
+                    ]),
+                Section::make('Additional Details')
+                    ->columns()
+                    ->schema([
+                        TextEntry::make('address.address_string')
+                            ->label('Billing Address')
+                            ->listWithLineBreaks(),
+                        TextEntry::make('notes'),
+                    ]),
+            ]);
+    }
+}

app/Filament/Company/Resources/Purchases/VendorResource/RelationManagers/BillsRelationManager.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases\VendorResource\RelationManagers;
+
+use App\Filament\Company\Resources\Purchases\BillResource;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class BillsRelationManager extends RelationManager
+{
+    protected static string $relationship = 'bills';
+
+    protected static bool $isLazy = false;
+
+    public function isReadOnly(): bool
+    {
+        return false;
+    }
+
+    public function table(Table $table): Table
+    {
+        return BillResource::table($table)
+            ->headerActions([
+                Tables\Actions\CreateAction::make()
+                    ->url(BillResource\Pages\CreateBill::getUrl(['vendor' => $this->getOwnerRecord()->getKey()])),
+            ]);
+    }
+}

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

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Filament\Company\Resources\Purchases\VendorResource\Widgets;
+
+use App\Enums\Accounting\BillStatus;
+use App\Filament\Widgets\EnhancedStatsOverviewWidget;
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Number;
+
+class BillOverview extends EnhancedStatsOverviewWidget
+{
+    public ?Model $record = null;
+
+    protected function getStats(): array
+    {
+        $unpaidBills = $this->record->bills()
+            ->whereIn('status', [BillStatus::Unpaid, BillStatus::Partial, BillStatus::Overdue]);
+
+        $amountToPay = $unpaidBills->get()->sumMoneyInDefaultCurrency('amount_due');
+
+        $amountOverdue = $unpaidBills
+            ->clone()
+            ->where('status', BillStatus::Overdue)
+            ->get()
+            ->sumMoneyInDefaultCurrency('amount_due');
+
+        $amountDueWithin7Days = $unpaidBills
+            ->clone()
+            ->whereBetween('due_date', [today(), today()->addWeek()])
+            ->get()
+            ->sumMoneyInDefaultCurrency('amount_due');
+
+        $averagePaymentTime = $this->record->bills()
+            ->whereNotNull('paid_at')
+            ->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days')
+            ->value('avg_days');
+
+        $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);
+
+        $lastMonthTotal = $this->record->bills()
+            ->where('status', BillStatus::Paid)
+            ->whereBetween('date', [
+                today()->subMonth()->startOfMonth(),
+                today()->subMonth()->endOfMonth(),
+            ])
+            ->get()
+            ->sumMoneyInDefaultCurrency('amount_paid');
+
+        return [
+            EnhancedStatsOverviewWidget\EnhancedStat::make('Total To Pay', CurrencyConverter::formatCentsToMoney($amountToPay))
+                ->suffix(CurrencyAccessor::getDefaultCurrency())
+                ->description('Includes ' . CurrencyConverter::formatCentsToMoney($amountOverdue) . ' overdue'),
+
+            EnhancedStatsOverviewWidget\EnhancedStat::make('Due Within 7 Days', CurrencyConverter::formatCentsToMoney($amountDueWithin7Days))
+                ->suffix(CurrencyAccessor::getDefaultCurrency()),
+
+            EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', $averagePaymentTimeFormatted)
+                ->suffix('days'),
+
+            EnhancedStatsOverviewWidget\EnhancedStat::make('Paid Last Month', CurrencyConverter::formatCentsToMoney($lastMonthTotal))
+                ->suffix(CurrencyAccessor::getDefaultCurrency()),
+        ];
+    }
+}

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

@@ -3,15 +3,22 @@
 namespace App\Filament\Company\Resources\Sales;
 
 use App\Filament\Company\Resources\Sales\ClientResource\Pages;
+use App\Filament\Forms\Components\AddressFields;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CustomSection;
 use App\Filament\Forms\Components\PhoneBuilder;
+use App\Filament\Tables\Columns;
+use App\Models\Common\Address;
 use App\Models\Common\Client;
+use App\Utilities\Currency\CurrencyConverter;
 use Filament\Forms;
 use Filament\Forms\Form;
+use Filament\Forms\Get;
+use Filament\Forms\Set;
 use Filament\Resources\Resource;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Builder;
 
 class ClientResource extends Resource
 {
@@ -170,45 +177,27 @@ class ClientResource extends Resource
                         CreateCurrencySelect::make('currency_code'),
                         CustomSection::make('Billing Address')
                             ->relationship('billingAddress')
+                            ->saveRelationshipsUsing(null)
+                            ->dehydrated(true)
                             ->contained(false)
                             ->schema([
                                 Forms\Components\Hidden::make('type')
                                     ->default('billing'),
-                                Forms\Components\TextInput::make('address_line_1')
-                                    ->label('Address Line 1')
-                                    ->required()
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('address_line_2')
-                                    ->label('Address Line 2')
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('city')
-                                    ->label('City')
-                                    ->required()
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('state')
-                                    ->label('State')
-                                    ->required()
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('postal_code')
-                                    ->label('Postal Code / Zip Code')
-                                    ->required()
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('country')
-                                    ->label('Country')
-                                    ->required()
-                                    ->maxLength(255),
+                                AddressFields::make(),
                             ])->columns(),
                     ])
                     ->columns(1),
                 Forms\Components\Section::make('Shipping')
                     ->relationship('shippingAddress')
+                    ->saveRelationshipsUsing(null)
+                    ->dehydrated(true)
                     ->schema([
+                        Forms\Components\Hidden::make('type')
+                            ->default('shipping'),
                         Forms\Components\TextInput::make('recipient')
                             ->label('Recipient')
                             ->required()
                             ->maxLength(255),
-                        Forms\Components\Hidden::make('type')
-                            ->default('shipping'),
                         Forms\Components\TextInput::make('phone')
                             ->label('Phone')
                             ->required()
@@ -216,29 +205,39 @@ class ClientResource extends Resource
                         CustomSection::make('Shipping Address')
                             ->contained(false)
                             ->schema([
-                                Forms\Components\TextInput::make('address_line_1')
-                                    ->label('Address Line 1')
-                                    ->required()
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('address_line_2')
-                                    ->label('Address Line 2')
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('city')
-                                    ->label('City')
-                                    ->required()
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('state')
-                                    ->label('State')
-                                    ->required()
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('postal_code')
-                                    ->label('Postal Code / Zip Code')
-                                    ->required()
-                                    ->maxLength(255),
-                                Forms\Components\TextInput::make('country')
-                                    ->label('Country')
-                                    ->required()
-                                    ->maxLength(255),
+                                Forms\Components\Checkbox::make('same_as_billing')
+                                    ->label('Same as Billing Address')
+                                    ->live()
+                                    ->afterStateHydrated(function (?Address $record, Forms\Components\Checkbox $component) {
+                                        if (! $record || $record->parent_address_id) {
+                                            return $component->state(true);
+                                        }
+
+                                        return $component->state(false);
+                                    })
+                                    ->afterStateUpdated(static function (Get $get, Set $set, $state) {
+                                        if ($state) {
+                                            return;
+                                        }
+
+                                        $billingAddress = $get('../billingAddress');
+
+                                        $fieldsToSync = [
+                                            'address_line_1',
+                                            'address_line_2',
+                                            'country',
+                                            'state_id',
+                                            'city',
+                                            'postal_code',
+                                        ];
+
+                                        foreach ($fieldsToSync as $field) {
+                                            $set($field, $billingAddress[$field]);
+                                        }
+                                    })
+                                    ->columnSpanFull(),
+                                AddressFields::make()
+                                    ->visible(static fn (Get $get) => ! $get('same_as_billing')),
                                 Forms\Components\Textarea::make('notes')
                                     ->label('Delivery Instructions')
                                     ->maxLength(255)
@@ -252,21 +251,62 @@ class ClientResource extends Resource
     {
         return $table
             ->columns([
+                Columns::id(),
                 Tables\Columns\TextColumn::make('name')
                     ->searchable()
-                    ->description(fn (Client $client) => $client->primaryContact->full_name),
+                    ->sortable()
+                    ->description(static fn (Client $client) => $client->primaryContact->full_name),
                 Tables\Columns\TextColumn::make('primaryContact.email')
                     ->label('Email')
-                    ->searchable(),
+                    ->searchable()
+                    ->toggleable(),
                 Tables\Columns\TextColumn::make('primaryContact.phones')
                     ->label('Phone')
-                    ->state(fn (Client $client) => $client->primaryContact->first_available_phone),
+                    ->toggleable()
+                    ->state(static fn (Client $client) => $client->primaryContact->first_available_phone),
+                Tables\Columns\TextColumn::make('billingAddress.address_string')
+                    ->label('Billing Address')
+                    ->searchable()
+                    ->toggleable(isToggledHiddenByDefault: true)
+                    ->listWithLineBreaks(),
+                Tables\Columns\TextColumn::make('balance')
+                    ->label('Balance')
+                    ->getStateUsing(function (Client $client) {
+                        return $client->invoices()
+                            ->unpaid()
+                            ->get()
+                            ->sumMoneyInDefaultCurrency('amount_due');
+                    })
+                    ->coloredDescription(function (Client $client) {
+                        $overdue = $client->invoices()
+                            ->overdue()
+                            ->get()
+                            ->sumMoneyInDefaultCurrency('amount_due');
+
+                        if ($overdue <= 0) {
+                            return null;
+                        }
+
+                        $formattedOverdue = CurrencyConverter::formatCentsToMoney($overdue);
+
+                        return "Overdue: {$formattedOverdue}";
+                    })
+                    ->sortable(query: function (Builder $query, string $direction) {
+                        return $query
+                            ->withSum(['invoices' => fn (Builder $query) => $query->unpaid()], 'amount_due')
+                            ->orderBy('invoices_sum_amount_due', $direction);
+                    })
+                    ->currency(convert: false)
+                    ->alignEnd(),
             ])
             ->filters([
                 //
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
+                Tables\Actions\ActionGroup::make([
+                    Tables\Actions\EditAction::make(),
+                    Tables\Actions\ViewAction::make(),
+                ]),
             ])
             ->bulkActions([
                 Tables\Actions\BulkActionGroup::make([
@@ -287,6 +327,7 @@ class ClientResource extends Resource
         return [
             'index' => Pages\ListClients::route('/'),
             'create' => Pages\CreateClient::route('/create'),
+            'view' => Pages\ViewClient::route('/{record}'),
             'edit' => Pages\EditClient::route('/{record}/edit'),
         ];
     }

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

@@ -3,9 +3,12 @@
 namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 
 use App\Concerns\RedirectToListPage;
+use App\Enums\Common\AddressType;
 use App\Filament\Company\Resources\Sales\ClientResource;
+use App\Models\Common\Client;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Database\Eloquent\Model;
 
 class CreateClient extends CreateRecord
 {
@@ -17,4 +20,53 @@ class CreateClient extends CreateRecord
     {
         return MaxWidth::FiveExtraLarge;
     }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        /** @var Client $record */
+        $record = parent::handleRecordCreation($data);
+
+        // Create billing address first
+        $billingAddress = $record->addresses()->create([
+            ...$data['billingAddress'],
+            'type' => AddressType::Billing,
+        ]);
+
+        // Create shipping address with reference to billing if needed
+        $shippingData = $data['shippingAddress'];
+
+        $shippingAddress = [
+            'type' => AddressType::Shipping,
+            'recipient' => $shippingData['recipient'],
+            'phone' => $shippingData['phone'],
+            'notes' => $shippingData['notes'],
+        ];
+
+        if ($shippingData['same_as_billing']) {
+            $shippingAddress = [
+                ...$shippingAddress,
+                'parent_address_id' => $billingAddress->id,
+                'address_line_1' => $billingAddress->address_line_1,
+                'address_line_2' => $billingAddress->address_line_2,
+                'country_code' => $billingAddress->country_code,
+                'state_id' => $billingAddress->state_id,
+                'city' => $billingAddress->city,
+                'postal_code' => $billingAddress->postal_code,
+            ];
+        } else {
+            $shippingAddress = [
+                ...$shippingAddress,
+                'address_line_1' => $shippingData['address_line_1'],
+                'address_line_2' => $shippingData['address_line_2'],
+                'country_code' => $shippingData['country_code'],
+                'state_id' => $shippingData['state_id'],
+                'city' => $shippingData['city'],
+                'postal_code' => $shippingData['postal_code'],
+            ];
+        }
+
+        $record->addresses()->create($shippingAddress);
+
+        return $record;
+    }
 }

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

@@ -4,9 +4,11 @@ namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
 
 use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Sales\ClientResource;
+use App\Models\Common\Client;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Database\Eloquent\Model;
 
 class EditClient extends EditRecord
 {
@@ -25,4 +27,52 @@ class EditClient extends EditRecord
     {
         return MaxWidth::FiveExtraLarge;
     }
+
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        /** @var Client $record */
+        $record = parent::handleRecordUpdate($record, $data);
+
+        // Update billing address
+        $billingAddress = $record->billingAddress;
+        $billingAddress->update($data['billingAddress']);
+
+        // Update shipping address
+        $shippingAddress = $record->shippingAddress;
+        $shippingData = $data['shippingAddress'];
+
+        $shippingUpdateData = [
+            'recipient' => $shippingData['recipient'],
+            'phone' => $shippingData['phone'],
+            'notes' => $shippingData['notes'],
+        ];
+
+        if ($shippingData['same_as_billing']) {
+            $shippingUpdateData = [
+                ...$shippingUpdateData,
+                'parent_address_id' => $billingAddress->id,
+                'address_line_1' => $billingAddress->address_line_1,
+                'address_line_2' => $billingAddress->address_line_2,
+                'country_code' => $billingAddress->country_code,
+                'state_id' => $billingAddress->state_id,
+                'city' => $billingAddress->city,
+                'postal_code' => $billingAddress->postal_code,
+            ];
+        } else {
+            $shippingUpdateData = [
+                ...$shippingUpdateData,
+                'parent_address_id' => null,
+                'address_line_1' => $shippingData['address_line_1'],
+                'address_line_2' => $shippingData['address_line_2'],
+                'country_code' => $shippingData['country_code'],
+                'state_id' => $shippingData['state_id'],
+                'city' => $shippingData['city'],
+                'postal_code' => $shippingData['postal_code'],
+            ];
+        }
+
+        $shippingAddress->update($shippingUpdateData);
+
+        return $record;
+    }
 }

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

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\ClientResource\Pages;
+
+use App\Filament\Company\Resources\Sales\ClientResource;
+use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers;
+use Filament\Infolists\Components\Section;
+use Filament\Infolists\Components\TextEntry;
+use Filament\Infolists\Infolist;
+use Filament\Resources\Pages\ViewRecord;
+use Illuminate\Contracts\Support\Htmlable;
+
+class ViewClient extends ViewRecord
+{
+    protected static string $resource = ClientResource::class;
+
+    public function getRelationManagers(): array
+    {
+        return [
+            RelationManagers\InvoicesRelationManager::class,
+            RelationManagers\RecurringInvoicesRelationManager::class,
+            RelationManagers\EstimatesRelationManager::class,
+        ];
+    }
+
+    public function getTitle(): string | Htmlable
+    {
+        return $this->record->name;
+    }
+
+    protected function getHeaderWidgets(): array
+    {
+        return [
+            ClientResource\Widgets\InvoiceOverview::class,
+        ];
+    }
+
+    public function infolist(Infolist $infolist): Infolist
+    {
+        return $infolist
+            ->schema([
+                Section::make('General')
+                    ->columns()
+                    ->schema([
+                        TextEntry::make('primaryContact.full_name')
+                            ->label('Primary Contact'),
+                        TextEntry::make('primaryContact.email')
+                            ->label('Primary Email'),
+                        TextEntry::make('primaryContact.first_available_phone')
+                            ->label('Primary Phone'),
+                        TextEntry::make('website')
+                            ->label('Website')
+                            ->url(static fn ($state) => $state, true),
+                    ]),
+                Section::make('Additional Details')
+                    ->columns()
+                    ->schema([
+                        TextEntry::make('billingAddress.address_string')
+                            ->label('Billing Address')
+                            ->listWithLineBreaks(),
+                        TextEntry::make('shippingAddress.address_string')
+                            ->label('Shipping Address')
+                            ->listWithLineBreaks(),
+                        TextEntry::make('notes')
+                            ->label('Delivery Instructions'),
+                    ]),
+            ]);
+    }
+}

app/Filament/Company/Resources/Sales/ClientResource/RelationManagers/EstimatesRelationManager.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\ClientResource\RelationManagers;
+
+use App\Filament\Company\Resources\Sales\EstimateResource;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class EstimatesRelationManager extends RelationManager
+{
+    protected static string $relationship = 'estimates';
+
+    protected static bool $isLazy = false;
+
+    public function isReadOnly(): bool
+    {
+        return false;
+    }
+
+    public function table(Table $table): Table
+    {
+        return EstimateResource::table($table)
+            ->headerActions([
+                Tables\Actions\CreateAction::make()
+                    ->url(EstimateResource\Pages\CreateEstimate::getUrl(['client' => $this->getOwnerRecord()->getKey()])),
+            ]);
+    }
+}

app/Filament/Company/Resources/Sales/ClientResource/RelationManagers/InvoicesRelationManager.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\ClientResource\RelationManagers;
+
+use App\Filament\Company\Resources\Sales\InvoiceResource;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class InvoicesRelationManager extends RelationManager
+{
+    protected static string $relationship = 'invoices';
+
+    protected static bool $isLazy = false;
+
+    public function isReadOnly(): bool
+    {
+        return false;
+    }
+
+    public function table(Table $table): Table
+    {
+        return InvoiceResource::table($table)
+            ->headerActions([
+                Tables\Actions\CreateAction::make()
+                    ->url(InvoiceResource\Pages\CreateInvoice::getUrl(['client' => $this->getOwnerRecord()->getKey()])),
+            ]);
+    }
+}

app/Filament/Company/Resources/Sales/ClientResource/RelationManagers/RecurringInvoicesRelationManager.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\ClientResource\RelationManagers;
+
+use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
+use Filament\Resources\RelationManagers\RelationManager;
+use Filament\Tables;
+use Filament\Tables\Table;
+
+class RecurringInvoicesRelationManager extends RelationManager
+{
+    protected static string $relationship = 'recurringInvoices';
+
+    protected static bool $isLazy = false;
+
+    public function isReadOnly(): bool
+    {
+        return false;
+    }
+
+    public function table(Table $table): Table
+    {
+        return RecurringInvoiceResource::table($table)
+            ->headerActions([
+                Tables\Actions\CreateAction::make()
+                    ->url(RecurringInvoiceResource\Pages\CreateRecurringInvoice::getUrl(['client' => $this->getOwnerRecord()->getKey()])),
+            ]);
+    }
+}

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

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Filament\Company\Resources\Sales\ClientResource\Widgets;
+
+use App\Enums\Accounting\InvoiceStatus;
+use App\Filament\Widgets\EnhancedStatsOverviewWidget;
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Number;
+
+class InvoiceOverview extends EnhancedStatsOverviewWidget
+{
+    public ?Model $record = null;
+
+    protected function getStats(): array
+    {
+        $unpaidInvoices = $this->record->invoices()->unpaid();
+
+        $amountUnpaid = $unpaidInvoices->get()->sumMoneyInDefaultCurrency('amount_due');
+
+        $amountOverdue = $unpaidInvoices->clone()
+            ->where('status', InvoiceStatus::Overdue)
+            ->get()
+            ->sumMoneyInDefaultCurrency('amount_due');
+
+        $amountDueWithin30Days = $unpaidInvoices->clone()
+            ->whereBetween('due_date', [today(), today()->addMonth()])
+            ->get()
+            ->sumMoneyInDefaultCurrency('amount_due');
+
+        $validInvoices = $this->record->invoices()
+            ->whereNotIn('status', [
+                InvoiceStatus::Void,
+                InvoiceStatus::Draft,
+            ]);
+
+        $totalValidInvoiceAmount = $validInvoices->get()->sumMoneyInDefaultCurrency('total');
+
+        $totalValidInvoiceCount = $validInvoices->count();
+
+        $averageInvoiceTotal = $totalValidInvoiceCount > 0
+            ? (int) round($totalValidInvoiceAmount / $totalValidInvoiceCount)
+            : 0;
+
+        $averagePaymentTime = $this->record->invoices()
+            ->whereNotNull('paid_at')
+            ->selectRaw('AVG(TIMESTAMPDIFF(DAY, date, paid_at)) as avg_days')
+            ->value('avg_days');
+
+        $averagePaymentTimeFormatted = Number::format($averagePaymentTime ?? 0, maxPrecision: 1);
+
+        return [
+            EnhancedStatsOverviewWidget\EnhancedStat::make('Total Unpaid', CurrencyConverter::formatCentsToMoney($amountUnpaid))
+                ->suffix(CurrencyAccessor::getDefaultCurrency())
+                ->description('Includes ' . CurrencyConverter::formatCentsToMoney($amountOverdue) . ' overdue'),
+            EnhancedStatsOverviewWidget\EnhancedStat::make('Due Within 30 Days', CurrencyConverter::formatCentsToMoney($amountDueWithin30Days))
+                ->suffix(CurrencyAccessor::getDefaultCurrency()),
+            EnhancedStatsOverviewWidget\EnhancedStat::make('Average Payment Time', $averagePaymentTimeFormatted)
+                ->suffix('days'),
+            EnhancedStatsOverviewWidget\EnhancedStat::make('Average Invoice Total', CurrencyConverter::formatCentsToMoney($averageInvoiceTotal))
+                ->suffix(CurrencyAccessor::getDefaultCurrency()),
+        ];
+    }
+}

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

@@ -10,6 +10,7 @@ use App\Filament\Company\Resources\Sales\EstimateResource\Widgets;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
+use App\Filament\Tables\Columns;
 use App\Filament\Tables\Filters\DateRangeFilter;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\Estimate;
@@ -286,11 +287,7 @@ class EstimateResource extends Resource
         return $table
             ->defaultSort('expiration_date')
             ->columns([
-                Tables\Columns\TextColumn::make('id')
-                    ->label('ID')
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true)
-                    ->searchable(),
+                Columns::id(),
                 Tables\Columns\TextColumn::make('status')
                     ->badge()
                     ->searchable(),
@@ -311,7 +308,7 @@ class EstimateResource extends Resource
                 Tables\Columns\TextColumn::make('total')
                     ->currencyWithConversion(static fn (Estimate $record) => $record->currency_code)
                     ->sortable()
-                    ->toggleable(),
+                    ->alignEnd(),
             ])
             ->filters([
                 Tables\Filters\SelectFilter::make('client')

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

@@ -6,9 +6,11 @@ use App\Concerns\ManagesLineItems;
 use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Sales\EstimateResource;
 use App\Models\Accounting\Estimate;
+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 CreateEstimate extends CreateRecord
 {
@@ -17,6 +19,22 @@ class CreateEstimate extends CreateRecord
 
     protected static string $resource = EstimateResource::class;
 
+    #[Url(as: 'client')]
+    public ?int $clientId = null;
+
+    public function mount(): void
+    {
+        parent::mount();
+
+        if ($this->clientId) {
+            $this->data['client_id'] = $this->clientId;
+
+            if ($currencyCode = Client::find($this->clientId)?->currency_code) {
+                $this->data['currency_code'] = $currencyCode;
+            }
+        }
+    }
+
     public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::Full;

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

@@ -7,12 +7,14 @@ use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\PaymentMethod;
+use App\Filament\Company\Resources\Sales\ClientResource\RelationManagers\InvoicesRelationManager;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 use App\Filament\Company\Resources\Sales\InvoiceResource\RelationManagers;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Widgets;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
+use App\Filament\Tables\Columns;
 use App\Filament\Tables\Filters\DateRangeFilter;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\Invoice;
@@ -114,7 +116,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')
@@ -297,27 +302,26 @@ class InvoiceResource extends Resource
         return $table
             ->defaultSort('due_date')
             ->modifyQueryUsing(function (Builder $query, Tables\Contracts\HasTable $livewire) {
-                $recurringInvoiceId = $livewire->recurringInvoice;
+                if (property_exists($livewire, 'recurringInvoice')) {
+                    $recurringInvoiceId = $livewire->recurringInvoice;
 
-                if (! empty($recurringInvoiceId)) {
-                    $query->where('recurring_invoice_id', $recurringInvoiceId);
+                    if (! empty($recurringInvoiceId)) {
+                        $query->where('recurring_invoice_id', $recurringInvoiceId);
+                    }
                 }
 
                 return $query;
             })
             ->columns([
-                Tables\Columns\TextColumn::make('id')
-                    ->label('ID')
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true)
-                    ->searchable(),
+                Columns::id(),
                 Tables\Columns\TextColumn::make('status')
                     ->badge()
                     ->searchable(),
                 Tables\Columns\TextColumn::make('due_date')
                     ->label('Due')
                     ->asRelativeDay()
-                    ->sortable(),
+                    ->sortable()
+                    ->hideOnTabs(['draft']),
                 Tables\Columns\TextColumn::make('date')
                     ->date()
                     ->sortable(),
@@ -330,20 +334,25 @@ class InvoiceResource extends Resource
                     ->sortable(),
                 Tables\Columns\TextColumn::make('client.name')
                     ->sortable()
-                    ->searchable(),
+                    ->searchable()
+                    ->hiddenOn(InvoicesRelationManager::class),
                 Tables\Columns\TextColumn::make('total')
                     ->currencyWithConversion(static fn (Invoice $record) => $record->currency_code)
                     ->sortable()
-                    ->toggleable(),
+                    ->toggleable()
+                    ->alignEnd(),
                 Tables\Columns\TextColumn::make('amount_paid')
                     ->label('Amount Paid')
                     ->currencyWithConversion(static fn (Invoice $record) => $record->currency_code)
                     ->sortable()
-                    ->toggleable(),
+                    ->alignEnd()
+                    ->showOnTabs(['unpaid']),
                 Tables\Columns\TextColumn::make('amount_due')
                     ->label('Amount Due')
                     ->currencyWithConversion(static fn (Invoice $record) => $record->currency_code)
-                    ->sortable(),
+                    ->sortable()
+                    ->alignEnd()
+                    ->hideOnTabs(['draft']),
             ])
             ->filters([
                 Tables\Filters\SelectFilter::make('client')
@@ -386,8 +395,10 @@ class InvoiceResource extends Resource
             ])
             ->actions([
                 Tables\Actions\ActionGroup::make([
-                    Tables\Actions\EditAction::make(),
-                    Tables\Actions\ViewAction::make(),
+                    Tables\Actions\EditAction::make()
+                        ->url(static fn (Invoice $record) => Pages\EditInvoice::getUrl(['record' => $record])),
+                    Tables\Actions\ViewAction::make()
+                        ->url(static fn (Invoice $record) => Pages\ViewInvoice::getUrl(['record' => $record])),
                     Tables\Actions\DeleteAction::make(),
                     Invoice::getReplicateAction(Tables\Actions\ReplicateAction::class),
                     Invoice::getApproveDraftAction(Tables\Actions\Action::class),

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,6 +19,22 @@ class CreateInvoice extends CreateRecord
 
     protected static string $resource = InvoiceResource::class;
 
+    #[Url(as: 'client')]
+    public ?int $clientId = null;
+
+    public function mount(): void
+    {
+        parent::mount();
+
+        if ($this->clientId) {
+            $this->data['client_id'] = $this->clientId;
+
+            if ($currencyCode = Client::find($this->clientId)?->currency_code) {
+                $this->data['currency_code'] = $currencyCode;
+            }
+        }
+    }
+
     public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::Full;

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

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
+use App\Concerns\HasTabSpecificColumnToggles;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Widgets;
@@ -23,6 +24,7 @@ use Livewire\Attributes\Url;
 class ListInvoices extends ListRecords
 {
     use ExposesTableToWidgets;
+    use HasTabSpecificColumnToggles;
 
     protected static string $resource = InvoiceResource::class;
 

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

@@ -9,6 +9,7 @@ use App\Enums\Setting\PaymentTerms;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\DocumentTotals;
+use App\Filament\Tables\Columns;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\RecurringInvoice;
 use App\Models\Common\Client;
@@ -272,11 +273,7 @@ class RecurringInvoiceResource extends Resource
         return $table
             ->defaultSort('next_date')
             ->columns([
-                Tables\Columns\TextColumn::make('id')
-                    ->label('ID')
-                    ->sortable()
-                    ->toggleable(isToggledHiddenByDefault: true)
-                    ->searchable(),
+                Columns::id(),
                 Tables\Columns\TextColumn::make('status')
                     ->badge()
                     ->searchable(),
@@ -291,20 +288,31 @@ class RecurringInvoiceResource extends Resource
                     ->description(function (RecurringInvoice $record) {
                         return $record->getTimelineDescription();
                     }),
+                Tables\Columns\TextColumn::make('created_at')
+                    ->label('Created')
+                    ->date()
+                    ->sortable()
+                    ->showOnTabs(['draft']),
+                Tables\Columns\TextColumn::make('start_date')
+                    ->label('First Invoice')
+                    ->date()
+                    ->sortable()
+                    ->showOnTabs(['draft']),
                 Tables\Columns\TextColumn::make('last_date')
                     ->label('Last Invoice')
                     ->date()
                     ->sortable()
-                    ->searchable(),
+                    ->hideOnTabs(['draft']),
                 Tables\Columns\TextColumn::make('next_date')
                     ->label('Next Invoice')
                     ->date()
                     ->sortable()
-                    ->searchable(),
+                    ->hideOnTabs(['draft']),
                 Tables\Columns\TextColumn::make('total')
                     ->currencyWithConversion(static fn (RecurringInvoice $record) => $record->currency_code)
                     ->sortable()
-                    ->toggleable(),
+                    ->toggleable()
+                    ->alignEnd(),
             ])
             ->filters([
                 Tables\Filters\SelectFilter::make('client')

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

@@ -5,9 +5,11 @@ namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 use App\Concerns\ManagesLineItems;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
 use App\Models\Accounting\RecurringInvoice;
+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 CreateRecurringInvoice extends CreateRecord
 {
@@ -15,6 +17,22 @@ class CreateRecurringInvoice extends CreateRecord
 
     protected static string $resource = RecurringInvoiceResource::class;
 
+    #[Url(as: 'client')]
+    public ?int $clientId = null;
+
+    public function mount(): void
+    {
+        parent::mount();
+
+        if ($this->clientId) {
+            $this->data['client_id'] = $this->clientId;
+
+            if ($currencyCode = Client::find($this->clientId)?->currency_code) {
+                $this->data['currency_code'] = $currencyCode;
+            }
+        }
+    }
+
     public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::Full;

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

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 
+use App\Concerns\HasTabSpecificColumnToggles;
 use App\Enums\Accounting\RecurringInvoiceStatus;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
 use Filament\Actions;
@@ -12,6 +13,8 @@ use Illuminate\Database\Eloquent\Builder;
 
 class ListRecurringInvoices extends ListRecords
 {
+    use HasTabSpecificColumnToggles;
+
     protected static string $resource = RecurringInvoiceResource::class;
 
     protected function getHeaderActions(): array

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,7 +54,7 @@ class ViewRecurringInvoice extends ViewRecord
     {
         return $infolist
             ->schema([
-                SimpleAlert::make('scheduleIsNotSet')
+                BannerEntry::make('scheduleIsNotSet')
                     ->info()
                     ->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.')
@@ -64,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

@@ -0,0 +1,58 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use Filament\Forms\Components\Field;
+use Filament\Forms\Components\Grid;
+use Filament\Forms\Components\TextInput;
+
+class AddressFields extends Grid
+{
+    protected bool $isSoftRequired = false;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->schema([
+            TextInput::make('address_line_1')
+                ->label('Address Line 1')
+                ->required()
+                ->maxLength(255),
+            TextInput::make('address_line_2')
+                ->label('Address Line 2')
+                ->maxLength(255),
+            CountrySelect::make('country_code')
+                ->clearStateField()
+                ->required(),
+            StateSelect::make('state_id'),
+            TextInput::make('city')
+                ->label('City')
+                ->required()
+                ->maxLength(255),
+            TextInput::make('postal_code')
+                ->label('Postal Code / Zip Code')
+                ->maxLength(255),
+        ]);
+    }
+
+    public function softRequired(bool $condition = true): static
+    {
+        $this->setSoftRequired($condition);
+
+        return $this;
+    }
+
+    protected function setSoftRequired(bool $condition): void
+    {
+        $this->isSoftRequired = $condition;
+
+        $childComponents = $this->getChildComponents();
+
+        foreach ($childComponents as $component) {
+            if ($component instanceof Field && $component->isRequired()) {
+                $component->markAsRequired(! $condition);
+            }
+        }
+    }
+}

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/CountrySelect.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Models\Locale\Country;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Set;
+
+class CountrySelect extends Select
+{
+    protected ?string $stateFieldName = null;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this
+            ->localizeLabel('Country')
+            ->searchable()
+            ->options($options = Country::getAvailableCountryOptions())
+            ->getSearchResultsUsing(static fn (string $search): array => Country::getSearchResultsUsing($search))
+            ->getOptionLabelUsing(static fn (string $value): ?string => $options[$value] ?? $value);
+
+        $this->afterStateUpdated(function (self $component, Set $set) {
+            if ($component->shouldClearStateField()) {
+                $set($component->getStateFieldName(), null);
+            }
+        });
+    }
+
+    public function clearStateField(string $fieldName = 'state_id'): static
+    {
+        $this->stateFieldName = $fieldName;
+
+        $this->live();
+
+        return $this;
+    }
+
+    public function getStateFieldName(): ?string
+    {
+        return $this->stateFieldName;
+    }
+
+    public function shouldClearStateField(): bool
+    {
+        return (bool) $this->stateFieldName;
+    }
+}

app/Filament/Forms/Components/LabeledField.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace App\Filament\Forms\Components;
-
-use Closure;
-use Filament\Forms\Components\Component;
-use Illuminate\Contracts\Support\Htmlable;
-
-class LabeledField extends Component
-{
-    protected string $view = 'filament.forms.components.labeled-field';
-
-    protected string | Htmlable | Closure | null $prefixLabel = null;
-
-    protected string | Htmlable | Closure | null $suffixLabel = null;
-
-    public static function make(): static
-    {
-        return app(static::class);
-    }
-
-    public function prefix(string | Htmlable | Closure | null $label): static
-    {
-        $this->prefixLabel = $label;
-
-        return $this;
-    }
-
-    public function suffix(string | Htmlable | Closure | null $label): static
-    {
-        $this->suffixLabel = $label;
-
-        return $this;
-    }
-
-    public function getPrefixLabel(): string | Htmlable | null
-    {
-        return $this->evaluate($this->prefixLabel);
-    }
-
-    public function getSuffixLabel(): string | Htmlable | null
-    {
-        return $this->evaluate($this->suffixLabel);
-    }
-}

app/Filament/Forms/Components/LineItemRepeater.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace App\Filament\Forms\Components;
-
-use Awcodes\TableRepeater\Components\TableRepeater;
-use Closure;
-use Filament\Forms\ComponentContainer;
-use Filament\Forms\Components\Component;
-
-class LineItemRepeater extends TableRepeater
-{
-    protected array | Closure $nestedSchema = [];
-
-    protected ?string $nestedColumn = null;
-
-    /**
-     * Set nested schema and optionally the column it belongs to.
-     *
-     * @param  array<Component> | Closure  $components
-     */
-    public function withNestedSchema(array | Closure $components, ?string $underColumn = null): static
-    {
-        $this->nestedSchema = $components;
-        $this->nestedColumn = $underColumn;
-
-        return $this;
-    }
-
-    /**
-     * Get the nested schema.
-     *
-     * @return array<Component>
-     */
-    public function getNestedSchema(): array
-    {
-        return $this->evaluate($this->nestedSchema);
-    }
-
-    /**
-     * Get the column under which the nested schema should be rendered.
-     */
-    public function getNestedColumn(): ?string
-    {
-        return $this->nestedColumn;
-    }
-
-    /**
-     * Determine if there is a nested schema defined.
-     */
-    public function hasNestedSchema(): bool
-    {
-        return ! empty($this->getNestedSchema());
-    }
-
-    public function getNestedSchemaMap(): array
-    {
-        return collect($this->getNestedSchema())
-            ->keyBy(fn ($component) => $component->getKey())
-            ->all();
-    }
-
-    /**
-     * Get all child components, including nested schema.
-     *
-     * @return array<Component>
-     */
-    public function getChildComponents(): array
-    {
-        $components = parent::getChildComponents();
-
-        if ($this->hasNestedSchema()) {
-            $components = array_merge($components, $this->getNestedSchema());
-        }
-
-        return $components;
-    }
-
-    public function getChildComponentContainers(bool $withHidden = false): array
-    {
-        if ((! $withHidden) && $this->isHidden()) {
-            return [];
-        }
-
-        $relationship = $this->getRelationship();
-
-        $records = $relationship ? $this->getCachedExistingRecords() : null;
-
-        $containers = [];
-
-        foreach ($this->getState() ?? [] as $itemKey => $itemData) {
-            $containers[$itemKey] = $this
-                ->getChildComponentContainer()
-                ->statePath($itemKey)
-                ->model($relationship ? $records[$itemKey] ?? $this->getRelatedModel() : null)
-                ->inlineLabel(false)
-                ->getClone();
-        }
-
-        return $containers;
-    }
-
-    public function getChildComponentContainersWithoutNestedSchema(bool $withHidden = false): array
-    {
-        if ((! $withHidden) && $this->isHidden()) {
-            return [];
-        }
-
-        $relationship = $this->getRelationship();
-        $records = $relationship ? $this->getCachedExistingRecords() : null;
-
-        $containers = [];
-
-        $childComponentsWithoutNestedSchema = $this->getChildComponentsWithoutNestedSchema();
-
-        foreach ($this->getState() ?? [] as $itemKey => $itemData) {
-            $containers[$itemKey] = ComponentContainer::make($this->getLivewire())
-                ->parentComponent($this)
-                ->statePath($itemKey)
-                ->model($relationship ? $records[$itemKey] ?? $this->getRelatedModel() : null)
-                ->components($childComponentsWithoutNestedSchema)
-                ->inlineLabel(false)
-                ->getClone();
-        }
-
-        return $containers;
-    }
-
-    public function getChildComponentContainer($key = null): ComponentContainer
-    {
-        if (filled($key) && array_key_exists($key, $containers = $this->getChildComponentContainers())) {
-            return $containers[$key];
-        }
-
-        return ComponentContainer::make($this->getLivewire())
-            ->parentComponent($this)
-            ->components($this->getChildComponents());
-    }
-
-    public function getChildComponentsWithoutNestedSchema(): array
-    {
-        // Fetch the nested schema components.
-        $nestedSchema = $this->getNestedSchema();
-
-        // Filter out the nested schema components.
-        return array_filter($this->getChildComponents(), function ($component) use ($nestedSchema) {
-            return ! in_array($component, $nestedSchema, true);
-        });
-    }
-
-    public function getNestedComponents(): array
-    {
-        // Fetch the nested schema components.
-        $nestedSchema = $this->getNestedSchema();
-
-        // Separate and return only the nested schema components.
-        return array_filter($this->getChildComponents(), function ($component) use ($nestedSchema) {
-            return in_array($component, $nestedSchema, true);
-        });
-    }
-
-    public function getView(): string
-    {
-        return 'filament.forms.components.line-item-repeater';
-    }
-}

app/Filament/Forms/Components/StateSelect.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Models\Locale\State;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Get;
+
+class StateSelect extends Select
+{
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this
+            ->localizeLabel('State / Province')
+            ->searchable()
+            ->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/Filament/Tables/Columns.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Filament\Tables;
+
+use Filament\Tables\Columns\TextColumn;
+
+class Columns
+{
+    public static function id(): TextColumn
+    {
+        return TextColumn::make('id')
+            ->label('ID')
+            ->sortable()
+            ->toggleable(isToggledHiddenByDefault: true)
+            ->searchable();
+    }
+}

app/Models/Accounting/Invoice.php

@@ -180,6 +180,13 @@ class Invoice extends Document
         ]);
     }
 
+    public function scopeOverdue(Builder $query): Builder
+    {
+        return $query
+            ->unpaid()
+            ->where('status', InvoiceStatus::Overdue);
+    }
+
     protected function isCurrentlyOverdue(): Attribute
     {
         return Attribute::get(function () {

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;
@@ -200,8 +200,12 @@ class RecurringInvoice extends Document
         return $this->start_date?->gte(today()) ?? false;
     }
 
-    public function getScheduleDescription(): string
+    public function getScheduleDescription(): ?string
     {
+        if (! $this->hasSchedule()) {
+            return null;
+        }
+
         $frequency = $this->frequency;
 
         return match (true) {
@@ -215,7 +219,7 @@ class RecurringInvoice extends Document
 
             $frequency->isCustom() => $this->getCustomScheduleDescription(),
 
-            default => 'Not Configured',
+            default => null,
         };
     }
 
@@ -238,10 +242,10 @@ class RecurringInvoice extends Document
         return "Repeat every {$interval}{$dayDescription}";
     }
 
-    public function getEndDescription(): string
+    public function getEndDescription(): ?string
     {
         if (! $this->end_type) {
-            return 'Not configured';
+            return null;
         }
 
         return match (true) {
@@ -251,12 +255,16 @@ class RecurringInvoice extends Document
 
             $this->end_type->isOn() && $this->end_date => 'On ' . $this->end_date->toDefaultDateFormat(),
 
-            default => 'Not configured'
+            default => null,
         };
     }
 
-    public function getTimelineDescription(): string
+    public function getTimelineDescription(): ?string
     {
+        if (! $this->hasSchedule()) {
+            return null;
+        }
+
         $parts = [];
 
         if ($this->start_date) {
@@ -303,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
@@ -325,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
         };
@@ -400,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()
@@ -422,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)
@@ -455,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

@@ -5,8 +5,13 @@ namespace App\Models\Common;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
 use App\Enums\Common\AddressType;
+use App\Models\Locale\Country;
+use App\Models\Locale\State;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\MorphTo;
 
 class Address extends Model
@@ -19,15 +24,16 @@ class Address extends Model
 
     protected $fillable = [
         'company_id',
+        'parent_address_id',
         'type',
         'recipient',
         'phone',
         'address_line_1',
         'address_line_2',
         'city',
-        'state',
+        'state_id',
         'postal_code',
-        'country',
+        'country_code',
         'notes',
         'created_by',
         'updated_by',
@@ -41,4 +47,48 @@ class Address extends Model
     {
         return $this->morphTo();
     }
+
+    public function parentAddress(): BelongsTo
+    {
+        return $this->belongsTo(self::class, 'parent_address_id', 'id');
+    }
+
+    public function childAddresses(): HasMany
+    {
+        return $this->hasMany(self::class, 'parent_address_id', 'id');
+    }
+
+    public function country(): BelongsTo
+    {
+        return $this->belongsTo(Country::class, 'country_code', 'id');
+    }
+
+    public function state(): BelongsTo
+    {
+        return $this->belongsTo(State::class, 'state_id', 'id');
+    }
+
+    protected function addressString(): Attribute
+    {
+        return Attribute::get(function () {
+            $street = array_filter([
+                $this->address_line_1,
+                $this->address_line_2,
+            ]);
+
+            return array_filter([
+                implode(', ', $street), // Street 1 & 2 on same line if both exist
+                implode(', ', array_filter([
+                    $this->city,
+                    $this->state->name,
+                    $this->postal_code,
+                ])),
+            ]);
+        });
+    }
+
+    public function isIncomplete(): bool
+    {
+        return empty($this->address_line_1) || empty($this->city);
+    }
 }

app/Models/Common/Client.php

@@ -5,7 +5,9 @@ namespace App\Models\Common;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
 use App\Enums\Common\AddressType;
+use App\Models\Accounting\Estimate;
 use App\Models\Accounting\Invoice;
+use App\Models\Accounting\RecurringInvoice;
 use App\Models\Setting\Currency;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -72,8 +74,18 @@ class Client extends Model
             ->where('type', AddressType::Shipping);
     }
 
+    public function estimates(): HasMany
+    {
+        return $this->hasMany(Estimate::class);
+    }
+
     public function invoices(): HasMany
     {
         return $this->hasMany(Invoice::class);
     }
+
+    public function recurringInvoices(): HasMany
+    {
+        return $this->hasMany(RecurringInvoice::class);
+    }
 }

app/Models/Locale/Country.php

@@ -2,7 +2,7 @@
 
 namespace App\Models\Locale;
 
-use App\Models\Setting\CompanyProfile;
+use App\Models\Common\Address;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
@@ -49,9 +49,9 @@ class Country extends Model
         return $this->belongsTo(Currency::class, 'currency_code', 'code');
     }
 
-    public function profiles(): HasMany
+    public function addresses(): HasMany
     {
-        return $this->hasMany(CompanyProfile::class, 'country', 'id');
+        return $this->hasMany(Address::class, 'country_code', 'id');
     }
 
     public function states(): HasMany
@@ -80,19 +80,50 @@ class Country extends Model
 
     public static function getAllCountryCodes(): Collection
     {
-        return self::all()->pluck('id');
+        return self::query()
+            ->select('id')
+            ->pluck('id');
     }
 
     public static function getAvailableCountryOptions(): array
     {
-        return self::all()->mapWithKeys(static function ($country): array {
-            return [$country->id => $country->name . ' ' . $country->flag];
-        })->toArray();
+        return self::query()
+            ->select(['id', 'name', 'flag'])
+            ->orderBy('name')
+            ->get()
+            ->mapWithKeys(static fn ($country) => [
+                $country->id => $country->name . ' ' . $country->flag,
+            ])
+            ->toArray();
+    }
+
+    public static function getSearchResultsUsing(string $search): array
+    {
+        return self::query()
+            ->select(['id', 'name', 'flag'])
+            ->where(static function ($query) use ($search) {
+                $query->whereLike('name', "%{$search}%")
+                    ->orWhereLike('id', "%{$search}%");
+            })
+            ->orderByRaw('
+                CASE
+                    WHEN id = ? THEN 1
+                    WHEN id LIKE ? THEN 2
+                    WHEN name LIKE ? THEN 3
+                    ELSE 4
+                END
+            ', [$search, $search . '%', $search . '%'])
+            ->limit(50)
+            ->get()
+            ->mapWithKeys(static fn (self $country) => [
+                $country->id => $country->name . ' ' . $country->flag,
+            ])
+            ->toArray();
     }
 
     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/Models/Setting/CompanyProfile.php

@@ -5,15 +5,13 @@ namespace App\Models\Setting;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
 use App\Enums\Setting\EntityType;
-use App\Models\Locale\City;
-use App\Models\Locale\Country;
-use App\Models\Locale\State;
+use App\Models\Common\Address;
 use Database\Factories\Setting\CompanyProfileFactory;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphOne;
 use Illuminate\Support\Facades\Storage;
 
 class CompanyProfile extends Model
@@ -27,11 +25,6 @@ class CompanyProfile extends Model
     protected $fillable = [
         'company_id',
         'logo',
-        'address',
-        'city_id',
-        'zip_code',
-        'state_id',
-        'country',
         'phone_number',
         'email',
         'tax_id',
@@ -59,24 +52,9 @@ class CompanyProfile extends Model
         });
     }
 
-    public function country(): BelongsTo
+    public function address(): MorphOne
     {
-        return $this->belongsTo(Country::class, 'country', 'id');
-    }
-
-    public function city(): BelongsTo
-    {
-        return $this->belongsTo(City::class, 'city_id', 'id');
-    }
-
-    public function state(): BelongsTo
-    {
-        return $this->belongsTo(State::class, 'state_id', 'id');
-    }
-
-    public function getCountryName(): string
-    {
-        return Country::findByIsoCode2($this->country)?->name ?? '';
+        return $this->morphOne(Address::class, 'addressable');
     }
 
     protected static function newFactory(): Factory

app/Models/Setting/DocumentDefault.php

@@ -187,6 +187,23 @@ class DocumentDefault extends Model
         return $options[$optionValue] ?? null;
     }
 
+    public function resolveColumnLabel(string $column, string $default, ?array $data = null): string
+    {
+        if ($data) {
+            $custom = $data[$column]['custom'] ?? null;
+            $option = $data[$column]['option'] ?? null;
+        } else {
+            $custom = $this->{$column}['custom'] ?? null;
+            $option = $this->{$column}['option'] ?? null;
+        }
+
+        if ($custom) {
+            return $custom;
+        }
+
+        return $this->getLabelOptionFor($column, $option) ?? $default;
+    }
+
     protected static function newFactory(): Factory
     {
         return DocumentDefaultFactory::new();

app/Providers/FilamentCompaniesServiceProvider.php

@@ -276,6 +276,10 @@ class FilamentCompaniesServiceProvider extends PanelProvider
                 ->filtersFormWidth(MaxWidth::Small)
                 ->filtersTriggerAction(fn (Tables\Actions\Action $action) => $action->slideOver());
         }, isImportant: true);
+
+        Tables\Columns\TextColumn::configureUsing(function (Tables\Columns\TextColumn $column): void {
+            $column->placeholder('–');
+        });
     }
 
     /**

app/Providers/MacroServiceProvider.php

@@ -19,7 +19,10 @@ use Filament\Forms\Components\Field;
 use Filament\Forms\Components\TextInput;
 use Filament\Infolists\Components\TextEntry;
 use Filament\Tables\Columns\TextColumn;
+use Filament\Tables\Contracts\HasTable;
+use Illuminate\Contracts\Support\Htmlable;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\HtmlString;
 use Illuminate\Support\ServiceProvider;
 
 class MacroServiceProvider extends ServiceProvider
@@ -113,6 +116,32 @@ class MacroServiceProvider extends ServiceProvider
                 });
         });
 
+        TextColumn::macro('coloredDescription', function (string | Htmlable | Closure | null $description, string $color = 'danger') {
+            $this->description(static function (TextColumn $column) use ($description, $color): Htmlable {
+                $description = $column->evaluate($description);
+
+                return new HtmlString("<span class='text-{$color}-700 dark:text-{$color}-400'>{$description}</span>");
+            });
+
+            return $this;
+        });
+
+        TextColumn::macro('hideOnTabs', function (array $tabs): static {
+            $this->toggleable(isToggledHiddenByDefault: function (HasTable $livewire) use ($tabs) {
+                return in_array($livewire->activeTab, $tabs);
+            });
+
+            return $this;
+        });
+
+        TextColumn::macro('showOnTabs', function (array $tabs): static {
+            $this->toggleable(isToggledHiddenByDefault: function (HasTable $livewire) use ($tabs) {
+                return ! in_array($livewire->activeTab, $tabs);
+            });
+
+            return $this;
+        });
+
         TextColumn::macro('defaultDateFormat', function (): static {
             $localization = Localization::firstOrFail();
 
@@ -172,20 +201,32 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
-        TextColumn::macro('currencyWithConversion', function (string | Closure | null $currency = null): static {
+        TextColumn::macro('currencyWithConversion', function (string | Closure | null $currency = null, ?bool $convertFromCents = null): static {
             $currency ??= CurrencyAccessor::getDefaultCurrency();
+            $convertFromCents ??= false;
 
-            $this->formatStateUsing(static function (TextColumn $column, $state) use ($currency): ?string {
+            $this->formatStateUsing(static function (TextColumn $column, $state) use ($currency, $convertFromCents): ?string {
                 if (blank($state)) {
                     return null;
                 }
 
                 $currency = $column->evaluate($currency);
+                $showCurrency = $currency !== CurrencyAccessor::getDefaultCurrency();
 
-                return CurrencyConverter::formatToMoney($state, $currency);
+                if ($convertFromCents) {
+                    $balanceInCents = $state;
+                } else {
+                    $balanceInCents = CurrencyConverter::convertToCents($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): ?string {
+            $this->description(static function (TextColumn $column, $state) use ($currency, $convertFromCents): ?string {
                 if (blank($state)) {
                     return null;
                 }
@@ -197,10 +238,18 @@ class MacroServiceProvider extends ServiceProvider
                     return null;
                 }
 
-                $balanceInCents = CurrencyConverter::convertToCents($state, $oldCurrency);
+                if ($convertFromCents) {
+                    $balanceInCents = $state;
+                } else {
+                    $balanceInCents = CurrencyConverter::convertToCents($state, $oldCurrency);
+                }
 
                 $convertedBalanceInCents = CurrencyConverter::convertBalance($balanceInCents, $oldCurrency, $newCurrency);
 
+                if ($convertedBalanceInCents < 0) {
+                    return '(' . CurrencyConverter::formatCentsToMoney(abs($convertedBalanceInCents), $newCurrency, true) . ')';
+                }
+
                 return CurrencyConverter::formatCentsToMoney($convertedBalanceInCents, $newCurrency, true);
             });
 

app/Services/ReportService.php

@@ -11,6 +11,7 @@ use App\DTO\CashFlowOverviewDTO;
 use App\DTO\ReportDTO;
 use App\Enums\Accounting\AccountCategory;
 use App\Enums\Accounting\AccountType;
+use App\Enums\Accounting\TransactionType;
 use App\Models\Accounting\Account;
 use App\Models\Accounting\Transaction;
 use App\Support\Column;
@@ -261,7 +262,11 @@ class ReportService
         if ($transaction->transactionable_type === null || $transaction->is_payment) {
             return [
                 'type' => 'transaction',
-                'action' => $transaction->type->isJournal() ? 'updateJournalTransaction' : 'updateTransaction',
+                'action' => match ($transaction->type) {
+                    TransactionType::Journal => 'updateJournalTransaction',
+                    TransactionType::Transfer => 'updateTransfer',
+                    default => 'updateTransaction',
+                },
                 'id' => $transaction->id,
             ];
         }

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

app/View/Models/InvoiceViewModel.php

@@ -1,209 +0,0 @@
-<?php
-
-namespace App\View\Models;
-
-use App\Enums\Setting\Font;
-use App\Enums\Setting\PaymentTerms;
-use App\Models\Setting\DocumentDefault;
-use Filament\Panel\Concerns\HasFont;
-
-class InvoiceViewModel
-{
-    use HasFont;
-
-    public function __construct(
-        public DocumentDefault $invoice,
-        public ?array $data = null
-    ) {}
-
-    public function logo(): ?string
-    {
-        return $this->invoice->logo_url;
-    }
-
-    public function show_logo(): bool
-    {
-        return $this->data['show_logo'] ?? $this->invoice->show_logo ?? false;
-    }
-
-    // Company related methods
-    public function company_name(): string
-    {
-        return $this->invoice->company->name;
-    }
-
-    public function company_address(): ?string
-    {
-        return $this->invoice->company->profile->address ?? null;
-    }
-
-    public function company_phone(): ?string
-    {
-        return $this->invoice->company->profile->phone_number ?? null;
-    }
-
-    public function company_city(): ?string
-    {
-        return $this->invoice->company->profile->city->name ?? null;
-    }
-
-    public function company_state(): ?string
-    {
-        return $this->invoice->company->profile->state->name ?? null;
-    }
-
-    public function company_zip(): ?string
-    {
-        return $this->invoice->company->profile->zip_code ?? null;
-    }
-
-    public function company_country(): ?string
-    {
-        return $this->invoice->company->profile->state->country->name ?? null;
-    }
-
-    // Invoice numbering related methods
-    public function number_prefix(): string
-    {
-        return $this->data['number_prefix'] ?? $this->invoice->number_prefix ?? 'INV-';
-    }
-
-    public function number_digits(): int
-    {
-        return $this->data['number_digits'] ?? $this->invoice->number_digits ?? 5;
-    }
-
-    public function number_next(): string
-    {
-        return $this->data['number_next'] ?? $this->invoice->number_next;
-    }
-
-    public function invoice_number(): string
-    {
-        return $this->invoice->getNumberNext(padded: true, format: true, prefix: $this->number_prefix(), digits: $this->number_digits(), next: $this->number_next());
-    }
-
-    // Invoice date related methods
-    public function invoice_date(): string
-    {
-        return $this->invoice->company->locale->date_format->getLabel();
-    }
-
-    public function payment_terms(): string
-    {
-        return $this->data['payment_terms'] ?? $this->invoice->payment_terms?->value ?? PaymentTerms::DEFAULT;
-    }
-
-    public function invoice_due_date(): string
-    {
-        $dateFormat = $this->invoice->company->locale->date_format->value;
-
-        return PaymentTerms::from($this->payment_terms())->getDueDate($dateFormat);
-    }
-
-    // Invoice header related methods
-    public function header(): string
-    {
-        return $this->data['header'] ?? $this->invoice->header ?? 'Invoice';
-    }
-
-    public function subheader(): ?string
-    {
-        return $this->data['subheader'] ?? $this->invoice->subheader ?? null;
-    }
-
-    // Invoice styling
-    public function accent_color(): string
-    {
-        return $this->data['accent_color'] ?? $this->invoice->accent_color;
-    }
-
-    public function fontFamily(): string
-    {
-        if ($this->data['font']) {
-            return Font::from($this->data['font'])->getLabel();
-        }
-
-        if ($this->invoice->font) {
-            return $this->invoice->font->getLabel();
-        }
-
-        return Font::from(Font::DEFAULT)->getLabel();
-    }
-
-    public function footer(): ?string
-    {
-        return $this->data['footer'] ?? $this->invoice->footer ?? null;
-    }
-
-    public function terms(): ?string
-    {
-        return $this->data['terms'] ?? $this->invoice->terms ?? null;
-    }
-
-    public function getItemColumnName(string $column, string $default): string
-    {
-        $custom = $this->data[$column]['custom'] ?? $this->invoice->{$column . '_custom'} ?? null;
-
-        if ($custom) {
-            return $custom;
-        }
-
-        $option = $this->data[$column]['option'] ?? $this->invoice->{$column . '_option'} ?? null;
-
-        return $option ? $this->invoice->getLabelOptionFor($column, $option) : translate($default);
-    }
-
-    // Invoice column related methods
-    public function item_name(): string
-    {
-        return $this->getItemColumnName('item_name', 'Items');
-    }
-
-    public function unit_name(): string
-    {
-        return $this->getItemColumnName('unit_name', 'Quantity');
-    }
-
-    public function price_name(): string
-    {
-        return $this->getItemColumnName('price_name', 'Price');
-    }
-
-    public function amount_name(): string
-    {
-        return $this->getItemColumnName('amount_name', 'Amount');
-    }
-
-    public function buildViewData(): array
-    {
-        return [
-            'logo' => $this->logo(),
-            'show_logo' => $this->show_logo(),
-            'company_name' => $this->company_name(),
-            'company_address' => $this->company_address(),
-            'company_phone' => $this->company_phone(),
-            'company_city' => $this->company_city(),
-            'company_state' => $this->company_state(),
-            'company_zip' => $this->company_zip(),
-            'company_country' => $this->company_country(),
-            'number_prefix' => $this->number_prefix(),
-            'number_digits' => $this->number_digits(),
-            'number_next' => $this->number_next(),
-            'invoice_number' => $this->invoice_number(),
-            'invoice_date' => $this->invoice_date(),
-            'invoice_due_date' => $this->invoice_due_date(),
-            'header' => $this->header(),
-            'subheader' => $this->subheader(),
-            'accent_color' => $this->accent_color(),
-            'font_family' => $this->fontFamily(),
-            'font_html' => $this->font($this->fontFamily())->getFontHtml(),
-            'footer' => $this->footer(),
-            'terms' => $this->terms(),
-            'item_name' => $this->item_name(),
-            'unit_name' => $this->unit_name(),
-            'price_name' => $this->price_name(),
-            'amount_name' => $this->amount_name(),
-        ];
-    }
-}

composer.json

@@ -25,7 +25,6 @@
         "laravel/framework": "^11.0",
         "laravel/sanctum": "^4.0",
         "laravel/tinker": "^2.9",
-        "spatie/laravel-view-models": "^1.6",
         "squirephp/model": "^3.4",
         "squirephp/repository": "^3.4",
         "symfony/intl": "^6.3"

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "decc627f2a7bd0c6546114ebb1f500f9",
+    "content-hash": "095bb4040f9910ddd128bd53c0670a55",
     "packages": [
         {
             "name": "akaunting/laravel-money",
@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.336.15",
+            "version": "3.337.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "f8028ef4b8dcb0acfe86c33e207fd3cb0b9cbf3b"
+                "reference": "06dfc8f76423b49aaa181debd25bbdc724c346d6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f8028ef4b8dcb0acfe86c33e207fd3cb0b9cbf3b",
-                "reference": "f8028ef4b8dcb0acfe86c33e207fd3cb0b9cbf3b",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/06dfc8f76423b49aaa181debd25bbdc724c346d6",
+                "reference": "06dfc8f76423b49aaa181debd25bbdc724c346d6",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.336.15"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.337.3"
             },
-            "time": "2025-01-14T19:03:58+00:00"
+            "time": "2025-01-21T19:10:05+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -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",
@@ -1282,16 +1282,16 @@
         },
         {
             "name": "doctrine/dbal",
-            "version": "4.2.1",
+            "version": "4.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "dadd35300837a3a2184bd47d403333b15d0a9bd0"
+                "reference": "19a2b7deb5fe8c2df0ff817ecea305e50acb62ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/dadd35300837a3a2184bd47d403333b15d0a9bd0",
-                "reference": "dadd35300837a3a2184bd47d403333b15d0a9bd0",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/19a2b7deb5fe8c2df0ff817ecea305e50acb62ec",
+                "reference": "19a2b7deb5fe8c2df0ff817ecea305e50acb62ec",
                 "shasum": ""
             },
             "require": {
@@ -1304,16 +1304,14 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.2",
-                "phpstan/phpstan": "1.12.6",
-                "phpstan/phpstan-phpunit": "1.4.0",
-                "phpstan/phpstan-strict-rules": "^1.6",
-                "phpunit/phpunit": "10.5.30",
-                "psalm/plugin-phpunit": "0.19.0",
+                "phpstan/phpstan": "2.1.1",
+                "phpstan/phpstan-phpunit": "2.0.3",
+                "phpstan/phpstan-strict-rules": "^2",
+                "phpunit/phpunit": "10.5.39",
                 "slevomat/coding-standard": "8.13.1",
                 "squizlabs/php_codesniffer": "3.10.2",
                 "symfony/cache": "^6.3.8|^7.0",
-                "symfony/console": "^5.4|^6.3|^7.0",
-                "vimeo/psalm": "5.25.0"
+                "symfony/console": "^5.4|^6.3|^7.0"
             },
             "suggest": {
                 "symfony/console": "For helpful console commands such as SQL execution and import of files."
@@ -1370,7 +1368,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/4.2.1"
+                "source": "https://github.com/doctrine/dbal/tree/4.2.2"
             },
             "funding": [
                 {
@@ -1386,7 +1384,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-10-10T18:01:27+00:00"
+            "time": "2025-01-16T08:40:56+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -3053,16 +3051,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.38.2",
+            "version": "v11.39.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "9d290aa90fcad44048bedca5219d2b872e98772a"
+                "reference": "996c96955f78e8a2b26a24c490a1721cfb14574f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/9d290aa90fcad44048bedca5219d2b872e98772a",
-                "reference": "9d290aa90fcad44048bedca5219d2b872e98772a",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/996c96955f78e8a2b26a24c490a1721cfb14574f",
+                "reference": "996c96955f78e8a2b26a24c490a1721cfb14574f",
                 "shasum": ""
             },
             "require": {
@@ -3263,7 +3261,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-01-15T00:06:46+00:00"
+            "time": "2025-01-21T15:02:43+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3451,16 +3449,16 @@
         },
         {
             "name": "laravel/socialite",
-            "version": "v5.16.1",
+            "version": "v5.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/socialite.git",
-                "reference": "4e5be83c0b3ecf81b2ffa47092e917d1f79dce71"
+                "reference": "77be8be7ee5099aed8ca7cfddc1bf6f9ab3fc159"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/socialite/zipball/4e5be83c0b3ecf81b2ffa47092e917d1f79dce71",
-                "reference": "4e5be83c0b3ecf81b2ffa47092e917d1f79dce71",
+                "url": "https://api.github.com/repos/laravel/socialite/zipball/77be8be7ee5099aed8ca7cfddc1bf6f9ab3fc159",
+                "reference": "77be8be7ee5099aed8ca7cfddc1bf6f9ab3fc159",
                 "shasum": ""
             },
             "require": {
@@ -3519,7 +3517,7 @@
                 "issues": "https://github.com/laravel/socialite/issues",
                 "source": "https://github.com/laravel/socialite"
             },
-            "time": "2024-12-11T16:43:51+00:00"
+            "time": "2025-01-17T15:17:00+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -4446,16 +4444,16 @@
         },
         {
             "name": "matomo/device-detector",
-            "version": "6.4.2",
+            "version": "6.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/matomo-org/device-detector.git",
-                "reference": "806e52d214b05ddead1a1d4304c7592f61f95976"
+                "reference": "aa4586d495a7f59029d46d976f160b13eb769bb0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/806e52d214b05ddead1a1d4304c7592f61f95976",
-                "reference": "806e52d214b05ddead1a1d4304c7592f61f95976",
+                "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/aa4586d495a7f59029d46d976f160b13eb769bb0",
+                "reference": "aa4586d495a7f59029d46d976f160b13eb769bb0",
                 "shasum": ""
             },
             "require": {
@@ -4511,7 +4509,7 @@
                 "source": "https://github.com/matomo-org/matomo",
                 "wiki": "https://dev.matomo.org/"
             },
-            "time": "2024-12-16T16:38:01+00:00"
+            "time": "2025-01-17T09:59:39+00:00"
         },
         {
             "name": "monolog/monolog",
@@ -6493,16 +6491,16 @@
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.18.0",
+            "version": "1.18.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "8332205b90d17164913244f4a8e13ab7e6761d29"
+                "reference": "d41c44a7eab604c3eb0cad93210612d4c1429c20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/8332205b90d17164913244f4a8e13ab7e6761d29",
-                "reference": "8332205b90d17164913244f4a8e13ab7e6761d29",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/d41c44a7eab604c3eb0cad93210612d4c1429c20",
+                "reference": "d41c44a7eab604c3eb0cad93210612d4c1429c20",
                 "shasum": ""
             },
             "require": {
@@ -6541,7 +6539,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.0"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.2"
             },
             "funding": [
                 {
@@ -6549,76 +6547,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-30T13:13:39+00:00"
-        },
-        {
-            "name": "spatie/laravel-view-models",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/laravel-view-models.git",
-                "reference": "c8c74e26e2cc78d04e581867ce74c8b772279015"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-view-models/zipball/c8c74e26e2cc78d04e581867ce74c8b772279015",
-                "reference": "c8c74e26e2cc78d04e581867ce74c8b772279015",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
-                "php": "^7.3|^8.0"
-            },
-            "require-dev": {
-                "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
-                "pestphp/pest": "^1.22|^2.34"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Spatie\\ViewModels\\Providers\\ViewModelsServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Spatie\\ViewModels\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Brent Roose",
-                    "email": "brent@spatie.be",
-                    "homepage": "https://spatie.be",
-                    "role": "Developer"
-                }
-            ],
-            "description": "View models in Laravel",
-            "homepage": "https://github.com/spatie/laravel-view-models",
-            "keywords": [
-                "laravel-view-models",
-                "spatie"
-            ],
-            "support": {
-                "issues": "https://github.com/spatie/laravel-view-models/issues",
-                "source": "https://github.com/spatie/laravel-view-models/tree/1.6.0"
-            },
-            "funding": [
-                {
-                    "url": "https://spatie.be/open-source/support-us",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/spatie",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-13T17:58:20+00:00"
+            "time": "2025-01-20T14:14:17+00:00"
         },
         {
             "name": "squirephp/model",
@@ -10151,16 +10080,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": {
@@ -10171,17 +10100,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": [
@@ -10247,7 +10176,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": [
                 {
@@ -10259,7 +10188,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-12T11:52:01+00:00"
+            "time": "2025-01-19T17:35:09+00:00"
         },
         {
             "name": "pestphp/pest-plugin",
@@ -11204,16 +11133,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": {
@@ -11227,14 +11156,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",
@@ -11285,7 +11214,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": [
                 {
@@ -11301,7 +11230,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-12-11T10:52:48+00:00"
+            "time": "2025-01-13T09:36:00+00:00"
         },
         {
             "name": "pimple/pimple",

config/aws.php

@@ -16,10 +16,7 @@ return [
     | http://docs.aws.amazon.com/aws-sdk-php/v3/guide/guide/configuration.html
     |
     */
-    'credentials' => [
-        'key' => env('AWS_ACCESS_KEY_ID', ''),
-        'secret' => env('AWS_SECRET_ACCESS_KEY', ''),
-    ],
+    'credentials' => false,
     'region' => env('AWS_REGION', 'us-east-1'),
     'version' => 'latest',
     'ua_append' => [

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

@@ -31,9 +31,9 @@ class AddressFactory extends Factory
             'address_line_1' => $this->faker->streetAddress,
             'address_line_2' => $this->faker->streetAddress,
             'city' => $this->faker->city,
-            'state' => $this->faker->state('US'),
+            '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/Common/ContactFactory.php

@@ -71,19 +71,15 @@ class ContactFactory extends Factory
 
     public function primary(): self
     {
-        return $this->state(function (array $attributes) {
-            return [
-                'is_primary' => true,
-            ];
-        });
+        return $this->state([
+            'is_primary' => true,
+        ]);
     }
 
     public function secondary(): self
     {
-        return $this->state(function (array $attributes) {
-            return [
-                'is_primary' => false,
-            ];
-        });
+        return $this->state([
+            'is_primary' => false,
+        ]);
     }
 }

database/factories/CompanyFactory.php

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

database/factories/Setting/CompanyProfileFactory.php

@@ -4,6 +4,7 @@ namespace Database\Factories\Setting;
 
 use App\Enums\Setting\EntityType;
 use App\Faker\State;
+use App\Models\Common\Address;
 use App\Models\Company;
 use App\Models\Setting\CompanyProfile;
 use Illuminate\Database\Eloquent\Factories\Factory;
@@ -25,28 +26,13 @@ class CompanyProfileFactory extends Factory
      */
     public function definition(): array
     {
-        $countryCode = $this->faker->countryCode;
-
         return [
-            'address' => $this->faker->streetAddress,
-            'zip_code' => $this->faker->postcode,
-            'state_id' => $this->faker->state($countryCode),
-            'country' => $countryCode,
-            'phone_number' => $this->faker->phoneNumberForCountryCode($countryCode),
+            'phone_number' => $this->faker->phoneNumber,
             'email' => $this->faker->email,
             'entity_type' => $this->faker->randomElement(EntityType::class),
         ];
     }
 
-    public function withCountry(string $code): self
-    {
-        return $this->state([
-            'country' => $code,
-            'state_id' => $this->faker->state($code),
-            'phone_number' => $this->faker->phoneNumberForCountryCode($code),
-        ]);
-    }
-
     public function forCompany(Company $company): self
     {
         return $this->state([
@@ -55,4 +41,9 @@ class CompanyProfileFactory extends Factory
             'updated_by' => $company->owner->id,
         ]);
     }
+
+    public function withAddress(): self
+    {
+        return $this->has(Address::factory()->general());
+    }
 }

database/migrations/2023_09_03_100000_create_accounting_tables.php

@@ -51,8 +51,6 @@ return new class extends Migration
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
-
-            $table->unique(['company_id', 'code']);
         });
 
         Schema::create('bank_accounts', function (Blueprint $table) {
@@ -66,8 +64,6 @@ return new class extends Migration
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
-
-            $table->unique(['company_id', 'account_id']);
         });
 
         Schema::create('connected_bank_accounts', function (Blueprint $table) {
@@ -98,10 +94,10 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::dropIfExists('institutions');
-        Schema::dropIfExists('account_subtypes');
-        Schema::dropIfExists('accounts');
-        Schema::dropIfExists('bank_accounts');
         Schema::dropIfExists('connected_bank_accounts');
+        Schema::dropIfExists('bank_accounts');
+        Schema::dropIfExists('accounts');
+        Schema::dropIfExists('account_subtypes');
+        Schema::dropIfExists('institutions');
     }
 };

database/migrations/2023_09_14_034800_create_company_profiles_table.php

@@ -15,11 +15,6 @@ return new class extends Migration
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
             $table->string('logo')->nullable();
-            $table->string('address', 255)->nullable();
-            $table->unsignedMediumInteger('city_id')->nullable()->index();
-            $table->string('zip_code', 20)->nullable();
-            $table->unsignedSmallInteger('state_id')->nullable()->index();
-            $table->string('country')->nullable();
             $table->string('phone_number', 30)->nullable();
             $table->string('email', 255)->nullable();
             $table->string('tax_id', 50)->nullable();

database/migrations/2024_11_14_230753_create_adjustments_table.php

@@ -28,8 +28,6 @@ return new class extends Migration
             $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
             $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
             $table->timestamps();
-
-            $table->unique(['company_id', 'account_id']);
         });
     }
 

database/migrations/2024_11_19_225812_create_addresses_table.php

@@ -14,16 +14,17 @@ return new class extends Migration
         Schema::create('addresses', function (Blueprint $table) {
             $table->id();
             $table->foreignId('company_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('parent_address_id')->nullable()->constrained('addresses')->nullOnDelete();
             $table->morphs('addressable');
             $table->string('type'); // billing, shipping, etc.
             $table->string('recipient')->nullable();
             $table->string('phone')->nullable();
-            $table->string('address_line_1');
+            $table->string('address_line_1')->nullable();
             $table->string('address_line_2')->nullable();
-            $table->string('city');
-            $table->string('state')->nullable();
+            $table->string('city')->nullable();
+            $table->smallInteger('state_id')->nullable();
             $table->string('postal_code')->nullable();
-            $table->string('country')->nullable();
+            $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"
             ],
@@ -1074,9 +1074,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001692",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001692.tgz",
-            "integrity": "sha512-A95VKan0kdtrsnMubMKxEKUKImOPSuCpYgxSQBo036P5YYgVIcOYJEgt/txJWqObiRQeISNCfef9nvlQ0vbV7A==",
+            "version": "1.0.30001695",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz",
+            "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==",
             "dev": true,
             "funding": [
                 {
@@ -1235,9 +1235,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.82",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.82.tgz",
-            "integrity": "sha512-Zq16uk1hfQhyGx5GpwPAYDwddJuSGhtRhgOA2mCxANYaDT79nAeGnaXogMGng4KqLaJUVnOnuL0+TDop9nLOiA==",
+            "version": "1.5.84",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.84.tgz",
+            "integrity": "sha512-I+DQ8xgafao9Ha6y0qjHHvpZ9OfyA1qKlkHkjywxzniORU2awxyz7f/iVJcULmrF2yrM3nHQf+iDjJtbbexd/g==",
             "dev": true,
             "license": "ISC"
         },
@@ -1597,9 +1597,9 @@
             }
         },
         "node_modules/laravel-vite-plugin": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.1.1.tgz",
-            "integrity": "sha512-HMZXpoSs1OR+7Lw1+g4Iy/s3HF3Ldl8KxxYT2Ot8pEB4XB/QRuZeWgDYJdu552UN03YRSRNK84CLC9NzYRtncA==",
+            "version": "1.2.0",
+            "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.2.0.tgz",
+            "integrity": "sha512-R0pJ+IcTVeqEMoKz/B2Ij57QVq3sFTABiFmb06gAwFdivbOgsUtuhX6N2MGLEArajrS3U5JbberzwOe7uXHMHQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -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"
             }
         },
@@ -2624,9 +2624,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.7.tgz",
-            "integrity": "sha512-RDt8r/7qx9940f8FcOIAH9PTViRrghKaK2K1jY3RaAURrEUbm9Du1mJ72G+jlhtG3WwodnfzY8ORQZbBavZEAQ==",
+            "version": "6.0.11",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.11.tgz",
+            "integrity": "sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

resources/css/filament/company/theme.css

@@ -18,6 +18,15 @@
     display: inline-flex;
 }
 
+/* End Alignment sortable column enhancement */
+.fi-ta-header-cell:has(button.justify-end > svg.fi-ta-header-cell-sort-icon) {
+    padding-right: 0.25rem;
+}
+
+.fi-ta-cell:has(.fi-ta-col-wrp > .justify-end) {
+    padding-right: 1rem;
+}
+
 :not(.dark) .fi-body {
     position: relative;
     background-color: #E8E9EB;

resources/data/lang/es.json

@@ -185,5 +185,43 @@
     "Currency List": "Lista de divisas",
     "Available": "Disponible",
     "Parent Department": "Departamento de padres",
-    "Live Rate": "Tarifa en vivo"
+    "Live Rate": "Tarifa en vivo",
+    "Category": "Categoría",
+    "Configuration": "Configuración",
+    "Dates": "Fechas",
+    "Adjustment Details": "Detalles del ajuste",
+    "Adjustments": "Ajustes",
+    "Sellable Configuration": "Configuración apta para venta",
+    "Purchasable Configuration": "Configuración que se puede comprar",
+    "Sale Information": "Información de venta",
+    "Purchase Information": "Información de compra",
+    "Billing": "Facturación",
+    "Shipping": "Envío",
+    "General Information": "Información general",
+    "Primary Contact": "Contacto principal",
+    "Billing Address": "Dirección de facturación",
+    "Shipping Address": "Dirección de envío",
+    "Invoice Header": "Encabezado de factura",
+    "Invoice Details": "Detalles de la factura",
+    "Secondary Contacts": "Contactos secundarios",
+    "Edit": "Editar",
+    "Bill Details": "Detalles de la factura",
+    "Frequency": "Frecuencia",
+    "Scheduling": "Programación",
+    "Notes": "Notas",
+    "Create": "Crear",
+    "Invoice Footer": "Pie de página de la factura",
+    "Time Zone": "Zona horaria",
+    "Footer": "Pie de página",
+    "Estimate Header": "Encabezado de estimación",
+    "Terms": "Términos",
+    "Estimate Footer": "Estimar pie de página",
+    "Scheduling Form": "Formulario de programación",
+    "Default :Type :Category": "Predeterminado :Type :Category",
+    "Approve": "Aprobar",
+    "Dates & Time": "Fechas y hora",
+    "Schedule Bounds": "Límites de programación",
+    "Ending Balance": "Saldo final",
+    "Address Information": "Información de dirección",
+    "Estimate Details": "Detalles de la estimación"
 }

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

@@ -20,8 +20,8 @@
                         <strong
                             @class([
                                 'text-lg',
-                                'text-green-700 dark:text-green-500' => $isTargetLabel && $isPositive,
-                                'text-danger-700 dark:text-danger-500' => $isTargetLabel && ! $isPositive,
+                                'text-success-700 dark:text-success-400' => $isTargetLabel && $isPositive,
+                                'text-danger-700 dark:text-danger-400' => $isTargetLabel && ! $isPositive,
                             ])
                         >
                             {{ $summary['value'] }}

resources/views/filament/company/components/invoice-layouts/classic.blade.php

@@ -1,15 +1,13 @@
 @php
     $data = $this->form->getRawState();
-    $viewModel = new \App\View\Models\InvoiceViewModel($this->record, $data);
-    $viewSpecial = $viewModel->buildViewData();
-    extract($viewSpecial,\EXTR_SKIP);
+    $document = \App\DTO\DocumentPreviewDTO::fromSettings($this->record, $data);
 @endphp
 
-{!! $font_html !!}
+{!! $document->getFontHtml() !!}
 
 <style>
     .inv-paper {
-        font-family: '{{ $font_family }}', sans-serif;
+        font-family: '{{ $document->font->getLabel() }}', sans-serif;
     }
 </style>
 
@@ -18,63 +16,65 @@
     <x-company.invoice.header class="default-template-header">
         <div class="w-2/3 text-left ml-6">
             <div class="text-xs">
-                <h2 class="text-base font-semibold">{{ $company_name }}</h2>
-                @if($company_address && $company_city && $company_state && $company_zip)
-                    <p>{{ $company_address }}</p>
-                    <p>{{ $company_city }}, {{ $company_state }} {{ $company_zip }}</p>
-                    <p>{{ $company_country }}</p>
+                <h2 class="text-base font-semibold">{{ $document->company->name }}</h2>
+                @if($formattedAddress = $document->company->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
                 @endif
             </div>
         </div>
 
         <div class="w-1/3 flex justify-end mr-6">
-            @if($logo && $show_logo)
-                <x-company.invoice.logo :src="$logo"/>
+            @if($document->logo && $document->showLogo)
+                <x-company.invoice.logo :src="$document->logo"/>
             @endif
         </div>
     </x-company.invoice.header>
 
     <x-company.invoice.metadata class="classic-template-metadata">
         <div class="items-center flex">
-            <hr class="grow-[2] py-0.5 border-solid border-y-2" style="border-color: {{ $accent_color }};">
+            <hr class="grow-[2] py-0.5 border-solid border-y-2" style="border-color: {{ $document->accentColor }};">
             <div class="items-center flex mx-5">
-                <x-icons.decor-border-left color="{{ $accent_color }}"/>
-                <div class="px-2.5 border-solid border-y-2 py-1 -mx-3" style="border-color: {{ $accent_color }};">
-                    <div class="px-2.5 border-solid border-y-2 py-3" style="border-color: {{ $accent_color }};">
+                <x-icons.decor-border-left color="{{ $document->accentColor }}"/>
+                <div class="px-2.5 border-solid border-y-2 py-1 -mx-3" style="border-color: {{ $document->accentColor }};">
+                    <div class="px-2.5 border-solid border-y-2 py-3" style="border-color: {{ $document->accentColor }};">
                         <div class="inline text-2xl font-semibold"
-                             style="color: {{ $accent_color }};">{{ $header }}</div>
+                             style="color: {{ $document->accentColor }};">{{ $document->header }}</div>
                     </div>
                 </div>
-                <x-icons.decor-border-right color="{{ $accent_color }}"/>
+                <x-icons.decor-border-right color="{{ $document->accentColor }}"/>
             </div>
-            <hr class="grow-[2] py-0.5 border-solid border-y-2" style="border-color: {{ $accent_color }};">
+            <hr class="grow-[2] py-0.5 border-solid border-y-2" style="border-color: {{ $document->accentColor }};">
         </div>
-        <div class="mt-2 text-sm text-center text-gray-600 dark:text-gray-400">{{ $subheader }}</div>
+        <div class="mt-2 text-sm text-center text-gray-600 dark:text-gray-400">{{ $document->subheader }}</div>
 
         <div class="flex justify-between items-end">
             <!-- Billing Details -->
             <div class="text-xs">
                 <h3 class="text-gray-600 dark:text-gray-400 font-medium tracking-tight mb-1">BILL TO</h3>
-                <p class="text-base font-bold">John Doe</p>
-                <p>123 Main Street</p>
-                <p>New York, New York 10001</p>
-                <p>United States</p>
+                <p class="text-base font-bold">{{ $document->client->name }}</p>
+                @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
+                @endif
             </div>
 
             <div class="text-xs">
                 <table class="min-w-full">
                     <tbody>
                     <tr>
-                        <td class="font-semibold text-right pr-2">Invoice Number:</td>
-                        <td class="text-left pl-2">{{ $invoice_number }}</td>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->number }}:</td>
+                        <td class="text-left pl-2">{{ $document->number }}</td>
+                    </tr>
+                    <tr>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->referenceNumber }}:</td>
+                        <td class="text-left pl-2">{{ $document->referenceNumber }}</td>
                     </tr>
                     <tr>
-                        <td class="font-semibold text-right pr-2">Invoice Date:</td>
-                        <td class="text-left pl-2">{{ $invoice_date }}</td>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->date }}:</td>
+                        <td class="text-left pl-2">{{ $document->date }}</td>
                     </tr>
                     <tr>
-                        <td class="font-semibold text-right pr-2">Payment Due:</td>
-                        <td class="text-left pl-2">{{ $invoice_due_date }}</td>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->dueDate }}:</td>
+                        <td class="text-left pl-2">{{ $document->dueDate }}</td>
                     </tr>
                     </tbody>
                 </table>
@@ -87,31 +87,21 @@
         <table class="w-full text-left table-fixed">
             <thead class="text-sm leading-8">
             <tr>
-                <th class="text-left">{{ $item_name }}</th>
-                <th class="text-center">{{ $unit_name }}</th>
-                <th class="text-right">{{ $price_name }}</th>
-                <th class="text-right">{{ $amount_name }}</th>
+                <th class="text-left">{{ $document->columnLabel->items }}</th>
+                <th class="text-center">{{ $document->columnLabel->units }}</th>
+                <th class="text-right">{{ $document->columnLabel->price }}</th>
+                <th class="text-right">{{ $document->columnLabel->amount }}</th>
             </tr>
             </thead>
             <tbody class="text-xs border-t-2 border-b-2 border-dotted border-gray-300 leading-8">
-            <tr>
-                <td class="text-left font-semibold">Item 1</td>
-                <td class="text-center">2</td>
-                <td class="text-right">$150.00</td>
-                <td class="text-right">$300.00</td>
-            </tr>
-            <tr>
-                <td class="text-left font-semibold">Item 2</td>
-                <td class="text-center">3</td>
-                <td class="text-right">$200.00</td>
-                <td class="text-right">$600.00</td>
-            </tr>
-            <tr>
-                <td class="text-left font-semibold">Item 3</td>
-                <td class="text-center">1</td>
-                <td class="text-right">$180.00</td>
-                <td class="text-right">$180.00</td>
-            </tr>
+            @foreach($document->lineItems as $item)
+                <tr>
+                    <td class="text-left font-semibold">{{ $item->name }}</td>
+                    <td class="text-center">{{ $item->quantity }}</td>
+                    <td class="text-right">{{ $item->unitPrice }}</td>
+                    <td class="text-right">{{ $item->subtotal }}</td>
+                </tr>
+            @endforeach
             </tbody>
         </table>
 
@@ -120,7 +110,7 @@
             <!-- Notes Section -->
             <div class="w-1/2 border border-dashed border-gray-300 p-2 mt-4">
                 <h4 class="font-semibold mb-2">Notes</h4>
-                <p>{{ $footer }}</p>
+                <p>{{ $document->footer }}</p>
             </div>
 
             <!-- Financial Summary -->
@@ -129,23 +119,23 @@
                     <tbody class="text-xs leading-loose">
                     <tr>
                         <td class="text-right font-semibold">Subtotal:</td>
-                        <td class="text-right">$1080.00</td>
+                        <td class="text-right">{{ $document->subtotal }}</td>
                     </tr>
                     <tr class="text-success-800 dark:text-success-600">
                         <td class="text-right">Discount (5%):</td>
-                        <td class="text-right">($54.00)</td>
+                        <td class="text-right">({{ $document->discount }})</td>
                     </tr>
                     <tr>
                         <td class="text-right">Sales Tax (10%):</td>
-                        <td class="text-right">$102.60</td>
+                        <td class="text-right">{{ $document->tax }}</td>
                     </tr>
                     <tr>
                         <td class="text-right font-semibold">Total:</td>
-                        <td class="text-right">$1128.60</td>
+                        <td class="text-right">{{ $document->total }}</td>
                     </tr>
                     <tr>
                         <td class="text-right font-semibold">Amount Due (USD):</td>
-                        <td class="text-right">$1128.60</td>
+                        <td class="text-right">{{ $document->amountDue }}</td>
                     </tr>
                     </tbody>
                 </table>
@@ -156,6 +146,6 @@
     <!-- Footer -->
     <x-company.invoice.footer class="classic-template-footer">
         <h4 class="font-semibold px-6 mb-2">Terms & Conditions</h4>
-        <p class="px-6 break-words line-clamp-4">{{ $terms }}</p>
+        <p class="px-6 break-words line-clamp-4">{{ $document->terms }}</p>
     </x-company.invoice.footer>
 </x-company.invoice.container>

resources/views/filament/company/components/invoice-layouts/default.blade.php

@@ -1,15 +1,13 @@
 @php
     $data = $this->form->getRawState();
-    $viewModel = new \App\View\Models\InvoiceViewModel($this->record, $data);
-    $viewSpecial = $viewModel->buildViewData();
-    extract($viewSpecial,\EXTR_SKIP);
+    $document = \App\DTO\DocumentPreviewDTO::fromSettings($this->record, $data);
 @endphp
 
-{!! $font_html !!}
+{!! $document->getFontHtml() !!}
 
 <style>
     .inv-paper {
-        font-family: '{{ $font_family }}', sans-serif;
+        font-family: '{{ $document->font->getLabel() }}', sans-serif;
     }
 </style>
 
@@ -17,18 +15,16 @@
 
     <x-company.invoice.header class="default-template-header border-b-2 p-6 pb-4">
         <div class="w-2/3">
-            @if($logo && $show_logo)
-                <x-company.invoice.logo :src="$logo"/>
+            @if($document->logo && $document->showLogo)
+                <x-company.invoice.logo :src="$document->logo"/>
             @endif
         </div>
 
         <div class="w-1/3 text-right">
             <div class="text-xs">
-                <h2 class="font-semibold">{{ $company_name }}</h2>
-                @if($company_address && $company_city && $company_state && $company_zip)
-                    <p>{{ $company_address }}</p>
-                    <p>{{ $company_city }}, {{ $company_state }} {{ $company_zip }}</p>
-                    <p>{{ $company_country }}</p>
+                <h2 class="font-semibold">{{ $document->company->name }}</h2>
+                @if($formattedAddress = $document->company->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
                 @endif
             </div>
         </div>
@@ -36,9 +32,9 @@
 
     <x-company.invoice.metadata class="default-template-metadata space-y-6">
         <div>
-            <h1 class="text-3xl font-light uppercase">{{ $header }}</h1>
-            @if ($subheader)
-                <h2 class="text-sm text-gray-600 dark:text-gray-400">{{ $subheader }}</h2>
+            <h1 class="text-3xl font-light uppercase">{{ $document->header }}</h1>
+            @if ($document->subheader)
+                <h2 class="text-sm text-gray-600 dark:text-gray-400">{{ $document->subheader }}</h2>
             @endif
         </div>
 
@@ -46,26 +42,30 @@
             <!-- Billing Details -->
             <div class="text-xs">
                 <h3 class="text-gray-600 dark:text-gray-400 font-medium tracking-tight mb-1">BILL TO</h3>
-                <p class="text-base font-bold">John Doe</p>
-                <p>123 Main Street</p>
-                <p>New York, New York 10001</p>
-                <p>United States</p>
+                <p class="text-base font-bold">{{ $document->client->name }}</p>
+                @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
+                @endif
             </div>
 
             <div class="text-xs">
                 <table class="min-w-full">
                     <tbody>
                     <tr>
-                        <td class="font-semibold text-right pr-2">Invoice Number:</td>
-                        <td class="text-left pl-2">{{ $invoice_number }}</td>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->number }}:</td>
+                        <td class="text-left pl-2">{{ $document->number }}</td>
+                    </tr>
+                    <tr>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->referenceNumber }}:</td>
+                        <td class="text-left pl-2">{{ $document->referenceNumber }}</td>
                     </tr>
                     <tr>
-                        <td class="font-semibold text-right pr-2">Invoice Date:</td>
-                        <td class="text-left pl-2">{{ $invoice_date }}</td>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->date }}:</td>
+                        <td class="text-left pl-2">{{ $document->date }}</td>
                     </tr>
                     <tr>
-                        <td class="font-semibold text-right pr-2">Payment Due:</td>
-                        <td class="text-left pl-2">{{ $invoice_due_date }}</td>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->dueDate }}:</td>
+                        <td class="text-left pl-2">{{ $document->dueDate }}</td>
                     </tr>
                     </tbody>
                 </table>
@@ -76,59 +76,49 @@
     <!-- Line Items Table -->
     <x-company.invoice.line-items class="default-template-line-items">
         <table class="w-full text-left table-fixed">
-            <thead class="text-sm leading-8" style="background: {{ $accent_color }}">
+            <thead class="text-sm leading-8" style="background: {{ $document->accentColor }}">
             <tr class="text-white">
-                <th class="text-left pl-6">{{ $item_name }}</th>
-                <th class="text-center">{{ $unit_name }}</th>
-                <th class="text-right">{{ $price_name }}</th>
-                <th class="text-right pr-6">{{ $amount_name }}</th>
+                <th class="text-left pl-6">{{ $document->columnLabel->items }}</th>
+                <th class="text-center">{{ $document->columnLabel->units }}</th>
+                <th class="text-right">{{ $document->columnLabel->price }}</th>
+                <th class="text-right pr-6">{{ $document->columnLabel->amount }}</th>
             </tr>
             </thead>
             <tbody class="text-xs border-b-2 border-gray-300 leading-8">
-            <tr>
-                <td class="text-left pl-6 font-semibold">Item 1</td>
-                <td class="text-center">2</td>
-                <td class="text-right">$150.00</td>
-                <td class="text-right pr-6">$300.00</td>
-            </tr>
-            <tr>
-                <td class="text-left pl-6 font-semibold">Item 2</td>
-                <td class="text-center">3</td>
-                <td class="text-right">$200.00</td>
-                <td class="text-right pr-6">$600.00</td>
-            </tr>
-            <tr>
-                <td class="text-left pl-6 font-semibold">Item 3</td>
-                <td class="text-center">1</td>
-                <td class="text-right">$180.00</td>
-                <td class="text-right pr-6">$180.00</td>
-            </tr>
+            @foreach($document->lineItems as $item)
+                <tr>
+                    <td class="text-left pl-6 font-semibold">{{ $item->name }}</td>
+                    <td class="text-center">{{ $item->quantity }}</td>
+                    <td class="text-right">{{ $item->unitPrice }}</td>
+                    <td class="text-right pr-6">{{ $item->subtotal }}</td>
+                </tr>
+            @endforeach
             </tbody>
             <tfoot class="text-xs leading-loose">
             <tr>
                 <td class="pl-6" colspan="2"></td>
                 <td class="text-right font-semibold">Subtotal:</td>
-                <td class="text-right pr-6">$1080.00</td>
+                <td class="text-right pr-6">{{ $document->subtotal }}</td>
             </tr>
             <tr class="text-success-800 dark:text-success-600">
                 <td class="pl-6" colspan="2"></td>
                 <td class="text-right">Discount (5%):</td>
-                <td class="text-right pr-6">($54.00)</td>
+                <td class="text-right pr-6">({{ $document->discount }})</td>
             </tr>
             <tr>
                 <td class="pl-6" colspan="2"></td>
-                <td class="text-right">Sales Tax (10%):</td>
-                <td class="text-right pr-6">$102.60</td>
+                <td class="text-right">Tax:</td>
+                <td class="text-right pr-6">{{ $document->tax }}</td>
             </tr>
             <tr>
                 <td class="pl-6" colspan="2"></td>
                 <td class="text-right font-semibold border-t">Total:</td>
-                <td class="text-right border-t pr-6">$1128.60</td>
+                <td class="text-right border-t pr-6">{{ $document->total }}</td>
             </tr>
             <tr>
                 <td class="pl-6" colspan="2"></td>
-                <td class="text-right font-semibold border-t-4 border-double">Amount Due (USD):</td>
-                <td class="text-right border-t-4 border-double pr-6">$1128.60</td>
+                <td class="text-right font-semibold border-t-4 border-double">{{ $document->label->amountDue }} ({{ $document->currencyCode }}):</td>
+                <td class="text-right border-t-4 border-double pr-6">{{ $document->amountDue }}</td>
             </tr>
             </tfoot>
         </table>
@@ -136,9 +126,9 @@
 
     <!-- Footer Notes -->
     <x-company.invoice.footer class="default-template-footer">
-        <p class="px-6">{{ $footer }}</p>
+        <p class="px-6">{{ $document->footer }}</p>
         <span class="border-t-2 my-2 border-gray-300 block w-full"></span>
         <h4 class="font-semibold px-6 mb-2">Terms & Conditions</h4>
-        <p class="px-6 break-words line-clamp-4">{{ $terms }}</p>
+        <p class="px-6 break-words line-clamp-4">{{ $document->terms }}</p>
     </x-company.invoice.footer>
 </x-company.invoice.container>

resources/views/filament/company/components/invoice-layouts/modern.blade.php

@@ -1,15 +1,13 @@
 @php
     $data = $this->form->getRawState();
-    $viewModel = new \App\View\Models\InvoiceViewModel($this->record, $data);
-    $viewSpecial = $viewModel->buildViewData();
-    extract($viewSpecial,\EXTR_SKIP);
+    $document = \App\DTO\DocumentPreviewDTO::fromSettings($this->record, $data);
 @endphp
 
-{!! $font_html !!}
+{!! $document->getFontHtml() !!}
 
 <style>
     .inv-paper {
-        font-family: '{{ $font_family }}', sans-serif;
+        font-family: '{{ $document->font->getLabel() }}', sans-serif;
     }
 </style>
 
@@ -19,16 +17,16 @@
     <x-company.invoice.header class="bg-gray-800 h-20">
         <!-- Logo -->
         <div class="w-2/3">
-            @if($logo && $show_logo)
-                <x-company.invoice.logo class="ml-6" :src="$logo"/>
+            @if($document->logo && $document->showLogo)
+                <x-company.invoice.logo class="ml-6" :src="$document->logo"/>
             @endif
         </div>
 
         <!-- Ribbon Container -->
         <div class="w-1/3 absolute right-0 top-0 p-2 h-28 flex flex-col justify-end rounded-bl-sm"
-             style="background: {{ $accent_color }};">
-            @if($header)
-                <h1 class="text-3xl font-bold text-white text-center uppercase">{{ $header }}</h1>
+             style="background: {{ $document->accentColor }};">
+            @if($document->header)
+                <h1 class="text-3xl font-bold text-white text-center uppercase">{{ $document->header }}</h1>
             @endif
         </div>
     </x-company.invoice.header>
@@ -36,38 +34,44 @@
     <!-- Company Details -->
     <x-company.invoice.metadata class="modern-template-metadata space-y-6">
         <div class="text-xs">
-            <h2 class="text-base font-semibold">{{ $company_name }}</h2>
-            @if($company_address && $company_city && $company_state && $company_zip)
-                <p>{{ $company_address }}</p>
-                <p>{{ $company_city }}, {{ $company_state }} {{ $company_zip }}</p>
-                <p>{{ $company_country }}</p>
+            <h2 class="text-base font-semibold">{{ $document->company->name }}</h2>
+            @if($formattedAddress = $document->company->getFormattedAddressHtml())
+                {!! $formattedAddress !!}
             @endif
         </div>
 
         <div class="flex justify-between items-end">
             <!-- Billing Details -->
-            <div class="text-xs">
+            <div class="text-xs tracking-tight">
                 <h3 class="text-gray-600 dark:text-gray-400 font-medium tracking-tight mb-1">BILL TO</h3>
-                <p class="text-base font-bold" style="color: {{ $accent_color }}">John Doe</p>
-                <p>123 Main Street</p>
-                <p>New York, New York 10001</p>
-                <p>United States</p>
+                <p class="text-base font-bold"
+                   style="color: {{ $document->accentColor }}">{{ $document->client->name }}</p>
+
+                @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
+                @endif
             </div>
 
-            <div class="text-xs">
+            <div class="text-xs tracking-tight">
                 <table class="min-w-full">
                     <tbody>
                     <tr>
-                        <td class="font-semibold text-right pr-2">Invoice Number:</td>
-                        <td class="text-left pl-2">{{ $invoice_number }}</td>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->number }}:</td>
+                        <td class="text-left pl-2">{{ $document->number }}</td>
                     </tr>
+                    @if($document->referenceNumber)
+                        <tr>
+                            <td class="font-semibold text-right pr-2">{{ $document->label->referenceNumber }}:</td>
+                            <td class="text-left pl-2">{{ $document->referenceNumber }}</td>
+                        </tr>
+                    @endif
                     <tr>
-                        <td class="font-semibold text-right pr-2">Invoice Date:</td>
-                        <td class="text-left pl-2">{{ $invoice_date }}</td>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->date }}:</td>
+                        <td class="text-left pl-2">{{ $document->date }}</td>
                     </tr>
                     <tr>
-                        <td class="font-semibold text-right pr-2">Payment Due:</td>
-                        <td class="text-left pl-2">{{ $invoice_due_date }}</td>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->dueDate }}:</td>
+                        <td class="text-left pl-2">{{ $document->dueDate }}</td>
                     </tr>
                     </tbody>
                 </table>
@@ -80,69 +84,74 @@
         <table class="w-full text-left table-fixed">
             <thead class="text-sm leading-8">
             <tr class="text-gray-600 dark:text-gray-400">
-                <th class="text-left pl-6">{{ $item_name }}</th>
-                <th class="text-center">{{ $unit_name }}</th>
-                <th class="text-right">{{ $price_name }}</th>
-                <th class="text-right pr-6">{{ $amount_name }}</th>
+                <th class="text-left pl-6 w-[50%]">{{ $document->columnLabel->items }}</th>
+                <th class="text-center w-[10%]">{{ $document->columnLabel->units }}</th>
+                <th class="text-right w-[20%]">{{ $document->columnLabel->price }}</th>
+                <th class="text-right pr-6 w-[20%]">{{ $document->columnLabel->amount }}</th>
             </tr>
             </thead>
-            <tbody class="text-xs border-t-2 border-b-2 leading-8">
-            <tr class="bg-gray-100 dark:bg-gray-800">
-                <td class="text-left pl-6 font-semibold">Item 1</td>
-                <td class="text-center">2</td>
-                <td class="text-right">$150.00</td>
-                <td class="text-right pr-6">$300.00</td>
-            </tr>
-            <tr>
-                <td class="text-left pl-6 font-semibold">Item 2</td>
-                <td class="text-center">3</td>
-                <td class="text-right">$200.00</td>
-                <td class="text-right pr-6">$600.00</td>
-            </tr>
-            <tr class="bg-gray-100 dark:bg-gray-800">
-                <td class="text-left pl-6 font-semibold">Item 3</td>
-                <td class="text-center">1</td>
-                <td class="text-right">$180.00</td>
-                <td class="text-right pr-6">$180.00</td>
-            </tr>
+            <tbody class="text-xs tracking-tight border-y-2">
+            @foreach($document->lineItems as $index => $item)
+                <tr @class(['bg-gray-100 dark:bg-gray-800' => $index % 2 === 0])>
+                    <td class="text-left pl-6 font-semibold py-2">
+                        {{ $item->name }}
+                        @if($item->description)
+                            <div class="text-gray-600 font-normal line-clamp-2">{{ $item->description }}</div>
+                        @endif
+                    </td>
+                    <td class="text-center">{{ $item->quantity }}</td>
+                    <td class="text-right">{{ $item->unitPrice }}</td>
+                    <td class="text-right pr-6">{{ $item->subtotal }}</td>
+                </tr>
+            @endforeach
             </tbody>
-            <tfoot class="text-xs leading-loose">
+            <tfoot class="text-xs tracking-tight">
             <tr>
-                <td class="pl-6" colspan="2"></td>
-                <td class="text-right font-semibold">Subtotal:</td>
-                <td class="text-right pr-6">$1080.00</td>
-            </tr>
-            <tr class="text-success-800 dark:text-success-600">
-                <td class="pl-6" colspan="2"></td>
-                <td class="text-right">Discount (5%):</td>
-                <td class="text-right pr-6">($54.00)</td>
-            </tr>
-            <tr>
-                <td class="pl-6" colspan="2"></td>
-                <td class="text-right">Sales Tax (10%):</td>
-                <td class="text-right pr-6">$102.60</td>
-            </tr>
-            <tr>
-                <td class="pl-6" colspan="2"></td>
-                <td class="text-right font-semibold border-t">Total:</td>
-                <td class="text-right border-t pr-6">$1128.60</td>
+                <td class="pl-6 py-1" colspan="2"></td>
+                <td class="text-right font-semibold py-1">Subtotal:</td>
+                <td class="text-right pr-6 py-1">{{ $document->subtotal }}</td>
             </tr>
+            @if($document->discount)
+                <tr class="text-success-800 dark:text-success-600">
+                    <td class="pl-6 py-1" colspan="2"></td>
+                    <td class="text-right py-1">Discount:</td>
+                    <td class="text-right pr-6 py-1">
+                        ({{ $document->discount }})
+                    </td>
+                </tr>
+            @endif
+            @if($document->tax)
+                <tr>
+                    <td class="pl-6 py-1" colspan="2"></td>
+                    <td class="text-right py-1">Tax:</td>
+                    <td class="text-right pr-6 py-1">{{ $document->tax }}</td>
+                </tr>
+            @endif
             <tr>
-                <td class="pl-6" colspan="2"></td>
-                <td class="text-right font-semibold border-t-4 border-double">Amount Due (USD):</td>
-                <td class="text-right border-t-4 border-double pr-6">$1128.60</td>
+                <td class="pl-6 py-1" colspan="2"></td>
+                <td class="text-right font-semibold border-t py-1">Total:</td>
+                <td class="text-right border-t pr-6 py-1">{{ $document->total }}</td>
             </tr>
+            @if($document->amountDue)
+                <tr>
+                    <td class="pl-6 py-1" colspan="2"></td>
+                    <td class="text-right font-semibold border-t-4 border-double py-1">{{ $document->label->amountDue }}
+                        ({{ $document->currencyCode }}):
+                    </td>
+                    <td class="text-right border-t-4 border-double pr-6 py-1">{{ $document->amountDue }}</td>
+                </tr>
+            @endif
             </tfoot>
         </table>
     </x-company.invoice.line-items>
 
     <!-- Footer Notes -->
-    <x-company.invoice.footer class="modern-template-footer">
-        <h4 class="font-semibold px-6" style="color: {{ $accent_color }}">Terms & Conditions</h4>
+    <x-company.invoice.footer class="modern-template-footer tracking-tight">
+        <h4 class="font-semibold px-6" style="color: {{ $document->accentColor }}">Terms & Conditions</h4>
         <span class="border-t-2 my-2 border-gray-300 block w-full"></span>
         <div class="flex justify-between space-x-4 px-6">
-            <p class="w-1/2 break-words line-clamp-4">{{ $terms }}</p>
-            <p class="w-1/2 break-words line-clamp-4">{{ $footer }}</p>
+            <p class="w-1/2 break-words line-clamp-4">{{ $document->terms }}</p>
+            <p class="w-1/2 break-words line-clamp-4">{{ $document->footer }}</p>
         </div>
     </x-company.invoice.footer>
 </x-company.invoice.container>

resources/views/filament/forms/components/labeled-field.blade.php

@@ -1,35 +0,0 @@
-@php
-    $prefixLabel = $getPrefixLabel();
-    $suffixLabel = $getSuffixLabel();
-
-    $childComponentContainer = $getChildComponentContainer();
-    $childComponents = $childComponentContainer->getComponents();
-@endphp
-
-<div
-    {{
-        $attributes->class([
-            'flex items-center gap-x-4',
-        ])
-    }}
->
-    @if($prefixLabel)
-        <span class="whitespace-nowrap text-sm font-medium leading-6 text-gray-950 dark:text-white">{{ $prefixLabel }}</span>
-    @endif
-
-    @foreach($childComponents as $component)
-        @if(count($component->getChildComponents()) > 1)
-            <div>
-                {{ $component }}
-            </div>
-        @else
-            <div class="min-w-28 [&_.fi-fo-field-wrp]:m-0 [&_.grid]:!grid-cols-1 [&_.sm\:grid-cols-3]:!grid-cols-1 [&_.sm\:col-span-2]:!col-span-1">
-                {{ $component }}
-            </div>
-        @endif
-    @endforeach
-
-    @if($suffixLabel)
-        <span class="whitespace-nowrap text-sm font-medium leading-6 text-gray-950 dark:text-white">{{ $suffixLabel }}</span>
-    @endif
-</div>

resources/views/filament/forms/components/line-item-repeater.blade.php

@@ -1,251 +0,0 @@
-@php
-    use Filament\Forms\Components\Actions\Action;
-    use Filament\Support\Enums\Alignment;
-    use Filament\Support\Enums\MaxWidth;
-
-    $containers = $getChildComponentContainersWithoutNestedSchema();
-
-    $addAction = $getAction($getAddActionName());
-    $cloneAction = $getAction($getCloneActionName());
-    $deleteAction = $getAction($getDeleteActionName());
-    $moveDownAction = $getAction($getMoveDownActionName());
-    $moveUpAction = $getAction($getMoveUpActionName());
-    $reorderAction = $getAction($getReorderActionName());
-    $isReorderableWithButtons = $isReorderableWithButtons();
-    $extraItemActions = $getExtraItemActions();
-    $extraActions = $getExtraActions();
-    $visibleExtraItemActions = [];
-    $visibleExtraActions = [];
-
-    $headers = $getHeaders();
-    $renderHeader = $shouldRenderHeader();
-    $stackAt = $getStackAt();
-    $hasContainers = count($containers) > 0;
-    $emptyLabel = $getEmptyLabel();
-    $streamlined = $isStreamlined();
-
-    $statePath = $getStatePath();
-
-    foreach ($extraActions as $extraAction) {
-        $visibleExtraActions = array_filter(
-            $extraActions,
-            fn (Action $action): bool => $action->isVisible(),
-        );
-    }
-
-    foreach ($extraItemActions as $extraItemAction) {
-        $visibleExtraItemActions = array_filter(
-            $extraItemActions,
-            fn (Action $action): bool => $action->isVisible(),
-        );
-    }
-
-    $hasActions = $reorderAction->isVisible()
-        || $cloneAction->isVisible()
-        || $deleteAction->isVisible()
-        || $moveUpAction->isVisible()
-        || $moveDownAction->isVisible()
-        || filled($visibleExtraItemActions);
-
-    $hasNestedSchema = $hasNestedSchema();
-
-    $totalColumns = count($headers) + ($hasActions ? 1 : 0);
-    $nestedColspan = 4; // Nested schema spans the last 3 columns.
-    $emptyColspan = $totalColumns - $nestedColspan;
-@endphp
-
-<x-dynamic-component :component="$getFieldWrapperView()" :field="$field">
-    <div
-        x-data="{}"
-        {{ $attributes->merge($getExtraAttributes())->class([
-            'table-repeater-component space-y-6 relative',
-            'streamlined' => $streamlined,
-            match ($stackAt) {
-                'sm', MaxWidth::Small => 'break-point-sm',
-                'lg', MaxWidth::Large => 'break-point-lg',
-                'xl', MaxWidth::ExtraLarge => 'break-point-xl',
-                '2xl', MaxWidth::TwoExtraLarge => 'break-point-2xl',
-                default => 'break-point-md',
-            }
-        ]) }}
-    >
-        @if (count($containers) || $emptyLabel !== false)
-            <div class="table-repeater-container rounded-xl relative ring-1 ring-gray-950/5 dark:ring-white/20">
-                <table class="w-full">
-                    <thead @class([
-                        'table-repeater-header-hidden sr-only' => ! $renderHeader,
-                        'table-repeater-header rounded-t-xl overflow-hidden border-b border-gray-950/5 dark:border-white/20' => $renderHeader,
-                    ])>
-                    <tr class="text-xs md:divide-x md:divide-gray-950/5 dark:md:divide-white/20">
-                        @foreach ($headers as $key => $header)
-                            <th
-                                @class([
-                                    'table-repeater-header-column p-2 font-medium first:rounded-tl-xl last:rounded-tr-xl bg-gray-100 dark:text-gray-300 dark:bg-gray-900/60',
-                                    match($header->getAlignment()) {
-                                      'center', Alignment::Center => 'text-center',
-                                      'right', 'end', Alignment::Right, Alignment::End => 'text-end',
-                                      default => 'text-start'
-                                    }
-                                ])
-                                style="width: {{ $header->getWidth() }}"
-                            >
-                                {{ $header->getLabel() }}
-                                @if ($header->isRequired())
-                                    <span class="whitespace-nowrap">
-                                        <sup class="font-medium text-danger-700 dark:text-danger-400">*</sup>
-                                    </span>
-                                @endif
-                            </th>
-                        @endforeach
-                        @if ($hasActions && count($containers))
-                            <th class="table-repeater-header-column w-px last:rounded-tr-xl p-2 bg-gray-100 dark:bg-gray-900/60">
-                                <span class="sr-only">
-                                    {{ trans('table-repeater::components.repeater.row_actions.label') }}
-                                </span>
-                            </th>
-                        @endif
-                    </tr>
-                    </thead>
-                    <tbody
-                        x-sortable
-                        wire:end.stop="{{ 'mountFormComponentAction(\'' . $statePath . '\', \'reorder\', { items: $event.target.sortable.toArray() })' }}"
-                        class="table-repeater-rows-wrapper divide-y divide-gray-950/5 dark:divide-white/20"
-                    >
-                    @if (count($containers))
-                        @foreach ($containers as $uuid => $row)
-                            @php
-                                $visibleExtraItemActions = array_filter(
-                                    $extraItemActions,
-                                    fn (Action $action): bool => $action(['item' => $uuid])->isVisible(),
-                                );
-                            @endphp
-                            <tr
-                                wire:key="{{ $this->getId() }}.{{ $row->getStatePath() }}.{{ $field::class }}.item"
-                                x-sortable-item="{{ $uuid }}"
-                                class="table-repeater-row"
-                            >
-                                @php($counter = 0)
-                                @foreach($row->getComponents() as $cell)
-                                    @if($cell instanceof \Filament\Forms\Components\Hidden || $cell->isHidden())
-                                        {{ $cell }}
-                                    @else
-                                        <td
-                                            @class([
-                                                'table-repeater-column',
-                                                'p-2' => ! $streamlined,
-                                                'has-hidden-label' => $cell->isLabelHidden(),
-                                                match($headers[$counter++]->getAlignment()) {
-                                                  'center', Alignment::Center => 'text-center',
-                                                  'right', 'end', Alignment::Right, Alignment::End => 'text-end',
-                                                  default => 'text-start'
-                                                }
-                                            ])
-                                            style="width: {{ $cell->getMaxWidth() ?? 'auto' }}"
-                                        >
-                                            {{ $cell }}
-                                        </td>
-                                    @endif
-                                @endforeach
-
-                                @if ($hasActions)
-                                    <td class="table-repeater-column p-2 w-px">
-                                        <ul class="flex items-center table-repeater-row-actions gap-x-3 px-2">
-                                            @foreach ($visibleExtraItemActions as $extraItemAction)
-                                                <li>
-                                                    {{ $extraItemAction(['item' => $uuid]) }}
-                                                </li>
-                                            @endforeach
-
-                                            @if ($reorderAction->isVisible())
-                                                <li x-sortable-handle class="shrink-0">
-                                                    {{ $reorderAction }}
-                                                </li>
-                                            @endif
-
-                                            @if ($isReorderableWithButtons)
-                                                @if (! $loop->first)
-                                                    <li>
-                                                        {{ $moveUpAction(['item' => $uuid]) }}
-                                                    </li>
-                                                @endif
-
-                                                @if (! $loop->last)
-                                                    <li>
-                                                        {{ $moveDownAction(['item' => $uuid]) }}
-                                                    </li>
-                                                @endif
-                                            @endif
-
-                                            @if ($cloneAction->isVisible())
-                                                <li>
-                                                    {{ $cloneAction(['item' => $uuid]) }}
-                                                </li>
-                                            @endif
-
-                                            @if ($deleteAction->isVisible())
-                                                <li>
-                                                    {{ $deleteAction(['item' => $uuid]) }}
-                                                </li>
-                                            @endif
-                                        </ul>
-                                    </td>
-                                @endif
-                            </tr>
-                            @if ($hasNestedSchema)
-                                <tr class="table-repeater-nested-row">
-                                    {{-- Empty cells for the columns before the nested schema --}}
-                                    @if ($emptyColspan > 0)
-                                        <td colspan="{{ $emptyColspan }}"></td>
-                                    @endif
-
-                                    {{-- Nested schema spanning the last 3 columns --}}
-                                    <td colspan="{{ $nestedColspan }}" class="p-4 bg-gray-50 dark:bg-gray-900">
-                                        <div class="nested-schema-wrapper">
-                                            @foreach ($getNestedSchema() as $nestedComponent)
-                                                {{ $nestedComponent }}
-                                            @endforeach
-                                        </div>
-                                    </td>
-                                </tr>
-                            @endif
-                        @endforeach
-                    @else
-                        <tr class="table-repeater-row table-repeater-empty-row">
-                            <td colspan="{{ count($headers) + intval($hasActions) }}"
-                                class="table-repeater-column table-repeater-empty-column p-4 w-px text-center italic">
-                                {{ $emptyLabel ?: trans('table-repeater::components.repeater.empty.label') }}
-                            </td>
-                        </tr>
-                    @endif
-                    </tbody>
-                </table>
-            </div>
-        @endif
-
-        @if ($addAction->isVisible() || filled($visibleExtraActions))
-            <ul
-                @class([
-                    'relative flex gap-4',
-                    match ($getAddActionAlignment()) {
-                        Alignment::Start, Alignment::Left => 'justify-start',
-                        Alignment::End, Alignment::Right => 'justify-end',
-                        default =>  'justify-center',
-                    },
-                ])
-            >
-                @if ($addAction->isVisible())
-                    <li>
-                        {{ $addAction }}
-                    </li>
-                @endif
-                @if (filled($visibleExtraActions))
-                    @foreach ($visibleExtraActions as $extraAction)
-                        <li>
-                            {{ ($extraAction) }}
-                        </li>
-                    @endforeach
-                @endif
-            </ul>
-        @endif
-    </div>
-</x-dynamic-component>

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

@@ -2,6 +2,14 @@
     $document = \App\DTO\DocumentDTO::fromModel($getRecord());
 @endphp
 
+{!! $document->getFontHtml() !!}
+
+<style>
+    .inv-paper {
+        font-family: '{{ $document->font->getLabel() }}', sans-serif;
+    }
+</style>
+
 <div {{ $attributes }}>
     <x-company.invoice.container class="modern-template-container">
         <!-- Colored Header with Logo -->
@@ -26,10 +34,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 +46,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>
 
@@ -88,10 +83,10 @@
             <table class="w-full text-left table-fixed">
                 <thead class="text-sm leading-relaxed">
                 <tr class="text-gray-600 dark:text-gray-400">
-                    <th class="text-left pl-6 w-[45%] py-4">Items</th>
-                    <th class="text-center w-[15%] py-4">Quantity</th>
-                    <th class="text-right w-[20%] py-4">Price</th>
-                    <th class="text-right pr-6 w-[20%] py-4">Amount</th>
+                    <th class="text-left pl-6 w-[50%] py-4">{{ $document->columnLabel->items }}</th>
+                    <th class="text-center w-[10%] py-4">{{ $document->columnLabel->units }}</th>
+                    <th class="text-right w-[20%] py-4">{{ $document->columnLabel->price }}</th>
+                    <th class="text-right pr-6 w-[20%] py-4">{{ $document->columnLabel->amount }}</th>
                 </tr>
                 </thead>
                 <tbody class="text-sm tracking-tight border-y-2">

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/Feature/CompanySetupAndBehaviorTest.php

@@ -56,7 +56,7 @@ it('returns data for the current company based on the CurrentCompanyScope', func
 it('validates that company default settings are non-null', function () {
     $testCompany = $this->testCompany;
 
-    expect($testCompany->profile->country)->not->toBeNull()
+    expect($testCompany->profile->address->country_code)->not->toBeNull()
         ->and($testCompany->profile->email)->not->toBeNull()
         ->and($testCompany->default->currency_code)->toBe('USD')
         ->and($testCompany->locale->language)->toBe('en')

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;
+    }
 }