wip

app/DTO/DocumentDTO.php

@@ -2,6 +2,7 @@
 
 namespace App\DTO;
 
+use App\Enums\Accounting\DocumentType;
 use App\Enums\Setting\Font;
 use App\Models\Accounting\Document;
 use App\Models\Setting\DocumentDefault;
@@ -30,7 +31,7 @@ readonly class DocumentDTO
         public ?string $discount,
         public ?string $tax,
         public string $total,
-        public string $amountDue,
+        public ?string $amountDue,
         public CompanyDTO $company,
         public ClientDTO $client,
         public iterable $lineItems,
@@ -50,14 +51,21 @@ readonly class DocumentDTO
 
         $currencyCode = $document->currency_code ?? CurrencyAccessor::getDefaultCurrency();
 
-        $discount = $document->discount_total > 0 ? self::formatToMoney($document->discount_total, $currencyCode) : null;
-        $tax = $document->tax_total > 0 ? self::formatToMoney($document->tax_total, $currencyCode) : null;
+        $discount = $document->discount_total > 0
+            ? self::formatToMoney($document->discount_total, $currencyCode)
+            : null;
 
-        if (! $discount && ! $tax) {
-            $subtotal = null;
-        } else {
-            $subtotal = self::formatToMoney($document->subtotal, $currencyCode);
-        }
+        $tax = $document->tax_total > 0
+            ? self::formatToMoney($document->tax_total, $currencyCode)
+            : null;
+
+        $subtotal = ($discount || $tax)
+            ? self::formatToMoney($document->subtotal, $currencyCode)
+            : null;
+
+        $amountDue = $document::documentType() !== DocumentType::Estimate ?
+            self::formatToMoney($document->amountDue(), $currencyCode) :
+            null;
 
         return new self(
             header: $document->header,
@@ -74,7 +82,7 @@ readonly class DocumentDTO
             discount: $discount,
             tax: $tax,
             total: self::formatToMoney($document->total, $currencyCode),
-            amountDue: self::formatToMoney($document->amountDue(), $currencyCode),
+            amountDue: $amountDue,
             company: CompanyDTO::fromModel($document->company),
             client: ClientDTO::fromModel($document->client),
             lineItems: $document->lineItems->map(fn ($item) => LineItemDTO::fromModel($item)),

app/DTO/DocumentLabelDTO.php

@@ -10,7 +10,7 @@ readonly class DocumentLabelDTO
         public string $referenceNumber,
         public string $date,
         public string $dueDate,
-        public string $amountDue,
+        public ?string $amountDue,
     ) {}
 
     public function toArray(): array

app/DTO/DocumentPreviewDTO.php

@@ -2,6 +2,7 @@
 
 namespace App\DTO;
 
+use App\Enums\Accounting\DocumentType;
 use App\Enums\Setting\Font;
 use App\Enums\Setting\PaymentTerms;
 use App\Models\Setting\DocumentDefault;
@@ -15,6 +16,10 @@ readonly class DocumentPreviewDTO extends DocumentDTO
 
         $paymentTerms = PaymentTerms::parse($data['payment_terms']) ?? $settings->payment_terms;
 
+        $amountDue = $settings->type !== DocumentType::Estimate ?
+            self::formatToMoney('950', null) :
+            null;
+
         return new self(
             header: $data['header'] ?? $settings->header ?? 'Invoice',
             subheader: $data['subheader'] ?? $settings->subheader,
@@ -30,7 +35,7 @@ readonly class DocumentPreviewDTO extends DocumentDTO
             discount: self::formatToMoney('100', null),
             tax: self::formatToMoney('50', null),
             total: self::formatToMoney('950', null),
-            amountDue: self::formatToMoney('950', null),
+            amountDue: $amountDue,
             company: CompanyDTO::fromModel($company),
             client: ClientPreviewDTO::fake(),
             lineItems: LineItemPreviewDTO::fakeItems(),

app/Enums/Accounting/DocumentType.php

@@ -79,7 +79,7 @@ enum DocumentType: string implements HasIcon, HasLabel
                 referenceNumber: 'Reference Number',
                 date: 'Estimate Date',
                 dueDate: 'Expiration Date',
-                amountDue: 'Grand Total',
+                amountDue: null,
             ),
             self::Bill => new DocumentLabelDTO(
                 title: self::Bill->getLabel(),

app/View/Models/DocumentTotalViewModel.php

@@ -36,14 +36,36 @@ class DocumentTotalViewModel
 
         $conversionMessage = $this->buildConversionMessage($grandTotalInCents, $currencyCode, $defaultCurrencyCode);
 
+        $discountMethod = DocumentDiscountMethod::parse($this->data['discount_method']);
+        $isPerDocumentDiscount = $discountMethod->isPerDocument();
+
+        $taxTotal = $taxTotalInCents > 0
+            ? CurrencyConverter::formatCentsToMoney($taxTotalInCents, $currencyCode)
+            : null;
+
+        $discountTotal = ($isPerDocumentDiscount || $discountTotalInCents > 0)
+            ? CurrencyConverter::formatCentsToMoney($discountTotalInCents, $currencyCode)
+            : null;
+
+        $subtotal = ($taxTotal || $discountTotal)
+            ? CurrencyConverter::formatCentsToMoney($subtotalInCents, $currencyCode)
+            : null;
+
+        $grandTotal = CurrencyConverter::formatCentsToMoney($grandTotalInCents, $currencyCode);
+
+        $amountDue = $this->documentType !== DocumentType::Estimate
+            ? CurrencyConverter::formatCentsToMoney($amountDueInCents, $currencyCode)
+            : null;
+
         return [
-            'subtotal' => CurrencyConverter::formatCentsToMoney($subtotalInCents, $currencyCode),
-            'taxTotal' => CurrencyConverter::formatCentsToMoney($taxTotalInCents, $currencyCode),
-            'discountTotal' => CurrencyConverter::formatCentsToMoney($discountTotalInCents, $currencyCode),
-            'grandTotal' => CurrencyConverter::formatCentsToMoney($grandTotalInCents, $currencyCode),
-            'amountDue' => CurrencyConverter::formatCentsToMoney($amountDueInCents, $currencyCode),
+            'subtotal' => $subtotal,
+            'taxTotal' => $taxTotal,
+            'discountTotal' => $discountTotal,
+            'grandTotal' => $grandTotal,
+            'amountDue' => $amountDue,
             'currencyCode' => $currencyCode,
             'conversionMessage' => $conversionMessage,
+            'isPerDocumentDiscount' => $isPerDocumentDiscount,
         ];
     }
 

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

@@ -128,7 +128,7 @@
                         </tr>
                     @endif
                     <tr>
-                        <td class="text-right font-semibold border-t py-2">Total:</td>
+                        <td class="text-right font-semibold border-t py-2">{{ $document->amountDue ? 'Total' : 'Grand Total' }}:</td>
                         <td class="text-right border-t py-2">{{ $document->total }}</td>
                     </tr>
                     @if($document->amountDue)

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

@@ -115,7 +115,7 @@
             @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 font-semibold border-t py-2">{{ $document->amountDue ? 'Total' : 'Grand Total' }}:</td>
                 <td class="text-right border-t pr-6 py-2">{{ $document->total }}</td>
             </tr>
             @if($document->amountDue)

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

@@ -117,7 +117,7 @@
             @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 font-semibold border-t py-2">{{ $document->amountDue ? 'Total' : 'Grand Total' }}:</td>
                 <td class="text-right border-t pr-6 py-2">{{ $document->total }}</td>
             </tr>
             @if($document->amountDue)

resources/views/filament/forms/components/document-totals.blade.php

@@ -7,9 +7,6 @@
     $type = $getType();
     $viewModel = new DocumentTotalViewModel($data, $type);
     extract($viewModel->buildViewData(), EXTR_SKIP);
-
-    $discountMethod = DocumentDiscountMethod::parse($data['discount_method']);
-    $isPerDocumentDiscount = $discountMethod->isPerDocument();
 @endphp
 
 <div class="totals-summary w-full lg:pl-[4rem] lg:pr-[6rem] py-8 lg:py-0">
@@ -23,66 +20,78 @@
             <col class="w-[10%]"> {{-- Amount --}}
         </colgroup>
         <tbody>
+        @if($subtotal)
             <tr>
                 <td colspan="4"></td>
                 <td class="text-sm p-2 font-semibold text-gray-950 dark:text-white">Subtotal:</td>
                 <td class="text-sm p-2">{{ $subtotal }}</td>
             </tr>
+        @endif
+        @if($taxTotal)
             <tr>
                 <td colspan="4"></td>
                 <td class="text-sm p-2">Tax:</td>
                 <td class="text-sm p-2">{{ $taxTotal }}</td>
             </tr>
-            @if($isPerDocumentDiscount)
-                <tr>
-                    <td colspan="3" class="text-sm p-2">Discount:</td>
-                    <td colspan="2" class="text-sm p-2">
-                        <div class="flex justify-between space-x-2">
-                            @foreach($getChildComponentContainer()->getComponents() as $component)
-                                <div class="flex-1 text-left">{{ $component }}</div>
-                            @endforeach
-                        </div>
-                    </td>
-                    <td class="text-sm p-2">({{ $discountTotal }})</td>
-                </tr>
-            @else
-                <tr>
-                    <td colspan="4"></td>
-                    <td class="text-sm p-2">Discount:</td>
-                    <td class="text-sm p-2">({{ $discountTotal }})</td>
-                </tr>
-            @endif
+        @endif
+        @if($isPerDocumentDiscount)
+            <tr>
+                <td colspan="3" class="text-sm p-2">Discount:</td>
+                <td colspan="2" class="text-sm p-2">
+                    <div class="flex justify-between space-x-2">
+                        @foreach($getChildComponentContainer()->getComponents() as $component)
+                            <div class="flex-1 text-left">{{ $component }}</div>
+                        @endforeach
+                    </div>
+                </td>
+                <td class="text-sm p-2">({{ $discountTotal }})</td>
+            </tr>
+        @elseif($discountTotal)
             <tr>
                 <td colspan="4"></td>
-                <td class="text-sm p-2 font-semibold text-gray-950 dark:text-white">Total:</td>
-                <td class="text-sm p-2">{{ $grandTotal }}</td>
+                <td class="text-sm p-2">Discount:</td>
+                <td class="text-sm p-2">({{ $discountTotal }})</td>
             </tr>
+        @endif
+        <tr>
+            <td colspan="4"></td>
+            <td class="text-sm p-2 font-semibold text-gray-950 dark:text-white">{{ $amountDue ? 'Total' : 'Grand Total' }}:</td>
+            <td class="text-sm p-2">{{ $grandTotal }}</td>
+        </tr>
+        @if($amountDue)
             <tr>
                 <td colspan="4"></td>
-                <td class="text-sm p-2 font-semibold text-gray-950 dark:text-white border-t-4 border-double">Amount Due ({{ $currencyCode }}):</td>
+                <td class="text-sm p-2 font-semibold text-gray-950 dark:text-white border-t-4 border-double">Amount Due
+                    ({{ $currencyCode }}):
+                </td>
                 <td class="text-sm p-2 border-t-4 border-double">{{ $amountDue }}</td>
             </tr>
-            @if($conversionMessage)
-                <tr>
-                    <td colspan="6" class="text-sm p-2 text-gray-600">
-                        {{ $conversionMessage }}
-                    </td>
-                </tr>
-            @endif
+        @endif
+        @if($conversionMessage)
+            <tr>
+                <td colspan="6" class="text-sm p-2 text-gray-600">
+                    {{ $conversionMessage }}
+                </td>
+            </tr>
+        @endif
         </tbody>
     </table>
 
     <!-- Mobile View -->
     <div class="block lg:hidden">
         <div class="flex flex-col space-y-6">
-            <div class="flex justify-between items-center">
-                <span class="text-sm font-semibold text-gray-950 dark:text-white">Subtotal:</span>
-                <span class="text-sm">{{ $subtotal }}</span>
-            </div>
-            <div class="flex justify-between items-center">
-                <span class="text-sm">Tax:</span>
-                <span class="text-sm">{{ $taxTotal }}</span>
-            </div>
+            @if($subtotal)
+                <div class="flex justify-between items-center">
+                    <span class="text-sm font-semibold text-gray-950 dark:text-white">Subtotal:</span>
+                    <span class="text-sm">{{ $subtotal }}</span>
+                </div>
+            @endif
+            @if($taxTotal)
+                <div class="flex justify-between items-center">
+                    <span class="text-sm">Tax:</span>
+                    <span class="text-sm">{{ $taxTotal }}</span>
+                </div>
+            @endif
             @if($isPerDocumentDiscount)
                 <div class="flex flex-col space-y-2">
                     <span class="text-sm">Discount:</span>
@@ -92,20 +101,23 @@
                         @endforeach
                     </div>
                 </div>
-            @else
+            @elseif($discountTotal)
                 <div class="flex justify-between items-center">
                     <span class="text-sm">Discount:</span>
                     <span class="text-sm">({{ $discountTotal }})</span>
                 </div>
             @endif
             <div class="flex justify-between items-center">
-                <span class="text-sm font-semibold text-gray-950 dark:text-white">Total:</span>
+                <span class="text-sm font-semibold text-gray-950 dark:text-white">{{ $amountDue ? 'Total' : 'Grand Total' }}:</span>
                 <span class="text-sm">{{ $grandTotal }}</span>
             </div>
-            <div class="flex justify-between items-center">
-                <span class="text-sm font-semibold text-gray-950 dark:text-white">Amount Due ({{ $currencyCode }}):</span>
-                <span class="text-sm">{{ $amountDue }}</span>
-            </div>
+            @if($amountDue)
+                <div class="flex justify-between items-center">
+                    <span
+                        class="text-sm font-semibold text-gray-950 dark:text-white">Amount Due ({{ $currencyCode }}):</span>
+                    <span class="text-sm">{{ $amountDue }}</span>
+                </div>
+            @endif
             @if($conversionMessage)
                 <div class="text-sm text-gray-600">
                     {{ $conversionMessage }}