wip

app/DTO/ClientDTO.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\DTO;
+
+use App\Models\Common\Client;
+
+readonly class ClientDTO
+{
+    public function __construct(
+        public string $name,
+        public string $addressLine1,
+        public string $addressLine2,
+        public string $city,
+        public string $state,
+        public string $postalCode,
+        public string $country,
+    ) {}
+
+    public static function fromModel(Client $client): self
+    {
+        $address = $client->billingAddress ?? null;
+
+        return new self(
+            name: $client->name,
+            addressLine1: $address?->address_line_1 ?? '',
+            addressLine2: $address?->address_line_2 ?? '',
+            city: $address?->city ?? '',
+            state: $address?->state ?? '',
+            postalCode: $address?->postal_code ?? '',
+            country: $address?->country ?? '',
+        );
+    }
+}

app/DTO/CompanyDTO.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\DTO;
+
+use App\Models\Company;
+
+readonly class CompanyDTO
+{
+    public function __construct(
+        public string $name,
+        public string $address,
+        public string $city,
+        public string $state,
+        public string $zipCode,
+        public string $country,
+    ) {}
+
+    public static function fromModel(Company $company): self
+    {
+        $profile = $company->profile;
+
+        return new self(
+            name: $company->name,
+            address: $profile->address ?? '',
+            city: $profile->city?->name ?? '',
+            state: $profile->state?->name ?? '',
+            zipCode: $profile->zip_code ?? '',
+            country: $profile->state?->country->name ?? '',
+        );
+    }
+}

app/DTO/DocumentDTO.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App\DTO;
+
+use App\Models\Accounting\Document;
+use App\Models\Setting\DocumentDefault;
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
+
+readonly class DocumentDTO
+{
+    /**
+     * @param  LineItemDTO[]  $lineItems
+     */
+    public function __construct(
+        public ?string $header,
+        public ?string $footer,
+        public ?string $terms,
+        public ?string $logo,
+        public string $number,
+        public ?string $referenceNumber,
+        public string $date,
+        public string $dueDate,
+        public string $currencyCode,
+        public string $subtotal,
+        public string $discount,
+        public string $tax,
+        public string $total,
+        public string $amountDue,
+        public CompanyDTO $company,
+        public ClientDTO $client,
+        public iterable $lineItems,
+        public DocumentLabelDTO $label,
+        public string $accentColor = '#000000',
+        public bool $showLogo = true,
+    ) {}
+
+    public static function fromModel(Document $document): self
+    {
+        /** @var DocumentDefault $settings */
+        $settings = $document->company->defaultInvoice;
+
+        return new self(
+            header: $document->header,
+            footer: $document->footer,
+            terms: $document->terms,
+            logo: $document->logo,
+            number: $document->documentNumber(),
+            referenceNumber: $document->referenceNumber(),
+            date: $document->documentDate(),
+            dueDate: $document->dueDate(),
+            currencyCode: $document->currency_code ?? CurrencyAccessor::getDefaultCurrency(),
+            subtotal: self::formatToMoney($document->subtotal, $document->currency_code),
+            discount: self::formatToMoney($document->discount_total, $document->currency_code),
+            tax: self::formatToMoney($document->tax_total, $document->currency_code),
+            total: self::formatToMoney($document->total, $document->currency_code),
+            amountDue: self::formatToMoney($document->amountDue(), $document->currency_code),
+            company: CompanyDTO::fromModel($document->company),
+            client: ClientDTO::fromModel($document->client),
+            lineItems: $document->lineItems->map(fn ($item) => LineItemDTO::fromModel($item)),
+            label: $document->documentType()->getLabels(),
+            accentColor: $settings->accent_color ?? '#000000',
+            showLogo: $settings->show_logo ?? false,
+        );
+    }
+
+    private static function formatToMoney(float | string $value, ?string $currencyCode): string
+    {
+        return CurrencyConverter::formatToMoney($value, $currencyCode);
+    }
+}

app/DTO/DocumentLabelDTO.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace App\DTO;
+
+readonly class DocumentLabelDTO
+{
+    public function __construct(
+        public string $title,
+        public string $number,
+        public string $referenceNumber,
+        public string $date,
+        public string $dueDate,
+        public string $amountDue,
+    ) {}
+
+    public function toArray(): array
+    {
+        return [
+            'title' => $this->title,
+            'number' => $this->number,
+            'reference_number' => $this->referenceNumber,
+            'date' => $this->date,
+            'due_date' => $this->dueDate,
+            'amount_due' => $this->amountDue,
+        ];
+    }
+}

app/DTO/LineItemDTO.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\DTO;
+
+use App\Models\Accounting\DocumentLineItem;
+use App\Utilities\Currency\CurrencyConverter;
+
+readonly class LineItemDTO
+{
+    public function __construct(
+        public string $name,
+        public string $description,
+        public int $quantity,
+        public string $unitPrice,
+        public string $subtotal,
+    ) {}
+
+    public static function fromModel(DocumentLineItem $lineItem): self
+    {
+        return new self(
+            name: $lineItem->offering->name ?? '',
+            description: $lineItem->description ?? '',
+            quantity: $lineItem->quantity,
+            unitPrice: self::formatToMoney($lineItem->unit_price, $lineItem->documentable->currency_code),
+            subtotal: self::formatToMoney($lineItem->subtotal, $lineItem->documentable->currency_code),
+        );
+    }
+
+    private static function formatToMoney(float | string $value, ?string $currencyCode): string
+    {
+        return CurrencyConverter::formatToMoney($value, $currencyCode);
+    }
+}

app/Enums/Accounting/DocumentType.php

@@ -2,6 +2,7 @@
 
 namespace App\Enums\Accounting;
 
+use App\DTO\DocumentLabelDTO;
 use Filament\Support\Contracts\HasIcon;
 use Filament\Support\Contracts\HasLabel;
 
@@ -47,41 +48,41 @@ enum DocumentType: string implements HasIcon, HasLabel
         };
     }
 
-    public function getLabels(): array
+    public function getLabels(): DocumentLabelDTO
     {
         return match ($this) {
-            self::Invoice => [
-                'title' => 'Invoice',
-                'number' => 'Invoice Number',
-                'reference_number' => 'P.O/S.O Number',
-                'date' => 'Invoice Date',
-                'due_date' => 'Payment Due',
-                'amount_due' => 'Amount Due',
-            ],
-            self::RecurringInvoice => [
-                'title' => 'Recurring Invoice',
-                'number' => 'Invoice Number',
-                'reference_number' => 'P.O/S.O Number',
-                'date' => 'Invoice Date',
-                'due_date' => 'Payment Due',
-                'amount_due' => 'Amount Due',
-            ],
-            self::Estimate => [
-                'title' => 'Estimate',
-                'number' => 'Estimate Number',
-                'reference_number' => 'Reference Number',
-                'date' => 'Estimate Date',
-                'due_date' => 'Expiration Date',
-                'amount_due' => 'Grand Total',
-            ],
-            self::Bill => [
-                'title' => 'Bill',
-                'number' => 'Bill Number',
-                'reference_number' => 'P.O/S.O Number',
-                'date' => 'Bill Date',
-                'due_date' => 'Payment Due',
-                'amount_due' => 'Amount Due',
-            ],
+            self::Invoice => new DocumentLabelDTO(
+                title: 'Invoice',
+                number: 'Invoice Number',
+                referenceNumber: 'P.O/S.O Number',
+                date: 'Invoice Date',
+                dueDate: 'Payment Due',
+                amountDue: 'Amount Due',
+            ),
+            self::RecurringInvoice => new DocumentLabelDTO(
+                title: 'Recurring Invoice',
+                number: 'Invoice Number',
+                referenceNumber: 'P.O/S.O Number',
+                date: 'Invoice Date',
+                dueDate: 'Payment Due',
+                amountDue: 'Amount Due',
+            ),
+            self::Estimate => new DocumentLabelDTO(
+                title: 'Estimate',
+                number: 'Estimate Number',
+                referenceNumber: 'Reference Number',
+                date: 'Estimate Date',
+                dueDate: 'Expiration Date',
+                amountDue: 'Grand Total',
+            ),
+            self::Bill => new DocumentLabelDTO(
+                title: 'Bill',
+                number: 'Bill Number',
+                referenceNumber: 'P.O/S.O Number',
+                date: 'Bill Date',
+                dueDate: 'Payment Due',
+                amountDue: 'Amount Due',
+            ),
         };
     }
 }

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

@@ -2,7 +2,6 @@
 
 namespace App\Filament\Company\Resources\Sales\RecurringInvoiceResource\Pages;
 
-use App\Enums\Accounting\DayOfMonth;
 use App\Enums\Accounting\DocumentType;
 use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Filament\Company\Resources\Sales\RecurringInvoiceResource;
@@ -25,14 +24,6 @@ class ViewRecurringInvoice extends ViewRecord
 {
     protected static string $resource = RecurringInvoiceResource::class;
 
-    protected function mutateFormDataBeforeFill(array $data): array
-    {
-        $data['day_of_month'] ??= DayOfMonth::First;
-        $data['start_date'] ??= now()->addMonth()->startOfMonth();
-
-        return $data;
-    }
-
     public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::SixExtraLarge;

app/Models/Accounting/Bill.php

@@ -5,11 +5,10 @@ namespace App\Models\Accounting;
 use App\Casts\MoneyCast;
 use App\Casts\RateCast;
 use App\Collections\Accounting\DocumentCollection;
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\BillStatus;
 use App\Enums\Accounting\DocumentDiscountMethod;
+use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\JournalEntryType;
 use App\Enums\Accounting\TransactionType;
 use App\Filament\Company\Resources\Purchases\BillResource;
@@ -25,7 +24,6 @@ use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -34,12 +32,8 @@ use Illuminate\Support\Carbon;
 
 #[CollectedBy(DocumentCollection::class)]
 #[ObservedBy(BillObserver::class)]
-class Bill extends Model
+class Bill extends Document
 {
-    use Blamable;
-    use CompanyOwned;
-    use HasFactory;
-
     protected $table = 'bills';
 
     protected $fillable = [
@@ -81,21 +75,11 @@ class Bill extends Model
         'amount_due' => MoneyCast::class,
     ];
 
-    public function currency(): BelongsTo
-    {
-        return $this->belongsTo(Currency::class, 'currency_code', 'code');
-    }
-
     public function vendor(): BelongsTo
     {
         return $this->belongsTo(Vendor::class);
     }
 
-    public function lineItems(): MorphMany
-    {
-        return $this->morphMany(DocumentLineItem::class, 'documentable');
-    }
-
     public function transactions(): MorphMany
     {
         return $this->morphMany(Transaction::class, 'transactionable');
@@ -122,6 +106,36 @@ class Bill extends Model
             ->where('type', TransactionType::Journal);
     }
 
+    public function documentType(): DocumentType
+    {
+        return DocumentType::Bill;
+    }
+
+    public function documentNumber(): ?string
+    {
+        return $this->bill_number;
+    }
+
+    public function documentDate(): ?string
+    {
+        return $this->date?->toDefaultDateFormat();
+    }
+
+    public function dueDate(): ?string
+    {
+        return $this->due_date?->toDefaultDateFormat();
+    }
+
+    public function referenceNumber(): ?string
+    {
+        return $this->order_number;
+    }
+
+    public function amountDue(): ?string
+    {
+        return $this->amount_due;
+    }
+
     protected function isCurrentlyOverdue(): Attribute
     {
         return Attribute::get(function () {
@@ -152,11 +166,6 @@ class Bill extends Model
         ]) && $this->currency_code === CurrencyAccessor::getDefaultCurrency();
     }
 
-    public function hasLineItems(): bool
-    {
-        return $this->lineItems()->exists();
-    }
-
     public function hasPayments(): bool
     {
         return $this->payments->isNotEmpty();

app/Models/Accounting/Document.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Models\Accounting;
+
+use App\Concerns\Blamable;
+use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\DocumentType;
+use App\Models\Setting\Currency;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+abstract class Document extends Model
+{
+    use Blamable;
+    use CompanyOwned;
+    use HasFactory;
+
+    public function currency(): BelongsTo
+    {
+        return $this->belongsTo(Currency::class, 'currency_code', 'code');
+    }
+
+    public function lineItems(): MorphMany
+    {
+        return $this->morphMany(DocumentLineItem::class, 'documentable');
+    }
+
+    public function hasLineItems(): bool
+    {
+        return $this->lineItems()->exists();
+    }
+
+    abstract public function documentType(): DocumentType;
+
+    abstract public function documentNumber(): ?string;
+
+    abstract public function documentDate(): ?string;
+
+    abstract public function dueDate(): ?string;
+
+    abstract public function referenceNumber(): ?string;
+
+    abstract public function amountDue(): ?string;
+}

app/Models/Accounting/Estimate.php

@@ -5,16 +5,14 @@ namespace App\Models\Accounting;
 use App\Casts\MoneyCast;
 use App\Casts\RateCast;
 use App\Collections\Accounting\DocumentCollection;
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\DocumentDiscountMethod;
+use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\EstimateStatus;
 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\Setting\Currency;
 use App\Observers\EstimateObserver;
 use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
@@ -23,21 +21,15 @@ use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasOne;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Carbon;
 
 #[CollectedBy(DocumentCollection::class)]
 #[ObservedBy(EstimateObserver::class)]
-class Estimate extends Model
+class Estimate extends Document
 {
-    use Blamable;
-    use CompanyOwned;
-    use HasFactory;
-
     protected $fillable = [
         'company_id',
         'client_id',
@@ -92,19 +84,39 @@ class Estimate extends Model
         return $this->belongsTo(Client::class);
     }
 
-    public function currency(): BelongsTo
+    public function invoice(): HasOne
     {
-        return $this->belongsTo(Currency::class, 'currency_code', 'code');
+        return $this->hasOne(Invoice::class);
     }
 
-    public function invoice(): HasOne
+    public function documentType(): DocumentType
     {
-        return $this->hasOne(Invoice::class);
+        return DocumentType::Estimate;
+    }
+
+    public function documentNumber(): ?string
+    {
+        return $this->estimate_number;
+    }
+
+    public function documentDate(): ?string
+    {
+        return $this->date?->toDateString();
+    }
+
+    public function dueDate(): ?string
+    {
+        return $this->expiration_date?->toDateString();
+    }
+
+    public function referenceNumber(): ?string
+    {
+        return $this->reference_number;
     }
 
-    public function lineItems(): MorphMany
+    public function amountDue(): ?string
     {
-        return $this->morphMany(DocumentLineItem::class, 'documentable');
+        return $this->total;
     }
 
     protected function isCurrentlyExpired(): Attribute
@@ -190,11 +202,6 @@ class Estimate extends Model
             && ! $this->wasConverted();
     }
 
-    public function hasLineItems(): bool
-    {
-        return $this->lineItems()->exists();
-    }
-
     public function scopeActive(Builder $query): Builder
     {
         return $query->whereIn('status', [

app/Models/Accounting/Invoice.php

@@ -5,10 +5,9 @@ namespace App\Models\Accounting;
 use App\Casts\MoneyCast;
 use App\Casts\RateCast;
 use App\Collections\Accounting\DocumentCollection;
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\DocumentDiscountMethod;
+use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\JournalEntryType;
 use App\Enums\Accounting\TransactionType;
@@ -16,7 +15,6 @@ 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\Currency;
 use App\Observers\InvoiceObserver;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
@@ -27,7 +25,6 @@ use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\MorphMany;
@@ -36,12 +33,8 @@ use Illuminate\Support\Carbon;
 
 #[CollectedBy(DocumentCollection::class)]
 #[ObservedBy(InvoiceObserver::class)]
-class Invoice extends Model
+class Invoice extends Document
 {
-    use Blamable;
-    use CompanyOwned;
-    use HasFactory;
-
     protected $table = 'invoices';
 
     protected $fillable = [
@@ -100,11 +93,6 @@ class Invoice extends Model
         return $this->belongsTo(Client::class);
     }
 
-    public function currency(): BelongsTo
-    {
-        return $this->belongsTo(Currency::class, 'currency_code', 'code');
-    }
-
     public function estimate(): BelongsTo
     {
         return $this->belongsTo(Estimate::class);
@@ -115,11 +103,6 @@ class Invoice extends Model
         return $this->belongsTo(RecurringInvoice::class);
     }
 
-    public function lineItems(): MorphMany
-    {
-        return $this->morphMany(DocumentLineItem::class, 'documentable');
-    }
-
     public function transactions(): MorphMany
     {
         return $this->morphMany(Transaction::class, 'transactionable');
@@ -146,6 +129,36 @@ class Invoice extends Model
             ->where('type', TransactionType::Journal);
     }
 
+    public function documentType(): DocumentType
+    {
+        return DocumentType::Invoice;
+    }
+
+    public function documentNumber(): ?string
+    {
+        return $this->invoice_number;
+    }
+
+    public function documentDate(): ?string
+    {
+        return $this->date?->toDefaultDateFormat();
+    }
+
+    public function dueDate(): ?string
+    {
+        return $this->due_date?->toDefaultDateFormat();
+    }
+
+    public function referenceNumber(): ?string
+    {
+        return $this->order_number;
+    }
+
+    public function amountDue(): ?string
+    {
+        return $this->amount_due;
+    }
+
     public function scopeUnpaid(Builder $query): Builder
     {
         return $query->whereNotIn('status', [
@@ -222,11 +235,6 @@ class Invoice extends Model
         return ! $this->hasBeenSent();
     }
 
-    public function hasLineItems(): bool
-    {
-        return $this->lineItems()->exists();
-    }
-
     public function hasPayments(): bool
     {
         return $this->payments()->exists();

app/Models/Accounting/RecurringInvoice.php

@@ -5,12 +5,11 @@ namespace App\Models\Accounting;
 use App\Casts\MoneyCast;
 use App\Casts\RateCast;
 use App\Collections\Accounting\DocumentCollection;
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
 use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\DayOfMonth;
 use App\Enums\Accounting\DayOfWeek;
 use App\Enums\Accounting\DocumentDiscountMethod;
+use App\Enums\Accounting\DocumentType;
 use App\Enums\Accounting\EndType;
 use App\Enums\Accounting\Frequency;
 use App\Enums\Accounting\IntervalType;
@@ -20,32 +19,23 @@ use App\Enums\Setting\PaymentTerms;
 use App\Filament\Forms\Components\CustomSection;
 use App\Models\Common\Client;
 use App\Models\Setting\CompanyProfile;
-use App\Models\Setting\Currency;
 use App\Observers\RecurringInvoiceObserver;
 use App\Utilities\Localization\Timezone;
 use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
 use Filament\Forms;
 use Filament\Forms\Form;
-use Filament\Support\Enums\MaxWidth;
 use Guava\FilamentClusters\Forms\Cluster;
 use Illuminate\Database\Eloquent\Attributes\CollectedBy;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Support\Carbon;
 
 #[CollectedBy(DocumentCollection::class)]
 #[ObservedBy(RecurringInvoiceObserver::class)]
-class RecurringInvoice extends Model
+class RecurringInvoice extends Document
 {
-    use Blamable;
-    use CompanyOwned;
-    use HasFactory;
-
     protected $table = 'recurring_invoices';
 
     protected $fillable = [
@@ -120,19 +110,39 @@ class RecurringInvoice extends Model
         return $this->belongsTo(Client::class);
     }
 
-    public function currency(): BelongsTo
+    public function invoices(): HasMany
     {
-        return $this->belongsTo(Currency::class, 'currency_code', 'code');
+        return $this->hasMany(Invoice::class, 'recurring_invoice_id');
     }
 
-    public function invoices(): HasMany
+    public function documentType(): DocumentType
     {
-        return $this->hasMany(Invoice::class, 'recurring_invoice_id');
+        return DocumentType::RecurringInvoice;
+    }
+
+    public function documentNumber(): ?string
+    {
+        return 'Auto-generated';
+    }
+
+    public function documentDate(): ?string
+    {
+        return $this->calculateNextDate()?->toDefaultDateFormat() ?? 'Auto-generated';
+    }
+
+    public function dueDate(): ?string
+    {
+        return $this->calculateNextDueDate()?->toDefaultDateFormat() ?? 'Auto-generated';
+    }
+
+    public function referenceNumber(): ?string
+    {
+        return $this->order_number;
     }
 
-    public function lineItems(): MorphMany
+    public function amountDue(): ?string
     {
-        return $this->morphMany(DocumentLineItem::class, 'documentable');
+        return $this->total;
     }
 
     public function isDraft(): bool
@@ -170,11 +180,6 @@ class RecurringInvoice extends Model
         return $this->isActive() && ! $this->wasEnded();
     }
 
-    public function hasLineItems(): bool
-    {
-        return $this->lineItems()->exists();
-    }
-
     public function hasSchedule(): bool
     {
         return $this->start_date !== null;
@@ -345,7 +350,6 @@ class RecurringInvoice extends Model
             ->label(fn (self $record) => $record->hasSchedule() ? 'Update Schedule' : 'Set Schedule')
             ->icon('heroicon-o-calendar-date-range')
             ->slideOver()
-            ->modalWidth(MaxWidth::FiveExtraLarge)
             ->successNotificationTitle('Schedule Updated')
             ->mountUsing(function (self $record, Form $form) {
                 $data = $record->attributesToArray();
@@ -412,12 +416,10 @@ class RecurringInvoice extends Model
                         // Custom frequency fields in a nested grid
                         Cluster::make([
                             Forms\Components\TextInput::make('interval_value')
-                                ->label('every')
                                 ->softRequired()
                                 ->numeric()
                                 ->default(1),
                             Forms\Components\Select::make('interval_type')
-                                ->label('Interval Type')
                                 ->options(IntervalType::class)
                                 ->softRequired()
                                 ->default(IntervalType::Month)
@@ -449,7 +451,7 @@ class RecurringInvoice extends Model
                                 }),
                         ])
                             ->live()
-                            ->label('Interval')
+                            ->label('Every')
                             ->required()
                             ->markAsRequired(false)
                             ->visible(fn (Forms\Get $get) => Frequency::parse($get('frequency'))?->isCustom()),
@@ -485,11 +487,11 @@ class RecurringInvoice extends Model
                             ),
                     ])->columns(2),
 
-                CustomSection::make('Dates')
+                CustomSection::make('Dates & Time')
                     ->contained(false)
                     ->schema([
                         Forms\Components\DatePicker::make('start_date')
-                            ->label('Create First Invoice')
+                            ->label('First Invoice Date')
                             ->softRequired(),
 
                         Forms\Components\Group::make(function (Forms\Get $get) {
@@ -524,6 +526,7 @@ class RecurringInvoice extends Model
                             if ($endType?->isAfter()) {
                                 $components[] = Forms\Components\TextInput::make('max_occurrences')
                                     ->numeric()
+                                    ->suffix('invoices')
                                     ->live();
                             }
 
@@ -534,23 +537,18 @@ class RecurringInvoice extends Model
 
                             return [
                                 Cluster::make($components)
-                                    ->label('Ends')
+                                    ->label('Schedule Ends')
                                     ->required()
                                     ->markAsRequired(false),
                             ];
                         }),
-                    ])
-                    ->columns(2),
 
-                CustomSection::make('Time Zone')
-                    ->contained(false)
-                    ->columns(2)
-                    ->schema([
                         Forms\Components\Select::make('timezone')
                             ->options(Timezone::getTimezoneOptions(CompanyProfile::first()->country))
                             ->searchable()
                             ->softRequired(),
-                    ]),
+                    ])
+                    ->columns(2),
             ])
             ->action(function (self $record, array $data, MountableAction $action) {
                 $record->update($data);

app/View/Models/DocumentPreviewViewModel.php

@@ -1,125 +0,0 @@
-<?php
-
-namespace App\View\Models;
-
-use App\Enums\Accounting\DocumentType;
-use App\Models\Accounting\DocumentLineItem;
-use App\Models\Common\Client;
-use App\Models\Company;
-use App\Models\Setting\DocumentDefault;
-use App\Utilities\Currency\CurrencyAccessor;
-use App\Utilities\Currency\CurrencyConverter;
-use Illuminate\Database\Eloquent\Model;
-
-class DocumentPreviewViewModel
-{
-    public function __construct(
-        public Model $document,
-        public DocumentType $documentType = DocumentType::Invoice,
-    ) {}
-
-    public function buildViewData(): array
-    {
-        return [
-            'company' => $this->getCompanyDetails(),
-            'client' => $this->getClientDetails(),
-            'metadata' => $this->getDocumentMetadata(),
-            'lineItems' => $this->getLineItems(),
-            'totals' => $this->getTotals(),
-            'header' => $this->document->header,
-            'footer' => $this->document->footer,
-            'terms' => $this->document->terms,
-            'logo' => $this->document->logo,
-            'style' => $this->getStyle(),
-            'labels' => $this->documentType->getLabels(),
-        ];
-    }
-
-    private function getCompanyDetails(): array
-    {
-        /** @var Company $company */
-        $company = $this->document->company;
-        $profile = $company->profile;
-
-        return [
-            'name' => $company->name,
-            'address' => $profile->address ?? '',
-            'city' => $profile->city?->name ?? '',
-            'state' => $profile->state?->name ?? '',
-            'zip_code' => $profile->zip_code ?? '',
-            'country' => $profile->state?->country->name ?? '',
-        ];
-    }
-
-    private function getClientDetails(): array
-    {
-        /** @var Client $client */
-        $client = $this->document->client;
-        $address = $client->billingAddress ?? null;
-
-        return [
-            'name' => $client->name,
-            'address_line_1' => $address->address_line_1 ?? '',
-            'address_line_2' => $address->address_line_2 ?? '',
-            'city' => $address->city ?? '',
-            'state' => $address->state ?? '',
-            'postal_code' => $address->postal_code ?? '',
-            'country' => $address->country ?? '',
-        ];
-    }
-
-    private function getDocumentMetadata(): array
-    {
-        $number = match ($this->documentType) {
-            DocumentType::Invoice => $this->document->invoice_number,
-            DocumentType::RecurringInvoice => 'Auto-generated',
-            DocumentType::Bill => $this->document->bill_number,
-            DocumentType::Estimate => $this->document->estimate_number,
-        };
-
-        return [
-            'number' => $number,
-            'reference_number' => $this->document->order_number ?? $this->document->reference_number,
-            'date' => $this->document->date?->toDefaultDateFormat() ?? $this->document->calculateNextDate()?->toDefaultDateFormat(),
-            'due_date' => $this->document->due_date?->toDefaultDateFormat() ?? $this->document->expiration_date?->toDefaultDateFormat() ?? $this->document->calculateNextDueDate()?->toDefaultDateFormat(),
-            'currency_code' => $this->document->currency_code ?? CurrencyAccessor::getDefaultCurrency(),
-        ];
-    }
-
-    private function getLineItems(): array
-    {
-        $currencyCode = $this->document->currency_code ?? CurrencyAccessor::getDefaultCurrency();
-
-        return $this->document->lineItems->map(fn (DocumentLineItem $item) => [
-            'name' => $item->offering->name ?? '',
-            'description' => $item->description ?? '',
-            'quantity' => $item->quantity,
-            'unit_price' => CurrencyConverter::formatToMoney($item->unit_price, $currencyCode),
-            'subtotal' => CurrencyConverter::formatToMoney($item->subtotal, $currencyCode),
-        ])->toArray();
-    }
-
-    private function getTotals(): array
-    {
-        $currencyCode = $this->document->currency_code ?? CurrencyAccessor::getDefaultCurrency();
-
-        return [
-            'subtotal' => CurrencyConverter::formatToMoney($this->document->subtotal, $currencyCode),
-            'discount' => CurrencyConverter::formatToMoney($this->document->discount_total, $currencyCode),
-            'tax' => CurrencyConverter::formatToMoney($this->document->tax_total, $currencyCode),
-            'total' => CurrencyConverter::formatToMoney($this->document->total, $currencyCode),
-            'amount_due' => $this->document->amount_due ? CurrencyConverter::formatToMoney($this->document->amount_due, $currencyCode) : CurrencyConverter::formatToMoney($this->document->total, $currencyCode),
-        ];
-    }
-
-    private function getStyle(): array
-    {
-        /** @var DocumentDefault $settings */
-        $settings = $this->document->company->defaultInvoice;
-
-        return [
-            'accent_color' => $settings->accent_color ?? '#000000',
-            'show_logo' => $settings->show_logo ?? false,
-        ];
-    }
-}

composer.json

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

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "095bb4040f9910ddd128bd53c0670a55",
+    "content-hash": "decc627f2a7bd0c6546114ebb1f500f9",
     "packages": [
         {
             "name": "akaunting/laravel-money",
@@ -6551,6 +6551,75 @@
             ],
             "time": "2024-12-30T13:13:39+00:00"
         },
+        {
+            "name": "spatie/laravel-view-models",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/spatie/laravel-view-models.git",
+                "reference": "c8c74e26e2cc78d04e581867ce74c8b772279015"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/spatie/laravel-view-models/zipball/c8c74e26e2cc78d04e581867ce74c8b772279015",
+                "reference": "c8c74e26e2cc78d04e581867ce74c8b772279015",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
+                "php": "^7.3|^8.0"
+            },
+            "require-dev": {
+                "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
+                "pestphp/pest": "^1.22|^2.34"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "Spatie\\ViewModels\\Providers\\ViewModelsServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Spatie\\ViewModels\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brent Roose",
+                    "email": "brent@spatie.be",
+                    "homepage": "https://spatie.be",
+                    "role": "Developer"
+                }
+            ],
+            "description": "View models in Laravel",
+            "homepage": "https://github.com/spatie/laravel-view-models",
+            "keywords": [
+                "laravel-view-models",
+                "spatie"
+            ],
+            "support": {
+                "issues": "https://github.com/spatie/laravel-view-models/issues",
+                "source": "https://github.com/spatie/laravel-view-models/tree/1.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://spatie.be/open-source/support-us",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/spatie",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-13T17:58:20+00:00"
+        },
         {
             "name": "squirephp/model",
             "version": "v3.7.0",
@@ -13398,7 +13467,7 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
@@ -13406,6 +13475,6 @@
         "ext-bcmath": "*",
         "ext-intl": "*"
     },
-    "platform-dev": [],
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }

resources/css/filament/company/custom-data-table.css

@@ -0,0 +1,27 @@
+.es-table__header-ctn, .es-table__footer-ctn {
+    @apply divide-y divide-gray-200 dark:divide-white/10 min-h-12;
+}
+
+.es-table .es-table__rowgroup td:first-child {
+    padding-left: 3rem;
+}
+
+.es-table .es-table__rowgroup .es-table__row > td:nth-child(2) {
+    word-wrap: break-word;
+    word-break: break-word;
+    white-space: normal;
+}
+
+.es-table .es-table__rowgroup .es-table__row > td:nth-child(3) {
+    word-wrap: break-word;
+    word-break: break-word;
+    white-space: normal;
+}
+
+.es-table .es-table__rowgroup .es-table__row > td:nth-child(4) {
+    white-space: nowrap;
+}
+
+.es-table .es-table__rowgroup .es-table__row > td:last-child {
+    padding-right: 3rem;
+}

resources/css/filament/company/custom-section.css

@@ -0,0 +1,125 @@
+.fi-custom-section {
+    &:not(.fi-section-not-contained) {
+        & .fi-section-content {
+            @apply p-6;
+        }
+
+        & .fi-section-footer {
+            @apply border-t border-gray-200 px-6 py-4 dark:border-white/10;
+        }
+
+        &:not(.fi-aside) {
+            @apply rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10;
+
+            & .fi-section-header {
+                @apply px-6 py-4;
+            }
+
+            &.fi-section-has-header {
+                & .fi-section-content-ctn {
+                    @apply border-t border-gray-200 dark:border-white/10;
+                }
+            }
+        }
+
+        &.fi-aside {
+            & .fi-section-content-ctn {
+                @apply rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10 md:col-span-2;
+            }
+        }
+
+        &.fi-compact {
+            &:not(.fi-aside) {
+                & .fi-section-header {
+                    @apply px-4 py-2.5;
+                }
+            }
+
+            & .fi-section-content {
+                @apply p-4;
+            }
+
+            & .fi-section-footer {
+                @apply px-4 py-2.5;
+            }
+        }
+    }
+
+    &.fi-section-not-contained:not(.fi-aside) {
+        @apply grid gap-y-4;
+
+        & .fi-section-header {
+            @apply py-2;
+        }
+
+        & .fi-section-content-ctn {
+            @apply grid gap-y-4;
+        }
+
+        &.fi-compact {
+            @apply gap-y-2.5;
+
+            & .fi-section-content-ctn {
+                @apply gap-y-2.5;
+            }
+        }
+    }
+
+    &.fi-aside {
+        @apply grid grid-cols-1 items-start gap-x-6 gap-y-4 md:grid-cols-3;
+    }
+
+    &.fi-collapsible {
+        & .fi-section-header {
+            @apply cursor-pointer;
+        }
+    }
+
+    &.fi-collapsed {
+        & .fi-section-collapse-btn {
+            @apply rotate-180;
+        }
+
+        & .fi-section-content-ctn {
+            @apply invisible absolute h-0 overflow-hidden border-none;
+        }
+    }
+
+    &.fi-section-has-content-before {
+        & .fi-section-content-ctn {
+            @apply md:order-first;
+        }
+    }
+
+    & .fi-section-header {
+        @apply flex items-center gap-3;
+    }
+
+    & .fi-section-header-icon {
+        @apply size-6 self-start text-gray-400 dark:text-gray-500;
+
+        &.fi-color-custom {
+            @apply text-custom-500 dark:text-custom-400;
+        }
+
+        &.fi-size-sm {
+            @apply mt-1 size-4;
+        }
+
+        &.fi-size-md {
+            @apply mt-0.5 size-5;
+        }
+    }
+
+    & .fi-section-header-text-ctn {
+        @apply grid flex-1 gap-y-1;
+    }
+
+    & .fi-section-header-heading {
+        @apply text-base font-semibold leading-6 text-gray-950 dark:text-white;
+    }
+
+    & .fi-section-header-description {
+        @apply overflow-hidden break-words text-sm text-gray-500 dark:text-gray-400;
+    }
+}

resources/css/filament/company/form-fields.css

@@ -0,0 +1,92 @@
+/* Filament Repeater Styles */
+.fi-fo-repeater.uncontained .fi-fo-repeater-item {
+    @apply divide-y-0 rounded-none bg-none shadow-none ring-0 ring-gray-950/5 dark:divide-white/10 dark:bg-white/5 dark:ring-white/10;
+
+    .fi-fo-repeater-item-header {
+        @apply px-0;
+
+        > h4 {
+            @apply text-base font-semibold leading-6 text-gray-950 dark:text-white;
+        }
+    }
+
+    .fi-fo-repeater-item-content {
+        @apply py-4 px-0;
+    }
+}
+
+.fi-fo-repeater-item {
+    @apply divide-y divide-gray-200 rounded-xl bg-white dark:bg-gray-900;
+}
+
+/* Report Field Styles */
+.fi-fo-field-wrp.report-hidden-label > div.grid.gap-y-2 > div.flex.items-center {
+    @apply hidden;
+}
+
+.fi-fo-field-wrp.report-hidden-label {
+    @apply lg:mt-8;
+}
+
+/* Choices.js select field overrides */
+.choices__list.choices__list--single {
+    @apply w-full;
+}
+
+.choices:focus-visible {
+    outline: none;
+}
+
+.choices__group {
+    @apply text-gray-900 dark:text-white font-semibold;
+}
+
+.choices[data-type="select-one"] .choices__inner {
+    line-height: 1.5;
+    display: flex;
+    align-items: center;
+    min-height: 2.25rem;
+    box-sizing: border-box;
+}
+
+.choices:not(.is-disabled) .choices__item {
+    cursor: pointer;
+}
+
+/* Table Repeater Styles */
+.table-repeater-container {
+    @apply rounded-none ring-0;
+}
+
+.table-repeater-component {
+    @apply space-y-10;
+}
+
+.table-repeater-component ul {
+    @apply justify-start;
+}
+
+.table-repeater-row {
+    @apply divide-x-0 !important;
+}
+
+.table-repeater-column {
+    @apply py-2 !important;
+}
+
+.table-repeater-header {
+    @apply rounded-t-none !important;
+}
+
+.table-repeater-rows-wrapper {
+    @apply divide-gray-300 last:border-b last:border-gray-300 dark:divide-white/20 dark:last:border-white/20;
+}
+
+.table-repeater-header tr {
+    @apply divide-x-0 text-base sm:text-sm sm:leading-6 !important;
+}
+
+.table-repeater-header-column {
+    @apply ps-3 pe-3 font-semibold bg-gray-200 dark:bg-gray-800 rounded-none !important;
+}
+

resources/css/filament/company/modal.css

@@ -0,0 +1,18 @@
+/* Journal Entry Modal Styles */
+.fi-modal.fi-width-screen {
+    .fi-modal-header {
+        @apply xl:px-80;
+
+        .absolute.end-4.top-4 {
+            @apply xl:end-80;
+        }
+    }
+
+    .fi-modal-content {
+        @apply xl:px-80;
+    }
+
+    .fi-modal-footer {
+        @apply xl:px-80;
+    }
+}

resources/css/filament/company/report-card.css

@@ -0,0 +1,15 @@
+.es-report-card {
+    @apply md:!grid-cols-2;
+
+    .fi-fo-component-ctn {
+        @apply divide-y divide-gray-200 dark:divide-white/10 !gap-0;
+    }
+
+    .fi-section-content-ctn {
+        @apply md:!col-span-1;
+    }
+
+    .fi-section-content {
+        @apply !p-0;
+    }
+}

resources/css/filament/company/theme.css

@@ -1,163 +1,23 @@
 @import '/vendor/filament/filament/resources/css/theme.css';
-@import 'tooltip.css';
 @import '/vendor/awcodes/filament-table-repeater/resources/css/plugin.css';
+@import 'custom-data-table.css';
+@import 'custom-section.css';
+@import 'form-fields.css';
+@import 'modal.css';
+@import 'report-card.css';
+@import 'tooltip.css';
+@import 'top-navigation.css';
 
 @config 'tailwind.config.js';
 
-.fi-fo-repeater.uncontained .fi-fo-repeater-item {
-    @apply divide-y-0 rounded-none bg-none shadow-none ring-0 ring-gray-950/5 dark:divide-white/10 dark:bg-white/5 dark:ring-white/10;
-
-    .fi-fo-repeater-item-header {
-        @apply px-0;
-
-        > h4 {
-            @apply text-base font-semibold leading-6 text-gray-950 dark:text-white;
-        }
-    }
-
-    .fi-fo-repeater-item-content {
-        @apply py-4 px-0;
-    }
-}
-
-.fi-fo-field-wrp.report-hidden-label > div.grid.gap-y-2 > div.flex.items-center {
-    @apply hidden;
-}
-
-.fi-fo-repeater-item {
-    @apply divide-y divide-gray-200 rounded-xl bg-white dark:bg-gray-900;
-}
-
-.fi-fo-field-wrp.report-hidden-label {
-    @apply lg:mt-8;
-}
-
-.choices__list.choices__list--single {
-    @apply w-full;
-}
-
-.choices:focus-visible {
-    outline: none;
-}
-
-.choices__group {
-    @apply text-gray-900 dark:text-white font-semibold;
-}
-
-.choices[data-type="select-one"] .choices__inner {
-    line-height: 1.5;
-    display: flex;
-    align-items: center;
-    min-height: 2.25rem;
-    box-sizing: border-box;
-}
-
-.choices:not(.is-disabled) .choices__item {
-    cursor: pointer;
-}
-
-.table-repeater-container {
-    @apply rounded-none ring-0;
-}
-
-.table-repeater-component {
-    @apply space-y-10;
-}
-
-.table-repeater-component ul {
-    @apply justify-start;
-}
-
-.table-repeater-row {
-    @apply divide-x-0 !important;
-}
-
-.table-repeater-column {
-    @apply py-2 !important;
-}
-
-.table-repeater-header {
-    @apply rounded-t-none !important;
-}
-
-.table-repeater-rows-wrapper {
-    @apply divide-gray-300 last:border-b last:border-gray-300 dark:divide-white/20 dark:last:border-white/20;
-}
-
-.table-repeater-header tr {
-    @apply divide-x-0 text-base sm:text-sm sm:leading-6 !important;
-}
-
-.table-repeater-header-column {
-    @apply ps-3 pe-3 font-semibold bg-gray-200 dark:bg-gray-800 rounded-none !important;
-}
-
-.es-report-card {
-    @apply md:!grid-cols-2;
-
-    .fi-fo-component-ctn {
-        @apply divide-y divide-gray-200 dark:divide-white/10 !gap-0;
-    }
-
-    .fi-section-content-ctn {
-        @apply md:!col-span-1;
-    }
-
-    .fi-section-content {
-        @apply !p-0;
-    }
-}
-
-.fi-modal.fi-width-screen {
-    .fi-modal-header {
-        @apply xl:px-80;
-
-        .absolute.end-4.top-4 {
-            @apply xl:end-80;
-        }
-    }
-
-    .fi-modal-content {
-        @apply xl:px-80;
-    }
-
-    .fi-modal-footer {
-        @apply xl:px-80;
-    }
-}
-
-.es-table__header-ctn, .es-table__footer-ctn {
-    @apply divide-y divide-gray-200 dark:divide-white/10 min-h-12;
-}
-
-.es-table .es-table__rowgroup td:first-child {
-    padding-left: 3rem;
-}
-
-.es-table .es-table__rowgroup .es-table__row > td:nth-child(2) {
-    word-wrap: break-word;
-    word-break: break-word;
-    white-space: normal;
-}
-
-.es-table .es-table__rowgroup .es-table__row > td:nth-child(3) {
-    word-wrap: break-word;
-    word-break: break-word;
-    white-space: normal;
-}
-
-.es-table .es-table__rowgroup .es-table__row > td:nth-child(4) {
-    white-space: nowrap;
-}
-
-.es-table .es-table__rowgroup .es-table__row > td:last-child {
-    padding-right: 3rem;
-}
-
 .fi-ta-empty-state-icon-ctn {
     @apply bg-platinum;
 }
 
+.fi-badge {
+    display: inline-flex;
+}
+
 :not(.dark) .fi-body {
     position: relative;
     background-color: #E8E9EB;
@@ -180,28 +40,3 @@
     pointer-events: none;
     z-index: -1;
 }
-
-.fi-topbar > nav, .fi-sidebar-header {
-    @apply bg-transparent ring-0 shadow-none !important;
-    transition: background-color 0.3s, top 0.3s;
-}
-
-.fi-topbar > nav.topbar-hovered, .fi-sidebar-header.topbar-hovered {
-    background-color: rgba(255, 255, 255, 0.75) !important;
-}
-
-:is(.dark .fi-topbar > nav.topbar-hovered, .dark .fi-sidebar-header.topbar-hovered) {
-    @apply bg-gray-900/75 !important;
-}
-
-.fi-topbar > nav.topbar-scrolled, .fi-sidebar-header.topbar-scrolled {
-    background-color: rgba(255, 255, 255, 0.5) !important;
-}
-
-:is(.dark .fi-topbar > nav.topbar-scrolled, .dark .fi-sidebar-header.topbar-scrolled) {
-    @apply bg-gray-900/50 !important;
-}
-
-.fi-badge {
-    display: inline-flex;
-}

resources/css/filament/company/top-navigation.css

@@ -0,0 +1,20 @@
+.fi-topbar > nav, .fi-sidebar-header {
+    @apply bg-transparent ring-0 shadow-none !important;
+    transition: background-color 0.3s, top 0.3s;
+}
+
+.fi-topbar > nav.topbar-hovered, .fi-sidebar-header.topbar-hovered {
+    background-color: rgba(255, 255, 255, 0.75) !important;
+}
+
+:is(.dark .fi-topbar > nav.topbar-hovered, .dark .fi-sidebar-header.topbar-hovered) {
+    @apply bg-gray-900/75 !important;
+}
+
+.fi-topbar > nav.topbar-scrolled, .fi-sidebar-header.topbar-scrolled {
+    background-color: rgba(255, 255, 255, 0.5) !important;
+}
+
+:is(.dark .fi-topbar > nav.topbar-scrolled, .dark .fi-sidebar-header.topbar-scrolled) {
+    @apply bg-gray-900/50 !important;
+}

resources/data/lang/en.json

@@ -222,5 +222,6 @@
     "Approve": "Approve",
     "Frequency": "Frequency",
     "Schedule Bounds": "Schedule Bounds",
-    "Time Zone": "Time Zone"
+    "Time Zone": "Time Zone",
+    "Dates & Time": "Dates & Time"
 }

resources/views/components/custom-section.blade.php

@@ -66,10 +66,13 @@
     @endif
     {{
         $attributes->class([
-            'fi-section',
-            'fi-aside grid grid-cols-1 items-start gap-x-6 gap-y-4 md:grid-cols-3' => $aside && $contained,
-            'fi-aside grid grid-cols-1 items-start gap-x-6 gap-y-4 md:grid-cols-3 pt-4' => $aside && ! $contained,
-            'rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10' => $contained && ! $aside,
+            'fi-custom-section',
+            'fi-section-not-contained' => ! $contained,
+            'fi-section-has-content-before' => $contentBefore,
+            'fi-section-has-header' => $hasHeader,
+            'fi-aside' => $aside,
+            'fi-compact' => $compact,
+            'fi-collapsible' => $collapsible,
         ])
     }}
 >
@@ -78,31 +81,20 @@
             @if ($collapsible)
                 x-on:click="isCollapsed = ! isCollapsed"
             @endif
-            @class([
-                'fi-section-header flex flex-col gap-3',
-                'cursor-pointer' => $collapsible,
-                'px-6 py-4' => $contained && ! $aside,
-                'px-4 py-2.5' => $compact && ! $aside,
-                'py-4' => ! $compact && ! $aside,
-            ])
+            class="fi-section-header"
         >
             <div class="flex items-center gap-3">
                 @if ($hasIcon)
                     <x-filament::icon
                         :icon="$icon"
                         @class([
-                            'fi-section-header-icon self-start',
+                            'fi-section-header-icon',
                             match ($iconColor) {
-                                'gray' => 'text-gray-400 dark:text-gray-500',
-                                default => 'fi-color-custom text-custom-500 dark:text-custom-400',
+                                'gray' => null,
+                                default => 'fi-color-custom',
                             },
                             is_string($iconColor) ? "fi-color-{$iconColor}" : null,
-                            match ($iconSize) {
-                                IconSize::Small, 'sm' => 'h-4 w-4 mt-1',
-                                IconSize::Medium, 'md' => 'h-5 w-5 mt-0.5',
-                                IconSize::Large, 'lg' => 'h-6 w-6',
-                                default => $iconSize,
-                            },
+                            ($iconSize instanceof IconSize) ? "fi-size-{$iconSize->value}" : (is_string($iconSize) ? $iconSize : null),
                         ])
                         @style([
                             \Filament\Support\get_color_css_variables(
@@ -115,7 +107,7 @@
                 @endif
 
                 @if ($hasHeading || $hasDescription)
-                    <div class="grid flex-1 gap-y-1">
+                    <div class="fi-section-header-text-ctn">
                         @if ($hasHeading)
                             <x-filament::section.heading>
                                 {{ $heading }}
@@ -171,37 +163,15 @@
             @if ($collapsed || $persistCollapsed)
                 x-cloak
             @endif
-            x-bind:class="{ 'invisible h-0 overflow-y-hidden border-none': isCollapsed }"
         @endif
-        @class([
-            'fi-section-content-ctn',
-            'border-t border-gray-200 dark:border-white/10' => $hasHeader && ! $aside && $contained,
-            'rounded-xl bg-white shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10 md:col-span-2' => $aside && $contained,
-            'md:col-span-2' => $aside && ! $contained,
-            'md:order-first' => $contentBefore,
-        ])
+        class="fi-section-content-ctn"
     >
-        <div
-            @class([
-                'fi-section-content',
-                'pt-4' => ! $contained && ! $aside,
-                'p-4' => $compact && $contained,
-                'p-6' => ! $compact && $contained,
-            ])
-        >
+        <div class="fi-section-content">
             {{ $slot }}
         </div>
 
         @if ($hasFooterActions)
-            <footer
-                @class([
-                    'fi-section-footer',
-                    'border-t border-gray-200 dark:border-white/10' => $contained,
-                    'mt-6' => ! $contained,
-                    'px-6 py-4' => ! $compact && $contained,
-                    'px-4 py-2.5' => $compact && $contained,
-                ])
-            >
+            <footer class="fi-section-footer">
                 <x-filament::actions
                     :actions="$footerActions"
                     :alignment="$footerActionsAlignment"

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

@@ -1,10 +1,5 @@
 @php
-    use App\View\Models\DocumentPreviewViewModel;
-    use App\Enums\Accounting\DocumentType;
-
-    $type = $getType();
-    $viewModel = new DocumentPreviewViewModel($getRecord(), $type);
-    extract($viewModel->buildViewData(), EXTR_SKIP);
+    $document = \App\DTO\DocumentDTO::fromModel($getRecord());
 @endphp
 
 <div {{ $attributes }}>
@@ -13,16 +8,16 @@
         <x-company.invoice.header class="bg-gray-800 h-24">
             <!-- Logo -->
             <div class="w-2/3">
-                @if($logo && $style['show_logo'])
-                    <x-company.invoice.logo class="ml-8" :src="$logo"/>
+                @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: {{ $style['accent_color'] }};">
-                @if($header)
-                    <h1 class="text-4xl font-bold text-white text-center uppercase">{{ $header }}</h1>
+                 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>
@@ -30,12 +25,11 @@
         <!-- Company Details -->
         <x-company.invoice.metadata class="modern-template-metadata space-y-8">
             <div class="text-sm">
-                <h2 class="text-lg font-semibold">{{ $company['name'] }}</h2>
-                @if($company['address'] && $company['city'] && $company['state'] && $company['zip_code'])
-                    <p>{{ $company['address'] }}</p>
-                    <p>{{ $company['city'] }}
-                        , {{ $company['state'] }} {{ $company['zip_code'] }}</p>
-                    <p>{{ $company['country'] }}</p>
+                <h2 class="text-lg font-semibold">{{ $document->company->name }}</h2>
+                @if($document->company->address && $document->company->city && $document->company->state && $document->company->zipCode)
+                    <p>{{ $document->company->address }}</p>
+                    <p>{{ $document->company->city }}, {{ $document->company->state }} {{ $document->company->zipCode }}</p>
+                    <p>{{ $document->company->country }}</p>
                 @endif
             </div>
 
@@ -44,20 +38,20 @@
                 <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: {{ $style['accent_color'] }}">{{ $client['name'] }}</p>
+                       style="color: {{ $document->accentColor }}">{{ $document->client->name }}</p>
 
-                    @if($client['address_line_1'])
-                        <p>{{ $client['address_line_1'] }}</p>
+                    @if($document->client->addressLine1)
+                        <p>{{ $document->client->addressLine1 }}</p>
 
-                        @if($client['address_line_2'])
-                            <p>{{ $client['address_line_2'] }}</p>
+                        @if($document->client->addressLine2)
+                            <p>{{ $document->client->addressLine2 }}</p>
                         @endif
                         <p>
-                            {{ $client['city'] }}{{ $client['state'] ? ', ' . $client['state'] : '' }}
-                            {{ $client['postal_code'] }}
+                            {{ $document->client->city }}{{ $document->client->state ? ', ' . $document->client->state: '' }}
+                            {{ $document->client->postalCode }}
                         </p>
-                        @if($client['country'])
-                            <p>{{ $client['country'] }}</p>
+                        @if($document->client->country)
+                            <p>{{ $document->client->country }}</p>
                         @endif
                     @endif
                 </div>
@@ -66,22 +60,22 @@
                     <table class="min-w-full">
                         <tbody>
                         <tr>
-                            <td class="font-semibold text-right pr-2">{{ $labels['number'] }}:</td>
-                            <td class="text-left pl-2">{{ $metadata['number'] }}</td>
+                            <td class="font-semibold text-right pr-2">{{ $document->label->number }}:</td>
+                            <td class="text-left pl-2">{{ $document->number }}</td>
                         </tr>
-                        @if($metadata['reference_number'])
+                        @if($document->referenceNumber)
                             <tr>
-                                <td class="font-semibold text-right pr-2">{{ $labels['reference_number'] }}:</td>
-                                <td class="text-left pl-2">{{ $metadata['reference_number'] }}</td>
+                                <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">{{ $labels['date'] }}:</td>
-                            <td class="text-left pl-2">{{ $metadata['date'] }}</td>
+                            <td class="font-semibold text-right pr-2">{{ $document->label->date }}:</td>
+                            <td class="text-left pl-2">{{ $document->date }}</td>
                         </tr>
                         <tr>
-                            <td class="font-semibold text-right pr-2">{{ $labels['due_date'] }}:</td>
-                            <td class="text-left pl-2">{{ $metadata['due_date'] }}</td>
+                            <td class="font-semibold text-right pr-2">{{ $document->label->dueDate }}:</td>
+                            <td class="text-left pl-2">{{ $document->dueDate }}</td>
                         </tr>
                         </tbody>
                     </table>
@@ -101,17 +95,17 @@
                 </tr>
                 </thead>
                 <tbody class="text-sm tracking-tight border-y-2">
-                @foreach($lineItems as $index => $item)
+                @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>
+                            {{ $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['unit_price'] }}</td>
-                        <td class="text-right pr-6 py-3">{{ $item['subtotal'] }}</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>
@@ -119,36 +113,36 @@
                 <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">{{ $totals['subtotal'] }}</td>
+                    <td class="text-right pr-6 py-2">{{ $document->subtotal }}</td>
                 </tr>
-                @if($totals['discount'])
+                @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">
-                            ({{ $totals['discount'] }})
+                            ({{ $document->discount }})
                         </td>
                     </tr>
                 @endif
-                @if($totals['tax'])
+                @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">{{ $totals['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">{{ $totals['total'] }}</td>
+                    <td class="text-right border-t pr-6 py-2">{{ $document->total }}</td>
                 </tr>
-                @if($totals['amount_due'])
+                @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">{{ $labels['amount_due'] }}
-                            ({{ $metadata['currency_code'] }}):
+                        <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">{{ $totals['amount_due'] }}</td>
+                        <td class="text-right border-t-4 border-double pr-6 py-2">{{ $document->amountDue }}</td>
                     </tr>
                 @endif
                 </tfoot>
@@ -157,13 +151,13 @@
 
         <!-- Footer Notes -->
         <x-company.invoice.footer class="modern-template-footer tracking-tight">
-            <h4 class="font-semibold px-6 text-sm" style="color: {{ $style['accent_color'] }}">
+            <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">{{ $terms }}</p>
-                <p class="w-1/2 break-words line-clamp-4">{{ $footer }}</p>
+                <p class="w-1/2 break-words line-clamp-4">{{ $document->terms }}</p>
+                <p class="w-1/2 break-words line-clamp-4">{{ $document->footer }}</p>
             </div>
         </x-company.invoice.footer>
     </x-company.invoice.container>