wip

app/DTO/ClientPreviewDTO.php

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

app/DTO/DocumentColumnLabelDTO.php

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

app/DTO/DocumentDTO.php

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

app/DTO/DocumentPreviewDTO.php

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

app/DTO/LineItemDTO.php

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

app/DTO/LineItemPreviewDTO.php

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

app/Enums/Concerns/ParsesEnum.php

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

app/Enums/Setting/PaymentTerms.php

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

app/Models/Setting/DocumentDefault.php

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

app/View/Models/InvoiceViewModel.php

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

composer.json

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

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "decc627f2a7bd0c6546114ebb1f500f9",
+    "content-hash": "095bb4040f9910ddd128bd53c0670a55",
     "packages": [
         {
             "name": "akaunting/laravel-money",
@@ -6491,16 +6491,16 @@
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.18.0",
+            "version": "1.18.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "8332205b90d17164913244f4a8e13ab7e6761d29"
+                "reference": "d41c44a7eab604c3eb0cad93210612d4c1429c20"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/8332205b90d17164913244f4a8e13ab7e6761d29",
-                "reference": "8332205b90d17164913244f4a8e13ab7e6761d29",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/d41c44a7eab604c3eb0cad93210612d4c1429c20",
+                "reference": "d41c44a7eab604c3eb0cad93210612d4c1429c20",
                 "shasum": ""
             },
             "require": {
@@ -6539,7 +6539,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.0"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.18.2"
             },
             "funding": [
                 {
@@ -6547,76 +6547,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-30T13:13:39+00:00"
-        },
-        {
-            "name": "spatie/laravel-view-models",
-            "version": "1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/spatie/laravel-view-models.git",
-                "reference": "c8c74e26e2cc78d04e581867ce74c8b772279015"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-view-models/zipball/c8c74e26e2cc78d04e581867ce74c8b772279015",
-                "reference": "c8c74e26e2cc78d04e581867ce74c8b772279015",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/support": "^8.0|^9.0|^10.0|^11.0",
-                "php": "^7.3|^8.0"
-            },
-            "require-dev": {
-                "orchestra/testbench": "^6.23|^7.0|^8.0|^9.0",
-                "pestphp/pest": "^1.22|^2.34"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "Spatie\\ViewModels\\Providers\\ViewModelsServiceProvider"
-                    ]
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Spatie\\ViewModels\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Brent Roose",
-                    "email": "brent@spatie.be",
-                    "homepage": "https://spatie.be",
-                    "role": "Developer"
-                }
-            ],
-            "description": "View models in Laravel",
-            "homepage": "https://github.com/spatie/laravel-view-models",
-            "keywords": [
-                "laravel-view-models",
-                "spatie"
-            ],
-            "support": {
-                "issues": "https://github.com/spatie/laravel-view-models/issues",
-                "source": "https://github.com/spatie/laravel-view-models/tree/1.6.0"
-            },
-            "funding": [
-                {
-                    "url": "https://spatie.be/open-source/support-us",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/spatie",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-03-13T17:58:20+00:00"
+            "time": "2025-01-20T14:14:17+00:00"
         },
         {
             "name": "squirephp/model",

package-lock.json

@@ -1235,9 +1235,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.83",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.83.tgz",
-            "integrity": "sha512-LcUDPqSt+V0QmI47XLzZrz5OqILSMGsPFkDYus22rIbgorSvBYEFqq854ltTmUdHkY92FSdAAvsh4jWEULMdfQ==",
+            "version": "1.5.84",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.84.tgz",
+            "integrity": "sha512-I+DQ8xgafao9Ha6y0qjHHvpZ9OfyA1qKlkHkjywxzniORU2awxyz7f/iVJcULmrF2yrM3nHQf+iDjJtbbexd/g==",
             "dev": true,
             "license": "ISC"
         },
@@ -2624,9 +2624,9 @@
             "license": "MIT"
         },
         "node_modules/vite": {
-            "version": "6.0.7",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.7.tgz",
-            "integrity": "sha512-RDt8r/7qx9940f8FcOIAH9PTViRrghKaK2K1jY3RaAURrEUbm9Du1mJ72G+jlhtG3WwodnfzY8ORQZbBavZEAQ==",
+            "version": "6.0.10",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.10.tgz",
+            "integrity": "sha512-MEszunEcMo6pFsfXN1GhCFQqnE25tWRH0MA4f0Q7uanACi4y1Us+ZGpTMnITwCTnYzB2b9cpmnelTlxgTBmaBA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {

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

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

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

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

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

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

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

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