refactor: invoice preview and currency logic

app/Enums/PaymentTerms.php

@@ -41,4 +41,11 @@ enum PaymentTerms: string implements HasLabel
             self::Net90 => 90,
         };
     }
+
+    public function getDueDate(): string
+    {
+        $days = $this->getDays() ?? 0;
+
+        return now()->addDays($days)->format('M d, Y');
+    }
 }

app/Events/DefaultCurrencyChanged.php

@@ -9,7 +9,9 @@ use Illuminate\Queue\SerializesModels;
 
 class DefaultCurrencyChanged
 {
-    use Dispatchable, InteractsWithSockets, SerializesModels;
+    use Dispatchable;
+    use InteractsWithSockets;
+    use SerializesModels;
 
     public Currency $currency;
 

app/Filament/Company/Pages/Setting/Invoice.php

@@ -6,7 +6,7 @@ use App\Enums\{DocumentType, Font, PaymentTerms, Template};
 use App\Models\Setting\DocumentDefault as InvoiceModel;
 use Filament\Actions\{Action, ActionGroup};
 use Filament\Forms\Components\{Checkbox, ColorPicker, Component, FileUpload, Group, Section, Select, TextInput, Textarea, ViewField};
-use Filament\Forms\{Form, Get};
+use Filament\Forms\{Form, Get, Set};
 use Filament\Notifications\Notification;
 use Filament\Pages\Concerns\InteractsWithFormActions;
 use Filament\Pages\Page;
@@ -119,6 +119,7 @@ class Invoice extends Page
     public function form(Form $form): Form
     {
         return $form
+            ->live()
             ->schema([
                 $this->getGeneralSection(),
                 $this->getContentSection(),
@@ -135,17 +136,15 @@ class Invoice extends Page
             ->schema([
                 TextInput::make('number_prefix')
                     ->label('Number Prefix')
-                    ->live()
-                    ->required(),
+                    ->nullable(),
                 Select::make('number_digits')
                     ->label('Number Digits')
                     ->options(InvoiceModel::availableNumberDigits())
+                    ->selectablePlaceholder(false)
                     ->native(false)
-                    ->live()
-                    ->required(),
+                    ->rule('required'),
                 TextInput::make('number_next')
                     ->label('Next Number')
-                    ->live()
                     ->maxLength(static fn (Get $get) => $get('number_digits'))
                     ->suffix(static function (Get $get, $state) {
                         $number_prefix = $get('number_prefix');
@@ -154,13 +153,13 @@ class Invoice extends Page
 
                         return InvoiceModel::getNumberNext(true, true, $number_prefix, $number_digits, $number_next);
                     })
-                    ->required(),
+                    ->rule('required'),
                 Select::make('payment_terms')
                     ->label('Payment Terms')
                     ->options(PaymentTerms::class)
+                    ->selectablePlaceholder(false)
                     ->native(false)
-                    ->live()
-                    ->required(),
+                    ->rule('required'),
             ])->columns();
     }
 
@@ -170,19 +169,15 @@ class Invoice extends Page
             ->schema([
                 TextInput::make('header')
                     ->label('Header')
-                    ->live()
-                    ->required(),
+                    ->nullable(),
                 TextInput::make('subheader')
                     ->label('Subheader')
-                    ->live()
                     ->nullable(),
                 Textarea::make('terms')
                     ->label('Terms')
-                    ->live()
                     ->nullable(),
                 Textarea::make('footer')
                     ->label('Footer / Notes')
-                    ->live()
                     ->nullable(),
             ])->columns();
     }
@@ -193,7 +188,6 @@ class Invoice extends Page
             ->description('Choose the template and edit the column names.')
             ->schema([
                 Group::make()
-                    ->live()
                     ->schema([
                         FileUpload::make('logo')
                             ->label('Logo')
@@ -231,12 +225,24 @@ class Invoice extends Page
                             ->label('Template')
                             ->native(false)
                             ->options(Template::class)
-                            ->required(),
+                            ->selectablePlaceholder(false)
+                            ->rule('required'),
                         Select::make('item_name.option')
                             ->label('Item Name')
                             ->native(false)
-                            ->required()
-                            ->options(InvoiceModel::getAvailableItemNameOptions()),
+                            ->options(InvoiceModel::getAvailableItemNameOptions())
+                            ->selectablePlaceholder(false)
+                            ->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'));
+                                }
+                            })
+                            ->rule('required'),
                         TextInput::make('item_name.custom')
                             ->hiddenLabel()
                             ->disabled(static fn (callable $get) => $get('item_name.option') !== 'other')
@@ -244,8 +250,19 @@ class Invoice extends Page
                         Select::make('unit_name.option')
                             ->label('Unit Name')
                             ->native(false)
-                            ->required()
-                            ->options(InvoiceModel::getAvailableUnitNameOptions()),
+                            ->options(InvoiceModel::getAvailableUnitNameOptions())
+                            ->selectablePlaceholder(false)
+                            ->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'));
+                                }
+                            })
+                            ->rule('required'),
                         TextInput::make('unit_name.custom')
                             ->hiddenLabel()
                             ->disabled(static fn (callable $get) => $get('unit_name.option') !== 'other')
@@ -253,8 +270,19 @@ class Invoice extends Page
                         Select::make('price_name.option')
                             ->label('Price Name')
                             ->native(false)
-                            ->required()
-                            ->options(InvoiceModel::getAvailablePriceNameOptions()),
+                            ->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'));
+                                }
+                            })
+                            ->selectablePlaceholder(false)
+                            ->rule('required'),
                         TextInput::make('price_name.custom')
                             ->hiddenLabel()
                             ->disabled(static fn (callable $get) => $get('price_name.option') !== 'other')
@@ -262,8 +290,19 @@ class Invoice extends Page
                         Select::make('amount_name.option')
                             ->label('Amount Name')
                             ->native(false)
-                            ->required()
-                            ->options(InvoiceModel::getAvailableAmountNameOptions()),
+                            ->options(InvoiceModel::getAvailableAmountNameOptions())
+                            ->selectablePlaceholder(false)
+                            ->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'));
+                                }
+                            })
+                            ->rule('required'),
                         TextInput::make('amount_name.custom')
                             ->hiddenLabel()
                             ->disabled(static fn (callable $get) => $get('amount_name.option') !== 'other')

app/Filament/Company/Resources/Setting/CurrencyResource.php

@@ -43,7 +43,12 @@ class CurrencyResource extends Resource
                             ->required()
                             ->hidden(static fn (Forms\Get $get, $state): bool => $get('enabled') && $state !== null)
                             ->afterStateUpdated(static function (Forms\Set $set, $state) {
+                                $fields = ['name', 'rate', 'precision', 'symbol', 'symbol_first', 'decimal_mark', 'thousands_separator'];
+
                                 if ($state === null) {
+                                    foreach ($fields as $field) {
+                                        $set($field, null);
+                                    }
                                     return;
                                 }
 
@@ -56,18 +61,15 @@ class CurrencyResource extends Resource
 
                                 $rate = $defaultCurrencyCode ? $currencyService->getCachedExchangeRate($defaultCurrencyCode, $code) : 1;
 
-                                $set('name', $selectedCurrencyCode['name'] ?? '');
-                                $set('rate', $rate ?? '');
-                                $set('precision', $selectedCurrencyCode['precision'] ?? '');
-                                $set('symbol', $selectedCurrencyCode['symbol'] ?? '');
-                                $set('symbol_first', $selectedCurrencyCode['symbol_first'] ?? '');
-                                $set('decimal_mark', $selectedCurrencyCode['decimal_mark'] ?? '');
-                                $set('thousands_separator', $selectedCurrencyCode['thousands_separator'] ?? '');
+                                foreach ($fields as $field) {
+                                    $set($field, $selectedCurrencyCode[$field] ?? ($field === 'rate' ? $rate : ''));
+                                }
                             }),
                         Forms\Components\TextInput::make('code')
                             ->label('Code')
-                            ->hidden(static fn (Forms\Get $get): bool => !($get('enabled') && $get('code') !== null))
+                            ->hidden(static fn (Forms\Get $get): bool => ! ($get('enabled') && $get('code') !== null))
                             ->disabled(static fn (Forms\Get $get): bool => $get('enabled'))
+                            ->dehydrated()
                             ->required(),
                         Forms\Components\TextInput::make('name')
                             ->label('Name')
@@ -94,7 +96,7 @@ class CurrencyResource extends Resource
                             ->label('Symbol Position')
                             ->native(false)
                             ->selectablePlaceholder(false)
-                            ->formatStateUsing(static fn($state) => isset($state) ? (int) $state : null)
+                            ->formatStateUsing(static fn ($state) => isset($state) ? (int) $state : null)
                             ->boolean('Before Amount', 'After Amount', 'Select a symbol position...')
                             ->required(),
                         Forms\Components\TextInput::make('decimal_mark')
@@ -120,7 +122,7 @@ class CurrencyResource extends Resource
                             ->offColor('danger')
                             ->onColor('primary')
                             ->afterStateUpdated(static function (Forms\Set $set, Forms\Get $get, $state) {
-                                $enabledState = (bool)$state;
+                                $enabledState = (bool) $state;
                                 $code = $get('code');
 
                                 $defaultCurrencyCode = Currency::getDefaultCurrencyCode();

app/Filament/Company/Resources/Setting/CurrencyResource/Pages/EditCurrency.php

@@ -40,7 +40,7 @@ class EditCurrency extends EditRecord
     /**
      * @throws Halt
      */
-    protected function handleRecordUpdate(Model|Currency $record, array $data): Model|Currency
+    protected function handleRecordUpdate(Model | Currency $record, array $data): Model | Currency
     {
         $user = Auth::user();
 

app/View/Models/InvoiceViewModel.php

@@ -95,15 +95,12 @@ class InvoiceViewModel
 
     public function payment_terms(): string
     {
-        return $this->data['payment_terms'] ?? $this->invoice->payment_terms ?? PaymentTerms::DEFAULT;
+        return $this->data['payment_terms'] ?? $this->invoice->payment_terms?->value ?? PaymentTerms::DEFAULT;
     }
 
     public function invoice_due_date(): string
     {
-        $enumPaymentTerms = PaymentTerms::tryFrom($this->payment_terms());
-        $days = $enumPaymentTerms ? $enumPaymentTerms->getDays() : 0;
-
-        return now()->addDays($days)->format('M d, Y');
+        return PaymentTerms::tryFrom($this->payment_terms())?->getDueDate();
     }
 
     // Invoice header related methods
@@ -146,49 +143,38 @@ class InvoiceViewModel
         return $this->data['terms'] ?? $this->invoice->terms ?? 'Payment is due within thirty (30) days from the date of invoice. Any discrepancies should be reported within fourteen (14) days of receipt.';
     }
 
-    // Invoice column related methods
-    public function item_name(): string
+    public function getItemColumnName(string $column, string $default): string
     {
-        $custom_item_name = $this->data['item_name']['custom'] ?? null;
+        $custom = $this->data[$column]['custom'] ?? $this->invoice->{$column . '_custom'} ?? null;
 
-        if ($custom_item_name) {
-            return $custom_item_name;
+        if ($custom) {
+            return $custom;
         }
 
-        return ucwords($this->data['item_name']['option']) ?? ucwords($this->invoice->item_name_option) ?? $this->invoice->item_name_custom ?? 'Items';
+        $option = $this->data[$column]['option'] ?? $this->invoice->{$column . '_option'} ?? null;
+
+        return $option ? ucwords($option) : $default;
     }
 
-    public function unit_name(): string
+    // Invoice column related methods
+    public function item_name(): string
     {
-        $custom_unit_name = $this->data['unit_name']['custom'] ?? null;
-
-        if ($custom_unit_name) {
-            return $custom_unit_name;
-        }
+        return $this->getItemColumnName('item_name', 'Items');
+    }
 
-        return ucwords($this->data['unit_name']['option']) ?? ucwords($this->invoice->unit_name_option) ?? $this->invoice->unit_name_custom ?? 'Quantity';
+    public function unit_name(): string
+    {
+        return $this->getItemColumnName('unit_name', 'Quantity');
     }
 
     public function price_name(): string
     {
-        $custom_price_name = $this->data['price_name']['custom'] ?? null;
-
-        if ($custom_price_name) {
-            return $custom_price_name;
-        }
-
-        return ucwords($this->data['price_name']['option']) ?? ucwords($this->invoice->price_name_option) ?? $this->invoice->price_name_custom ?? 'Price';
+        return $this->getItemColumnName('price_name', 'Price');
     }
 
     public function amount_name(): string
     {
-        $custom_amount_name = $this->data['amount_name']['custom'] ?? $this->invoice->amount_name_custom ?? null;
-
-        if ($custom_amount_name) {
-            return $custom_amount_name;
-        }
-
-        return ucwords($this->data['amount_name']['option']) ?? ucwords($this->invoice->amount_name_option) ?? 'Amount';
+        return $this->getItemColumnName('amount_name', 'Amount');
     }
 
     public function buildViewData(): array
@@ -208,7 +194,6 @@ class InvoiceViewModel
             'number_next' => $this->number_next(),
             'invoice_number' => $this->invoice_number(),
             'invoice_date' => $this->invoice_date(),
-            'payment_terms' => $this->payment_terms(),
             'invoice_due_date' => $this->invoice_due_date(),
             'header' => $this->header(),
             'subheader' => $this->subheader(),

database/migrations/2023_09_12_032057_create_document_defaults_table.php

@@ -18,11 +18,11 @@ return new class extends Migration
             $table->string('type');
             $table->string('logo')->nullable();
             $table->boolean('show_logo')->default(false);
-            $table->string('number_prefix');
+            $table->string('number_prefix')->nullable();
             $table->unsignedTinyInteger('number_digits')->default(5);
             $table->unsignedBigInteger('number_next')->default(1);
             $table->string('payment_terms')->default(PaymentTerms::DEFAULT);
-            $table->string('header');
+            $table->string('header')->nullable();
             $table->string('subheader')->nullable();
             $table->text('terms')->nullable();
             $table->text('footer')->nullable();