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

Development 3.x

app/DTO/DocumentDTO.php

@@ -44,7 +44,9 @@ readonly class DocumentDTO
     public static function fromModel(Document $document): self
     {
         /** @var DocumentDefault $settings */
-        $settings = $document->company->defaultInvoice;
+        $settings = $document->company->documentDefaults()
+            ->type($document::documentType())
+            ->first() ?? $document->company->defaultInvoice;
 
         $currencyCode = $document->currency_code ?? CurrencyAccessor::getDefaultCurrency();
 
@@ -67,7 +69,7 @@ readonly class DocumentDTO
             company: CompanyDTO::fromModel($document->company),
             client: ClientDTO::fromModel($document->client),
             lineItems: $document->lineItems->map(fn ($item) => LineItemDTO::fromModel($item)),
-            label: $document->documentType()->getLabels(),
+            label: $document::documentType()->getLabels(),
             columnLabel: DocumentColumnLabelDTO::fromModel($settings),
             accentColor: $settings->accent_color ?? '#000000',
             showLogo: $settings->show_logo ?? false,

app/DTO/DocumentPreviewDTO.php

@@ -2,7 +2,6 @@
 
 namespace App\DTO;
 
-use App\Enums\Accounting\DocumentType;
 use App\Enums\Setting\Font;
 use App\Enums\Setting\PaymentTerms;
 use App\Models\Setting\DocumentDefault;
@@ -23,7 +22,7 @@ readonly class DocumentPreviewDTO extends DocumentDTO
             terms: $data['terms'] ?? $settings->terms,
             logo: $settings->logo_url,
             number: self::generatePreviewNumber($settings, $data),
-            referenceNumber: 'ORD-00001',
+            referenceNumber: $settings->getNumberNext('ORD-'),
             date: $company->locale->date_format->getLabel(),
             dueDate: $paymentTerms->getDueDate($company->locale->date_format->value),
             currencyCode: CurrencyAccessor::getDefaultCurrency(),
@@ -35,7 +34,7 @@ readonly class DocumentPreviewDTO extends DocumentDTO
             company: CompanyDTO::fromModel($company),
             client: ClientPreviewDTO::fake(),
             lineItems: LineItemPreviewDTO::fakeItems(),
-            label: DocumentType::Invoice->getLabels(),
+            label: $settings->type->getLabels(),
             columnLabel: self::generateColumnLabels($settings, $data),
             accentColor: $data['accent_color'] ?? $settings->accent_color ?? '#000000',
             showLogo: $data['show_logo'] ?? $settings->show_logo ?? true,
@@ -46,10 +45,8 @@ readonly class DocumentPreviewDTO extends DocumentDTO
     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);
+        return $settings->getNumberNext($prefix);
     }
 
     protected static function generateColumnLabels(DocumentDefault $settings, ?array $data): DocumentColumnLabelDTO

app/Enums/Accounting/DocumentType.php

@@ -58,7 +58,7 @@ enum DocumentType: string implements HasIcon, HasLabel
     {
         return match ($this) {
             self::Invoice => new DocumentLabelDTO(
-                title: 'Invoice',
+                title: self::Invoice->getLabel(),
                 number: 'Invoice Number',
                 referenceNumber: 'P.O/S.O Number',
                 date: 'Invoice Date',
@@ -66,7 +66,7 @@ enum DocumentType: string implements HasIcon, HasLabel
                 amountDue: 'Amount Due',
             ),
             self::RecurringInvoice => new DocumentLabelDTO(
-                title: 'Recurring Invoice',
+                title: self::RecurringInvoice->getLabel(),
                 number: 'Invoice Number',
                 referenceNumber: 'P.O/S.O Number',
                 date: 'Invoice Date',
@@ -74,7 +74,7 @@ enum DocumentType: string implements HasIcon, HasLabel
                 amountDue: 'Amount Due',
             ),
             self::Estimate => new DocumentLabelDTO(
-                title: 'Estimate',
+                title: self::Estimate->getLabel(),
                 number: 'Estimate Number',
                 referenceNumber: 'Reference Number',
                 date: 'Estimate Date',
@@ -82,7 +82,7 @@ enum DocumentType: string implements HasIcon, HasLabel
                 amountDue: 'Grand Total',
             ),
             self::Bill => new DocumentLabelDTO(
-                title: 'Bill',
+                title: self::Bill->getLabel(),
                 number: 'Bill Number',
                 referenceNumber: 'P.O/S.O Number',
                 date: 'Bill Date',
@@ -91,4 +91,14 @@ enum DocumentType: string implements HasIcon, HasLabel
             ),
         };
     }
+
+    public function getDefaultPrefix(): ?string
+    {
+        return match ($this) {
+            self::Invoice => 'INV-',
+            self::Estimate => 'EST-',
+            self::Bill => 'BILL-',
+            default => null,
+        };
+    }
 }

app/Enums/Setting/DocumentType.php

@@ -2,13 +2,13 @@
 
 namespace App\Enums\Setting;
 
-use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
-enum DocumentType: string implements HasIcon, HasLabel
+enum DocumentType: string implements HasLabel
 {
     case Invoice = 'invoice';
     case Bill = 'bill';
+    case Estimate = 'estimate';
 
     public const DEFAULT = self::Invoice->value;
 
@@ -16,12 +16,4 @@ enum DocumentType: string implements HasIcon, HasLabel
     {
         return $this->name;
     }
-
-    public function getIcon(): ?string
-    {
-        return match ($this->value) {
-            self::Invoice->value => 'heroicon-o-document-duplicate',
-            self::Bill->value => 'heroicon-o-clipboard-document-list',
-        };
-    }
 }

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

@@ -1,187 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Clusters\Settings\Pages;
-
-use App\Enums\Setting\Font;
-use App\Enums\Setting\PrimaryColor;
-use App\Filament\Company\Clusters\Settings;
-use App\Models\Setting\Appearance as AppearanceModel;
-use App\Services\CompanySettingsService;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Form;
-use Filament\Notifications\Notification;
-use Filament\Pages\Concerns\InteractsWithFormActions;
-use Filament\Pages\Page;
-use Filament\Support\Enums\MaxWidth;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Contracts\Support\Htmlable;
-use Illuminate\Database\Eloquent\Model;
-use Livewire\Attributes\Locked;
-
-use function Filament\authorize;
-
-/**
- * @property Form $form
- */
-class Appearance extends Page
-{
-    use InteractsWithFormActions;
-
-    protected static ?string $title = 'Appearance';
-
-    protected static string $view = 'filament.company.pages.setting.appearance';
-
-    protected static ?string $cluster = Settings::class;
-
-    public ?array $data = [];
-
-    #[Locked]
-    public ?AppearanceModel $record = null;
-
-    public function getTitle(): string | Htmlable
-    {
-        return translate(static::$title);
-    }
-
-    public function getMaxContentWidth(): MaxWidth | string | null
-    {
-        return MaxWidth::ScreenTwoExtraLarge;
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return translate(static::$title);
-    }
-
-    public function mount(): void
-    {
-        $this->record = AppearanceModel::firstOrNew([
-            'company_id' => auth()->user()->currentCompany->id,
-        ]);
-
-        abort_unless(static::canView($this->record), 404);
-
-        $this->fillForm();
-    }
-
-    public function fillForm(): void
-    {
-        $data = $this->record->attributesToArray();
-
-        $this->form->fill($data);
-    }
-
-    public function save(): void
-    {
-        try {
-            $data = $this->form->getState();
-
-            $this->handleRecordUpdate($this->record, $data);
-
-        } catch (Halt $exception) {
-            return;
-        }
-
-        $this->getSavedNotification()->send();
-    }
-
-    protected function getSavedNotification(): Notification
-    {
-        return Notification::make()
-            ->success()
-            ->title(__('filament-panels::resources/pages/edit-record.notifications.saved.title'));
-    }
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->schema([
-                $this->getGeneralSection(),
-            ])
-            ->model($this->record)
-            ->statePath('data')
-            ->operation('edit');
-    }
-
-    protected function getGeneralSection(): Component
-    {
-        return Section::make('General')
-            ->schema([
-                Select::make('primary_color')
-                    ->allowHtml()
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->options(
-                        collect(PrimaryColor::cases())
-                            ->sort(static fn ($a, $b) => $a->value <=> $b->value)
-                            ->mapWithKeys(static fn ($case) => [
-                                $case->value => "<span class='flex items-center gap-x-4'>
-                                <span class='rounded-full w-4 h-4' style='background:rgb(" . $case->getColor()[600] . ")'></span>
-                                <span>" . $case->getLabel() . '</span>
-                                </span>',
-                            ]),
-                    ),
-                Select::make('font')
-                    ->allowHtml()
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->options(
-                        collect(Font::cases())
-                            ->mapWithKeys(static fn ($case) => [
-                                $case->value => "<span style='font-family:{$case->getLabel()}'>{$case->getLabel()}</span>",
-                            ]),
-                    ),
-            ])->columns();
-    }
-
-    protected function handleRecordUpdate(AppearanceModel $record, array $data): AppearanceModel
-    {
-        $record->fill($data);
-
-        $keysToWatch = [
-            'primary_color',
-            'font',
-        ];
-
-        if ($record->isDirty($keysToWatch)) {
-            CompanySettingsService::invalidateSettings($record->company_id);
-            $this->dispatch('appearanceUpdated');
-        }
-
-        $record->save();
-
-        return $record;
-    }
-
-    /**
-     * @return array<Action | ActionGroup>
-     */
-    protected function getFormActions(): array
-    {
-        return [
-            $this->getSaveFormAction(),
-        ];
-    }
-
-    protected function getSaveFormAction(): Action
-    {
-        return Action::make('save')
-            ->label(__('filament-panels::resources/pages/edit-record.form.actions.save.label'))
-            ->submit('save')
-            ->keyBindings(['mod+s']);
-    }
-
-    public static function canView(Model $record): bool
-    {
-        try {
-            return authorize('update', $record)->allowed();
-        } catch (AuthorizationException $exception) {
-            return $exception->toResponse()->allowed();
-        }
-    }
-}

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

@@ -1,350 +0,0 @@
-<?php
-
-namespace App\Filament\Company\Clusters\Settings\Pages;
-
-use App\Enums\Setting\DocumentType;
-use App\Enums\Setting\Font;
-use App\Enums\Setting\PaymentTerms;
-use App\Enums\Setting\Template;
-use App\Filament\Company\Clusters\Settings;
-use App\Models\Setting\DocumentDefault as InvoiceModel;
-use Filament\Actions\Action;
-use Filament\Actions\ActionGroup;
-use Filament\Forms\Components\Checkbox;
-use Filament\Forms\Components\ColorPicker;
-use Filament\Forms\Components\Component;
-use Filament\Forms\Components\FileUpload;
-use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\Section;
-use Filament\Forms\Components\Select;
-use Filament\Forms\Components\Textarea;
-use Filament\Forms\Components\TextInput;
-use Filament\Forms\Components\ViewField;
-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;
-use Filament\Support\Enums\MaxWidth;
-use Filament\Support\Exceptions\Halt;
-use Illuminate\Auth\Access\AuthorizationException;
-use Illuminate\Contracts\Support\Htmlable;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Support\Facades\Auth;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
-
-use function Filament\authorize;
-
-/**
- * @property Form $form
- */
-class Invoice extends Page
-{
-    use InteractsWithFormActions;
-
-    protected static ?string $title = 'Invoice';
-
-    protected static string $view = 'filament.company.pages.setting.invoice';
-
-    protected static ?string $cluster = Settings::class;
-
-    public ?array $data = [];
-
-    public ?InvoiceModel $record = null;
-
-    public function getTitle(): string | Htmlable
-    {
-        return translate(static::$title);
-    }
-
-    public static function getNavigationLabel(): string
-    {
-        return translate(static::$title);
-    }
-
-    public function getMaxContentWidth(): MaxWidth | string | null
-    {
-        return MaxWidth::ScreenTwoExtraLarge;
-    }
-
-    public function mount(): void
-    {
-        $this->record = InvoiceModel::invoice()
-            ->firstOrNew([
-                'company_id' => auth()->user()->currentCompany->id,
-                'type' => DocumentType::Invoice->value,
-            ]);
-
-        abort_unless(static::canView($this->record), 404);
-
-        $this->fillForm();
-    }
-
-    public function fillForm(): void
-    {
-        $data = $this->record->attributesToArray();
-
-        $this->form->fill($data);
-    }
-
-    public function save(): void
-    {
-        try {
-            $data = $this->form->getState();
-
-            $this->handleRecordUpdate($this->record, $data);
-
-        } catch (Halt $exception) {
-            return;
-        }
-
-        $this->getSavedNotification()->send();
-    }
-
-    protected function getSavedNotification(): Notification
-    {
-        return Notification::make()
-            ->success()
-            ->title(__('filament-panels::resources/pages/edit-record.notifications.saved.title'));
-    }
-
-    public function form(Form $form): Form
-    {
-        return $form
-            ->live()
-            ->schema([
-                $this->getGeneralSection(),
-                $this->getContentSection(),
-                $this->getTemplateSection(),
-            ])
-            ->model($this->record)
-            ->statePath('data')
-            ->operation('edit');
-    }
-
-    protected function getGeneralSection(): Component
-    {
-        return Section::make('General')
-            ->schema([
-                TextInput::make('number_prefix')
-                    ->localizeLabel()
-                    ->nullable(),
-                Select::make('number_digits')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->options(InvoiceModel::availableNumberDigits()),
-                TextInput::make('number_next')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->mask(static function (Get $get) {
-                        return str_repeat('9', $get('number_digits'));
-                    })
-                    ->hint(function (Get $get, $state) {
-                        $number_prefix = $get('number_prefix');
-                        $number_digits = $get('number_digits');
-                        $number_next = $state;
-
-                        return $this->record->getNumberNext(true, true, $number_prefix, $number_digits, $number_next);
-                    }),
-                Select::make('payment_terms')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->options(PaymentTerms::class),
-            ])->columns();
-    }
-
-    protected function getContentSection(): Component
-    {
-        return Section::make('Content')
-            ->schema([
-                TextInput::make('header')
-                    ->localizeLabel()
-                    ->nullable(),
-                TextInput::make('subheader')
-                    ->localizeLabel()
-                    ->nullable(),
-                Textarea::make('terms')
-                    ->localizeLabel()
-                    ->nullable(),
-                Textarea::make('footer')
-                    ->localizeLabel('Footer')
-                    ->nullable(),
-            ])->columns();
-    }
-
-    protected function getTemplateSection(): Component
-    {
-        return Section::make('Template')
-            ->description('Choose the template and edit the column names.')
-            ->schema([
-                Grid::make(1)
-                    ->schema([
-                        FileUpload::make('logo')
-                            ->openable()
-                            ->maxSize(1024)
-                            ->localizeLabel()
-                            ->visibility('public')
-                            ->disk('public')
-                            ->directory('logos/document')
-                            ->imageResizeMode('contain')
-                            ->imageCropAspectRatio('3:2')
-                            ->panelAspectRatio('3:2')
-                            ->panelLayout('integrated')
-                            ->removeUploadedFileButtonPosition('center bottom')
-                            ->uploadButtonPosition('center bottom')
-                            ->uploadProgressIndicatorPosition('center bottom')
-                            ->getUploadedFileNameForStorageUsing(
-                                static fn (TemporaryUploadedFile $file): string => (string) str($file->getClientOriginalName())
-                                    ->prepend(Auth::user()->currentCompany->id . '_'),
-                            )
-                            ->extraAttributes([
-                                'class' => 'aspect-[3/2] w-[9.375rem] max-w-full',
-                            ])
-                            ->acceptedFileTypes(['image/png', 'image/jpeg', 'image/gif']),
-                        Checkbox::make('show_logo')
-                            ->localizeLabel(),
-                        ColorPicker::make('accent_color')
-                            ->localizeLabel(),
-                        Select::make('font')
-                            ->softRequired()
-                            ->localizeLabel()
-                            ->allowHtml()
-                            ->options(
-                                collect(Font::cases())
-                                    ->mapWithKeys(static fn ($case) => [
-                                        $case->value => "<span style='font-family:{$case->getLabel()}'>{$case->getLabel()}</span>",
-                                    ]),
-                            ),
-                        Select::make('template')
-                            ->softRequired()
-                            ->localizeLabel()
-                            ->options(Template::class),
-                        Select::make('item_name.option')
-                            ->softRequired()
-                            ->localizeLabel('Item name')
-                            ->options(InvoiceModel::getAvailableItemNameOptions())
-                            ->afterStateUpdated(static function (Get $get, Set $set, $state, $old) {
-                                if ($state !== 'other' && $old === 'other' && filled($get('item_name.custom'))) {
-                                    $set('item_name.old_custom', $get('item_name.custom'));
-                                    $set('item_name.custom', null);
-                                }
-
-                                if ($state === 'other' && $old !== 'other') {
-                                    $set('item_name.custom', $get('item_name.old_custom'));
-                                }
-                            }),
-                        TextInput::make('item_name.custom')
-                            ->hiddenLabel()
-                            ->disabled(static fn (callable $get) => $get('item_name.option') !== 'other')
-                            ->nullable(),
-                        Select::make('unit_name.option')
-                            ->softRequired()
-                            ->localizeLabel('Unit name')
-                            ->options(InvoiceModel::getAvailableUnitNameOptions())
-                            ->afterStateUpdated(static function (Get $get, Set $set, $state, $old) {
-                                if ($state !== 'other' && $old === 'other' && filled($get('unit_name.custom'))) {
-                                    $set('unit_name.old_custom', $get('unit_name.custom'));
-                                    $set('unit_name.custom', null);
-                                }
-
-                                if ($state === 'other' && $old !== 'other') {
-                                    $set('unit_name.custom', $get('unit_name.old_custom'));
-                                }
-                            }),
-                        TextInput::make('unit_name.custom')
-                            ->hiddenLabel()
-                            ->disabled(static fn (callable $get) => $get('unit_name.option') !== 'other')
-                            ->nullable(),
-                        Select::make('price_name.option')
-                            ->softRequired()
-                            ->localizeLabel('Price name')
-                            ->options(InvoiceModel::getAvailablePriceNameOptions())
-                            ->afterStateUpdated(static function (Get $get, Set $set, $state, $old) {
-                                if ($state !== 'other' && $old === 'other' && filled($get('price_name.custom'))) {
-                                    $set('price_name.old_custom', $get('price_name.custom'));
-                                    $set('price_name.custom', null);
-                                }
-
-                                if ($state === 'other' && $old !== 'other') {
-                                    $set('price_name.custom', $get('price_name.old_custom'));
-                                }
-                            }),
-                        TextInput::make('price_name.custom')
-                            ->hiddenLabel()
-                            ->disabled(static fn (callable $get) => $get('price_name.option') !== 'other')
-                            ->nullable(),
-                        Select::make('amount_name.option')
-                            ->softRequired()
-                            ->localizeLabel('Amount name')
-                            ->options(InvoiceModel::getAvailableAmountNameOptions())
-                            ->afterStateUpdated(static function (Get $get, Set $set, $state, $old) {
-                                if ($state !== 'other' && $old === 'other' && filled($get('amount_name.custom'))) {
-                                    $set('amount_name.old_custom', $get('amount_name.custom'));
-                                    $set('amount_name.custom', null);
-                                }
-
-                                if ($state === 'other' && $old !== 'other') {
-                                    $set('amount_name.custom', $get('amount_name.old_custom'));
-                                }
-                            }),
-                        TextInput::make('amount_name.custom')
-                            ->hiddenLabel()
-                            ->disabled(static fn (callable $get) => $get('amount_name.option') !== 'other')
-                            ->nullable(),
-                    ])->columnSpan(1),
-                Grid::make()
-                    ->schema([
-                        ViewField::make('preview.default')
-                            ->columnSpan(2)
-                            ->hiddenLabel()
-                            ->visible(static fn (Get $get) => $get('template') === 'default')
-                            ->view('filament.company.components.invoice-layouts.default'),
-                        ViewField::make('preview.modern')
-                            ->columnSpan(2)
-                            ->hiddenLabel()
-                            ->visible(static fn (Get $get) => $get('template') === 'modern')
-                            ->view('filament.company.components.invoice-layouts.modern'),
-                        ViewField::make('preview.classic')
-                            ->columnSpan(2)
-                            ->hiddenLabel()
-                            ->visible(static fn (Get $get) => $get('template') === 'classic')
-                            ->view('filament.company.components.invoice-layouts.classic'),
-                    ])->columnSpan(2),
-            ])->columns(3);
-    }
-
-    protected function handleRecordUpdate(InvoiceModel $record, array $data): InvoiceModel
-    {
-        $record->update($data);
-
-        return $record;
-    }
-
-    /**
-     * @return array<Action | ActionGroup>
-     */
-    protected function getFormActions(): array
-    {
-        return [
-            $this->getSaveFormAction(),
-        ];
-    }
-
-    protected function getSaveFormAction(): Action
-    {
-        return Action::make('save')
-            ->label(__('filament-panels::resources/pages/edit-record.form.actions.save.label'))
-            ->submit('save')
-            ->keyBindings(['mod+s']);
-    }
-
-    public static function canView(Model $record): bool
-    {
-        try {
-            return authorize('update', $record)->allowed();
-        } catch (AuthorizationException $exception) {
-            return $exception->toResponse()->allowed();
-        }
-    }
-}

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

@@ -0,0 +1,282 @@
+<?php
+
+namespace App\Filament\Company\Clusters\Settings\Resources;
+
+use App\Enums\Accounting\DocumentType;
+use App\Enums\Setting\Font;
+use App\Enums\Setting\PaymentTerms;
+use App\Enums\Setting\Template;
+use App\Filament\Company\Clusters\Settings;
+use App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource\Pages;
+use App\Models\Setting\DocumentDefault;
+use Filament\Forms;
+use Filament\Forms\Components\Component;
+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\Support\Facades\Auth;
+use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
+
+class DocumentDefaultResource extends Resource
+{
+    protected static ?string $model = DocumentDefault::class;
+
+    protected static ?string $cluster = Settings::class;
+
+    protected static ?string $modelLabel = 'document template';
+
+    public static function form(Form $form): Form
+    {
+        return $form
+            ->live()
+            ->schema([
+                self::getGeneralSection(),
+                self::getContentSection(),
+                self::getTemplateSection(),
+                self::getBillColumnLabelsSection(),
+            ]);
+    }
+
+    public static function getGeneralSection(): Forms\Components\Component
+    {
+        return Forms\Components\Section::make('General')
+            ->schema([
+                Forms\Components\TextInput::make('number_prefix')
+                    ->localizeLabel()
+                    ->nullable(),
+                Forms\Components\Select::make('payment_terms')
+                    ->softRequired()
+                    ->localizeLabel()
+                    ->options(PaymentTerms::class),
+            ])->columns();
+    }
+
+    public static function getContentSection(): Forms\Components\Component
+    {
+        return Forms\Components\Section::make('Content')
+            ->hidden(static fn (DocumentDefault $record) => $record->type === DocumentType::Bill)
+            ->schema([
+                Forms\Components\TextInput::make('header')
+                    ->localizeLabel()
+                    ->nullable(),
+                Forms\Components\TextInput::make('subheader')
+                    ->localizeLabel()
+                    ->nullable(),
+                Forms\Components\Textarea::make('terms')
+                    ->localizeLabel()
+                    ->nullable(),
+                Forms\Components\Textarea::make('footer')
+                    ->localizeLabel('Footer')
+                    ->nullable(),
+            ])->columns();
+    }
+
+    public static function getTemplateSection(): Component
+    {
+        return Forms\Components\Section::make('Template')
+            ->description('Choose the template and edit the column names.')
+            ->hidden(static fn (DocumentDefault $record) => $record->type === DocumentType::Bill)
+            ->schema([
+                Forms\Components\Grid::make(1)
+                    ->schema([
+                        Forms\Components\FileUpload::make('logo')
+                            ->openable()
+                            ->maxSize(1024)
+                            ->localizeLabel()
+                            ->visibility('public')
+                            ->disk('public')
+                            ->directory('logos/document')
+                            ->imageResizeMode('contain')
+                            ->imageCropAspectRatio('3:2')
+                            ->panelAspectRatio('3:2')
+                            ->panelLayout('integrated')
+                            ->removeUploadedFileButtonPosition('center bottom')
+                            ->uploadButtonPosition('center bottom')
+                            ->uploadProgressIndicatorPosition('center bottom')
+                            ->getUploadedFileNameForStorageUsing(
+                                static fn (TemporaryUploadedFile $file): string => (string) str($file->getClientOriginalName())
+                                    ->prepend(Auth::user()->currentCompany->id . '_'),
+                            )
+                            ->extraAttributes([
+                                'class' => 'aspect-[3/2] w-[9.375rem] max-w-full',
+                            ])
+                            ->acceptedFileTypes(['image/png', 'image/jpeg', 'image/gif']),
+                        Forms\Components\Checkbox::make('show_logo')
+                            ->localizeLabel(),
+                        Forms\Components\ColorPicker::make('accent_color')
+                            ->localizeLabel(),
+                        Forms\Components\Select::make('font')
+                            ->softRequired()
+                            ->localizeLabel()
+                            ->allowHtml()
+                            ->options(
+                                collect(Font::cases())
+                                    ->mapWithKeys(static fn ($case) => [
+                                        $case->value => "<span style='font-family:{$case->getLabel()}'>{$case->getLabel()}</span>",
+                                    ]),
+                            ),
+                        Forms\Components\Select::make('template')
+                            ->softRequired()
+                            ->localizeLabel()
+                            ->options(Template::class),
+                        ...static::getColumnLabelsSchema(),
+                    ])->columnSpan(1),
+                Forms\Components\Grid::make()
+                    ->schema([
+                        Forms\Components\ViewField::make('preview.default')
+                            ->columnSpan(2)
+                            ->hiddenLabel()
+                            ->visible(static fn (Get $get) => $get('template') === 'default')
+                            ->view('filament.company.components.invoice-layouts.default'),
+                        Forms\Components\ViewField::make('preview.modern')
+                            ->columnSpan(2)
+                            ->hiddenLabel()
+                            ->visible(static fn (Get $get) => $get('template') === 'modern')
+                            ->view('filament.company.components.invoice-layouts.modern'),
+                        Forms\Components\ViewField::make('preview.classic')
+                            ->columnSpan(2)
+                            ->hiddenLabel()
+                            ->visible(static fn (Get $get) => $get('template') === 'classic')
+                            ->view('filament.company.components.invoice-layouts.classic'),
+                    ])->columnSpan(2),
+            ])->columns(3);
+    }
+
+    public static function getBillColumnLabelsSection(): Component
+    {
+        return Forms\Components\Section::make('Column Labels')
+            ->visible(static fn (DocumentDefault $record) => $record->type === DocumentType::Bill)
+            ->schema(static::getColumnLabelsSchema())->columns();
+    }
+
+    public static function getColumnLabelsSchema(): array
+    {
+        return [
+            Forms\Components\Select::make('item_name.option')
+                ->softRequired()
+                ->localizeLabel('Item name')
+                ->options(DocumentDefault::getAvailableItemNameOptions())
+                ->afterStateUpdated(static function (Get $get, Set $set, $state, $old) {
+                    if ($state !== 'other' && $old === 'other' && filled($get('item_name.custom'))) {
+                        $set('item_name.old_custom', $get('item_name.custom'));
+                        $set('item_name.custom', null);
+                    }
+
+                    if ($state === 'other' && $old !== 'other') {
+                        $set('item_name.custom', $get('item_name.old_custom'));
+                    }
+                }),
+            Forms\Components\TextInput::make('item_name.custom')
+                ->hiddenLabel()
+                ->extraFieldWrapperAttributes(static fn (DocumentDefault $record) => [
+                    'class' => $record->type === DocumentType::Bill ? 'report-hidden-label' : '',
+                ])
+                ->disabled(static fn (callable $get) => $get('item_name.option') !== 'other')
+                ->nullable(),
+            Forms\Components\Select::make('unit_name.option')
+                ->softRequired()
+                ->localizeLabel('Unit name')
+                ->options(DocumentDefault::getAvailableUnitNameOptions())
+                ->afterStateUpdated(static function (Get $get, Set $set, $state, $old) {
+                    if ($state !== 'other' && $old === 'other' && filled($get('unit_name.custom'))) {
+                        $set('unit_name.old_custom', $get('unit_name.custom'));
+                        $set('unit_name.custom', null);
+                    }
+
+                    if ($state === 'other' && $old !== 'other') {
+                        $set('unit_name.custom', $get('unit_name.old_custom'));
+                    }
+                }),
+            Forms\Components\TextInput::make('unit_name.custom')
+                ->hiddenLabel()
+                ->extraFieldWrapperAttributes(static fn (DocumentDefault $record) => [
+                    'class' => $record->type === DocumentType::Bill ? 'report-hidden-label' : '',
+                ])
+                ->disabled(static fn (callable $get) => $get('unit_name.option') !== 'other')
+                ->nullable(),
+            Forms\Components\Select::make('price_name.option')
+                ->softRequired()
+                ->localizeLabel('Price name')
+                ->options(DocumentDefault::getAvailablePriceNameOptions())
+                ->afterStateUpdated(static function (Get $get, Set $set, $state, $old) {
+                    if ($state !== 'other' && $old === 'other' && filled($get('price_name.custom'))) {
+                        $set('price_name.old_custom', $get('price_name.custom'));
+                        $set('price_name.custom', null);
+                    }
+
+                    if ($state === 'other' && $old !== 'other') {
+                        $set('price_name.custom', $get('price_name.old_custom'));
+                    }
+                }),
+            Forms\Components\TextInput::make('price_name.custom')
+                ->hiddenLabel()
+                ->extraFieldWrapperAttributes(static fn (DocumentDefault $record) => [
+                    'class' => $record->type === DocumentType::Bill ? 'report-hidden-label' : '',
+                ])
+                ->disabled(static fn (callable $get) => $get('price_name.option') !== 'other')
+                ->nullable(),
+            Forms\Components\Select::make('amount_name.option')
+                ->softRequired()
+                ->localizeLabel('Amount name')
+                ->options(DocumentDefault::getAvailableAmountNameOptions())
+                ->afterStateUpdated(static function (Get $get, Set $set, $state, $old) {
+                    if ($state !== 'other' && $old === 'other' && filled($get('amount_name.custom'))) {
+                        $set('amount_name.old_custom', $get('amount_name.custom'));
+                        $set('amount_name.custom', null);
+                    }
+
+                    if ($state === 'other' && $old !== 'other') {
+                        $set('amount_name.custom', $get('amount_name.old_custom'));
+                    }
+                }),
+            Forms\Components\TextInput::make('amount_name.custom')
+                ->hiddenLabel()
+                ->extraFieldWrapperAttributes(static fn (DocumentDefault $record) => [
+                    'class' => $record->type === DocumentType::Bill ? 'report-hidden-label' : '',
+                ])
+                ->disabled(static fn (callable $get) => $get('amount_name.option') !== 'other')
+                ->nullable(),
+        ];
+    }
+
+    public static function table(Table $table): Table
+    {
+        return $table
+            ->columns([
+                Tables\Columns\TextColumn::make('type')
+                    ->badge(),
+                Tables\Columns\TextColumn::make('number_prefix'),
+                Tables\Columns\TextColumn::make('template')
+                    ->badge(),
+                Tables\Columns\IconColumn::make('show_logo')
+                    ->boolean(),
+            ])
+            ->filters([
+                //
+            ])
+            ->actions([
+                Tables\Actions\EditAction::make(),
+            ])
+            ->bulkActions([
+                //
+            ]);
+    }
+
+    public static function getRelations(): array
+    {
+        return [
+            //
+        ];
+    }
+
+    public static function getPages(): array
+    {
+        return [
+            'index' => Pages\ListDocumentDefaults::route('/'),
+            'edit' => Pages\EditDocumentDefault::route('/{record}/edit'),
+        ];
+    }
+}

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

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource\Pages;
+
+use App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource;
+use Filament\Resources\Pages\EditRecord;
+use Illuminate\Contracts\Support\Htmlable;
+
+class EditDocumentDefault extends EditRecord
+{
+    protected static string $resource = DocumentDefaultResource::class;
+
+    public function getRecordTitle(): string | Htmlable
+    {
+        return $this->record->type->getLabel();
+    }
+
+    public function getBreadcrumbs(): array
+    {
+        $breadcrumbs = parent::getBreadcrumbs();
+
+        array_pop($breadcrumbs);
+
+        return $breadcrumbs;
+    }
+}

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

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource\Pages;
+
+use App\Filament\Company\Clusters\Settings\Resources\DocumentDefaultResource;
+use Filament\Resources\Pages\ListRecords;
+use Filament\Support\Enums\MaxWidth;
+
+class ListDocumentDefaults extends ListRecords
+{
+    protected static string $resource = DocumentDefaultResource::class;
+
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return MaxWidth::ScreenTwoExtraLarge;
+    }
+}

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

@@ -72,7 +72,7 @@ class BillResource extends Resource
                             Forms\Components\Group::make([
                                 Forms\Components\TextInput::make('bill_number')
                                     ->label('Bill number')
-                                    ->default(fn () => Bill::getNextDocumentNumber())
+                                    ->default(static fn () => Bill::getNextDocumentNumber())
                                     ->required(),
                                 Forms\Components\TextInput::make('order_number')
                                     ->label('P.O/S.O Number'),

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

@@ -8,6 +8,8 @@ use App\Enums\Accounting\EstimateStatus;
 use App\Filament\Company\Resources\Sales\EstimateResource\Pages;
 use App\Filament\Company\Resources\Sales\EstimateResource\Widgets;
 use App\Filament\Forms\Components\CreateCurrencySelect;
+use App\Filament\Forms\Components\DocumentFooterSection;
+use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Filament\Tables\Columns;
@@ -22,7 +24,6 @@ use App\Utilities\RateCalculator;
 use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Filament\Forms;
-use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
@@ -31,7 +32,6 @@ use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Auth;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class EstimateResource extends Resource
 {
@@ -41,51 +41,13 @@ class EstimateResource extends Resource
     {
         $company = Auth::user()->currentCompany;
 
+        $settings = $company->defaultEstimate;
+
         return $form
             ->schema([
-                Forms\Components\Section::make('Estimate Header')
-                    ->collapsible()
-                    ->collapsed()
-                    ->schema([
-                        Forms\Components\Split::make([
-                            Forms\Components\Group::make([
-                                FileUpload::make('logo')
-                                    ->openable()
-                                    ->maxSize(1024)
-                                    ->localizeLabel()
-                                    ->visibility('public')
-                                    ->disk('public')
-                                    ->directory('logos/document')
-                                    ->imageResizeMode('contain')
-                                    ->imageCropAspectRatio('3:2')
-                                    ->panelAspectRatio('3:2')
-                                    ->maxWidth(MaxWidth::ExtraSmall)
-                                    ->panelLayout('integrated')
-                                    ->removeUploadedFileButtonPosition('center bottom')
-                                    ->uploadButtonPosition('center bottom')
-                                    ->uploadProgressIndicatorPosition('center bottom')
-                                    ->getUploadedFileNameForStorageUsing(
-                                        static fn (TemporaryUploadedFile $file): string => (string) str($file->getClientOriginalName())
-                                            ->prepend(Auth::user()->currentCompany->id . '_'),
-                                    )
-                                    ->acceptedFileTypes(['image/png', 'image/jpeg', 'image/gif']),
-                            ]),
-                            Forms\Components\Group::make([
-                                Forms\Components\TextInput::make('header')
-                                    ->default('Estimate'),
-                                Forms\Components\TextInput::make('subheader'),
-                                Forms\Components\View::make('filament.forms.components.company-info')
-                                    ->viewData([
-                                        'company_name' => $company->name,
-                                        'company_address' => $company->profile->address,
-                                        'company_city' => $company->profile->city?->name,
-                                        'company_state' => $company->profile->state?->name,
-                                        'company_zip' => $company->profile->zip_code,
-                                        'company_country' => $company->profile->state?->country->name,
-                                    ]),
-                            ])->grow(true),
-                        ])->from('md'),
-                    ]),
+                DocumentHeaderSection::make('Estimate Header')
+                    ->defaultHeader($settings->header)
+                    ->defaultSubheader($settings->subheader),
                 Forms\Components\Section::make('Estimate Details')
                     ->schema([
                         Forms\Components\Split::make([
@@ -112,7 +74,7 @@ class EstimateResource extends Resource
                             Forms\Components\Group::make([
                                 Forms\Components\TextInput::make('estimate_number')
                                     ->label('Estimate number')
-                                    ->default(fn () => Estimate::getNextDocumentNumber()),
+                                    ->default(static fn () => Estimate::getNextDocumentNumber()),
                                 Forms\Components\TextInput::make('reference_number')
                                     ->label('Reference number'),
                                 Forms\Components\DatePicker::make('date')
@@ -129,8 +91,8 @@ class EstimateResource extends Resource
                                     }),
                                 Forms\Components\DatePicker::make('expiration_date')
                                     ->label('Expiration date')
-                                    ->default(function () use ($company) {
-                                        return now()->addDays($company->defaultInvoice->payment_terms->getDays());
+                                    ->default(function () use ($settings) {
+                                        return now()->addDays($settings->payment_terms->getDays());
                                     })
                                     ->minDate(static function (Forms\Get $get) {
                                         return $get('date') ?? now();
@@ -154,22 +116,29 @@ class EstimateResource extends Resource
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
-                            ->headers(function (Forms\Get $get) {
+                            ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 
                                 $headers = [
-                                    Header::make('Items')->width($hasDiscounts ? '15%' : '20%'),
-                                    Header::make('Description')->width($hasDiscounts ? '25%' : '30%'),  // Increase when no discounts
-                                    Header::make('Quantity')->width('10%'),
-                                    Header::make('Price')->width('10%'),
-                                    Header::make('Taxes')->width($hasDiscounts ? '15%' : '20%'),       // Increase when no discounts
+                                    Header::make($settings->resolveColumnLabel('item_name', 'Items'))
+                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                    Header::make('Description')
+                                        ->width($hasDiscounts ? '25%' : '30%'),
+                                    Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
+                                        ->width('10%'),
+                                    Header::make($settings->resolveColumnLabel('price_name', 'Price'))
+                                        ->width('10%'),
+                                    Header::make('Taxes')
+                                        ->width($hasDiscounts ? '15%' : '20%'),
                                 ];
 
                                 if ($hasDiscounts) {
                                     $headers[] = Header::make('Discounts')->width('15%');
                                 }
 
-                                $headers[] = Header::make('Amount')->width('10%')->align('right');
+                                $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
+                                    ->width('10%')
+                                    ->align('right');
 
                                 return $headers;
                             })
@@ -270,15 +239,11 @@ class EstimateResource extends Resource
                         DocumentTotals::make()
                             ->type(DocumentType::Estimate),
                         Forms\Components\Textarea::make('terms')
+                            ->default($settings->terms)
                             ->columnSpanFull(),
                     ]),
-                Forms\Components\Section::make('Estimate Footer')
-                    ->collapsible()
-                    ->collapsed()
-                    ->schema([
-                        Forms\Components\Textarea::make('footer')
-                            ->columnSpanFull(),
-                    ]),
+                DocumentFooterSection::make('Estimate Footer')
+                    ->defaultFooter($settings->footer),
             ]);
     }
 

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

@@ -12,6 +12,8 @@ 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\DocumentFooterSection;
+use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Filament\Tables\Columns;
@@ -28,7 +30,6 @@ use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Closure;
 use Filament\Forms;
-use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Form;
 use Filament\Notifications\Notification;
 use Filament\Resources\Resource;
@@ -39,7 +40,6 @@ use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Auth;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class InvoiceResource extends Resource
 {
@@ -49,52 +49,13 @@ class InvoiceResource extends Resource
     {
         $company = Auth::user()->currentCompany;
 
+        $settings = $company->defaultInvoice;
+
         return $form
             ->schema([
-                Forms\Components\Section::make('Invoice Header')
-                    ->collapsible()
-                    ->collapsed()
-                    ->schema([
-                        Forms\Components\Split::make([
-                            Forms\Components\Group::make([
-                                FileUpload::make('logo')
-                                    ->openable()
-                                    ->maxSize(1024)
-                                    ->localizeLabel()
-                                    ->visibility('public')
-                                    ->disk('public')
-                                    ->directory('logos/document')
-                                    ->imageResizeMode('contain')
-                                    ->imageCropAspectRatio('3:2')
-                                    ->panelAspectRatio('3:2')
-                                    ->maxWidth(MaxWidth::ExtraSmall)
-                                    ->panelLayout('integrated')
-                                    ->removeUploadedFileButtonPosition('center bottom')
-                                    ->uploadButtonPosition('center bottom')
-                                    ->uploadProgressIndicatorPosition('center bottom')
-                                    ->getUploadedFileNameForStorageUsing(
-                                        static fn (TemporaryUploadedFile $file): string => (string) str($file->getClientOriginalName())
-                                            ->prepend(Auth::user()->currentCompany->id . '_'),
-                                    )
-                                    ->acceptedFileTypes(['image/png', 'image/jpeg', 'image/gif']),
-                            ]),
-                            Forms\Components\Group::make([
-                                Forms\Components\TextInput::make('header')
-                                    ->default(fn () => $company->defaultInvoice->header),
-                                Forms\Components\TextInput::make('subheader')
-                                    ->default(fn () => $company->defaultInvoice->subheader),
-                                Forms\Components\View::make('filament.forms.components.company-info')
-                                    ->viewData([
-                                        'company_name' => $company->name,
-                                        'company_address' => $company->profile->address,
-                                        'company_city' => $company->profile->city?->name,
-                                        'company_state' => $company->profile->state?->name,
-                                        'company_zip' => $company->profile->zip_code,
-                                        'company_country' => $company->profile->state?->country->name,
-                                    ]),
-                            ])->grow(true),
-                        ])->from('md'),
-                    ]),
+                DocumentHeaderSection::make('Invoice Header')
+                    ->defaultHeader($settings->header)
+                    ->defaultSubheader($settings->subheader),
                 Forms\Components\Section::make('Invoice Details')
                     ->schema([
                         Forms\Components\Split::make([
@@ -124,7 +85,7 @@ class InvoiceResource extends Resource
                             Forms\Components\Group::make([
                                 Forms\Components\TextInput::make('invoice_number')
                                     ->label('Invoice number')
-                                    ->default(fn () => Invoice::getNextDocumentNumber()),
+                                    ->default(static fn () => Invoice::getNextDocumentNumber()),
                                 Forms\Components\TextInput::make('order_number')
                                     ->label('P.O/S.O Number'),
                                 Forms\Components\DatePicker::make('date')
@@ -144,8 +105,8 @@ class InvoiceResource extends Resource
                                     }),
                                 Forms\Components\DatePicker::make('due_date')
                                     ->label('Payment due')
-                                    ->default(function () use ($company) {
-                                        return now()->addDays($company->defaultInvoice->payment_terms->getDays());
+                                    ->default(function () use ($settings) {
+                                        return now()->addDays($settings->payment_terms->getDays());
                                     })
                                     ->minDate(static function (Forms\Get $get) {
                                         return $get('date') ?? now();
@@ -169,22 +130,29 @@ class InvoiceResource extends Resource
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
-                            ->headers(function (Forms\Get $get) {
+                            ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 
                                 $headers = [
-                                    Header::make('Items')->width($hasDiscounts ? '15%' : '20%'),
-                                    Header::make('Description')->width($hasDiscounts ? '25%' : '30%'),  // Increase when no discounts
-                                    Header::make('Quantity')->width('10%'),
-                                    Header::make('Price')->width('10%'),
-                                    Header::make('Taxes')->width($hasDiscounts ? '15%' : '20%'),       // Increase when no discounts
+                                    Header::make($settings->resolveColumnLabel('item_name', 'Items'))
+                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                    Header::make('Description')
+                                        ->width($hasDiscounts ? '25%' : '30%'),
+                                    Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
+                                        ->width('10%'),
+                                    Header::make($settings->resolveColumnLabel('price_name', 'Price'))
+                                        ->width('10%'),
+                                    Header::make('Taxes')
+                                        ->width($hasDiscounts ? '15%' : '20%'),
                                 ];
 
                                 if ($hasDiscounts) {
                                     $headers[] = Header::make('Discounts')->width('15%');
                                 }
 
-                                $headers[] = Header::make('Amount')->width('10%')->align('right');
+                                $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
+                                    ->width('10%')
+                                    ->align('right');
 
                                 return $headers;
                             })
@@ -285,15 +253,11 @@ class InvoiceResource extends Resource
                         DocumentTotals::make()
                             ->type(DocumentType::Invoice),
                         Forms\Components\Textarea::make('terms')
+                            ->default($settings->terms)
                             ->columnSpanFull(),
                     ]),
-                Forms\Components\Section::make('Invoice Footer')
-                    ->collapsible()
-                    ->collapsed()
-                    ->schema([
-                        Forms\Components\Textarea::make('footer')
-                            ->columnSpanFull(),
-                    ]),
+                DocumentFooterSection::make('Invoice Footer')
+                    ->defaultFooter($settings->footer),
             ]);
     }
 

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

@@ -8,6 +8,8 @@ use App\Enums\Accounting\RecurringInvoiceStatus;
 use App\Enums\Setting\PaymentTerms;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 use App\Filament\Forms\Components\CreateCurrencySelect;
+use App\Filament\Forms\Components\DocumentFooterSection;
+use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Columns;
 use App\Models\Accounting\Adjustment;
@@ -20,14 +22,11 @@ use App\Utilities\RateCalculator;
 use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Filament\Forms;
-use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Form;
 use Filament\Resources\Resource;
-use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Support\Facades\Auth;
-use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
 class RecurringInvoiceResource extends Resource
 {
@@ -37,52 +36,13 @@ class RecurringInvoiceResource extends Resource
     {
         $company = Auth::user()->currentCompany;
 
+        $settings = $company->defaultInvoice;
+
         return $form
             ->schema([
-                Forms\Components\Section::make('Invoice Header')
-                    ->collapsible()
-                    ->collapsed()
-                    ->schema([
-                        Forms\Components\Split::make([
-                            Forms\Components\Group::make([
-                                FileUpload::make('logo')
-                                    ->openable()
-                                    ->maxSize(1024)
-                                    ->localizeLabel()
-                                    ->visibility('public')
-                                    ->disk('public')
-                                    ->directory('logos/document')
-                                    ->imageResizeMode('contain')
-                                    ->imageCropAspectRatio('3:2')
-                                    ->panelAspectRatio('3:2')
-                                    ->maxWidth(MaxWidth::ExtraSmall)
-                                    ->panelLayout('integrated')
-                                    ->removeUploadedFileButtonPosition('center bottom')
-                                    ->uploadButtonPosition('center bottom')
-                                    ->uploadProgressIndicatorPosition('center bottom')
-                                    ->getUploadedFileNameForStorageUsing(
-                                        static fn (TemporaryUploadedFile $file): string => (string) str($file->getClientOriginalName())
-                                            ->prepend(Auth::user()->currentCompany->id . '_'),
-                                    )
-                                    ->acceptedFileTypes(['image/png', 'image/jpeg', 'image/gif']),
-                            ]),
-                            Forms\Components\Group::make([
-                                Forms\Components\TextInput::make('header')
-                                    ->default(fn () => $company->defaultInvoice->header),
-                                Forms\Components\TextInput::make('subheader')
-                                    ->default(fn () => $company->defaultInvoice->subheader),
-                                Forms\Components\View::make('filament.forms.components.company-info')
-                                    ->viewData([
-                                        'company_name' => $company->name,
-                                        'company_address' => $company->profile->address,
-                                        'company_city' => $company->profile->city?->name,
-                                        'company_state' => $company->profile->state?->name,
-                                        'company_zip' => $company->profile->zip_code,
-                                        'company_country' => $company->profile->state?->country->name,
-                                    ]),
-                            ])->grow(true),
-                        ])->from('md'),
-                    ]),
+                DocumentHeaderSection::make('Invoice Header')
+                    ->defaultHeader($settings->header)
+                    ->defaultSubheader($settings->subheader),
                 Forms\Components\Section::make('Invoice Details')
                     ->schema([
                         Forms\Components\Split::make([
@@ -119,7 +79,7 @@ class RecurringInvoiceResource extends Resource
                                     ->label('Payment due')
                                     ->options(PaymentTerms::class)
                                     ->softRequired()
-                                    ->default($company->defaultInvoice->payment_terms)
+                                    ->default($settings->payment_terms)
                                     ->live(),
                                 Forms\Components\Select::make('discount_method')
                                     ->label('Discount method')
@@ -140,22 +100,29 @@ class RecurringInvoiceResource extends Resource
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
-                            ->headers(function (Forms\Get $get) {
+                            ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 
                                 $headers = [
-                                    Header::make('Items')->width($hasDiscounts ? '15%' : '20%'),
-                                    Header::make('Description')->width($hasDiscounts ? '25%' : '30%'),  // Increase when no discounts
-                                    Header::make('Quantity')->width('10%'),
-                                    Header::make('Price')->width('10%'),
-                                    Header::make('Taxes')->width($hasDiscounts ? '15%' : '20%'),       // Increase when no discounts
+                                    Header::make($settings->resolveColumnLabel('item_name', 'Items'))
+                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                    Header::make('Description')
+                                        ->width($hasDiscounts ? '25%' : '30%'),
+                                    Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
+                                        ->width('10%'),
+                                    Header::make($settings->resolveColumnLabel('price_name', 'Price'))
+                                        ->width('10%'),
+                                    Header::make('Taxes')
+                                        ->width($hasDiscounts ? '15%' : '20%'),
                                 ];
 
                                 if ($hasDiscounts) {
                                     $headers[] = Header::make('Discounts')->width('15%');
                                 }
 
-                                $headers[] = Header::make('Amount')->width('10%')->align('right');
+                                $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
+                                    ->width('10%')
+                                    ->align('right');
 
                                 return $headers;
                             })
@@ -256,15 +223,11 @@ class RecurringInvoiceResource extends Resource
                         DocumentTotals::make()
                             ->type(DocumentType::Invoice),
                         Forms\Components\Textarea::make('terms')
+                            ->default($settings->terms)
                             ->columnSpanFull(),
                     ]),
-                Forms\Components\Section::make('Invoice Footer')
-                    ->collapsible()
-                    ->collapsed()
-                    ->schema([
-                        Forms\Components\Textarea::make('footer')
-                            ->columnSpanFull(),
-                    ]),
+                DocumentFooterSection::make('Invoice Footer')
+                    ->defaultFooter($settings->footer),
             ]);
     }
 

app/Filament/Forms/Components/DocumentFooterSection.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use Closure;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Textarea;
+
+class DocumentFooterSection extends Section
+{
+    protected string | Closure | null $defaultFooter = null;
+
+    public function defaultFooter(string | Closure | null $footer): static
+    {
+        $this->defaultFooter = $footer;
+
+        return $this;
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->collapsible();
+        $this->collapsed();
+
+        $this->schema([
+            Textarea::make('footer')
+                ->default(fn () => $this->getDefaultFooter())
+                ->columnSpanFull(),
+        ]);
+    }
+
+    public function getDefaultFooter(): ?string
+    {
+        return $this->evaluate($this->defaultFooter);
+    }
+}

app/Filament/Forms/Components/DocumentHeaderSection.php

@@ -0,0 +1,97 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use Closure;
+use Filament\Forms\Components\FileUpload;
+use Filament\Forms\Components\Group;
+use Filament\Forms\Components\Section;
+use Filament\Forms\Components\Split;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Components\View;
+use Filament\Support\Enums\MaxWidth;
+use Illuminate\Support\Facades\Auth;
+use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
+
+class DocumentHeaderSection extends Section
+{
+    protected string | Closure | null $defaultHeader = null;
+
+    protected string | Closure | null $defaultSubheader = null;
+
+    public function defaultHeader(string | Closure | null $header): static
+    {
+        $this->defaultHeader = $header;
+
+        return $this;
+    }
+
+    public function defaultSubheader(string | Closure | null $subheader): static
+    {
+        $this->defaultSubheader = $subheader;
+
+        return $this;
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->collapsible();
+        $this->collapsed();
+
+        $company = Auth::user()->currentCompany;
+
+        $this->schema([
+            Split::make([
+                Group::make([
+                    FileUpload::make('logo')
+                        ->openable()
+                        ->maxSize(1024)
+                        ->localizeLabel()
+                        ->visibility('public')
+                        ->disk('public')
+                        ->directory('logos/document')
+                        ->imageResizeMode('contain')
+                        ->imageCropAspectRatio('3:2')
+                        ->panelAspectRatio('3:2')
+                        ->maxWidth(MaxWidth::ExtraSmall)
+                        ->panelLayout('integrated')
+                        ->removeUploadedFileButtonPosition('center bottom')
+                        ->uploadButtonPosition('center bottom')
+                        ->uploadProgressIndicatorPosition('center bottom')
+                        ->getUploadedFileNameForStorageUsing(
+                            static fn (TemporaryUploadedFile $file): string => (string) str($file->getClientOriginalName())
+                                ->prepend(Auth::user()->currentCompany->id . '_'),
+                        )
+                        ->acceptedFileTypes(['image/png', 'image/jpeg', 'image/gif']),
+                ]),
+                Group::make([
+                    TextInput::make('header')
+                        ->default(fn () => $this->getDefaultHeader()),
+                    TextInput::make('subheader')
+                        ->default(fn () => $this->getDefaultSubheader()),
+                    View::make('filament.forms.components.company-info')
+                        ->viewData([
+                            'company_name' => $company->name,
+                            'company_address' => $company->profile->address,
+                            'company_city' => $company->profile->city?->name,
+                            'company_state' => $company->profile->state?->name,
+                            'company_zip' => $company->profile->zip_code,
+                            'company_country' => $company->profile->state?->country->name,
+                        ]),
+                ])->grow(true),
+            ])->from('md'),
+        ]);
+    }
+
+    public function getDefaultHeader(): ?string
+    {
+        return $this->evaluate($this->defaultHeader);
+    }
+
+    public function getDefaultSubheader(): ?string
+    {
+        return $this->evaluate($this->defaultSubheader);
+    }
+}

app/Filament/Infolists/Components/DocumentPreview.php

@@ -3,6 +3,8 @@
 namespace App\Filament\Infolists\Components;
 
 use App\Enums\Accounting\DocumentType;
+use App\Enums\Setting\Template;
+use App\Models\Setting\DocumentDefault;
 use Filament\Infolists\Components\Grid;
 
 class DocumentPreview extends Grid
@@ -33,4 +35,19 @@ class DocumentPreview extends Grid
     {
         return $this->documentType;
     }
+
+    public function getTemplate(): Template
+    {
+        if ($this->documentType === DocumentType::RecurringInvoice) {
+            $lookupType = DocumentType::Invoice;
+        } else {
+            $lookupType = $this->documentType;
+        }
+
+        $defaults = DocumentDefault::query()
+            ->type($lookupType)
+            ->first();
+
+        return $defaults?->template ?? Template::Default;
+    }
 }

app/Http/Middleware/Authenticate.php

@@ -2,8 +2,10 @@
 
 namespace App\Http\Middleware;
 
+use Filament\Exceptions\NoDefaultPanelSetException;
 use Filament\Facades\Filament;
 use Filament\Http\Middleware\Authenticate as Middleware;
+use Wallo\FilamentCompanies\FilamentCompanies;
 
 class Authenticate extends Middleware
 {
@@ -12,6 +14,12 @@ class Authenticate extends Middleware
      */
     protected function redirectTo($request): ?string
     {
-        return Filament::getDefaultPanel()->getLoginUrl();
+        try {
+            $defaultPanelLoginUrl = Filament::getDefaultPanel()->getLoginUrl();
+        } catch (NoDefaultPanelSetException) {
+            $defaultPanelLoginUrl = Filament::getPanel(FilamentCompanies::getCompanyPanel())->getLoginUrl();
+        }
+
+        return $defaultPanelLoginUrl;
     }
 }

app/Http/Responses/LoginRedirectResponse.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Responses;
+
+use Filament\Exceptions\NoDefaultPanelSetException;
+use Filament\Facades\Filament;
+use Filament\Http\Responses\Auth\LoginResponse;
+use Illuminate\Http\RedirectResponse;
+use Livewire\Features\SupportRedirects\Redirector;
+use Wallo\FilamentCompanies\FilamentCompanies;
+
+class LoginRedirectResponse extends LoginResponse
+{
+    public function toResponse($request): RedirectResponse | Redirector
+    {
+        try {
+            $defaultPanelUrl = Filament::getDefaultPanel()->getUrl();
+        } catch (NoDefaultPanelSetException) {
+            $defaultPanelUrl = Filament::getPanel(FilamentCompanies::getCompanyPanel())->getUrl();
+        }
+
+        return redirect()->intended($defaultPanelUrl);
+    }
+}

app/Http/Responses/LoginResponse.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace App\Http\Responses;
-
-use Filament\Facades\Filament;
-use Illuminate\Http\RedirectResponse;
-use Livewire\Features\SupportRedirects\Redirector;
-
-class LoginResponse extends \Filament\Http\Responses\Auth\LoginResponse
-{
-    public function toResponse($request): RedirectResponse | Redirector
-    {
-        return redirect()->to(Filament::getDefaultPanel()->getUrl());
-    }
-}

app/Listeners/ConfigureCompanyDefault.php

@@ -2,7 +2,6 @@
 
 namespace App\Listeners;
 
-use App\Enums\Setting\PrimaryColor;
 use App\Events\CompanyConfigured;
 use App\Services\CompanySettingsService;
 use App\Utilities\Currency\ConfigureCurrencies;
@@ -11,7 +10,6 @@ use Filament\Forms\Components\DatePicker;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Tabs\Tab;
 use Filament\Resources\Components\Tab as ResourcesTab;
-use Filament\Support\Facades\FilamentColor;
 
 class ConfigureCompanyDefault
 {
@@ -32,12 +30,7 @@ class ConfigureCompanyDefault
         config(['app.timezone' => $settings['default_timezone']]);
         date_default_timezone_set($settings['default_timezone']);
 
-        FilamentColor::register([
-            'primary' => PrimaryColor::from($settings['default_primary_color'])->getColor(),
-        ]);
-
         Filament::getPanel('company')
-            ->font($settings['default_font'])
             ->brandName($company->name);
 
         DatePicker::configureUsing(static function (DatePicker $component) use ($settings) {

app/Listeners/CreateEmployeeContact.php

@@ -3,6 +3,8 @@
 namespace App\Listeners;
 
 use App\Enums\Common\ContactType;
+use App\Models\Company;
+use App\Models\User;
 use Wallo\FilamentCompanies\Events\CompanyEmployeeAdded;
 
 class CreateEmployeeContact
@@ -20,12 +22,21 @@ class CreateEmployeeContact
      */
     public function handle(CompanyEmployeeAdded $event): void
     {
+        /** @var Company $company */
         $company = $event->company;
+
+        /** @var User $employee */
         $employee = $event->user;
 
-        $company->contacts()->create([
+        $nameParts = explode(' ', $employee->name, 2);
+        $firstName = $nameParts[0];
+        $lastName = $nameParts[1] ?? '';
+
+        $employee->contacts()->create([
+            'company_id' => $company->id,
             'type' => ContactType::Employee,
-            'name' => $employee->name,
+            'first_name' => $firstName,
+            'last_name' => $lastName,
             'email' => $employee->email,
             'created_by' => $company->owner->id,
             'updated_by' => $company->owner->id,

app/Models/Accounting/Bill.php

@@ -14,7 +14,9 @@ use App\Enums\Accounting\TransactionType;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Vendor;
+use App\Models\Company;
 use App\Models\Setting\Currency;
+use App\Models\Setting\DocumentDefault;
 use App\Observers\BillObserver;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
@@ -106,7 +108,7 @@ class Bill extends Document
             ->where('type', TransactionType::Journal);
     }
 
-    public function documentType(): DocumentType
+    public static function documentType(): DocumentType
     {
         return DocumentType::Bill;
     }
@@ -171,9 +173,9 @@ class Bill extends Document
         return $this->payments->isNotEmpty();
     }
 
-    public static function getNextDocumentNumber(): string
+    public static function getNextDocumentNumber(?Company $company = null): string
     {
-        $company = auth()->user()->currentCompany;
+        $company ??= auth()->user()?->currentCompany;
 
         if (! $company) {
             throw new \RuntimeException('No current company is set for the user.');
@@ -181,8 +183,7 @@ class Bill extends Document
 
         $defaultBillSettings = $company->defaultBill;
 
-        $numberPrefix = $defaultBillSettings->number_prefix;
-        $numberDigits = $defaultBillSettings->number_digits;
+        $numberPrefix = $defaultBillSettings->number_prefix ?? '';
 
         $latestDocument = static::query()
             ->whereNotNull('bill_number')
@@ -191,15 +192,12 @@ class Bill extends Document
 
         $lastNumberNumericPart = $latestDocument
             ? (int) substr($latestDocument->bill_number, strlen($numberPrefix))
-            : 0;
+            : DocumentDefault::getBaseNumber();
 
         $numberNext = $lastNumberNumericPart + 1;
 
         return $defaultBillSettings->getNumberNext(
-            padded: true,
-            format: true,
             prefix: $numberPrefix,
-            digits: $numberDigits,
             next: $numberNext
         );
     }

app/Models/Accounting/Document.php

@@ -32,7 +32,7 @@ abstract class Document extends Model
         return $this->lineItems()->exists();
     }
 
-    abstract public function documentType(): DocumentType;
+    abstract public static function documentType(): DocumentType;
 
     abstract public function documentNumber(): ?string;
 

app/Models/Accounting/Estimate.php

@@ -13,6 +13,8 @@ use App\Enums\Accounting\InvoiceStatus;
 use App\Filament\Company\Resources\Sales\EstimateResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Common\Client;
+use App\Models\Company;
+use App\Models\Setting\DocumentDefault;
 use App\Observers\EstimateObserver;
 use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
@@ -89,7 +91,7 @@ class Estimate extends Document
         return $this->hasOne(Invoice::class);
     }
 
-    public function documentType(): DocumentType
+    public static function documentType(): DocumentType
     {
         return DocumentType::Estimate;
     }
@@ -212,18 +214,17 @@ class Estimate extends Document
         ]);
     }
 
-    public static function getNextDocumentNumber(): string
+    public static function getNextDocumentNumber(?Company $company = null): string
     {
-        $company = auth()->user()->currentCompany;
+        $company ??= auth()->user()?->currentCompany;
 
         if (! $company) {
             throw new \RuntimeException('No current company is set for the user.');
         }
 
-        $defaultEstimateSettings = $company->defaultInvoice;
+        $defaultEstimateSettings = $company->defaultEstimate;
 
-        $numberPrefix = 'EST-';
-        $numberDigits = $defaultEstimateSettings->number_digits;
+        $numberPrefix = $defaultEstimateSettings->number_prefix ?? '';
 
         $latestDocument = static::query()
             ->whereNotNull('estimate_number')
@@ -232,15 +233,12 @@ class Estimate extends Document
 
         $lastNumberNumericPart = $latestDocument
             ? (int) substr($latestDocument->estimate_number, strlen($numberPrefix))
-            : 0;
+            : DocumentDefault::getBaseNumber();
 
         $numberNext = $lastNumberNumericPart + 1;
 
         return $defaultEstimateSettings->getNumberNext(
-            padded: true,
-            format: true,
             prefix: $numberPrefix,
-            digits: $numberDigits,
             next: $numberNext
         );
     }

app/Models/Accounting/Invoice.php

@@ -15,6 +15,7 @@ use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Client;
 use App\Models\Company;
+use App\Models\Setting\DocumentDefault;
 use App\Observers\InvoiceObserver;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
@@ -140,7 +141,7 @@ class Invoice extends Document
         });
     }
 
-    public function documentType(): DocumentType
+    public static function documentType(): DocumentType
     {
         return DocumentType::Invoice;
     }
@@ -268,8 +269,7 @@ class Invoice extends Document
 
         $defaultInvoiceSettings = $company->defaultInvoice;
 
-        $numberPrefix = $defaultInvoiceSettings->number_prefix;
-        $numberDigits = $defaultInvoiceSettings->number_digits;
+        $numberPrefix = $defaultInvoiceSettings->number_prefix ?? '';
 
         $latestDocument = static::query()
             ->whereNotNull('invoice_number')
@@ -278,15 +278,12 @@ class Invoice extends Document
 
         $lastNumberNumericPart = $latestDocument
             ? (int) substr($latestDocument->invoice_number, strlen($numberPrefix))
-            : 0;
+            : DocumentDefault::getBaseNumber();
 
         $numberNext = $lastNumberNumericPart + 1;
 
         return $defaultInvoiceSettings->getNumberNext(
-            padded: true,
-            format: true,
             prefix: $numberPrefix,
-            digits: $numberDigits,
             next: $numberNext
         );
     }

app/Models/Accounting/RecurringInvoice.php

@@ -120,7 +120,7 @@ class RecurringInvoice extends Document
         return $this->hasMany(Invoice::class, 'recurring_invoice_id');
     }
 
-    public function documentType(): DocumentType
+    public static function documentType(): DocumentType
     {
         return DocumentType::RecurringInvoice;
     }

app/Models/Company.php

@@ -2,7 +2,7 @@
 
 namespace App\Models;
 
-use App\Enums\Setting\DocumentType;
+use App\Enums\Accounting\DocumentType;
 use App\Models\Accounting\AccountSubtype;
 use App\Models\Banking\BankAccount;
 use App\Models\Banking\ConnectedBankAccount;
@@ -10,7 +10,6 @@ use App\Models\Common\Client;
 use App\Models\Common\Contact;
 use App\Models\Common\Offering;
 use App\Models\Core\Department;
-use App\Models\Setting\Appearance;
 use App\Models\Setting\CompanyDefault;
 use App\Models\Setting\CompanyProfile;
 use App\Models\Setting\Currency;
@@ -94,11 +93,6 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
         return $this->hasMany(Accounting\Bill::class, 'company_id');
     }
 
-    public function appearance(): HasOne
-    {
-        return $this->hasOne(Appearance::class, 'company_id');
-    }
-
     public function accountSubtypes(): HasMany
     {
         return $this->hasMany(AccountSubtype::class, 'company_id');
@@ -125,18 +119,35 @@ class Company extends FilamentCompaniesCompany implements HasAvatar
         return $this->hasOne(CompanyDefault::class, 'company_id');
     }
 
+    public function documentDefaults(): HasMany
+    {
+        return $this->hasMany(DocumentDefault::class, 'company_id');
+    }
+
     public function defaultBill(): HasOne
     {
         return $this->hasOne(DocumentDefault::class, 'company_id')
             ->where('type', DocumentType::Bill);
     }
 
+    public function defaultEstimate(): HasOne
+    {
+        return $this->hasOne(DocumentDefault::class, 'company_id')
+            ->where('type', DocumentType::Estimate);
+    }
+
     public function defaultInvoice(): HasOne
     {
         return $this->hasOne(DocumentDefault::class, 'company_id')
             ->where('type', DocumentType::Invoice);
     }
 
+    public function defaultRecurringInvoice(): HasOne
+    {
+        return $this->hasOne(DocumentDefault::class, 'company_id')
+            ->where('type', DocumentType::RecurringInvoice);
+    }
+
     public function departments(): HasMany
     {
         return $this->hasMany(Department::class, 'company_id');

app/Models/Setting/Appearance.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace App\Models\Setting;
-
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
-use App\Enums\Setting\Font;
-use App\Enums\Setting\PrimaryColor;
-use Database\Factories\Setting\AppearanceFactory;
-use Illuminate\Database\Eloquent\Factories\Factory;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-
-class Appearance extends Model
-{
-    use Blamable;
-    use CompanyOwned;
-    use HasFactory;
-
-    protected $table = 'appearances';
-
-    protected $fillable = [
-        'company_id',
-        'primary_color',
-        'font',
-        'created_by',
-        'updated_by',
-    ];
-
-    protected $casts = [
-        'primary_color' => PrimaryColor::class,
-        'font' => Font::class,
-    ];
-
-    protected static function newFactory(): Factory
-    {
-        return AppearanceFactory::new();
-    }
-}

app/Models/Setting/DocumentDefault.php

@@ -2,10 +2,9 @@
 
 namespace App\Models\Setting;
 
-use App\Casts\TrimLeadingZeroCast;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
-use App\Enums\Setting\DocumentType;
+use App\Enums\Accounting\DocumentType;
 use App\Enums\Setting\Font;
 use App\Enums\Setting\PaymentTerms;
 use App\Enums\Setting\Template;
@@ -32,8 +31,6 @@ class DocumentDefault extends Model
         'logo',
         'show_logo',
         'number_prefix',
-        'number_digits',
-        'number_next',
         'payment_terms',
         'header',
         'subheader',
@@ -51,8 +48,8 @@ class DocumentDefault extends Model
     ];
 
     protected $casts = [
+        'type' => DocumentType::class,
         'show_logo' => 'boolean',
-        'number_next' => TrimLeadingZeroCast::class,
         'payment_terms' => PaymentTerms::class,
         'font' => Font::class,
         'template' => Template::class,
@@ -80,47 +77,35 @@ class DocumentDefault extends Model
 
     public function scopeInvoice(Builder $query): Builder
     {
-        return $query->scopes(['type' => [DocumentType::Invoice]]);
+        return $query->type(DocumentType::Invoice);
     }
 
-    public function scopeBill(Builder $query): Builder
+    public function scopeRecurringInvoice(Builder $query): Builder
     {
-        return $query->scopes(['type' => [DocumentType::Bill]]);
+        return $query->type(DocumentType::RecurringInvoice);
     }
 
-    public static function availableNumberDigits(): array
+    public function scopeBill(Builder $query): Builder
     {
-        return array_combine(range(1, 20), range(1, 20));
+        return $query->type(DocumentType::Bill);
     }
 
-    public function getNumberNext(?bool $padded = null, ?bool $format = null, ?string $prefix = null, int | string | null $digits = null, int | string | null $next = null): string
+    public function scopeEstimate(Builder $query): Builder
     {
-        [$number_prefix, $number_digits, $number_next] = $this->initializeAttributes($prefix, $digits, $next);
-
-        return match (true) {
-            $format && $padded => $number_prefix . $this->getPaddedNumberNext($number_next, $number_digits),
-            $format => $number_prefix . $number_next,
-            $padded => $this->getPaddedNumberNext($number_next, $number_digits),
-            default => $number_next,
-        };
+        return $query->type(DocumentType::Estimate);
     }
 
-    public function initializeAttributes(?string $prefix, int | string | null $digits, int | string | null $next): array
+    public function getNumberNext(?string $prefix = null, int | string | null $next = null): string
     {
-        $number_prefix = $prefix ?? $this->number_prefix;
-        $number_digits = $digits ?? $this->number_digits;
-        $number_next = $next ?? $this->number_next;
+        $numberPrefix = $prefix ?? $this->number_prefix ?? '';
+        $numberNext = (string) ($next ?? (static::getBaseNumber() + 1));
 
-        return [$number_prefix, $number_digits, $number_next];
+        return $numberPrefix . $numberNext;
     }
 
-    /**
-     * Get the next number with padding for dynamic display purposes.
-     * Even if number_next is a string, it will be cast to an integer.
-     */
-    public function getPaddedNumberNext(int | string | null $number_next, int | string | null $number_digits): string
+    public static function getBaseNumber(): int
     {
-        return str_pad($number_next, $number_digits, '0', STR_PAD_LEFT);
+        return 1000;
     }
 
     public static function getAvailableItemNameOptions(): array

app/Models/User.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Models\Common\Contact;
 use App\Models\Core\Department;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Models\Contracts\HasAvatar;
@@ -11,6 +12,7 @@ use Filament\Panel;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Collection;
@@ -92,6 +94,11 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, HasDefaul
         return $this->profile_photo_url;
     }
 
+    public function contacts(): MorphMany
+    {
+        return $this->morphMany(Contact::class, 'contactable');
+    }
+
     public function managerOf(): HasMany
     {
         return $this->hasMany(Department::class, 'manager_id');

app/Providers/AppServiceProvider.php

@@ -2,6 +2,7 @@
 
 namespace App\Providers;
 
+use App\Http\Responses\LoginRedirectResponse;
 use App\Services\DateRangeService;
 use Filament\Http\Responses\Auth\Contracts\LoginResponse;
 use Filament\Notifications\Livewire\Notifications;
@@ -18,7 +19,7 @@ class AppServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->app->singleton(DateRangeService::class);
-        $this->app->singleton(LoginResponse::class, \App\Http\Responses\LoginResponse::class);
+        $this->app->singleton(LoginResponse::class, LoginRedirectResponse::class);
     }
 
     /**
@@ -29,7 +30,8 @@ class AppServiceProvider extends ServiceProvider
         Notifications::alignment(Alignment::Center);
 
         FilamentAsset::register([
-            Js::make('TopNavigation', __DIR__ . '/../../resources/js/TopNavigation.js'),
+            Js::make('top-navigation', __DIR__ . '/../../resources/js/top-navigation.js'),
+            Js::make('history-fix', __DIR__ . '/../../resources/js/history-fix.js'),
         ]);
     }
 }

app/Providers/Filament/CompanyPanelProvider.php

@@ -99,6 +99,7 @@ class CompanyPanelProvider extends PanelProvider
                     ->profilePhotos()
                     ->api()
                     ->companies(invitations: true)
+                    ->autoAcceptInvitations()
                     ->termsAndPrivacyPolicy()
                     ->notifications()
                     ->modals()

app/Providers/Filament/UserPanelProvider.php

@@ -6,6 +6,7 @@ use App\Filament\Components\PanelShiftDropdown;
 use App\Filament\User\Clusters\Account;
 use App\Http\Middleware\Authenticate;
 use Exception;
+use Filament\Facades\Filament;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
 use Filament\Navigation\NavigationBuilder;
@@ -20,7 +21,9 @@ use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
 use Illuminate\Routing\Middleware\SubstituteBindings;
 use Illuminate\Session\Middleware\AuthenticateSession;
 use Illuminate\Session\Middleware\StartSession;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\View\Middleware\ShareErrorsFromSession;
+use Wallo\FilamentCompanies\FilamentCompanies;
 use Wallo\FilamentCompanies\Pages\User\PersonalAccessTokens;
 use Wallo\FilamentCompanies\Pages\User\Profile;
 
@@ -45,7 +48,15 @@ class UserPanelProvider extends PanelProvider
                                 NavigationItem::make('company')
                                     ->label('Company Dashboard')
                                     ->icon('heroicon-s-building-office-2')
-                                    ->url(static fn (): string => Pages\Dashboard::getUrl(panel: 'company', tenant: auth()->user()->personalCompany())),
+                                    ->url(static function (): ?string {
+                                        $user = Auth::user();
+
+                                        if ($company = $user?->primaryCompany()) {
+                                            return Pages\Dashboard::getUrl(panel: FilamentCompanies::getCompanyPanel(), tenant: $company);
+                                        }
+
+                                        return Filament::getPanel(FilamentCompanies::getCompanyPanel())->getTenantRegistrationUrl();
+                                    }),
                             ]);
                     }),
             )

app/Services/CompanySettingsService.php

@@ -3,8 +3,6 @@
 namespace App\Services;
 
 use App\Enums\Setting\DateFormat;
-use App\Enums\Setting\Font;
-use App\Enums\Setting\PrimaryColor;
 use App\Enums\Setting\WeekStart;
 use App\Models\Company;
 use Illuminate\Support\Facades\Cache;
@@ -16,7 +14,7 @@ class CompanySettingsService
         $cacheKey = "company_settings_{$companyId}";
 
         return Cache::rememberForever($cacheKey, function () use ($companyId) {
-            $company = Company::with(['locale', 'appearance'])->find($companyId);
+            $company = Company::with(['locale'])->find($companyId);
 
             if (! $company) {
                 return self::getDefaultSettings();
@@ -26,8 +24,6 @@ class CompanySettingsService
                 'default_language' => $company->locale->language ?? config('transmatic.source_locale'),
                 'default_timezone' => $company->locale->timezone ?? config('app.timezone'),
                 'default_currency' => $company->currency_code ?? 'USD',
-                'default_primary_color' => $company->appearance->primary_color->value ?? PrimaryColor::DEFAULT,
-                'default_font' => $company->appearance->font->value ?? Font::DEFAULT,
                 'default_date_format' => $company->locale->date_format->value ?? DateFormat::DEFAULT,
                 'default_week_start' => $company->locale->week_start->value ?? WeekStart::DEFAULT,
             ];
@@ -46,8 +42,6 @@ class CompanySettingsService
             'default_language' => config('transmatic.source_locale'),
             'default_timezone' => config('app.timezone'),
             'default_currency' => 'USD',
-            'default_primary_color' => PrimaryColor::DEFAULT,
-            'default_font' => Font::DEFAULT,
             'default_date_format' => DateFormat::DEFAULT,
             'default_week_start' => WeekStart::DEFAULT,
         ];
@@ -75,16 +69,6 @@ class CompanySettingsService
         return self::getSpecificSetting($companyId, 'default_currency', 'USD');
     }
 
-    public static function getDefaultPrimaryColor(int $companyId): string
-    {
-        return self::getSpecificSetting($companyId, 'default_primary_color', PrimaryColor::DEFAULT);
-    }
-
-    public static function getDefaultFont(int $companyId): string
-    {
-        return self::getSpecificSetting($companyId, 'default_font', Font::DEFAULT);
-    }
-
     public static function getDefaultDateFormat(int $companyId): string
     {
         return self::getSpecificSetting($companyId, 'default_date_format', DateFormat::DEFAULT);

bootstrap/providers.php

@@ -3,7 +3,6 @@
 return [
     App\Providers\AppServiceProvider::class,
     App\Providers\AuthServiceProvider::class,
-    App\Providers\Filament\AdminPanelProvider::class,
     App\Providers\Filament\CompanyPanelProvider::class,
     App\Providers\Filament\UserPanelProvider::class,
     App\Providers\Faker\FakerServiceProvider::class,

database/factories/Accounting/BillFactory.php

@@ -8,6 +8,7 @@ use App\Models\Accounting\Bill;
 use App\Models\Accounting\DocumentLineItem;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Vendor;
+use App\Models\Setting\DocumentDefault;
 use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
@@ -42,8 +43,8 @@ class BillFactory extends Factory
         return [
             'company_id' => 1,
             'vendor_id' => Vendor::inRandomOrder()->value('id'),
-            'bill_number' => $this->faker->unique()->numerify('BILL-#####'),
-            'order_number' => $this->faker->unique()->numerify('PO-#####'),
+            'bill_number' => $this->faker->unique()->numerify('BILL-####'),
+            'order_number' => $this->faker->unique()->numerify('PO-####'),
             'date' => $billDate,
             'due_date' => Carbon::parse($billDate)->addDays($dueDays),
             'status' => BillStatus::Open,
@@ -179,11 +180,11 @@ class BillFactory extends Factory
         return $this->afterCreating(function (Bill $bill) {
             $this->ensureInitialized($bill);
 
-            $paddedId = str_pad((string) $bill->id, 5, '0', STR_PAD_LEFT);
+            $number = DocumentDefault::getBaseNumber() + $bill->id;
 
             $bill->updateQuietly([
-                'bill_number' => "BILL-{$paddedId}",
-                'order_number' => "PO-{$paddedId}",
+                'bill_number' => "BILL-{$number}",
+                'order_number' => "PO-{$number}",
             ]);
 
             if ($bill->wasInitialized() && $bill->is_currently_overdue) {

database/factories/Accounting/EstimateFactory.php

@@ -6,6 +6,7 @@ use App\Enums\Accounting\EstimateStatus;
 use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\Estimate;
 use App\Models\Common\Client;
+use App\Models\Setting\DocumentDefault;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -33,8 +34,8 @@ class EstimateFactory extends Factory
             'client_id' => Client::inRandomOrder()->value('id'),
             'header' => 'Estimate',
             'subheader' => 'Estimate',
-            'estimate_number' => $this->faker->unique()->numerify('EST-#####'),
-            'reference_number' => $this->faker->unique()->numerify('REF-#####'),
+            'estimate_number' => $this->faker->unique()->numerify('EST-####'),
+            'reference_number' => $this->faker->unique()->numerify('REF-####'),
             'date' => $estimateDate,
             'expiration_date' => Carbon::parse($estimateDate)->addDays($this->faker->numberBetween(14, 30)),
             'status' => EstimateStatus::Draft,
@@ -152,11 +153,11 @@ class EstimateFactory extends Factory
         return $this->afterCreating(function (Estimate $estimate) {
             $this->ensureLineItems($estimate);
 
-            $paddedId = str_pad((string) $estimate->id, 5, '0', STR_PAD_LEFT);
+            $number = DocumentDefault::getBaseNumber() + $estimate->id;
 
             $estimate->updateQuietly([
-                'estimate_number' => "EST-{$paddedId}",
-                'reference_number' => "REF-{$paddedId}",
+                'estimate_number' => "EST-{$number}",
+                'reference_number' => "REF-{$number}",
             ]);
 
             if ($estimate->wasApproved() && $estimate->is_currently_expired) {

database/factories/Accounting/InvoiceFactory.php

@@ -8,6 +8,7 @@ use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\Invoice;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Client;
+use App\Models\Setting\DocumentDefault;
 use App\Utilities\Currency\CurrencyConverter;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
@@ -36,8 +37,8 @@ class InvoiceFactory extends Factory
             'client_id' => Client::inRandomOrder()->value('id'),
             'header' => 'Invoice',
             'subheader' => 'Invoice',
-            'invoice_number' => $this->faker->unique()->numerify('INV-#####'),
-            'order_number' => $this->faker->unique()->numerify('ORD-#####'),
+            'invoice_number' => $this->faker->unique()->numerify('INV-####'),
+            'order_number' => $this->faker->unique()->numerify('ORD-####'),
             'date' => $invoiceDate,
             'due_date' => Carbon::parse($invoiceDate)->addDays($this->faker->numberBetween(14, 60)),
             'status' => InvoiceStatus::Draft,
@@ -197,11 +198,11 @@ class InvoiceFactory extends Factory
         return $this->afterCreating(function (Invoice $invoice) {
             $this->ensureLineItems($invoice);
 
-            $paddedId = str_pad((string) $invoice->id, 5, '0', STR_PAD_LEFT);
+            $number = DocumentDefault::getBaseNumber() + $invoice->id;
 
             $invoice->updateQuietly([
-                'invoice_number' => "INV-{$paddedId}",
-                'order_number' => "ORD-{$paddedId}",
+                'invoice_number' => "INV-{$number}",
+                'order_number' => "ORD-{$number}",
             ]);
 
             if ($invoice->wasApproved() && $invoice->is_currently_overdue) {

database/factories/Accounting/RecurringInvoiceFactory.php

@@ -38,7 +38,7 @@ class RecurringInvoiceFactory extends Factory
             'client_id' => Client::inRandomOrder()->value('id'),
             'header' => 'Invoice',
             'subheader' => 'Invoice',
-            'order_number' => $this->faker->unique()->numerify('ORD-#####'),
+            'order_number' => $this->faker->unique()->numerify('ORD-####'),
             'payment_terms' => PaymentTerms::Net30,
             'status' => RecurringInvoiceStatus::Draft,
             'currency_code' => 'USD',

database/factories/Setting/AppearanceFactory.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Database\Factories\Setting;
-
-use App\Models\Setting\Appearance;
-use Illuminate\Database\Eloquent\Factories\Factory;
-
-/**
- * @extends Factory<Appearance>
- */
-class AppearanceFactory extends Factory
-{
-    /**
-     * Define the model's default state.
-     *
-     * @return array<string, mixed>
-     */
-    public function definition(): array
-    {
-        return [
-            //
-        ];
-    }
-}

database/factories/Setting/CompanyDefaultFactory.php

@@ -4,7 +4,6 @@ namespace Database\Factories\Setting;
 
 use App\Faker\CurrencyCode;
 use App\Models\Company;
-use App\Models\Setting\Appearance;
 use App\Models\Setting\CompanyDefault;
 use App\Models\Setting\Currency;
 use App\Models\Setting\DocumentDefault;
@@ -44,7 +43,6 @@ class CompanyDefaultFactory extends Factory
         }
 
         $currency = $this->createCurrency($company, $user, $currencyCode);
-        $this->createAppearance($company, $user);
         $this->createDocumentDefaults($company, $user);
         $this->createLocalization($company, $user, $countryCode, $language);
 
@@ -68,24 +66,21 @@ class CompanyDefaultFactory extends Factory
         ]);
     }
 
-    private function createAppearance(Company $company, User $user): void
+    private function createDocumentDefaults(Company $company, User $user): void
     {
-        Appearance::factory()->createQuietly([
+        DocumentDefault::factory()->invoice()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
         ]);
-    }
 
-    private function createDocumentDefaults(Company $company, User $user): void
-    {
-        DocumentDefault::factory()->invoice()->createQuietly([
+        DocumentDefault::factory()->bill()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,
         ]);
 
-        DocumentDefault::factory()->bill()->createQuietly([
+        DocumentDefault::factory()->estimate()->createQuietly([
             'company_id' => $company->id,
             'created_by' => $user->id,
             'updated_by' => $user->id,

database/factories/Setting/DocumentDefaultFactory.php

@@ -2,7 +2,9 @@
 
 namespace Database\Factories\Setting;
 
-use App\Enums\Setting\DocumentType;
+use App\Enums\Accounting\DocumentType;
+use App\Enums\Setting\Font;
+use App\Enums\Setting\Template;
 use App\Models\Setting\DocumentDefault;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
@@ -26,24 +28,36 @@ class DocumentDefaultFactory extends Factory
     public function definition(): array
     {
         return [
-            //
+            'company_id' => 1,
+            'payment_terms' => 'due_upon_receipt',
         ];
     }
 
     /**
      * The model's common default state.
      */
-    private function baseState(DocumentType $type, string $prefix, string $header): array
+    private function baseState(DocumentType $type): array
     {
-        return [
-            'type' => $type->value,
-            'number_prefix' => $prefix,
-            'header' => $header,
+        $state = [
+            'type' => $type,
+            'number_prefix' => $type->getDefaultPrefix(),
             'item_name' => ['option' => 'items', 'custom' => null],
             'unit_name' => ['option' => 'quantity', 'custom' => null],
             'price_name' => ['option' => 'price', 'custom' => null],
             'amount_name' => ['option' => 'amount', 'custom' => null],
         ];
+
+        if ($type !== DocumentType::Bill) {
+            $state = [...$state,
+                'header' => $type->getLabel(),
+                'show_logo' => false,
+                'accent_color' => '#4F46E5',
+                'font' => Font::Inter,
+                'template' => Template::Default,
+            ];
+        }
+
+        return $state;
     }
 
     /**
@@ -51,7 +65,7 @@ class DocumentDefaultFactory extends Factory
      */
     public function invoice(): self
     {
-        return $this->state($this->baseState(DocumentType::Invoice, 'INV-', 'Invoice'));
+        return $this->state($this->baseState(DocumentType::Invoice));
     }
 
     /**
@@ -59,6 +73,14 @@ class DocumentDefaultFactory extends Factory
      */
     public function bill(): self
     {
-        return $this->state($this->baseState(DocumentType::Bill, 'BILL-', 'Bill'));
+        return $this->state($this->baseState(DocumentType::Bill));
+    }
+
+    /**
+     * Indicate that the model's type is estimate.
+     */
+    public function estimate(): self
+    {
+        return $this->state($this->baseState(DocumentType::Estimate));
     }
 }

database/migrations/2023_09_12_014413_create_appearances_table.php

@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('appearances', function (Blueprint $table) {
-            $table->id();
-            $table->foreignId('company_id')->constrained()->onDelete('cascade');
-            $table->string('primary_color')->default('indigo');
-            $table->string('font')->default('inter');
-            $table->foreignId('created_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->foreignId('updated_by')->nullable()->constrained('users')->nullOnDelete();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('appearances');
-    }
-};

database/migrations/2023_09_12_032057_create_document_defaults_table.php

@@ -18,16 +18,14 @@ return new class extends Migration
             $table->string('logo')->nullable();
             $table->boolean('show_logo')->default(false);
             $table->string('number_prefix')->nullable();
-            $table->unsignedTinyInteger('number_digits')->default(5);
-            $table->unsignedBigInteger('number_next')->default(1);
             $table->string('payment_terms')->default('due_upon_receipt');
             $table->string('header')->nullable();
             $table->string('subheader')->nullable();
             $table->text('terms')->nullable();
             $table->text('footer')->nullable();
-            $table->string('accent_color')->default('#4F46E5');
-            $table->string('font')->default('inter');
-            $table->string('template')->default('default');
+            $table->string('accent_color')->nullable();
+            $table->string('font')->nullable();
+            $table->string('template')->nullable();
             $table->json('item_name')->nullable();
             $table->json('unit_name')->nullable();
             $table->json('price_name')->nullable();

resources/data/lang/en.json

@@ -195,5 +195,7 @@
     "Frequency": "Frequency",
     "Dates & Time": "Dates & Time",
     "account": "account",
-    "currency": "currency"
-}
+    "currency": "currency",
+    "Estimate": "Estimate",
+    "Column Labels": "Column Labels"
+}

resources/js/history-fix.js

@@ -0,0 +1,10 @@
+const original = window.history.replaceState;
+let previousState = null;
+window.history.replaceState = function (state, unused, url) {
+    state.url = url instanceof URL ? url.toString() : url;
+    if (JSON.stringify(state) === JSON.stringify(previousState)) {
+        return;
+    }
+    original.apply(this, [state, unused, url]);
+    previousState = state;
+};

resources/views/components/company/invoice/container.blade.php

@@ -6,9 +6,12 @@
     <div
         @class([
             'inv-paper bg-[#ffffff] dark:bg-gray-800 rounded-sm shadow-xl',
-            'w-full max-w-[820px] min-h-[1024px]' => $preview === false,
+            'w-full max-w-[820px] max-h-[1024px] overflow-y-auto' => $preview === false,
             'w-[38.25rem] h-[49.5rem] overflow-hidden' => $preview === true,
         ])
+        @style([
+            'scrollbar-width: thin;' => $preview === false,
+        ])
     >
         {{ $slot }}
     </div>

resources/views/components/icons/document-header-decoration.blade.php

@@ -0,0 +1,19 @@
+@props([
+   'color' => 'currentColor',
+   'text' => '',
+])
+
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 72" aria-hidden="true" fill="none" {{ $attributes }}>
+   <g stroke="{{ $color }}" stroke-width="2">
+       <path d="M20 57.038v-42.076c.33.025.664.038 1 .038 7.18 0 13-5.82 13-13 0-.336-.013-.67-.038-1h172.076c-.025.33-.038.664-.038 1 0 7.18 5.82 13 13 13 .336 0 .67-.013 1-.038v42.076c-.33-.025-.664-.038-1-.038-7.18 0-13 5.82-13 13 0 .336.013.67.038 1h-172.076c.025-.33.038-.664.038-1 0-7.18-5.82-13-13-13-.336 0-.67.013-1 .038z" />
+       <path d="M26 51.503v-31.007c.33.024.664.037 1 .037 7.18 0 13-5.626 13-12.567 0-.325.013-.648-.038-.967h160.076c-.025.319-.038.641-.038.967 0 6.94 5.82 12.567 13 12.567.336 0 .67-.012 1-.037v31.007c-.33-.024-.664-.037-1-.037-7.18 0-13 5.626-13 12.567 0 .325.013.648.038.967h-160.076c.025-.319.038-.641.038-.967 0-6.94-5.82-12.567-13-12.567-.336 0-.67.012-1 .037z" />
+   </g>
+   <text
+       x="50%"
+       y="50%"
+       text-anchor="middle"
+       dominant-baseline="middle"
+       class="text-3xl font-light tracking-tight"
+       fill="{{ $color }}"
+   >{{ $text }}</text>
+</svg>

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

@@ -33,16 +33,11 @@
     <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: {{ $document->accentColor }};">
-            <div class="items-center flex mx-5">
-                <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: {{ $document->accentColor }};">{{ $document->header }}</div>
-                    </div>
-                </div>
-                <x-icons.decor-border-right color="{{ $document->accentColor }}"/>
-            </div>
+            <x-icons.document-header-decoration
+                color="{{ $document->accentColor }}"
+                text="{{ $document->header }}"
+                class="w-48"
+            />
             <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">{{ $document->subheader }}</div>

resources/views/filament/company/pages/setting/appearance.blade.php

@@ -1,17 +0,0 @@
-<x-filament-panels::page style="margin-bottom: 500px">
-    <x-filament-panels::form wire:submit="save">
-        {{ $this->form }}
-
-        <x-filament-panels::form.actions
-            :actions="$this->getCachedFormActions()"
-            :full-width="$this->hasFullWidthFormActions()"
-        />
-    </x-filament-panels::form>
-</x-filament-panels::page>
-<script>
-    document.addEventListener('livewire:init', function () {
-        Livewire.on('appearanceUpdated', function () {
-            window.location.reload();
-        });
-    });
-</script>

resources/views/filament/company/pages/setting/invoice.blade.php

@@ -1,10 +0,0 @@
-<x-filament-panels::page style="margin-bottom: 500px">
-    <x-filament-panels::form wire:submit="save">
-        {{ $this->form }}
-
-        <x-filament-panels::form.actions
-            :actions="$this->getCachedFormActions()"
-            :full-width="$this->hasFullWidthFormActions()"
-        />
-    </x-filament-panels::form>
-</x-filament-panels::page>

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

@@ -1,5 +1,6 @@
 @php
     $document = \App\DTO\DocumentDTO::fromModel($getRecord());
+    $template = $getTemplate();
 @endphp
 
 {!! $document->getFontHtml() !!}
@@ -11,149 +12,8 @@
 </style>
 
 <div {{ $attributes }}>
-    <x-company.invoice.container class="modern-template-container">
-        <!-- Colored Header with Logo -->
-        <x-company.invoice.header class="bg-gray-800 h-24">
-            <!-- Logo -->
-            <div class="w-2/3">
-                @if($document->logo && $document->showLogo)
-                    <x-company.invoice.logo class="ml-8" :src="$document->logo"/>
-                @endif
-            </div>
-
-            <!-- Ribbon Container -->
-            <div class="w-1/3 absolute right-0 top-0 p-3 h-32 flex flex-col justify-end rounded-bl-sm"
-                 style="background: {{ $document->accentColor }};">
-                @if($document->header)
-                    <h1 class="text-4xl font-bold text-white text-center uppercase">{{ $document->header }}</h1>
-                @endif
-            </div>
-        </x-company.invoice.header>
-
-        <!-- Company Details -->
-        <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($formattedAddress = $document->company->getFormattedAddressHtml())
-                    {!! $formattedAddress !!}
-                @endif
-            </div>
-
-            <div class="flex justify-between items-end">
-                <!-- Billing Details -->
-                <div class="text-sm 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: {{ $document->accentColor }}">{{ $document->client->name }}</p>
-
-                    @if($formattedAddress = $document->client->getFormattedAddressHtml())
-                        {!! $formattedAddress !!}
-                    @endif
-                </div>
-
-                <div class="text-sm tracking-tight">
-                    <table class="min-w-full">
-                        <tbody>
-                        <tr>
-                            <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">{{ $document->label->date }}:</td>
-                            <td class="text-left pl-2">{{ $document->date }}</td>
-                        </tr>
-                        <tr>
-                            <td class="font-semibold text-right pr-2">{{ $document->label->dueDate }}:</td>
-                            <td class="text-left pl-2">{{ $document->dueDate }}</td>
-                        </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </x-company.invoice.metadata>
-
-        <!-- Line Items Table -->
-        <x-company.invoice.line-items class="modern-template-line-items">
-            <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-[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">
-                @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-3">
-                            {{ $item->name }}
-                            @if($item->description)
-                                <div class="text-gray-600 font-normal line-clamp-2 mt-1">{{ $item->description }}</div>
-                            @endif
-                        </td>
-                        <td class="text-center py-3">{{ $item->quantity }}</td>
-                        <td class="text-right py-3">{{ $item->unitPrice }}</td>
-                        <td class="text-right pr-6 py-3">{{ $item->subtotal }}</td>
-                    </tr>
-                @endforeach
-                </tbody>
-                <tfoot class="text-sm tracking-tight">
-                <tr>
-                    <td class="pl-6 py-2" colspan="2"></td>
-                    <td class="text-right font-semibold py-2">Subtotal:</td>
-                    <td class="text-right pr-6 py-2">{{ $document->subtotal }}</td>
-                </tr>
-                @if($document->discount)
-                    <tr class="text-success-800 dark:text-success-600">
-                        <td class="pl-6 py-2" colspan="2"></td>
-                        <td class="text-right py-2">Discount:</td>
-                        <td class="text-right pr-6 py-2">
-                            ({{ $document->discount }})
-                        </td>
-                    </tr>
-                @endif
-                @if($document->tax)
-                    <tr>
-                        <td class="pl-6 py-2" colspan="2"></td>
-                        <td class="text-right py-2">Tax:</td>
-                        <td class="text-right pr-6 py-2">{{ $document->tax }}</td>
-                    </tr>
-                @endif
-                <tr>
-                    <td class="pl-6 py-2" colspan="2"></td>
-                    <td class="text-right font-semibold border-t py-2">Total:</td>
-                    <td class="text-right border-t pr-6 py-2">{{ $document->total }}</td>
-                </tr>
-                @if($document->amountDue)
-                    <tr>
-                        <td class="pl-6 py-2" colspan="2"></td>
-                        <td class="text-right font-semibold border-t-4 border-double py-2">{{ $document->label->amountDue }}
-                            ({{ $document->currencyCode }}):
-                        </td>
-                        <td class="text-right border-t-4 border-double pr-6 py-2">{{ $document->amountDue }}</td>
-                    </tr>
-                @endif
-                </tfoot>
-            </table>
-        </x-company.invoice.line-items>
-
-        <!-- Footer Notes -->
-        <x-company.invoice.footer class="modern-template-footer tracking-tight">
-            <h4 class="font-semibold px-6 text-sm" 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 text-sm">
-                <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>
+    @include("filament.infolists.components.document-templates.{$template->value}", [
+        'document' => $document,
+        'preview' => false,
+    ])
 </div>

resources/views/filament/infolists/components/document-templates/classic.blade.php

@@ -0,0 +1,148 @@
+<x-company.invoice.container class="classic-template-container">
+    <!-- Header Section -->
+    <x-company.invoice.header class="default-template-header">
+        <div class="w-2/3 text-left ml-6">
+            <div class="text-sm tracking-tight">
+                <h2 class="text-lg 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($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 space-y-8">
+        <div class="items-center flex">
+            <hr class="grow-[2] py-0.5 border-solid border-y-2" style="border-color: {{ $document->accentColor }};">
+            <x-icons.document-header-decoration
+                color="{{ $document->accentColor }}"
+                text="{{ $document->header }}"
+                class="w-60"
+            />
+            <hr class="grow-[2] py-0.5 border-solid border-y-2" style="border-color: {{ $document->accentColor }};">
+        </div>
+        <div class="mt-2 text-base text-center text-gray-600 dark:text-gray-400">{{ $document->subheader }}</div>
+
+        <div class="flex justify-between items-end">
+            <!-- Billing Details -->
+            <div class="text-sm 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">{{ $document->client->name }}</p>
+                @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
+                @endif
+            </div>
+
+            <div class="text-sm tracking-tight">
+                <table class="min-w-full">
+                    <tbody>
+                    <tr>
+                        <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">{{ $document->label->date }}:</td>
+                        <td class="text-left pl-2">{{ $document->date }}</td>
+                    </tr>
+                    <tr>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->dueDate }}:</td>
+                        <td class="text-left pl-2">{{ $document->dueDate }}</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </x-company.invoice.metadata>
+
+    <!-- Line Items -->
+    <x-company.invoice.line-items class="classic-template-line-items">
+        <table class="w-full text-left table-fixed">
+            <thead class="text-sm leading-relaxed">
+            <tr>
+                <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 border-dotted border-gray-300">
+            @foreach($document->lineItems as $item)
+                <tr>
+                    <td class="text-left pl-6 font-semibold py-3">
+                        {{ $item->name }}
+                        @if($item->description)
+                            <div class="text-gray-600 font-normal line-clamp-2 mt-1">{{ $item->description }}</div>
+                        @endif
+                    </td>
+                    <td class="text-center py-3">{{ $item->quantity }}</td>
+                    <td class="text-right py-3">{{ $item->unitPrice }}</td>
+                    <td class="text-right pr-6 py-3">{{ $item->subtotal }}</td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+
+        <!-- Financial Details and Notes -->
+        <div class="flex justify-between text-sm tracking-tight space-x-1">
+            <!-- Notes Section -->
+            <div class="w-[60%] border border-dashed border-gray-300 p-2 mt-4">
+                <h4 class="font-semibold mb-2">Notes</h4>
+                <p>{{ $document->footer }}</p>
+            </div>
+
+            <!-- Financial Summary -->
+            <div class="w-[40%] mt-2">
+                <table class="w-full table-fixed">
+                    <tbody class="text-sm tracking-tight">
+                    <tr>
+                        <td class="text-right font-semibold py-2">Subtotal:</td>
+                        <td class="text-right pr-6 py-2">{{ $document->subtotal }}</td>
+                    </tr>
+                    @if($document->discount)
+                        <tr class="text-success-800 dark:text-success-600">
+                            <td class="text-right py-2">Discount:</td>
+                            <td class="text-right pr-6 py-2">
+                                ({{ $document->discount }})
+                            </td>
+                        </tr>
+                    @endif
+                    @if($document->tax)
+                        <tr>
+                            <td class="text-right py-2">Tax:</td>
+                            <td class="text-right pr-6 py-2">{{ $document->tax }}</td>
+                        </tr>
+                    @endif
+                    <tr>
+                        <td class="text-right font-semibold border-t py-2">Total:</td>
+                        <td class="text-right border-t pr-6 py-2">{{ $document->total }}</td>
+                    </tr>
+                    @if($document->amountDue)
+                        <tr>
+                            <td class="text-right font-semibold border-t-4 border-double py-2">{{ $document->label->amountDue }}
+                                ({{ $document->currencyCode }}):
+                            </td>
+                            <td class="text-right border-t-4 border-double pr-6 py-2">{{ $document->amountDue }}</td>
+                        </tr>
+                    @endif
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </x-company.invoice.line-items>
+
+    <!-- Footer -->
+    <x-company.invoice.footer class="classic-template-footer tracking-tight min-h-48">
+        <h4 class="font-semibold px-6 mb-2 text-sm">Terms & Conditions</h4>
+        <p class="px-6 break-words line-clamp-4 text-sm">{{ $document->terms }}</p>
+    </x-company.invoice.footer>
+</x-company.invoice.container>

resources/views/filament/infolists/components/document-templates/default.blade.php

@@ -0,0 +1,138 @@
+<x-company.invoice.container class="default-template-container">
+
+    <x-company.invoice.header class="default-template-header border-b-2 p-6 pb-4">
+        <div class="w-2/3">
+            @if($document->logo && $document->showLogo)
+                <x-company.invoice.logo :src="$document->logo"/>
+            @endif
+        </div>
+
+        <div class="w-1/3 text-right">
+            <div class="text-sm tracking-tight">
+                <h2 class="text-lg font-semibold">{{ $document->company->name }}</h2>
+                @if($formattedAddress = $document->company->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
+                @endif
+            </div>
+        </div>
+    </x-company.invoice.header>
+
+    <x-company.invoice.metadata class="default-template-metadata space-y-8">
+        <div>
+            <h1 class="text-4xl font-light uppercase">{{ $document->header }}</h1>
+            @if ($document->subheader)
+                <h2 class="text-base text-gray-600 dark:text-gray-400">{{ $document->subheader }}</h2>
+            @endif
+        </div>
+
+        <div class="flex justify-between items-end">
+            <!-- Billing Details -->
+            <div class="text-sm 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">{{ $document->client->name }}</p>
+                @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
+                @endif
+            </div>
+
+            <div class="text-sm tracking-tight">
+                <table class="min-w-full">
+                    <tbody>
+                    <tr>
+                        <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">{{ $document->label->date }}:</td>
+                        <td class="text-left pl-2">{{ $document->date }}</td>
+                    </tr>
+                    <tr>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->dueDate }}:</td>
+                        <td class="text-left pl-2">{{ $document->dueDate }}</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </x-company.invoice.metadata>
+
+    <!-- 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-relaxed" style="background: {{ $document->accentColor }}">
+            <tr class="text-white">
+                <th class="text-left pl-6 w-[50%] py-2">{{ $document->columnLabel->items }}</th>
+                <th class="text-center w-[10%] py-2">{{ $document->columnLabel->units }}</th>
+                <th class="text-right w-[20%] py-2">{{ $document->columnLabel->price }}</th>
+                <th class="text-right pr-6 w-[20%] py-2">{{ $document->columnLabel->amount }}</th>
+            </tr>
+            </thead>
+            <tbody class="text-sm tracking-tight border-b-2 border-gray-300">
+            @foreach($document->lineItems as $item)
+                <tr>
+                    <td class="text-left pl-6 font-semibold py-3">
+                        {{ $item->name }}
+                        @if($item->description)
+                            <div class="text-gray-600 font-normal line-clamp-2 mt-1">{{ $item->description }}</div>
+                        @endif
+                    </td>
+                    <td class="text-center py-3">{{ $item->quantity }}</td>
+                    <td class="text-right py-3">{{ $item->unitPrice }}</td>
+                    <td class="text-right pr-6 py-3">{{ $item->subtotal }}</td>
+                </tr>
+            @endforeach
+            </tbody>
+            <tfoot class="text-sm tracking-tight">
+            <tr>
+                <td class="pl-6 py-2" colspan="2"></td>
+                <td class="text-right font-semibold py-2">Subtotal:</td>
+                <td class="text-right pr-6 py-2">{{ $document->subtotal }}</td>
+            </tr>
+            @if($document->discount)
+                <tr class="text-success-800 dark:text-success-600">
+                    <td class="pl-6 py-2" colspan="2"></td>
+                    <td class="text-right py-2">Discount:</td>
+                    <td class="text-right pr-6 py-2">
+                        ({{ $document->discount }})
+                    </td>
+                </tr>
+            @endif
+            @if($document->tax)
+                <tr>
+                    <td class="pl-6 py-2" colspan="2"></td>
+                    <td class="text-right py-2">Tax:</td>
+                    <td class="text-right pr-6 py-2">{{ $document->tax }}</td>
+                </tr>
+            @endif
+            <tr>
+                <td class="pl-6 py-2" colspan="2"></td>
+                <td class="text-right font-semibold border-t py-2">Total:</td>
+                <td class="text-right border-t pr-6 py-2">{{ $document->total }}</td>
+            </tr>
+            @if($document->amountDue)
+                <tr>
+                    <td class="pl-6 py-2" colspan="2"></td>
+                    <td class="text-right font-semibold border-t-4 border-double py-2">{{ $document->label->amountDue }}
+                        ({{ $document->currencyCode }}):
+                    </td>
+                    <td class="text-right border-t-4 border-double pr-6 py-2">{{ $document->amountDue }}</td>
+                </tr>
+            @endif
+            </tfoot>
+        </table>
+    </x-company.invoice.line-items>
+
+    <!-- Footer Notes -->
+    <x-company.invoice.footer class="default-template-footer tracking-tight">
+        <p class="px-6 text-sm">{{ $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 text-sm">Terms & Conditions</h4>
+        <p class="px-6 break-words line-clamp-4 text-sm">{{ $document->terms }}</p>
+    </x-company.invoice.footer>
+</x-company.invoice.container>

resources/views/filament/infolists/components/document-templates/modern.blade.php

@@ -0,0 +1,145 @@
+<x-company.invoice.container class="modern-template-container">
+    <!-- Colored Header with Logo -->
+    <x-company.invoice.header class="bg-gray-800 h-24">
+        <!-- Logo -->
+        <div class="w-2/3">
+            @if($document->logo && $document->showLogo)
+                <x-company.invoice.logo class="ml-8" :src="$document->logo"/>
+            @endif
+        </div>
+
+        <!-- Ribbon Container -->
+        <div class="w-1/3 absolute right-0 top-0 p-3 h-32 flex flex-col justify-end rounded-bl-sm"
+             style="background: {{ $document->accentColor }};">
+            @if($document->header)
+                <h1 class="text-4xl font-bold text-white text-center uppercase">{{ $document->header }}</h1>
+            @endif
+        </div>
+    </x-company.invoice.header>
+
+    <!-- Company Details -->
+    <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($formattedAddress = $document->company->getFormattedAddressHtml())
+                {!! $formattedAddress !!}
+            @endif
+        </div>
+
+        <div class="flex justify-between items-end">
+            <!-- Billing Details -->
+            <div class="text-sm 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: {{ $document->accentColor }}">{{ $document->client->name }}</p>
+
+                @if($formattedAddress = $document->client->getFormattedAddressHtml())
+                    {!! $formattedAddress !!}
+                @endif
+            </div>
+
+            <div class="text-sm tracking-tight">
+                <table class="min-w-full">
+                    <tbody>
+                    <tr>
+                        <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">{{ $document->label->date }}:</td>
+                        <td class="text-left pl-2">{{ $document->date }}</td>
+                    </tr>
+                    <tr>
+                        <td class="font-semibold text-right pr-2">{{ $document->label->dueDate }}:</td>
+                        <td class="text-left pl-2">{{ $document->dueDate }}</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </x-company.invoice.metadata>
+
+    <!-- Line Items Table -->
+    <x-company.invoice.line-items class="modern-template-line-items">
+        <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-[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">
+            @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-3">
+                        {{ $item->name }}
+                        @if($item->description)
+                            <div class="text-gray-600 font-normal line-clamp-2 mt-1">{{ $item->description }}</div>
+                        @endif
+                    </td>
+                    <td class="text-center py-3">{{ $item->quantity }}</td>
+                    <td class="text-right py-3">{{ $item->unitPrice }}</td>
+                    <td class="text-right pr-6 py-3">{{ $item->subtotal }}</td>
+                </tr>
+            @endforeach
+            </tbody>
+            <tfoot class="text-sm tracking-tight">
+            <tr>
+                <td class="pl-6 py-2" colspan="2"></td>
+                <td class="text-right font-semibold py-2">Subtotal:</td>
+                <td class="text-right pr-6 py-2">{{ $document->subtotal }}</td>
+            </tr>
+            @if($document->discount)
+                <tr class="text-success-800 dark:text-success-600">
+                    <td class="pl-6 py-2" colspan="2"></td>
+                    <td class="text-right py-2">Discount:</td>
+                    <td class="text-right pr-6 py-2">
+                        ({{ $document->discount }})
+                    </td>
+                </tr>
+            @endif
+            @if($document->tax)
+                <tr>
+                    <td class="pl-6 py-2" colspan="2"></td>
+                    <td class="text-right py-2">Tax:</td>
+                    <td class="text-right pr-6 py-2">{{ $document->tax }}</td>
+                </tr>
+            @endif
+            <tr>
+                <td class="pl-6 py-2" colspan="2"></td>
+                <td class="text-right font-semibold border-t py-2">Total:</td>
+                <td class="text-right border-t pr-6 py-2">{{ $document->total }}</td>
+            </tr>
+            @if($document->amountDue)
+                <tr>
+                    <td class="pl-6 py-2" colspan="2"></td>
+                    <td class="text-right font-semibold border-t-4 border-double py-2">{{ $document->label->amountDue }}
+                        ({{ $document->currencyCode }}):
+                    </td>
+                    <td class="text-right border-t-4 border-double pr-6 py-2">{{ $document->amountDue }}</td>
+                </tr>
+            @endif
+            </tfoot>
+        </table>
+    </x-company.invoice.line-items>
+
+    <!-- Footer Notes -->
+    <x-company.invoice.footer class="modern-template-footer tracking-tight">
+        <h4 class="font-semibold px-6 text-sm" 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 text-sm">
+            <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>

tests/Feature/Setting/LocalizationTest.php

@@ -0,0 +1,66 @@
+<?php
+
+use App\Models\Setting\Localization;
+use App\Utilities\RateCalculator;
+
+// RateCalculator Basic Operations
+it('calculates percentage correctly', function () {
+    $valueInCents = 100000; // 1000 dollars in cents
+    $scaledRate = RateCalculator::decimalToScaledRate(0.025); // 2.5%
+
+    expect(RateCalculator::calculatePercentage($valueInCents, $scaledRate))
+        ->toBe(2500); // Should be 25 dollars in cents
+});
+
+it('converts between scaled rates and decimals correctly', function (float $decimal, int $scaled) {
+    // Test decimal to scaled
+    expect(RateCalculator::decimalToScaledRate($decimal))->toBe($scaled)
+        ->and(RateCalculator::scaledRateToDecimal($scaled))->toBe($decimal);
+})->with([
+    [0.25, 250000],     // 0.25 * 1000000 = 250000
+    [0.1, 100000],      // 0.1 * 1000000 = 100000
+    [0.01, 10000],      // 0.01 * 1000000 = 10000
+    [0.001, 1000],      // 0.001 * 1000000 = 1000
+    [0.0001, 100],      // 0.0001 * 1000000 = 100
+]);
+
+it('handles rate formatting correctly for different computations', function () {
+    $localization = Localization::firstOrFail();
+    $localization->update(['language' => 'en']);
+
+    // Test fixed amount formatting
+    expect(rateFormat(100000, 'fixed', 'USD'))->toBe('$100,000.00 USD');
+
+    // Test percentage formatting
+    $scaledRate = RateCalculator::decimalToScaledRate(0.000025); // 0.25%
+    expect(rateFormat($scaledRate, 'percentage'))->toBe('25%');
+});
+
+// Edge Cases and Error Handling
+it('handles edge cases correctly', function () {
+    $localization = Localization::firstOrFail();
+    $localization->update(['language' => 'en']);
+
+    expect(RateCalculator::formatScaledRate(0))->toBe('0')
+        ->and(RateCalculator::formatScaledRate(1))->toBe('0.0001')
+        ->and(RateCalculator::formatScaledRate(10000000))->toBe('1,000')
+        ->and(RateCalculator::formatScaledRate(-250000))->toBe('-25');
+});
+
+// Precision Tests
+it('maintains precision correctly', function () {
+    $localization = Localization::firstOrFail();
+    $localization->update(['language' => 'en']);
+
+    $testCases = [
+        '1.0000' => '1',
+        '1.2300' => '1.23',
+        '1.2340' => '1.234',
+        '1.2345' => '1.2345',
+    ];
+
+    foreach ($testCases as $input => $expected) {
+        $scaled = RateCalculator::parseLocalizedRate($input);
+        expect(RateCalculator::formatScaledRate($scaled))->toBe($expected);
+    }
+});