wip

app/Concerns/ManagesLineItems.php

+<?php
+
+namespace App\Concerns;
+
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Models\Accounting\DocumentLineItem;
+use App\Models\Accounting\Invoice;
+use App\Utilities\Currency\CurrencyConverter;
+use Illuminate\Support\Collection;
+
+trait ManagesLineItems
+{
+    protected function handleLineItems(Invoice $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(Invoice $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, string $discountMethod): void
+    {
+        $adjustmentIds = collect($itemData['salesTaxes'] ?? [])
+            ->merge($discountMethod === 'line_items' ? ($itemData['salesDiscounts'] ?? []) : [])
+            ->filter()
+            ->unique();
+
+        $lineItem->adjustments()->sync($adjustmentIds);
+        $lineItem->refresh();
+    }
+
+    protected function updateLineItemTotals(DocumentLineItem $lineItem, string $discountMethod): void
+    {
+        $lineItem->updateQuietly([
+            'tax_total' => $lineItem->calculateTaxTotal()->getAmount(),
+            'discount_total' => $discountMethod === 'line_items'
+                ? $lineItem->calculateDiscountTotal()->getAmount()
+                : 0,
+        ]);
+    }
+
+    protected function updateInvoiceTotals(Invoice $record, array $data): array
+    {
+        $subtotalCents = $record->lineItems()->sum('subtotal');
+        $taxTotalCents = $record->lineItems()->sum('tax_total');
+        $discountTotalCents = $this->calculateDiscountTotal(
+            $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(
+        string $discountMethod,
+        ?AdjustmentComputation $discountComputation,
+        ?string $discountRate,
+        int $subtotalCents,
+        Invoice $record
+    ): int {
+        if ($discountMethod === 'line_items') {
+            return $record->lineItems()->sum('discount_total');
+        }
+
+        if ($discountComputation === AdjustmentComputation::Percentage) {
+            return (int) ($subtotalCents * ((float) $discountRate / 100));
+        }
+
+        return CurrencyConverter::convertToCents($discountRate);
+    }
+}

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

 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;
         return $form
             ->schema([
                 $this->getGeneralSection(),
-                // $this->getModifiersSection(),
             ])
             ->model($this->record)
             ->statePath('data')
             ])->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/Resources/Sales/InvoiceResource.php

 namespace App\Filament\Company\Resources\Sales;
 
 use App\Collections\Accounting\InvoiceCollection;
-use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\PaymentMethod;
 use App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 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;
 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;
 
                         ])->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);
-                                }
-
-                                $component->getRecord()->setRelation($component->getRelationshipName(), $existingRecords);
-
-                                /** @var Invoice $invoice */
-                                $invoice = $component->getRecord();
-
-                                // Recalculate totals for line items
-                                // Recalculate totals for line items
-                                $invoice->lineItems()->each(function (DocumentLineItem $lineItem) use ($invoice) {
-                                    $lineItem->updateQuietly([
-                                        'tax_total' => $lineItem->calculateTaxTotal()->getAmount(),
-                                        'discount_total' => $invoice->discount_method === 'line_items'
-                                            ? $lineItem->calculateDiscountTotal()->getAmount()
-                                            : 0,
-                                    ]);
-                                });
-
-                                $subtotal = $invoice->lineItems()->sum('subtotal') / 100;
-                                $taxTotal = $invoice->lineItems()->sum('tax_total') / 100;
-                                if ($invoice->discount_method === 'line_items') {
-                                    $discountTotal = $invoice->lineItems()->sum('discount_total') / 100;
-                                } else {
-                                    // Calculate invoice-level discount
-                                    if ($invoice->discount_computation === AdjustmentComputation::Percentage) {
-                                        $discountTotal = $subtotal * ($invoice->discount_rate / 100);
-                                    } else {
-                                        $discountTotal = $invoice->discount_rate;
-                                    }
-                                }
-
-                                $grandTotal = $subtotal + $taxTotal - $discountTotal;
-
-                                $invoice->updateQuietly([
-                                    'subtotal' => $subtotal,
-                                    'tax_total' => $taxTotal,
-                                    'discount_total' => $discountTotal,
-                                    'total' => $grandTotal,
-                                ]);
-
-                                if ($invoice->approved_at && $invoice->approvalTransaction) {
-                                    $invoice->updateApprovalTransaction();
-                                }
-                            })
+                            ->saveRelationshipsUsing(null)
+                            ->dehydrated(true)
                             ->headers(function (Forms\Get $get) {
                                 $hasDiscounts = $get('discount_method') === 'line_items';
 
                                     ->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()
         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

 
 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;
     {
         return MaxWidth::Full;
     }
+
+    protected function handleRecordCreation(array $data): Model
+    {
+        /** @var Invoice $record */
+        $record = parent::handleRecordCreation($data);
+
+        $this->handleLineItems($record, collect($data['lineItems'] ?? []));
+
+        $totals = $this->updateInvoiceTotals($record, $data);
+
+        $record->updateQuietly($totals);
+
+        return $record;
+    }
 }

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

 
 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;
     {
         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->updateInvoiceTotals($record, $data);
+
+        $data = array_merge($data, $totals);
+
+        $record = parent::handleRecordUpdate($record, $data);
+
+        if ($record->approved_at && $record->approvalTransaction) {
+            $record->updateApprovalTransaction();
+        }
+
+        return $record;
+    }
 }

app/Models/Setting/Discount.php

-<?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

-<?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

     {
         $models = [
             Setting\Currency::class,
-            Setting\Discount::class,
-            Setting\Tax::class,
             Banking\BankAccount::class,
         ];