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

Development 3.x

app/Concerns/ManagesLineItems.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace App\Concerns;
+
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\DocumentDiscountMethod;
+use App\Models\Accounting\Bill;
+use App\Models\Accounting\DocumentLineItem;
+use App\Utilities\Currency\CurrencyConverter;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Collection;
+
+trait ManagesLineItems
+{
+    protected function handleLineItems(Model $record, Collection $lineItems): void
+    {
+        foreach ($lineItems as $itemData) {
+            $lineItem = isset($itemData['id'])
+                ? $record->lineItems->find($itemData['id'])
+                : $record->lineItems()->make();
+
+            $lineItem->fill([
+                'offering_id' => $itemData['offering_id'],
+                'description' => $itemData['description'],
+                'quantity' => $itemData['quantity'],
+                'unit_price' => $itemData['unit_price'],
+            ]);
+
+            if (! $lineItem->exists) {
+                $lineItem->documentable()->associate($record);
+            }
+
+            $lineItem->save();
+
+            $this->handleLineItemAdjustments($lineItem, $itemData, $record->discount_method);
+            $this->updateLineItemTotals($lineItem, $record->discount_method);
+        }
+    }
+
+    protected function deleteRemovedLineItems(Model $record, Collection $lineItems): void
+    {
+        $existingLineItemIds = $record->lineItems->pluck('id');
+        $updatedLineItemIds = $lineItems->pluck('id')->filter();
+        $lineItemsToDelete = $existingLineItemIds->diff($updatedLineItemIds);
+
+        if ($lineItemsToDelete->isNotEmpty()) {
+            $record
+                ->lineItems()
+                ->whereIn('id', $lineItemsToDelete)
+                ->each(fn (DocumentLineItem $lineItem) => $lineItem->delete());
+        }
+    }
+
+    protected function handleLineItemAdjustments(DocumentLineItem $lineItem, array $itemData, DocumentDiscountMethod $discountMethod): void
+    {
+        $isBill = $lineItem->documentable instanceof Bill;
+
+        $taxType = $isBill ? 'purchaseTaxes' : 'salesTaxes';
+        $discountType = $isBill ? 'purchaseDiscounts' : 'salesDiscounts';
+
+        $adjustmentIds = collect($itemData[$taxType] ?? [])
+            ->merge($discountMethod->isPerLineItem() ? ($itemData[$discountType] ?? []) : [])
+            ->filter()
+            ->unique();
+
+        $lineItem->adjustments()->sync($adjustmentIds);
+        $lineItem->refresh();
+    }
+
+    protected function updateLineItemTotals(DocumentLineItem $lineItem, DocumentDiscountMethod $discountMethod): void
+    {
+        $lineItem->updateQuietly([
+            'tax_total' => $lineItem->calculateTaxTotal()->getAmount(),
+            'discount_total' => $discountMethod->isPerLineItem()
+                ? $lineItem->calculateDiscountTotal()->getAmount()
+                : 0,
+        ]);
+    }
+
+    protected function updateDocumentTotals(Model $record, array $data): array
+    {
+        $subtotalCents = $record->lineItems()->sum('subtotal');
+        $taxTotalCents = $record->lineItems()->sum('tax_total');
+        $discountTotalCents = $this->calculateDiscountTotal(
+            DocumentDiscountMethod::parse($data['discount_method']),
+            AdjustmentComputation::parse($data['discount_computation']),
+            $data['discount_rate'] ?? null,
+            $subtotalCents,
+            $record
+        );
+
+        $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
+
+        return [
+            'subtotal' => CurrencyConverter::convertCentsToFormatSimple($subtotalCents),
+            'tax_total' => CurrencyConverter::convertCentsToFormatSimple($taxTotalCents),
+            'discount_total' => CurrencyConverter::convertCentsToFormatSimple($discountTotalCents),
+            'total' => CurrencyConverter::convertCentsToFormatSimple($grandTotalCents),
+        ];
+    }
+
+    protected function calculateDiscountTotal(
+        DocumentDiscountMethod $discountMethod,
+        ?AdjustmentComputation $discountComputation,
+        ?string $discountRate,
+        int $subtotalCents,
+        Model $record
+    ): int {
+        if ($discountMethod->isPerLineItem()) {
+            return $record->lineItems()->sum('discount_total');
+        }
+
+        if ($discountComputation?->isPercentage()) {
+            return (int) ($subtotalCents * ((float) $discountRate / 100));
+        }
+
+        return CurrencyConverter::convertToCents($discountRate);
+    }
+}

app/Enums/Accounting/AdjustmentComputation.php

@@ -2,10 +2,13 @@
 
 namespace App\Enums\Accounting;
 
+use App\Enums\Concerns\ParsesEnum;
 use Filament\Support\Contracts\HasLabel;
 
 enum AdjustmentComputation: string implements HasLabel
 {
+    use ParsesEnum;
+
     case Percentage = 'percentage';
     case Fixed = 'fixed';
 
@@ -13,4 +16,14 @@ enum AdjustmentComputation: string implements HasLabel
     {
         return translate($this->name);
     }
+
+    public function isPercentage(): bool
+    {
+        return $this == self::Percentage;
+    }
+
+    public function isFixed(): bool
+    {
+        return $this == self::Fixed;
+    }
 }

app/Enums/Accounting/DocumentDiscountMethod.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Enums\Accounting;
+
+use App\Enums\Concerns\ParsesEnum;
+use Filament\Support\Contracts\HasLabel;
+
+enum DocumentDiscountMethod: string implements HasLabel
+{
+    use ParsesEnum;
+
+    case PerLineItem = 'per_line_item';
+    case PerDocument = 'per_document';
+
+    public function getLabel(): string
+    {
+        return match ($this) {
+            self::PerLineItem => 'Per Line Item',
+            self::PerDocument => 'Per Document',
+        };
+    }
+
+    public function isPerLineItem(): bool
+    {
+        return $this == self::PerLineItem;
+    }
+
+    public function isPerDocument(): bool
+    {
+        return $this == self::PerDocument;
+    }
+}

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

@@ -6,8 +6,6 @@ use App\Events\CompanyDefaultUpdated;
 use App\Filament\Company\Clusters\Settings;
 use App\Models\Banking\BankAccount;
 use App\Models\Setting\CompanyDefault as CompanyDefaultModel;
-use App\Models\Setting\Discount;
-use App\Models\Setting\Tax;
 use Filament\Actions\Action;
 use Filament\Actions\ActionGroup;
 use Filament\Forms\Components\Component;
@@ -108,7 +106,6 @@ class CompanyDefault extends Page
         return $form
             ->schema([
                 $this->getGeneralSection(),
-                // $this->getModifiersSection(),
             ])
             ->model($this->record)
             ->statePath('data')
@@ -140,76 +137,6 @@ class CompanyDefault extends Page
             ])->columns();
     }
 
-    protected function getModifiersSection(): Component
-    {
-        return Section::make('Taxes & Discounts')
-            ->schema([
-                Select::make('sales_tax_id')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->relationship('salesTax', 'name')
-                    ->getOptionLabelFromRecordUsing(function (Tax $record) {
-                        $currencyCode = $this->record->currency_code;
-
-                        $rate = rateFormat($record->rate, $record->computation->value, $currencyCode);
-
-                        $rateBadge = $this->renderBadgeOptionLabel($rate);
-
-                        return "{$record->name} ⁓ {$rateBadge}";
-                    })
-                    ->allowHtml()
-                    ->saveRelationshipsUsing(null)
-                    ->searchable(),
-                Select::make('purchase_tax_id')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->relationship('purchaseTax', 'name')
-                    ->getOptionLabelFromRecordUsing(function (Tax $record) {
-                        $currencyCode = $this->record->currency_code;
-
-                        $rate = rateFormat($record->rate, $record->computation->value, $currencyCode);
-
-                        $rateBadge = $this->renderBadgeOptionLabel($rate);
-
-                        return "{$record->name} ⁓ {$rateBadge}";
-                    })
-                    ->allowHtml()
-                    ->saveRelationshipsUsing(null)
-                    ->searchable(),
-                Select::make('sales_discount_id')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->relationship('salesDiscount', 'name')
-                    ->getOptionLabelFromRecordUsing(function (Discount $record) {
-                        $currencyCode = $this->record->currency_code;
-
-                        $rate = rateFormat($record->rate, $record->computation->value, $currencyCode);
-
-                        $rateBadge = $this->renderBadgeOptionLabel($rate);
-
-                        return "{$record->name} ⁓ {$rateBadge}";
-                    })
-                    ->saveRelationshipsUsing(null)
-                    ->allowHtml()
-                    ->searchable(),
-                Select::make('purchase_discount_id')
-                    ->softRequired()
-                    ->localizeLabel()
-                    ->relationship('purchaseDiscount', 'name')
-                    ->getOptionLabelFromRecordUsing(function (Discount $record) {
-                        $currencyCode = $this->record->currency_code;
-                        $rate = rateFormat($record->rate, $record->computation->value, $currencyCode);
-
-                        $rateBadge = $this->renderBadgeOptionLabel($rate);
-
-                        return "{$record->name} ⁓ {$rateBadge}";
-                    })
-                    ->allowHtml()
-                    ->saveRelationshipsUsing(null)
-                    ->searchable(),
-            ])->columns();
-    }
-
     public function renderBadgeOptionLabel(string $label): string
     {
         return Blade::render('filament::components.badge', [

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

@@ -53,7 +53,7 @@ class AdjustmentResource extends Resource
                         ToggleButton::make('recoverable')
                             ->label('Recoverable')
                             ->default(false)
-                            ->visible(fn (Forms\Get $get) => AdjustmentCategory::parse($get('category')) === AdjustmentCategory::Tax && AdjustmentType::parse($get('type')) === AdjustmentType::Purchase),
+                            ->visible(fn (Forms\Get $get) => AdjustmentCategory::parse($get('category'))->isTax() && AdjustmentType::parse($get('type'))->isPurchase()),
                     ])
                     ->columns()
                     ->visibleOn('create'),
@@ -80,7 +80,7 @@ class AdjustmentResource extends Resource
                         Forms\Components\DateTimePicker::make('end_date'),
                     ])
                     ->columns()
-                    ->visible(fn (Forms\Get $get) => AdjustmentCategory::parse($get('category')) === AdjustmentCategory::Discount),
+                    ->visible(fn (Forms\Get $get) => AdjustmentCategory::parse($get('category'))->isDiscount()),
             ]);
     }
 

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

@@ -3,13 +3,14 @@
 namespace App\Filament\Company\Resources\Purchases;
 
 use App\Enums\Accounting\BillStatus;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\PaymentMethod;
 use App\Filament\Company\Resources\Purchases\BillResource\Pages;
+use App\Filament\Forms\Components\BillTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Filament\Tables\Filters\DateRangeFilter;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\Bill;
-use App\Models\Accounting\DocumentLineItem;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyConverter;
@@ -26,7 +27,6 @@ use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 
 class BillResource extends Resource
@@ -71,129 +71,44 @@ class BillResource extends Resource
                                         return now()->addDays($company->defaultBill->payment_terms->getDays());
                                     })
                                     ->required(),
+                                Forms\Components\Select::make('discount_method')
+                                    ->label('Discount Method')
+                                    ->options(DocumentDiscountMethod::class)
+                                    ->selectablePlaceholder(false)
+                                    ->default(DocumentDiscountMethod::PerLineItem)
+                                    ->afterStateUpdated(function ($state, Forms\Set $set) {
+                                        $discountMethod = DocumentDiscountMethod::parse($state);
+
+                                        if ($discountMethod->isPerDocument()) {
+                                            $set('lineItems.*.purchaseDiscounts', []);
+                                        }
+                                    })
+                                    ->live(),
                             ])->grow(true),
                         ])->from('md'),
                         TableRepeater::make('lineItems')
                             ->relationship()
-                            ->saveRelationshipsUsing(function (TableRepeater $component, Forms\Contracts\HasForms $livewire, ?array $state) {
-                                if (! is_array($state)) {
-                                    $state = [];
-                                }
-
-                                $relationship = $component->getRelationship();
-
-                                $existingRecords = $component->getCachedExistingRecords();
-
-                                $recordsToDelete = [];
-
-                                foreach ($existingRecords->pluck($relationship->getRelated()->getKeyName()) as $keyToCheckForDeletion) {
-                                    if (array_key_exists("record-{$keyToCheckForDeletion}", $state)) {
-                                        continue;
-                                    }
-
-                                    $recordsToDelete[] = $keyToCheckForDeletion;
-                                    $existingRecords->forget("record-{$keyToCheckForDeletion}");
+                            ->saveRelationshipsUsing(null)
+                            ->dehydrated(true)
+                            ->headers(function (Forms\Get $get) {
+                                $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
+
+                                $headers = [
+                                    Header::make('Items')->width($hasDiscounts ? '15%' : '20%'),
+                                    Header::make('Description')->width($hasDiscounts ? '25%' : '30%'),  // Increase when no discounts
+                                    Header::make('Quantity')->width('10%'),
+                                    Header::make('Price')->width('10%'),
+                                    Header::make('Taxes')->width($hasDiscounts ? '15%' : '20%'),       // Increase when no discounts
+                                ];
+
+                                if ($hasDiscounts) {
+                                    $headers[] = Header::make('Discounts')->width('15%');
                                 }
 
-                                $relationship
-                                    ->whereKey($recordsToDelete)
-                                    ->get()
-                                    ->each(static fn (Model $record) => $record->delete());
-
-                                $childComponentContainers = $component->getChildComponentContainers(
-                                    withHidden: $component->shouldSaveRelationshipsWhenHidden(),
-                                );
-
-                                $itemOrder = 1;
-                                $orderColumn = $component->getOrderColumn();
-
-                                $translatableContentDriver = $livewire->makeFilamentTranslatableContentDriver();
-
-                                foreach ($childComponentContainers as $itemKey => $item) {
-                                    $itemData = $item->getState(shouldCallHooksBefore: false);
-
-                                    if ($orderColumn) {
-                                        $itemData[$orderColumn] = $itemOrder;
-
-                                        $itemOrder++;
-                                    }
-
-                                    if ($record = ($existingRecords[$itemKey] ?? null)) {
-                                        $itemData = $component->mutateRelationshipDataBeforeSave($itemData, record: $record);
-
-                                        if ($itemData === null) {
-                                            continue;
-                                        }
-
-                                        $translatableContentDriver ?
-                                            $translatableContentDriver->updateRecord($record, $itemData) :
-                                            $record->fill($itemData)->save();
-
-                                        continue;
-                                    }
-
-                                    $relatedModel = $component->getRelatedModel();
-
-                                    $itemData = $component->mutateRelationshipDataBeforeCreate($itemData);
-
-                                    if ($itemData === null) {
-                                        continue;
-                                    }
-
-                                    if ($translatableContentDriver) {
-                                        $record = $translatableContentDriver->makeRecord($relatedModel, $itemData);
-                                    } else {
-                                        $record = new $relatedModel;
-                                        $record->fill($itemData);
-                                    }
+                                $headers[] = Header::make('Amount')->width('10%')->align('right');
 
-                                    $record = $relationship->save($record);
-                                    $item->model($record)->saveRelationships();
-                                    $existingRecords->push($record);
-                                }
-
-                                $component->getRecord()->setRelation($component->getRelationshipName(), $existingRecords);
-
-                                /** @var Bill $bill */
-                                $bill = $component->getRecord();
-
-                                // Recalculate totals for line items
-                                $bill->lineItems()->each(function (DocumentLineItem $lineItem) {
-                                    $lineItem->updateQuietly([
-                                        'tax_total' => $lineItem->calculateTaxTotal()->getAmount(),
-                                        'discount_total' => $lineItem->calculateDiscountTotal()->getAmount(),
-                                    ]);
-                                });
-
-                                $subtotal = $bill->lineItems()->sum('subtotal') / 100;
-                                $taxTotal = $bill->lineItems()->sum('tax_total') / 100;
-                                $discountTotal = $bill->lineItems()->sum('discount_total') / 100;
-                                $grandTotal = $subtotal + $taxTotal - $discountTotal;
-
-                                $bill->updateQuietly([
-                                    'subtotal' => $subtotal,
-                                    'tax_total' => $taxTotal,
-                                    'discount_total' => $discountTotal,
-                                    'total' => $grandTotal,
-                                ]);
-
-                                $bill->refresh();
-
-                                if (! $bill->initialTransaction) {
-                                    $bill->createInitialTransaction();
-                                } else {
-                                    $bill->updateInitialTransaction();
-                                }
+                                return $headers;
                             })
-                            ->headers([
-                                Header::make('Items')->width('15%'),
-                                Header::make('Description')->width('25%'),
-                                Header::make('Quantity')->width('10%'),
-                                Header::make('Price')->width('10%'),
-                                Header::make('Taxes')->width('15%'),
-                                Header::make('Discounts')->width('15%'),
-                                Header::make('Amount')->width('10%')->align('right'),
-                            ])
                             ->schema([
                                 Forms\Components\Select::make('offering_id')
                                     ->relationship('purchasableOffering', 'name')
@@ -209,7 +124,11 @@ class BillResource extends Resource
                                             $set('description', $offeringRecord->description);
                                             $set('unit_price', $offeringRecord->price);
                                             $set('purchaseTaxes', $offeringRecord->purchaseTaxes->pluck('id')->toArray());
-                                            $set('purchaseDiscounts', $offeringRecord->purchaseDiscounts->pluck('id')->toArray());
+
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                            if ($discountMethod->isPerLineItem()) {
+                                                $set('purchaseDiscounts', $offeringRecord->purchaseDiscounts->pluck('id')->toArray());
+                                            }
                                         }
                                     }),
                                 Forms\Components\TextInput::make('description'),
@@ -225,15 +144,24 @@ class BillResource extends Resource
                                     ->default(0),
                                 Forms\Components\Select::make('purchaseTaxes')
                                     ->relationship('purchaseTaxes', 'name')
+                                    ->saveRelationshipsUsing(null)
+                                    ->dehydrated(true)
                                     ->preload()
                                     ->multiple()
                                     ->live()
                                     ->searchable(),
                                 Forms\Components\Select::make('purchaseDiscounts')
                                     ->relationship('purchaseDiscounts', 'name')
+                                    ->saveRelationshipsUsing(null)
+                                    ->dehydrated(true)
                                     ->preload()
                                     ->multiple()
                                     ->live()
+                                    ->hidden(function (Forms\Get $get) {
+                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+
+                                        return $discountMethod->isPerDocument();
+                                    })
                                     ->searchable(),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
@@ -265,13 +193,7 @@ class BillResource extends Resource
                                         return CurrencyConverter::formatToMoney($total);
                                     }),
                             ]),
-                        Forms\Components\Grid::make(6)
-                            ->schema([
-                                Forms\Components\ViewField::make('totals')
-                                    ->columnStart(5)
-                                    ->columnSpan(2)
-                                    ->view('filament.forms.components.bill-totals'),
-                            ]),
+                        BillTotals::make(),
                     ]),
             ]);
     }
@@ -281,6 +203,11 @@ class BillResource extends Resource
         return $table
             ->defaultSort('due_date')
             ->columns([
+                Tables\Columns\TextColumn::make('id')
+                    ->label('ID')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true)
+                    ->searchable(),
                 Tables\Columns\TextColumn::make('status')
                     ->badge()
                     ->searchable(),

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

@@ -2,13 +2,17 @@
 
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
+use App\Concerns\ManagesLineItems;
 use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
+use App\Models\Accounting\Bill;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Database\Eloquent\Model;
 
 class CreateBill extends CreateRecord
 {
+    use ManagesLineItems;
     use RedirectToListPage;
 
     protected static string $resource = BillResource::class;
@@ -17,4 +21,22 @@ class CreateBill extends CreateRecord
     {
         return MaxWidth::Full;
     }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        /** @var Bill $record */
+        $record = parent::handleRecordCreation($data);
+
+        $this->handleLineItems($record, collect($data['lineItems'] ?? []));
+
+        $totals = $this->updateDocumentTotals($record, $data);
+
+        $record->updateQuietly($totals);
+
+        if (! $record->initialTransaction) {
+            $record->createInitialTransaction();
+        }
+
+        return $record;
+    }
 }

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

@@ -2,14 +2,18 @@
 
 namespace App\Filament\Company\Resources\Purchases\BillResource\Pages;
 
+use App\Concerns\ManagesLineItems;
 use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Purchases\BillResource;
+use App\Models\Accounting\Bill;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Database\Eloquent\Model;
 
 class EditBill extends EditRecord
 {
+    use ManagesLineItems;
     use RedirectToListPage;
 
     protected static string $resource = BillResource::class;
@@ -25,4 +29,28 @@ class EditBill extends EditRecord
     {
         return MaxWidth::Full;
     }
+
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        /** @var Bill $record */
+        $lineItems = collect($data['lineItems'] ?? []);
+
+        $this->deleteRemovedLineItems($record, $lineItems);
+
+        $this->handleLineItems($record, $lineItems);
+
+        $totals = $this->updateDocumentTotals($record, $data);
+
+        $data = array_merge($data, $totals);
+
+        $record = parent::handleRecordUpdate($record, $data);
+
+        if (! $record->initialTransaction) {
+            $record->createInitialTransaction();
+        } else {
+            $record->updateInitialTransaction();
+        }
+
+        return $record;
+    }
 }

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

@@ -3,15 +3,16 @@
 namespace App\Filament\Company\Resources\Sales;
 
 use App\Collections\Accounting\InvoiceCollection;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\PaymentMethod;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 use App\Filament\Company\Resources\Sales\InvoiceResource\RelationManagers;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Widgets;
+use App\Filament\Forms\Components\InvoiceTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Filament\Tables\Filters\DateRangeFilter;
 use App\Models\Accounting\Adjustment;
-use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\Invoice;
 use App\Models\Banking\BankAccount;
 use App\Models\Common\Offering;
@@ -30,7 +31,6 @@ use Filament\Tables;
 use Filament\Tables\Table;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Collection;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
@@ -128,125 +128,44 @@ class InvoiceResource extends Resource
                                     ->minDate(static function (Forms\Get $get) {
                                         return $get('date') ?? now();
                                     }),
+                                Forms\Components\Select::make('discount_method')
+                                    ->label('Discount Method')
+                                    ->options(DocumentDiscountMethod::class)
+                                    ->selectablePlaceholder(false)
+                                    ->default(DocumentDiscountMethod::PerLineItem)
+                                    ->afterStateUpdated(function ($state, Forms\Set $set) {
+                                        $discountMethod = DocumentDiscountMethod::parse($state);
+
+                                        if ($discountMethod->isPerDocument()) {
+                                            $set('lineItems.*.salesDiscounts', []);
+                                        }
+                                    })
+                                    ->live(),
                             ])->grow(true),
                         ])->from('md'),
                         TableRepeater::make('lineItems')
                             ->relationship()
-                            ->saveRelationshipsUsing(function (TableRepeater $component, Forms\Contracts\HasForms $livewire, ?array $state) {
-                                if (! is_array($state)) {
-                                    $state = [];
-                                }
-
-                                $relationship = $component->getRelationship();
-
-                                $existingRecords = $component->getCachedExistingRecords();
-
-                                $recordsToDelete = [];
-
-                                foreach ($existingRecords->pluck($relationship->getRelated()->getKeyName()) as $keyToCheckForDeletion) {
-                                    if (array_key_exists("record-{$keyToCheckForDeletion}", $state)) {
-                                        continue;
-                                    }
-
-                                    $recordsToDelete[] = $keyToCheckForDeletion;
-                                    $existingRecords->forget("record-{$keyToCheckForDeletion}");
-                                }
-
-                                $relationship
-                                    ->whereKey($recordsToDelete)
-                                    ->get()
-                                    ->each(static fn (Model $record) => $record->delete());
-
-                                $childComponentContainers = $component->getChildComponentContainers(
-                                    withHidden: $component->shouldSaveRelationshipsWhenHidden(),
-                                );
-
-                                $itemOrder = 1;
-                                $orderColumn = $component->getOrderColumn();
-
-                                $translatableContentDriver = $livewire->makeFilamentTranslatableContentDriver();
-
-                                foreach ($childComponentContainers as $itemKey => $item) {
-                                    $itemData = $item->getState(shouldCallHooksBefore: false);
-
-                                    if ($orderColumn) {
-                                        $itemData[$orderColumn] = $itemOrder;
-
-                                        $itemOrder++;
-                                    }
-
-                                    if ($record = ($existingRecords[$itemKey] ?? null)) {
-                                        $itemData = $component->mutateRelationshipDataBeforeSave($itemData, record: $record);
-
-                                        if ($itemData === null) {
-                                            continue;
-                                        }
-
-                                        $translatableContentDriver ?
-                                            $translatableContentDriver->updateRecord($record, $itemData) :
-                                            $record->fill($itemData)->save();
-
-                                        continue;
-                                    }
-
-                                    $relatedModel = $component->getRelatedModel();
-
-                                    $itemData = $component->mutateRelationshipDataBeforeCreate($itemData);
-
-                                    if ($itemData === null) {
-                                        continue;
-                                    }
-
-                                    if ($translatableContentDriver) {
-                                        $record = $translatableContentDriver->makeRecord($relatedModel, $itemData);
-                                    } else {
-                                        $record = new $relatedModel;
-                                        $record->fill($itemData);
-                                    }
-
-                                    $record = $relationship->save($record);
-                                    $item->model($record)->saveRelationships();
-                                    $existingRecords->push($record);
+                            ->saveRelationshipsUsing(null)
+                            ->dehydrated(true)
+                            ->headers(function (Forms\Get $get) {
+                                $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
+
+                                $headers = [
+                                    Header::make('Items')->width($hasDiscounts ? '15%' : '20%'),
+                                    Header::make('Description')->width($hasDiscounts ? '25%' : '30%'),  // Increase when no discounts
+                                    Header::make('Quantity')->width('10%'),
+                                    Header::make('Price')->width('10%'),
+                                    Header::make('Taxes')->width($hasDiscounts ? '15%' : '20%'),       // Increase when no discounts
+                                ];
+
+                                if ($hasDiscounts) {
+                                    $headers[] = Header::make('Discounts')->width('15%');
                                 }
 
-                                $component->getRecord()->setRelation($component->getRelationshipName(), $existingRecords);
-
-                                /** @var Invoice $invoice */
-                                $invoice = $component->getRecord();
-
-                                // Recalculate totals for line items
-                                $invoice->lineItems()->each(function (DocumentLineItem $lineItem) {
-                                    $lineItem->updateQuietly([
-                                        'tax_total' => $lineItem->calculateTaxTotal()->getAmount(),
-                                        'discount_total' => $lineItem->calculateDiscountTotal()->getAmount(),
-                                    ]);
-                                });
-
-                                $subtotal = $invoice->lineItems()->sum('subtotal') / 100;
-                                $taxTotal = $invoice->lineItems()->sum('tax_total') / 100;
-                                $discountTotal = $invoice->lineItems()->sum('discount_total') / 100;
-                                $grandTotal = $subtotal + $taxTotal - $discountTotal;
-
-                                $invoice->updateQuietly([
-                                    'subtotal' => $subtotal,
-                                    'tax_total' => $taxTotal,
-                                    'discount_total' => $discountTotal,
-                                    'total' => $grandTotal,
-                                ]);
+                                $headers[] = Header::make('Amount')->width('10%')->align('right');
 
-                                if ($invoice->approved_at && $invoice->approvalTransaction) {
-                                    $invoice->updateApprovalTransaction();
-                                }
+                                return $headers;
                             })
-                            ->headers([
-                                Header::make('Items')->width('15%'),
-                                Header::make('Description')->width('25%'),
-                                Header::make('Quantity')->width('10%'),
-                                Header::make('Price')->width('10%'),
-                                Header::make('Taxes')->width('15%'),
-                                Header::make('Discounts')->width('15%'),
-                                Header::make('Amount')->width('10%')->align('right'),
-                            ])
                             ->schema([
                                 Forms\Components\Select::make('offering_id')
                                     ->relationship('sellableOffering', 'name')
@@ -262,7 +181,11 @@ class InvoiceResource extends Resource
                                             $set('description', $offeringRecord->description);
                                             $set('unit_price', $offeringRecord->price);
                                             $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
-                                            $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
+
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                            if ($discountMethod->isPerLineItem()) {
+                                                $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
+                                            }
                                         }
                                     }),
                                 Forms\Components\TextInput::make('description'),
@@ -278,15 +201,24 @@ class InvoiceResource extends Resource
                                     ->default(0),
                                 Forms\Components\Select::make('salesTaxes')
                                     ->relationship('salesTaxes', 'name')
+                                    ->saveRelationshipsUsing(null)
+                                    ->dehydrated(true)
                                     ->preload()
                                     ->multiple()
                                     ->live()
                                     ->searchable(),
                                 Forms\Components\Select::make('salesDiscounts')
                                     ->relationship('salesDiscounts', 'name')
+                                    ->saveRelationshipsUsing(null)
+                                    ->dehydrated(true)
                                     ->preload()
                                     ->multiple()
                                     ->live()
+                                    ->hidden(function (Forms\Get $get) {
+                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+
+                                        return $discountMethod->isPerDocument();
+                                    })
                                     ->searchable(),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
@@ -318,13 +250,7 @@ class InvoiceResource extends Resource
                                         return CurrencyConverter::formatToMoney($total);
                                     }),
                             ]),
-                        Forms\Components\Grid::make(6)
-                            ->schema([
-                                Forms\Components\ViewField::make('totals')
-                                    ->columnStart(5)
-                                    ->columnSpan(2)
-                                    ->view('filament.forms.components.invoice-totals'),
-                            ]),
+                        InvoiceTotals::make(),
                         Forms\Components\Textarea::make('terms')
                             ->columnSpanFull(),
                     ]),
@@ -342,6 +268,11 @@ class InvoiceResource extends Resource
         return $table
             ->defaultSort('due_date')
             ->columns([
+                Tables\Columns\TextColumn::make('id')
+                    ->label('ID')
+                    ->sortable()
+                    ->toggleable(isToggledHiddenByDefault: true)
+                    ->searchable(),
                 Tables\Columns\TextColumn::make('status')
                     ->badge()
                     ->searchable(),

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

@@ -2,13 +2,17 @@
 
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
+use App\Concerns\ManagesLineItems;
 use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
+use App\Models\Accounting\Invoice;
 use Filament\Resources\Pages\CreateRecord;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Database\Eloquent\Model;
 
 class CreateInvoice extends CreateRecord
 {
+    use ManagesLineItems;
     use RedirectToListPage;
 
     protected static string $resource = InvoiceResource::class;
@@ -17,4 +21,18 @@ class CreateInvoice extends CreateRecord
     {
         return MaxWidth::Full;
     }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        /** @var Invoice $record */
+        $record = parent::handleRecordCreation($data);
+
+        $this->handleLineItems($record, collect($data['lineItems'] ?? []));
+
+        $totals = $this->updateDocumentTotals($record, $data);
+
+        $record->updateQuietly($totals);
+
+        return $record;
+    }
 }

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

@@ -2,14 +2,18 @@
 
 namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 
+use App\Concerns\ManagesLineItems;
 use App\Concerns\RedirectToListPage;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
+use App\Models\Accounting\Invoice;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
 use Filament\Support\Enums\MaxWidth;
+use Illuminate\Database\Eloquent\Model;
 
 class EditInvoice extends EditRecord
 {
+    use ManagesLineItems;
     use RedirectToListPage;
 
     protected static string $resource = InvoiceResource::class;
@@ -25,4 +29,26 @@ class EditInvoice extends EditRecord
     {
         return MaxWidth::Full;
     }
+
+    protected function handleRecordUpdate(Model $record, array $data): Model
+    {
+        /** @var Invoice $record */
+        $lineItems = collect($data['lineItems'] ?? []);
+
+        $this->deleteRemovedLineItems($record, $lineItems);
+
+        $this->handleLineItems($record, $lineItems);
+
+        $totals = $this->updateDocumentTotals($record, $data);
+
+        $data = array_merge($data, $totals);
+
+        $record = parent::handleRecordUpdate($record, $data);
+
+        if ($record->approved_at && $record->approvalTransaction) {
+            $record->updateApprovalTransaction();
+        }
+
+        return $record;
+    }
 }

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

@@ -6,22 +6,32 @@ use App\Filament\Company\Resources\Sales\ClientResource;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Accounting\Invoice;
 use Filament\Actions;
+use Filament\Infolists\Components\Grid;
 use Filament\Infolists\Components\Section;
 use Filament\Infolists\Components\TextEntry;
+use Filament\Infolists\Components\ViewEntry;
 use Filament\Infolists\Infolist;
 use Filament\Resources\Pages\ViewRecord;
 use Filament\Support\Enums\FontWeight;
 use Filament\Support\Enums\IconPosition;
 use Filament\Support\Enums\IconSize;
+use Filament\Support\Enums\MaxWidth;
 
 class ViewInvoice extends ViewRecord
 {
+    protected static string $view = 'filament.company.resources.sales.invoices.pages.view-invoice';
+
     protected static string $resource = InvoiceResource::class;
 
     protected $listeners = [
         'refresh' => '$refresh',
     ];
 
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return MaxWidth::SixExtraLarge;
+    }
+
     protected function getHeaderActions(): array
     {
         return [
@@ -49,39 +59,47 @@ class ViewInvoice extends ViewRecord
                 Section::make('Invoice Details')
                     ->columns(4)
                     ->schema([
-                        TextEntry::make('invoice_number')
-                            ->label('Invoice #'),
-                        TextEntry::make('status')
-                            ->badge(),
-                        TextEntry::make('client.name')
-                            ->label('Client')
-                            ->color('primary')
-                            ->weight(FontWeight::SemiBold)
-                            ->url(static fn (Invoice $record) => ClientResource::getUrl('edit', ['record' => $record->client_id])),
-                        TextEntry::make('total')
-                            ->label('Total')
-                            ->money(),
-                        TextEntry::make('amount_due')
-                            ->label('Amount Due')
-                            ->money(),
-                        TextEntry::make('date')
-                            ->label('Date')
-                            ->date(),
-                        TextEntry::make('due_date')
-                            ->label('Due')
-                            ->asRelativeDay(),
-                        TextEntry::make('approved_at')
-                            ->label('Approved At')
-                            ->placeholder('Not Approved')
-                            ->date(),
-                        TextEntry::make('last_sent')
-                            ->label('Last Sent')
-                            ->placeholder('Never')
-                            ->date(),
-                        TextEntry::make('paid_at')
-                            ->label('Paid At')
-                            ->placeholder('Not Paid')
-                            ->date(),
+                        Grid::make(1)
+                            ->schema([
+                                TextEntry::make('invoice_number')
+                                    ->label('Invoice #'),
+                                TextEntry::make('status')
+                                    ->badge(),
+                                TextEntry::make('client.name')
+                                    ->label('Client')
+                                    ->color('primary')
+                                    ->weight(FontWeight::SemiBold)
+                                    ->url(static fn (Invoice $record) => ClientResource::getUrl('edit', ['record' => $record->client_id])),
+                                TextEntry::make('amount_due')
+                                    ->label('Amount Due')
+                                    ->money(),
+                                TextEntry::make('due_date')
+                                    ->label('Due')
+                                    ->asRelativeDay(),
+                                TextEntry::make('approved_at')
+                                    ->label('Approved At')
+                                    ->placeholder('Not Approved')
+                                    ->date(),
+                                TextEntry::make('last_sent')
+                                    ->label('Last Sent')
+                                    ->placeholder('Never')
+                                    ->date(),
+                                TextEntry::make('paid_at')
+                                    ->label('Paid At')
+                                    ->placeholder('Not Paid')
+                                    ->date(),
+                            ])->columnSpan(1),
+                        Grid::make()
+                            ->schema([
+                                ViewEntry::make('invoice-view')
+                                    ->label('View Invoice')
+                                    ->columnSpan(3)
+                                    ->view('filament.company.resources.sales.invoices.components.invoice-view')
+                                    ->viewData([
+                                        'invoice' => $this->record,
+                                    ]),
+                            ])
+                            ->columnSpan(3),
                     ]),
             ]);
     }

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

@@ -28,6 +28,8 @@ class PaymentsRelationManager extends RelationManager
 
     protected static ?string $modelLabel = 'Payment';
 
+    protected static bool $isLazy = false;
+
     protected $listeners = [
         'refresh' => '$refresh',
     ];

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

@@ -45,7 +45,9 @@ class InvoiceOverview extends EnhancedStatsOverviewWidget
 
         $totalValidInvoiceCount = $validInvoices->count();
 
-        $averageInvoiceTotal = $totalValidInvoiceCount > 0 ? $totalValidInvoiceAmount / $totalValidInvoiceCount : 0;
+        $averageInvoiceTotal = $totalValidInvoiceCount > 0
+            ? (int) round($totalValidInvoiceAmount / $totalValidInvoiceCount)
+            : 0;
 
         $averagePaymentTime = $this->getPageTableQuery()
             ->whereNotNull('paid_at')

app/Filament/Forms/Components/BillTotals.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Enums\Accounting\AdjustmentComputation;
+use Filament\Forms\Components\Grid;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Get;
+
+class BillTotals extends Grid
+{
+    protected string $view = 'filament.forms.components.bill-totals';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->schema([
+            TextInput::make('discount_rate')
+                ->label('Discount Rate')
+                ->hiddenLabel()
+                ->live()
+                ->rate(computation: static fn (Get $get) => $get('discount_computation'), showAffix: false),
+            Select::make('discount_computation')
+                ->label('Discount Computation')
+                ->hiddenLabel()
+                ->options([
+                    'percentage' => '%',
+                    'fixed' => '$',
+                ])
+                ->default(AdjustmentComputation::Percentage)
+                ->selectablePlaceholder(false)
+                ->live(),
+        ]);
+    }
+}

app/Filament/Forms/Components/InvoiceTotals.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Filament\Forms\Components;
+
+use App\Enums\Accounting\AdjustmentComputation;
+use Filament\Forms\Components\Grid;
+use Filament\Forms\Components\Select;
+use Filament\Forms\Components\TextInput;
+use Filament\Forms\Get;
+
+class InvoiceTotals extends Grid
+{
+    protected string $view = 'filament.forms.components.invoice-totals';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->schema([
+            TextInput::make('discount_rate')
+                ->label('Discount Rate')
+                ->hiddenLabel()
+                ->live()
+                ->rate(computation: static fn (Get $get) => $get('discount_computation'), showAffix: false),
+            Select::make('discount_computation')
+                ->label('Discount Computation')
+                ->hiddenLabel()
+                ->options([
+                    'percentage' => '%',
+                    'fixed' => '$',
+                ])
+                ->default(AdjustmentComputation::Percentage)
+                ->selectablePlaceholder(false)
+                ->live(),
+        ]);
+    }
+}

app/Models/Accounting/Account.php

@@ -133,6 +133,16 @@ class Account extends Model
         return self::where('name', 'Accounts Payable')->firstOrFail();
     }
 
+    public static function getSalesDiscountAccount(): self
+    {
+        return self::where('name', 'Sales Discount')->firstOrFail();
+    }
+
+    public static function getPurchaseDiscountAccount(): self
+    {
+        return self::where('name', 'Purchase Discount')->firstOrFail();
+    }
+
     protected static function newFactory(): Factory
     {
         return AccountFactory::new();

app/Models/Accounting/Bill.php

@@ -3,14 +3,18 @@
 namespace App\Models\Accounting;
 
 use App\Casts\MoneyCast;
+use App\Casts\RateCast;
 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\JournalEntryType;
 use App\Enums\Accounting\TransactionType;
 use App\Filament\Company\Resources\Purchases\BillResource;
 use App\Models\Common\Vendor;
 use App\Observers\BillObserver;
+use App\Utilities\Currency\CurrencyConverter;
 use Filament\Actions\MountableAction;
 use Filament\Actions\ReplicateAction;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
@@ -42,6 +46,9 @@ class Bill extends Model
         'paid_at',
         'status',
         'currency_code',
+        'discount_method',
+        'discount_computation',
+        'discount_rate',
         'subtotal',
         'tax_total',
         'discount_total',
@@ -57,6 +64,9 @@ class Bill extends Model
         'due_date' => 'date',
         'paid_at' => 'datetime',
         'status' => BillStatus::class,
+        'discount_method' => DocumentDiscountMethod::class,
+        'discount_computation' => AdjustmentComputation::class,
+        'discount_rate' => RateCast::class,
         'subtotal' => MoneyCast::class,
         'tax_total' => MoneyCast::class,
         'discount_total' => MoneyCast::class,
@@ -215,7 +225,11 @@ class Bill extends Model
             'description' => $baseDescription,
         ]);
 
-        foreach ($this->lineItems as $lineItem) {
+        $totalLineItemSubtotal = (int) $this->lineItems()->sum('subtotal');
+        $billDiscountTotalCents = (int) $this->getRawOriginal('discount_total');
+        $remainingDiscountCents = $billDiscountTotalCents;
+
+        foreach ($this->lineItems as $index => $lineItem) {
             $lineItemDescription = "{$baseDescription} › {$lineItem->offering->name}";
 
             $transaction->journalEntries()->create([
@@ -245,6 +259,29 @@ class Bill extends Model
                     ]);
                 }
             }
+
+            if ($this->discount_method->isPerDocument() && $totalLineItemSubtotal > 0) {
+                $lineItemSubtotalCents = (int) $lineItem->getRawOriginal('subtotal');
+
+                if ($index === $this->lineItems->count() - 1) {
+                    $lineItemDiscount = $remainingDiscountCents;
+                } else {
+                    $lineItemDiscount = (int) round(
+                        ($lineItemSubtotalCents / $totalLineItemSubtotal) * $billDiscountTotalCents
+                    );
+                    $remainingDiscountCents -= $lineItemDiscount;
+                }
+
+                if ($lineItemDiscount > 0) {
+                    $transaction->journalEntries()->create([
+                        'company_id' => $this->company_id,
+                        'type' => JournalEntryType::Credit,
+                        'account_id' => Account::getPurchaseDiscountAccount()->id,
+                        'amount' => CurrencyConverter::convertCentsToFormatSimple($lineItemDiscount),
+                        'description' => "{$lineItemDescription} (Proportional Discount)",
+                    ]);
+                }
+            }
         }
     }
 

app/Models/Accounting/Invoice.php

@@ -3,15 +3,19 @@
 namespace App\Models\Accounting;
 
 use App\Casts\MoneyCast;
+use App\Casts\RateCast;
 use App\Collections\Accounting\InvoiceCollection;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\JournalEntryType;
 use App\Enums\Accounting\TransactionType;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use App\Models\Common\Client;
 use App\Observers\InvoiceObserver;
+use App\Utilities\Currency\CurrencyConverter;
 use Filament\Actions\Action;
 use Filament\Actions\MountableAction;
 use Filament\Actions\ReplicateAction;
@@ -51,6 +55,9 @@ class Invoice extends Model
         'last_sent',
         'status',
         'currency_code',
+        'discount_method',
+        'discount_computation',
+        'discount_rate',
         'subtotal',
         'tax_total',
         'discount_total',
@@ -69,6 +76,9 @@ class Invoice extends Model
         'paid_at' => 'datetime',
         'last_sent' => 'datetime',
         'status' => InvoiceStatus::class,
+        'discount_method' => DocumentDiscountMethod::class,
+        'discount_computation' => AdjustmentComputation::class,
+        'discount_rate' => RateCast::class,
         'subtotal' => MoneyCast::class,
         'tax_total' => MoneyCast::class,
         'discount_total' => MoneyCast::class,
@@ -260,7 +270,11 @@ class Invoice extends Model
             'description' => $baseDescription,
         ]);
 
-        foreach ($this->lineItems as $lineItem) {
+        $totalLineItemSubtotal = (int) $this->lineItems()->sum('subtotal');
+        $invoiceDiscountTotalCents = (int) $this->getRawOriginal('discount_total');
+        $remainingDiscountCents = $invoiceDiscountTotalCents;
+
+        foreach ($this->lineItems as $index => $lineItem) {
             $lineItemDescription = "{$baseDescription} › {$lineItem->offering->name}";
 
             $transaction->journalEntries()->create([
@@ -280,6 +294,29 @@ class Invoice extends Model
                     'description' => $lineItemDescription,
                 ]);
             }
+
+            if ($this->discount_method->isPerDocument() && $totalLineItemSubtotal > 0) {
+                $lineItemSubtotalCents = (int) $lineItem->getRawOriginal('subtotal');
+
+                if ($index === $this->lineItems->count() - 1) {
+                    $lineItemDiscount = $remainingDiscountCents;
+                } else {
+                    $lineItemDiscount = (int) round(
+                        ($lineItemSubtotalCents / $totalLineItemSubtotal) * $invoiceDiscountTotalCents
+                    );
+                    $remainingDiscountCents -= $lineItemDiscount;
+                }
+
+                if ($lineItemDiscount > 0) {
+                    $transaction->journalEntries()->create([
+                        'company_id' => $this->company_id,
+                        'type' => JournalEntryType::Debit,
+                        'account_id' => Account::getSalesDiscountAccount()->id,
+                        'amount' => CurrencyConverter::convertCentsToFormatSimple($lineItemDiscount),
+                        'description' => "{$lineItemDescription} (Proportional Discount)",
+                    ]);
+                }
+            }
         }
     }
 

app/Models/Setting/Discount.php

@@ -1,82 +0,0 @@
-<?php
-
-namespace App\Models\Setting;
-
-use App\Casts\RateCast;
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
-use App\Concerns\HasDefault;
-use App\Concerns\SyncsWithCompanyDefaults;
-use App\Enums\Setting\DiscountComputation;
-use App\Enums\Setting\DiscountScope;
-use App\Enums\Setting\DiscountType;
-use App\Models\Accounting\Account;
-use Database\Factories\Setting\DiscountFactory;
-use Illuminate\Database\Eloquent\Factories\Factory;
-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\MorphTo;
-
-class Discount extends Model
-{
-    use Blamable;
-    use CompanyOwned;
-    use HasDefault;
-    use HasFactory;
-    use SyncsWithCompanyDefaults;
-
-    protected $table = 'discounts';
-
-    protected $fillable = [
-        'company_id',
-        'account_id',
-        'rate',
-        'computation',
-        'type',
-        'scope',
-        'start_date',
-        'end_date',
-        'enabled',
-        'created_by',
-        'updated_by',
-    ];
-
-    protected $casts = [
-        'rate' => RateCast::class,
-        'computation' => DiscountComputation::class,
-        'type' => DiscountType::class,
-        'scope' => DiscountScope::class,
-        'start_date' => 'datetime',
-        'end_date' => 'datetime',
-        'enabled' => 'boolean',
-    ];
-
-    protected ?string $evaluatedDefault = 'type';
-
-    public function account(): BelongsTo
-    {
-        return $this->belongsTo(Account::class, 'account_id');
-    }
-
-    public function defaultSalesDiscount(): HasOne
-    {
-        return $this->hasOne(CompanyDefault::class, 'sales_discount_id');
-    }
-
-    public function defaultPurchaseDiscount(): HasOne
-    {
-        return $this->hasOne(CompanyDefault::class, 'purchase_discount_id');
-    }
-
-    public function adjustmentables(): MorphTo
-    {
-        return $this->morphTo();
-    }
-
-    protected static function newFactory(): Factory
-    {
-        return DiscountFactory::new();
-    }
-}

app/Models/Setting/Tax.php

@@ -1,78 +0,0 @@
-<?php
-
-namespace App\Models\Setting;
-
-use App\Casts\RateCast;
-use App\Concerns\Blamable;
-use App\Concerns\CompanyOwned;
-use App\Concerns\HasDefault;
-use App\Concerns\SyncsWithCompanyDefaults;
-use App\Enums\Setting\TaxComputation;
-use App\Enums\Setting\TaxScope;
-use App\Enums\Setting\TaxType;
-use App\Models\Accounting\Account;
-use Database\Factories\Setting\TaxFactory;
-use Illuminate\Database\Eloquent\Factories\Factory;
-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\MorphTo;
-
-class Tax extends Model
-{
-    use Blamable;
-    use CompanyOwned;
-    use HasDefault;
-    use HasFactory;
-    use SyncsWithCompanyDefaults;
-
-    protected $table = 'taxes';
-
-    protected $fillable = [
-        'company_id',
-        'account_id',
-        'rate',
-        'computation',
-        'type',
-        'scope',
-        'enabled',
-        'created_by',
-        'updated_by',
-    ];
-
-    protected $casts = [
-        'rate' => RateCast::class,
-        'computation' => TaxComputation::class,
-        'type' => TaxType::class,
-        'scope' => TaxScope::class,
-        'enabled' => 'boolean',
-    ];
-
-    protected ?string $evaluatedDefault = 'type';
-
-    public function account(): BelongsTo
-    {
-        return $this->belongsTo(Account::class, 'account_id');
-    }
-
-    public function defaultSalesTax(): HasOne
-    {
-        return $this->hasOne(CompanyDefault::class, 'sales_tax_id');
-    }
-
-    public function defaultPurchaseTax(): HasOne
-    {
-        return $this->hasOne(CompanyDefault::class, 'purchase_tax_id');
-    }
-
-    public function adjustmentables(): MorphTo
-    {
-        return $this->morphTo();
-    }
-
-    protected static function newFactory(): Factory
-    {
-        return TaxFactory::new();
-    }
-}

app/Providers/AuthServiceProvider.php

@@ -36,8 +36,6 @@ class AuthServiceProvider extends ServiceProvider
     {
         $models = [
             Setting\Currency::class,
-            Setting\Discount::class,
-            Setting\Tax::class,
             Banking\BankAccount::class,
         ];
 

app/Providers/MacroServiceProvider.php

@@ -19,7 +19,6 @@ use Filament\Infolists\Components\TextEntry;
 use Filament\Tables\Columns\TextColumn;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Str;
 
 class MacroServiceProvider extends ServiceProvider
 {
@@ -103,18 +102,22 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
-        TextInput::macro('rate', function (string | Closure | null $computation = null): static {
-            $this->extraAttributes(['wire:key' => Str::random()])
-                ->prefix(static function (TextInput $component) use ($computation) {
-                    $computation = $component->evaluate($computation);
-
-                    return ratePrefix(computation: $computation);
-                })
-                ->suffix(static function (TextInput $component) use ($computation) {
-                    $computation = $component->evaluate($computation);
-
-                    return rateSuffix(computation: $computation);
-                })
+        TextInput::macro('rate', function (string | Closure | null $computation = null, bool $showAffix = true): static {
+            $this
+                ->when(
+                    $showAffix,
+                    fn (TextInput $component) => $component
+                        ->prefix(static function (TextInput $component) use ($computation) {
+                            $computation = $component->evaluate($computation);
+
+                            return ratePrefix(computation: $computation);
+                        })
+                        ->suffix(static function (TextInput $component) use ($computation) {
+                            $computation = $component->evaluate($computation);
+
+                            return rateSuffix(computation: $computation);
+                        })
+                )
                 ->mask(static function (TextInput $component) use ($computation) {
                     $computation = $component->evaluate($computation);
 

app/Services/ReportService.php

@@ -177,6 +177,8 @@ class ReportService
 
             $accountTransactions = [];
             $currentBalance = $account->starting_balance;
+            $periodDebitTotal = 0;
+            $periodCreditTotal = 0;
 
             $accountTransactions[] = new AccountTransactionDTO(
                 id: null,
@@ -192,6 +194,13 @@ class ReportService
             foreach ($account->journalEntries as $journalEntry) {
                 $transaction = $journalEntry->transaction;
                 $signedAmount = $journalEntry->signed_amount;
+                $amount = $journalEntry->getRawOriginal('amount');
+
+                if ($journalEntry->type->isDebit()) {
+                    $periodDebitTotal += $amount;
+                } else {
+                    $periodCreditTotal += $amount;
+                }
 
                 if ($account->category->isNormalDebitBalance()) {
                     $currentBalance += $signedAmount;
@@ -219,8 +228,8 @@ class ReportService
                 id: null,
                 date: 'Totals and Ending Balance',
                 description: '',
-                debit: money($account->total_debit, $defaultCurrency)->format(),
-                credit: money($account->total_credit, $defaultCurrency)->format(),
+                debit: money($periodDebitTotal, $defaultCurrency)->format(),
+                credit: money($periodCreditTotal, $defaultCurrency)->format(),
                 balance: money($currentBalance, $defaultCurrency)->format(),
                 type: null,
                 tableAction: null

app/View/Models/BillTotalViewModel.php

@@ -2,6 +2,8 @@
 
 namespace App\View\Models;
 
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\Bill;
 use App\Utilities\Currency\CurrencyConverter;
@@ -17,7 +19,7 @@ class BillTotalViewModel
     {
         $lineItems = collect($this->data['lineItems'] ?? []);
 
-        $subtotal = $lineItems->sum(function ($item) {
+        $subtotal = $lineItems->sum(static function ($item) {
             $quantity = max((float) ($item['quantity'] ?? 0), 0);
             $unitPrice = max((float) ($item['unit_price'] ?? 0), 0);
 
@@ -37,18 +39,32 @@ class BillTotalViewModel
             return $carry + $taxAmount;
         }, 0);
 
-        $discountTotal = $lineItems->reduce(function ($carry, $item) {
-            $quantity = max((float) ($item['quantity'] ?? 0), 0);
-            $unitPrice = max((float) ($item['unit_price'] ?? 0), 0);
-            $purchaseDiscounts = $item['purchaseDiscounts'] ?? [];
-            $lineTotal = $quantity * $unitPrice;
+        // Calculate discount based on method
+        $discountMethod = DocumentDiscountMethod::parse($this->data['discount_method']) ?? DocumentDiscountMethod::PerLineItem;
 
-            $discountAmount = Adjustment::whereIn('id', $purchaseDiscounts)
-                ->pluck('rate')
-                ->sum(fn ($rate) => $lineTotal * ($rate / 100));
+        if ($discountMethod->isPerLineItem()) {
+            $discountTotal = $lineItems->reduce(function ($carry, $item) {
+                $quantity = max((float) ($item['quantity'] ?? 0), 0);
+                $unitPrice = max((float) ($item['unit_price'] ?? 0), 0);
+                $purchaseDiscounts = $item['purchaseDiscounts'] ?? [];
+                $lineTotal = $quantity * $unitPrice;
 
-            return $carry + $discountAmount;
-        }, 0);
+                $discountAmount = Adjustment::whereIn('id', $purchaseDiscounts)
+                    ->pluck('rate')
+                    ->sum(fn ($rate) => $lineTotal * ($rate / 100));
+
+                return $carry + $discountAmount;
+            }, 0);
+        } else {
+            $discountComputation = AdjustmentComputation::parse($this->data['discount_computation']) ?? AdjustmentComputation::Percentage;
+            $discountRate = (float) ($this->data['discount_rate'] ?? 0);
+
+            if ($discountComputation->isPercentage()) {
+                $discountTotal = $subtotal * ($discountRate / 100);
+            } else {
+                $discountTotal = $discountRate;
+            }
+        }
 
         $grandTotal = $subtotal + ($taxTotal - $discountTotal);
 

app/View/Models/InvoiceTotalViewModel.php

@@ -2,6 +2,8 @@
 
 namespace App\View\Models;
 
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\Invoice;
 use App\Utilities\Currency\CurrencyConverter;
@@ -17,7 +19,7 @@ class InvoiceTotalViewModel
     {
         $lineItems = collect($this->data['lineItems'] ?? []);
 
-        $subtotal = $lineItems->sum(function ($item) {
+        $subtotal = $lineItems->sum(static function ($item) {
             $quantity = max((float) ($item['quantity'] ?? 0), 0);
             $unitPrice = max((float) ($item['unit_price'] ?? 0), 0);
 
@@ -37,18 +39,32 @@ class InvoiceTotalViewModel
             return $carry + $taxAmount;
         }, 0);
 
-        $discountTotal = $lineItems->reduce(function ($carry, $item) {
-            $quantity = max((float) ($item['quantity'] ?? 0), 0);
-            $unitPrice = max((float) ($item['unit_price'] ?? 0), 0);
-            $salesDiscounts = $item['salesDiscounts'] ?? [];
-            $lineTotal = $quantity * $unitPrice;
+        // Calculate discount based on method
+        $discountMethod = DocumentDiscountMethod::parse($this->data['discount_method']) ?? DocumentDiscountMethod::PerLineItem;
 
-            $discountAmount = Adjustment::whereIn('id', $salesDiscounts)
-                ->pluck('rate')
-                ->sum(fn ($rate) => $lineTotal * ($rate / 100));
+        if ($discountMethod->isPerLineItem()) {
+            $discountTotal = $lineItems->reduce(function ($carry, $item) {
+                $quantity = max((float) ($item['quantity'] ?? 0), 0);
+                $unitPrice = max((float) ($item['unit_price'] ?? 0), 0);
+                $salesDiscounts = $item['salesDiscounts'] ?? [];
+                $lineTotal = $quantity * $unitPrice;
 
-            return $carry + $discountAmount;
-        }, 0);
+                $discountAmount = Adjustment::whereIn('id', $salesDiscounts)
+                    ->pluck('rate')
+                    ->sum(fn ($rate) => $lineTotal * ($rate / 100));
+
+                return $carry + $discountAmount;
+            }, 0);
+        } else {
+            $discountComputation = AdjustmentComputation::parse($this->data['discount_computation']) ?? AdjustmentComputation::Percentage;
+            $discountRate = (float) ($this->data['discount_rate'] ?? 0);
+
+            if ($discountComputation->isPercentage()) {
+                $discountTotal = $subtotal * ($discountRate / 100);
+            } else {
+                $discountTotal = $discountRate;
+            }
+        }
 
         $grandTotal = $subtotal + ($taxTotal - $discountTotal);
 

composer.json

@@ -17,7 +17,7 @@
         "andrewdwallo/transmatic": "^1.1",
         "awcodes/filament-table-repeater": "^3.0",
         "barryvdh/laravel-snappy": "^1.0",
-        "filament/filament": "^3.2.115",
+        "filament/filament": "v3.2.129",
         "guava/filament-clusters": "^1.1",
         "guzzlehttp/guzzle": "^7.8",
         "jaocero/radio-deck": "^1.2",

database/factories/Accounting/AdjustmentFactory.php

@@ -30,9 +30,11 @@ class AdjustmentFactory extends Factory
     {
         $startDate = $this->faker->dateTimeBetween('now', '+1 year');
         $endDate = $this->faker->dateTimeBetween($startDate, Carbon::parse($startDate)->addYear());
+
+        /** @var AdjustmentComputation $computation */
         $computation = $this->faker->randomElement(AdjustmentComputation::class);
 
-        $rate = $computation === AdjustmentComputation::Fixed
+        $rate = $computation->isFixed()
             ? $this->faker->numberBetween(5, 100) * 100 // $5 - $100 for fixed amounts
             : $this->faker->numberBetween(3, 25) * 10000; // 3% - 25% for percentages
 

database/migrations/2024_11_27_221657_create_bills_table.php

@@ -22,6 +22,9 @@ return new class extends Migration
             $table->timestamp('paid_at')->nullable();
             $table->string('status')->default('unpaid');
             $table->string('currency_code')->nullable();
+            $table->string('discount_method')->default('per_line_item');
+            $table->string('discount_computation')->default('percentage');
+            $table->integer('discount_rate')->default(0);
             $table->integer('subtotal')->default(0);
             $table->integer('tax_total')->default(0);
             $table->integer('discount_total')->default(0);

database/migrations/2024_11_27_223015_create_invoices_table.php

@@ -27,6 +27,9 @@ return new class extends Migration
             $table->timestamp('last_sent')->nullable();
             $table->string('status')->default('draft');
             $table->string('currency_code')->nullable();
+            $table->string('discount_method')->default('per_line_item');
+            $table->string('discount_computation')->default('percentage');
+            $table->integer('discount_rate')->default(0);
             $table->integer('subtotal')->default(0);
             $table->integer('tax_total')->default(0);
             $table->integer('discount_total')->default(0);

package-lock.json

@@ -456,9 +456,9 @@
             }
         },
         "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.5",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-            "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+            "version": "0.3.8",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
+            "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1014,9 +1014,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.24.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
-            "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+            "version": "4.24.3",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz",
+            "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==",
             "dev": true,
             "funding": [
                 {
@@ -1034,9 +1034,9 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001669",
-                "electron-to-chromium": "^1.5.41",
-                "node-releases": "^2.0.18",
+                "caniuse-lite": "^1.0.30001688",
+                "electron-to-chromium": "^1.5.73",
+                "node-releases": "^2.0.19",
                 "update-browserslist-db": "^1.1.1"
             },
             "bin": {
@@ -1057,9 +1057,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001687",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001687.tgz",
-            "integrity": "sha512-0S/FDhf4ZiqrTUiQ39dKeUjYRjkv7lOZU1Dgif2rIqrTzX/1wV2hfKu9TOm1IHkdSijfLswxTFzl/cvir+SLSQ==",
+            "version": "1.0.30001688",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001688.tgz",
+            "integrity": "sha512-Nmqpru91cuABu/DTCXbM2NSRHzM2uVHfPnhJ/1zEAJx/ILBRVmz3pzH4N7DZqbdG0gWClsCC05Oj0mJ/1AWMbA==",
             "dev": true,
             "funding": [
                 {
@@ -1218,9 +1218,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.71",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz",
-            "integrity": "sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==",
+            "version": "1.5.73",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.73.tgz",
+            "integrity": "sha512-8wGNxG9tAG5KhGd3eeA0o6ixhiNdgr0DcHWm85XPCphwZgD1lIEoi6t3VERayWao7SF7AAZTw6oARGJeVjH8Kg==",
             "dev": true,
             "license": "ISC"
         },
@@ -1487,9 +1487,9 @@
             }
         },
         "node_modules/is-core-module": {
-            "version": "2.15.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-            "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+            "version": "2.16.0",
+            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.0.tgz",
+            "integrity": "sha512-urTSINYfAYgcbLb0yDQ6egFm6h3Mo1DcF9EkyXSRjjzdHbsulg01qhwWuXdOoUBuTkbQ80KDboXa0vFJ+BDH+g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1761,9 +1761,9 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.18",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
-            "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+            "version": "2.0.19",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+            "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
             "dev": true,
             "license": "MIT"
         },
@@ -2192,13 +2192,13 @@
             }
         },
         "node_modules/resolve": {
-            "version": "1.22.8",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-            "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+            "version": "1.22.9",
+            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.9.tgz",
+            "integrity": "sha512-QxrmX1DzraFIi9PxdG5VkRfRwIgjwyud+z/iBwfRRrVmHc+P9Q7u2lSSpQ6bjr2gy5lrqIiU9vb6iAeGf2400A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "is-core-module": "^2.13.0",
+                "is-core-module": "^2.16.0",
                 "path-parse": "^1.0.7",
                 "supports-preserve-symlinks-flag": "^1.0.0"
             },

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

@@ -1,5 +1,15 @@
+@props([
+    'preview' => false,
+])
+
 <div class="inv-container flex justify-center p-6">
-    <div class="inv-paper bg-[#ffffff] dark:bg-gray-800 rounded-sm shadow-xl w-[38.25rem] h-[49.5rem] overflow-hidden">
+    <div
+        @class([
+            'inv-paper bg-[#ffffff] dark:bg-gray-800 rounded-sm shadow-xl',
+            'w-full max-w-[820px] min-h-[1024px]' => $preview === false,
+            'w-[38.25rem] h-[49.5rem] overflow-hidden' => $preview === true,
+        ])
+    >
         {{ $slot }}
     </div>
 </div>

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

@@ -1,3 +1,3 @@
-<footer {{ $attributes->class(['inv-footer text-xs text-gray-600 dark:text-gray-300']) }}>
+<footer {{ $attributes->class(['inv-footer text-xs text-gray-600 dark:text-gray-300 min-h-60']) }}>
     {{ $slot }}
 </footer>

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

@@ -13,7 +13,7 @@
     }
 </style>
 
-<x-company.invoice.container class="classic-template-container">
+<x-company.invoice.container class="classic-template-container" preview>
     <!-- Header Section -->
     <x-company.invoice.header class="default-template-header">
         <div class="w-2/3 text-left ml-6">

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

@@ -13,7 +13,7 @@
     }
 </style>
 
-<x-company.invoice.container class="default-template-container">
+<x-company.invoice.container class="default-template-container" preview>
 
     <x-company.invoice.header class="default-template-header border-b-2 p-6 pb-4">
         <div class="w-2/3">

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

@@ -13,7 +13,7 @@
     }
 </style>
 
-<x-company.invoice.container class="modern-template-container">
+<x-company.invoice.container class="modern-template-container" preview>
 
     <!-- Colored Header with Logo -->
     <x-company.invoice.header class="bg-gray-800 h-20">

resources/views/filament/company/resources/sales/invoices/components/invoice-view.blade.php

@@ -0,0 +1,169 @@
+@php
+    /** @var \App\Models\Accounting\Invoice $invoice */
+    $invoiceSettings = $invoice->company->defaultInvoice;
+
+    $company = $invoice->company;
+
+    use App\Utilities\Currency\CurrencyConverter;
+@endphp
+
+<x-company.invoice.container class="modern-template-container">
+    <!-- Colored Header with Logo -->
+    <x-company.invoice.header class="bg-gray-800 h-24">
+        <!-- Logo -->
+        <div class="w-2/3">
+            @if($invoice->logo && $invoiceSettings->show_logo)
+                <x-company.invoice.logo class="ml-8" :src="$invoice->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: {{ $invoiceSettings->accent_color }};">
+            @if($invoice->header)
+                <h1 class="text-4xl font-bold text-white text-center uppercase">{{ $invoice->header }}</h1>
+            @endif
+        </div>
+    </x-company.invoice.header>
+
+    <!-- Company Details -->
+    <x-company.invoice.metadata class="modern-template-metadata space-y-8">
+        <div class="text-sm">
+            <h2 class="text-lg font-semibold">{{ $company->name }}</h2>
+            @if($company->profile->address && $company->profile->city?->name && $company->profile->state?->name && $company->profile?->zip_code)
+                <p>{{ $company->profile->address }}</p>
+                <p>{{ $company->profile->city->name }}
+                    , {{ $company->profile->state->name }} {{ $company->profile->zip_code }}</p>
+                <p>{{ $company->profile->state->country->name }}</p>
+            @endif
+        </div>
+
+        <div class="flex justify-between items-end">
+            <!-- Billing Details -->
+            <div class="text-sm tracking-tight">
+                <h3 class="text-gray-600 dark:text-gray-400 font-medium tracking-tight mb-1">BILL TO</h3>
+                <p class="text-base font-bold"
+                   style="color: {{ $invoiceSettings->accent_color }}">{{ $invoice->client->name }}</p>
+
+                @if($invoice->client->billingAddress)
+                    @php
+                        $address = $invoice->client->billingAddress;
+                    @endphp
+                    @if($address->address_line_1)
+                        <p>{{ $address->address_line_1 }}</p>
+                    @endif
+                    @if($address->address_line_2)
+                        <p>{{ $address->address_line_2 }}</p>
+                    @endif
+                    <p>
+                        {{ $address->city }}{{ $address->state ? ', ' . $address->state : '' }}
+                        {{ $address->postal_code }}
+                    </p>
+                    @if($address->country)
+                        <p>{{ $address->country }}</p>
+                    @endif
+                @endif
+            </div>
+
+            <div class="text-sm 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->invoice_number }}</td>
+                    </tr>
+                    @if($invoice->order_number)
+                        <tr>
+                            <td class="font-semibold text-right pr-2">P.O/S.O Number:</td>
+                            <td class="text-left pl-2">{{ $invoice->order_number }}</td>
+                        </tr>
+                    @endif
+                    <tr>
+                        <td class="font-semibold text-right pr-2">Invoice Date:</td>
+                        <td class="text-left pl-2">{{ $invoice->date->toDefaultDateFormat() }}</td>
+                    </tr>
+                    <tr>
+                        <td class="font-semibold text-right pr-2">Payment Due:</td>
+                        <td class="text-left pl-2">{{ $invoice->due_date->toDefaultDateFormat() }}</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </x-company.invoice.metadata>
+
+    <!-- Line Items Table -->
+    <x-company.invoice.line-items class="modern-template-line-items">
+        <table class="w-full text-left table-fixed">
+            <thead class="text-sm leading-relaxed">
+            <tr class="text-gray-600 dark:text-gray-400">
+                <th class="text-left pl-6 w-[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>
+            </tr>
+            </thead>
+            <tbody class="text-sm tracking-tight border-y-2">
+            @foreach($invoice->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->offering->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">{{ CurrencyConverter::formatToMoney($item->unit_price) }}</td>
+                    <td class="text-right pr-6 py-3">{{ CurrencyConverter::formatToMoney($item->subtotal) }}</td>
+                </tr>
+            @endforeach
+            </tbody>
+            <tfoot class="text-sm tracking-tight">
+            <tr>
+                <td class="pl-6 py-2" colspan="2"></td>
+                <td class="text-right font-semibold py-2">Subtotal:</td>
+                <td class="text-right pr-6 py-2">{{ CurrencyConverter::formatToMoney($invoice->subtotal) }}</td>
+            </tr>
+            @if($invoice->discount_total)
+                <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">
+                        ({{ CurrencyConverter::formatToMoney($invoice->discount_total) }})
+                    </td>
+                </tr>
+            @endif
+            @if($invoice->tax_total)
+                <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">{{ CurrencyConverter::formatToMoney($invoice->tax_total) }}</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">{{ CurrencyConverter::formatToMoney($invoice->total) }}</td>
+            </tr>
+            <tr>
+                <td class="pl-6 py-2" colspan="2"></td>
+                <td class="text-right font-semibold border-t-4 border-double py-2">Amount Due
+                    ({{ $invoice->currency_code }}):
+                </td>
+                <td class="text-right border-t-4 border-double pr-6 py-2">{{ CurrencyConverter::formatToMoney($invoice->amount_due) }}</td>
+            </tr>
+            </tfoot>
+        </table>
+    </x-company.invoice.line-items>
+
+    <!-- Footer Notes -->
+    <x-company.invoice.footer class="modern-template-footer tracking-tight">
+        <h4 class="font-semibold px-6 text-sm" style="color: {{ $invoiceSettings->accent_color }}">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">{{ $invoice->terms }}</p>
+            <p class="w-1/2 break-words line-clamp-4">{{ $invoice->footer }}</p>
+        </div>
+    </x-company.invoice.footer>
+</x-company.invoice.container>

resources/views/filament/company/resources/sales/invoices/pages/view-invoice.blade.php

@@ -0,0 +1,47 @@
+<x-filament-panels::page
+    @class([
+        'fi-resource-view-record-page',
+        'fi-resource-' . str_replace('/', '-', $this->getResource()::getSlug()),
+        'fi-resource-record-' . $record->getKey(),
+    ])
+>
+    @php
+        $relationManagers = $this->getRelationManagers();
+        $hasCombinedRelationManagerTabsWithContent = $this->hasCombinedRelationManagerTabsWithContent();
+    @endphp
+
+    @if ((! $hasCombinedRelationManagerTabsWithContent) || (! count($relationManagers)))
+        @if ($this->hasInfolist())
+            {{ $this->infolist }}
+        @else
+            <div
+                wire:key="{{ $this->getId() }}.forms.{{ $this->getFormStatePath() }}"
+            >
+                {{ $this->form }}
+            </div>
+        @endif
+    @endif
+
+    @if (count($relationManagers))
+        <x-filament-panels::resources.relation-managers
+            :active-locale="isset($activeLocale) ? $activeLocale : null"
+            :active-manager="$this->activeRelationManager ?? ($hasCombinedRelationManagerTabsWithContent ? null : array_key_first($relationManagers))"
+            :content-tab-label="$this->getContentTabLabel()"
+            :content-tab-icon="$this->getContentTabIcon()"
+            :content-tab-position="$this->getContentTabPosition()"
+            :managers="$relationManagers"
+            :owner-record="$record"
+            :page-class="static::class"
+        >
+            @if ($hasCombinedRelationManagerTabsWithContent)
+                <x-slot name="content">
+                    @if ($this->hasInfolist())
+                        {{ $this->infolist }}
+                    @else
+                        {{ $this->form }}
+                    @endif
+                </x-slot>
+            @endif
+        </x-filament-panels::resources.relation-managers>
+    @endif
+</x-filament-panels::page>

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

@@ -1,34 +1,61 @@
-@use('App\Utilities\Currency\CurrencyAccessor')
-
 @php
+    use App\Enums\Accounting\DocumentDiscountMethod;
+    use App\Utilities\Currency\CurrencyAccessor;
+    use App\View\Models\BillTotalViewModel;
+
     $data = $this->form->getRawState();
-    $viewModel = new \App\View\Models\BillTotalViewModel($this->record, $data);
-    extract($viewModel->buildViewData(), \EXTR_SKIP);
+    $viewModel = new BillTotalViewModel($this->record, $data);
+    extract($viewModel->buildViewData(), EXTR_SKIP);
+
+    $discountMethod = DocumentDiscountMethod::parse($data['discount_method']);
+    $isPerDocumentDiscount = $discountMethod->isPerDocument();
 @endphp
 
 <div class="totals-summary w-full pr-14">
     <table class="w-full text-right table-fixed">
+        <colgroup>
+            <col class="w-[20%]"> {{-- Items --}}
+            <col class="w-[30%]"> {{-- Description --}}
+            <col class="w-[10%]"> {{-- Quantity --}}
+            <col class="w-[10%]"> {{-- Price --}}
+            <col class="w-[20%]"> {{-- Taxes --}}
+            <col class="w-[10%]"> {{-- Amount --}}
+        </colgroup>
         <tbody>
             <tr>
-                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Subtotal:</td>
-                <td class="w-1/3 text-sm pl-4 py-2 leading-6">{{ $subtotal }}</td>
-            </tr>
-            <tr>
-                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Taxes:</td>
-                <td class="w-1/3 text-sm pl-4 py-2 leading-6">{{ $taxTotal }}</td>
+                <td colspan="4"></td>
+                <td class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Subtotal:</td>
+                <td class="text-sm pl-4 py-2 leading-6">{{ $subtotal }}</td>
             </tr>
             <tr>
-                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Discounts:</td>
-                <td class="w-1/3 text-sm pl-4 py-2 leading-6">({{ $discountTotal }})</td>
+                <td colspan="4"></td>
+                <td class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Taxes:</td>
+                <td class="text-sm pl-4 py-2 leading-6">{{ $taxTotal }}</td>
             </tr>
+            @if($isPerDocumentDiscount)
+                <tr>
+                    <td colspan="4" class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white text-right">Discount:</td>
+                    <td class="text-sm px-4 py-2">
+                        <div class="flex justify-between space-x-2">
+                            @foreach($getChildComponentContainer()->getComponents() as $component)
+                                <div class="flex-1">{{ $component }}</div>
+                            @endforeach
+                        </div>
+                    </td>
+                    <td class="text-sm pl-4 py-2 leading-6">({{ $discountTotal }})</td>
+                </tr>
+            @else
+                <tr>
+                    <td colspan="4"></td>
+                    <td class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Discounts:</td>
+                    <td class="text-sm pl-4 py-2 leading-6">({{ $discountTotal }})</td>
+                </tr>
+            @endif
             <tr class="font-semibold">
-                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Total:</td>
-                <td class="w-1/3 text-sm pl-4 py-2 leading-6">{{ $grandTotal }}</td>
+                <td colspan="4"></td>
+                <td class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Total:</td>
+                <td class="text-sm pl-4 py-2 leading-6">{{ $grandTotal }}</td>
             </tr>
         </tbody>
     </table>
 </div>
-
-
-
-

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

@@ -1,34 +1,61 @@
-@use('App\Utilities\Currency\CurrencyAccessor')
-
 @php
+    use App\Enums\Accounting\DocumentDiscountMethod;
+    use App\Utilities\Currency\CurrencyAccessor;
+    use App\View\Models\InvoiceTotalViewModel;
+
     $data = $this->form->getRawState();
-    $viewModel = new \App\View\Models\InvoiceTotalViewModel($this->record, $data);
-    extract($viewModel->buildViewData(), \EXTR_SKIP);
+    $viewModel = new InvoiceTotalViewModel($this->record, $data);
+    extract($viewModel->buildViewData(), EXTR_SKIP);
+
+    $discountMethod = DocumentDiscountMethod::parse($data['discount_method']);
+    $isPerDocumentDiscount = $discountMethod->isPerDocument();
 @endphp
 
 <div class="totals-summary w-full pr-14">
     <table class="w-full text-right table-fixed">
+        <colgroup>
+            <col class="w-[20%]"> {{-- Items --}}
+            <col class="w-[30%]"> {{-- Description --}}
+            <col class="w-[10%]"> {{-- Quantity --}}
+            <col class="w-[10%]"> {{-- Price --}}
+            <col class="w-[20%]"> {{-- Taxes --}}
+            <col class="w-[10%]"> {{-- Amount --}}
+        </colgroup>
         <tbody>
             <tr>
-                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Subtotal:</td>
-                <td class="w-1/3 text-sm pl-4 py-2 leading-6">{{ $subtotal }}</td>
-            </tr>
-            <tr>
-                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Taxes:</td>
-                <td class="w-1/3 text-sm pl-4 py-2 leading-6">{{ $taxTotal }}</td>
+                <td colspan="4"></td>
+                <td class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Subtotal:</td>
+                <td class="text-sm pl-4 py-2 leading-6">{{ $subtotal }}</td>
             </tr>
             <tr>
-                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Discounts:</td>
-                <td class="w-1/3 text-sm pl-4 py-2 leading-6">({{ $discountTotal }})</td>
+                <td colspan="4"></td>
+                <td class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Taxes:</td>
+                <td class="text-sm pl-4 py-2 leading-6">{{ $taxTotal }}</td>
             </tr>
+            @if($isPerDocumentDiscount)
+                <tr>
+                    <td colspan="4" class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white text-right">Discount:</td>
+                    <td class="text-sm px-4 py-2">
+                        <div class="flex justify-between space-x-2">
+                            @foreach($getChildComponentContainer()->getComponents() as $component)
+                                <div class="flex-1">{{ $component }}</div>
+                            @endforeach
+                        </div>
+                    </td>
+                    <td class="text-sm pl-4 py-2 leading-6">({{ $discountTotal }})</td>
+                </tr>
+            @else
+                <tr>
+                    <td colspan="4"></td>
+                    <td class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Discounts:</td>
+                    <td class="text-sm pl-4 py-2 leading-6">({{ $discountTotal }})</td>
+                </tr>
+            @endif
             <tr class="font-semibold">
-                <td class="w-2/3 text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Total:</td>
-                <td class="w-1/3 text-sm pl-4 py-2 leading-6">{{ $grandTotal }}</td>
+                <td colspan="4"></td>
+                <td class="text-sm px-4 py-2 font-medium leading-6 text-gray-950 dark:text-white">Total:</td>
+                <td class="text-sm pl-4 py-2 leading-6">{{ $grandTotal }}</td>
             </tr>
         </tbody>
     </table>
 </div>
-
-
-
-