wip

app/Casts/DocumentMoneyCast.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Casts;
+
+use App\Utilities\Currency\CurrencyAccessor;
+use App\Utilities\Currency\CurrencyConverter;
+use Illuminate\Contracts\Database\Eloquent\CastsAttributes;
+use Illuminate\Database\Eloquent\Model;
+use UnexpectedValueException;
+
+class DocumentMoneyCast implements CastsAttributes
+{
+    /**
+     * Cast the given value.
+     *
+     * @param  array<string, mixed>  $attributes
+     */
+    public function get(Model $model, string $key, mixed $value, array $attributes): mixed
+    {
+        $currency_code = $attributes['currency_code'] ?? CurrencyAccessor::getDefaultCurrency();
+
+        if ($value !== null) {
+            return CurrencyConverter::convertCentsToFloat($value, $currency_code);
+        }
+
+        return 0.0;
+    }
+
+    /**
+     * Prepare the given value for storage.
+     *
+     * @param  array<string, mixed>  $attributes
+     */
+    public function set(Model $model, string $key, mixed $value, array $attributes): mixed
+    {
+        $currency_code = $attributes['currency_code'] ?? CurrencyAccessor::getDefaultCurrency();
+
+        if (is_numeric($value)) {
+            $value = (string) $value;
+        } elseif (! is_string($value)) {
+            throw new UnexpectedValueException('Expected string or numeric value for money cast');
+        }
+
+        return CurrencyConverter::prepareForAccessor($value, $currency_code);
+    }
+}

app/Enums/Accounting/DocumentStatus.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Enums\Accounting;
+
+use Filament\Support\Contracts\HasColor;
+use Filament\Support\Contracts\HasLabel;
+
+enum DocumentStatus: string implements HasColor, HasLabel
+{
+    case Draft = 'draft';
+    case Sent = 'sent';
+
+    case Partial = 'partial';
+
+    case Paid = 'paid';
+
+    case Overdue = 'overdue';
+
+    case Void = 'void';
+
+    case Unpaid = 'unpaid';
+
+    public function getInvoiceStatuses(): array
+    {
+        return [
+            self::Draft,
+            self::Sent,
+            self::Partial,
+            self::Paid,
+            self::Overdue,
+            self::Void,
+        ];
+    }
+
+    public function getBillStatuses(): array
+    {
+        return [
+            self::Partial,
+            self::Paid,
+            self::Unpaid,
+            self::Void,
+        ];
+    }
+
+    public function getLabel(): ?string
+    {
+        return $this->name;
+    }
+
+    public function getColor(): string | array | null
+    {
+        return match ($this) {
+            self::Draft, self::Void => 'gray',
+            self::Sent => 'primary',
+            self::Partial, self::Unpaid => 'warning',
+            self::Paid => 'success',
+            self::Overdue => 'danger',
+        };
+    }
+}

app/Filament/Company/Resources/Accounting/DocumentResource.php

@@ -6,10 +6,12 @@ use App\Enums\Accounting\AdjustmentCategory;
 use App\Filament\Company\Resources\Accounting\DocumentResource\Pages;
 use App\Models\Accounting\Adjustment;
 use App\Models\Accounting\Document;
+use App\Models\Accounting\DocumentLineItem;
 use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyAccessor;
 use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
+use Carbon\CarbonInterface;
 use Filament\Forms;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Form;
@@ -17,6 +19,8 @@ use Filament\Resources\Resource;
 use Filament\Support\Enums\MaxWidth;
 use Filament\Tables;
 use Filament\Tables\Table;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Features\SupportFileUploads\TemporaryUploadedFile;
 
@@ -88,7 +92,7 @@ class DocumentResource extends Resource
                             Forms\Components\Group::make([
                                 Forms\Components\TextInput::make('document_number')
                                     ->label('Invoice Number')
-                                    ->default(fn () => $company->defaultInvoice->getNumberNext()),
+                                    ->default(fn () => Document::getNextDocumentNumber()),
                                 Forms\Components\TextInput::make('order_number')
                                     ->label('P.O/S.O Number'),
                                 Forms\Components\DatePicker::make('date')
@@ -103,28 +107,96 @@ class DocumentResource extends Resource
                         ])->from('md'),
                         TableRepeater::make('lineItems')
                             ->relationship()
-                            ->saveRelationshipsUsing(function (Document $document, array $state) {
-                                $document->lineItems()->delete();
-
-                                collect($state)->map(function ($lineItemData) use ($document) {
-                                    $lineItem = $document->lineItems()->create([
-                                        'offering_id' => $lineItemData['offering_id'],
-                                        'description' => $lineItemData['description'],
-                                        'quantity' => $lineItemData['quantity'],
-                                        'unit_price' => $lineItemData['unit_price'],
-                                        'tax_total' => collect($lineItemData['salesTaxes'] ?? [])->sum(function ($taxId) use ($lineItemData) {
-                                            $tax = Adjustment::find($taxId);
-
-                                            return $tax ? ($lineItemData['quantity'] * $lineItemData['unit_price']) * ($tax->rate / 100) : 0;
-                                        }),
-                                    ]);
+                            ->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();
 
-                                    $lineItem->taxes()->sync($lineItemData['salesTaxes'] ?? []);
+                                    $itemData = $component->mutateRelationshipDataBeforeCreate($itemData);
 
-                                    return $lineItem;
+                                    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 Document $document */
+                                $document = $component->getRecord();
+
+                                // Recalculate totals for line items
+                                $document->lineItems()->each(function (DocumentLineItem $lineItem) {
+                                    $lineItem->updateQuietly([
+                                        'tax_total' => $lineItem->calculateTaxTotal()->getAmount(),
+                                        'discount_total' => $lineItem->calculateDiscountTotal()->getAmount(),
+                                    ]);
                                 });
 
-                                $document->refresh();
                                 $subtotal = $document->lineItems()->sum('subtotal') / 100;
                                 $taxTotal = $document->lineItems()->sum('tax_total') / 100;
                                 $discountTotal = $document->lineItems()->sum('discount_total') / 100;
@@ -138,11 +210,12 @@ class DocumentResource extends Resource
                                 ]);
                             })
                             ->headers([
-                                Header::make('Items')->width('20%'),
-                                Header::make('Description')->width('30%'),
+                                Header::make('Items')->width('15%'),
+                                Header::make('Description')->width('25%'),
                                 Header::make('Quantity')->width('10%'),
                                 Header::make('Price')->width('10%'),
-                                Header::make('Taxes')->width('20%'),
+                                Header::make('Taxes')->width('15%'),
+                                Header::make('Discounts')->width('15%'),
                                 Header::make('Amount')->width('10%')->align('right'),
                             ])
                             ->live()
@@ -160,13 +233,7 @@ class DocumentResource extends Resource
                                             $set('description', $offeringRecord->description);
                                             $set('unit_price', $offeringRecord->price);
                                             $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
-
-                                            $quantity = $get('quantity');
-                                            $total = $quantity * $offeringRecord->price;
-
-                                            // Calculate taxes and update total
-                                            $taxAmount = $offeringRecord->salesTaxes->sum(fn ($tax) => $total * ($tax->rate / 100));
-                                            $set('total', $total + $taxAmount);
+                                            $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
                                         }
                                     }),
                                 Forms\Components\TextInput::make('description'),
@@ -183,27 +250,39 @@ class DocumentResource extends Resource
                                     ->preload()
                                     ->multiple()
                                     ->searchable(),
+                                Forms\Components\Select::make('salesDiscounts')
+                                    ->relationship('salesDiscounts', 'name')
+                                    ->preload()
+                                    ->multiple()
+                                    ->searchable(),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
                                     ->content(function (Forms\Get $get) {
                                         $quantity = $get('quantity') ?? 0;
                                         $unitPrice = $get('unit_price') ?? 0;
                                         $salesTaxes = $get('salesTaxes') ?? [];
+                                        $salesDiscounts = $get('salesDiscounts') ?? [];
 
-                                        $total = $quantity * $unitPrice;
+                                        // Base total (subtotal)
+                                        $subtotal = $quantity * $unitPrice;
 
+                                        // Calculate tax amount based on subtotal
+                                        $taxAmount = 0;
                                         if (! empty($salesTaxes)) {
                                             $taxRates = Adjustment::whereIn('id', $salesTaxes)->pluck('rate');
+                                            $taxAmount = collect($taxRates)->sum(fn ($rate) => $subtotal * ($rate / 100));
+                                        }
 
-                                            $taxAmount = $taxRates->sum(function ($rate) use ($total) {
-                                                return $total * ($rate / 100);
-                                            });
-
-                                            $total += $taxAmount;
-
-                                            return money($total, CurrencyAccessor::getDefaultCurrency(), true)->format();
+                                        // Calculate discount amount based on subtotal
+                                        $discountAmount = 0;
+                                        if (! empty($salesDiscounts)) {
+                                            $discountRates = Adjustment::whereIn('id', $salesDiscounts)->pluck('rate');
+                                            $discountAmount = collect($discountRates)->sum(fn ($rate) => $subtotal * ($rate / 100));
                                         }
 
+                                        // Final total
+                                        $total = $subtotal + ($taxAmount - $discountAmount);
+
                                         return money($total, CurrencyAccessor::getDefaultCurrency(), true)->format();
                                     }),
                             ]),
@@ -316,9 +395,26 @@ class DocumentResource extends Resource
         return $table
             ->columns([
                 Tables\Columns\TextColumn::make('status')
+                    ->badge()
                     ->searchable(),
                 Tables\Columns\TextColumn::make('due_date')
-                    ->date()
+                    ->label('Due')
+                    ->formatStateUsing(function (Tables\Columns\TextColumn $column, mixed $state) {
+                        if (blank($state)) {
+                            return null;
+                        }
+
+                        $date = Carbon::parse($state)
+                            ->setTimezone($timezone ?? $column->getTimezone());
+
+                        if ($date->isToday()) {
+                            return 'Today';
+                        }
+
+                        return $date->diffForHumans([
+                            'options' => CarbonInterface::ONE_DAY_WORDS,
+                        ]);
+                    })
                     ->sortable(),
                 Tables\Columns\TextColumn::make('date')
                     ->date()
@@ -330,11 +426,13 @@ class DocumentResource extends Resource
                     ->numeric()
                     ->sortable(),
                 Tables\Columns\TextColumn::make('total')
-                    ->money(),
+                    ->currency(),
                 Tables\Columns\TextColumn::make('amount_paid')
-                    ->money(),
+                    ->label('Amount Paid')
+                    ->currency(),
                 Tables\Columns\TextColumn::make('amount_due')
-                    ->money(),
+                    ->label('Amount Due')
+                    ->currency(),
             ])
             ->filters([
                 //

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

@@ -5,7 +5,7 @@ namespace App\Filament\Company\Resources\Sales\InvoiceResource\Pages;
 use App\Filament\Company\Resources\Sales\InvoiceResource;
 use Filament\Actions;
 use Filament\Resources\Pages\EditRecord;
-use Illuminate\Database\Eloquent\Model;
+use Filament\Support\Enums\MaxWidth;
 
 class EditInvoice extends EditRecord
 {
@@ -18,10 +18,8 @@ class EditInvoice extends EditRecord
         ];
     }
 
-    protected function handleRecordUpdate(Model $record, array $data): Model
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
-        ray($data);
-
-        return parent::handleRecordUpdate($record, $data); // TODO: Change the autogenerated stub
+        return MaxWidth::Full;
     }
 }

app/Models/Accounting/Document.php

@@ -5,6 +5,7 @@ namespace App\Models\Accounting;
 use App\Casts\MoneyCast;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\DocumentStatus;
 use App\Enums\Accounting\DocumentType;
 use App\Models\Banking\Payment;
 use App\Models\Common\Client;
@@ -54,6 +55,7 @@ class Document extends Model
         'type' => DocumentType::class,
         'date' => 'date',
         'due_date' => 'date',
+        'status' => DocumentStatus::class,
         'subtotal' => MoneyCast::class,
         'tax_total' => MoneyCast::class,
         'discount_total' => MoneyCast::class,
@@ -81,4 +83,38 @@ class Document extends Model
     {
         return $this->hasMany(Payment::class);
     }
+
+    public static function getNextDocumentNumber(DocumentType $documentType = DocumentType::Invoice): string
+    {
+        $company = auth()->user()->currentCompany;
+
+        if (! $company) {
+            throw new \RuntimeException('No current company is set for the user.');
+        }
+
+        $defaultInvoiceSettings = $company->defaultInvoice;
+
+        $numberPrefix = $defaultInvoiceSettings->number_prefix;
+        $numberDigits = $defaultInvoiceSettings->number_digits;
+
+        $latestDocument = static::query()
+            ->whereNotNull('document_number')
+            ->where('type', $documentType)
+            ->latest('document_number')
+            ->first();
+
+        $lastNumberNumericPart = $latestDocument
+            ? (int) substr($latestDocument->document_number, strlen($numberPrefix))
+            : 0;
+
+        $numberNext = $lastNumberNumericPart + 1;
+
+        return $defaultInvoiceSettings->getNumberNext(
+            padded: true,
+            format: true,
+            prefix: $numberPrefix,
+            digits: $numberDigits,
+            next: $numberNext
+        );
+    }
 }

app/Models/Accounting/DocumentLineItem.php

@@ -2,6 +2,8 @@
 
 namespace App\Models\Accounting;
 
+use Akaunting\Money\Money;
+use App\Casts\DocumentMoneyCast;
 use App\Casts\MoneyCast;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
@@ -9,6 +11,7 @@ use App\Enums\Accounting\AdjustmentCategory;
 use App\Enums\Accounting\AdjustmentType;
 use App\Models\Common\Offering;
 use App\Observers\DocumentLineItemObserver;
+use App\Utilities\Currency\CurrencyAccessor;
 use Illuminate\Database\Eloquent\Attributes\ObservedBy;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -39,7 +42,7 @@ class DocumentLineItem extends Model
 
     protected $casts = [
         'unit_price' => MoneyCast::class,
-        'subtotal' => MoneyCast::class,
+        'subtotal' => DocumentMoneyCast::class,
         'tax_total' => MoneyCast::class,
         'discount_total' => MoneyCast::class,
         'total' => MoneyCast::class,
@@ -79,4 +82,24 @@ class DocumentLineItem extends Model
     {
         return $this->adjustments()->where('category', AdjustmentCategory::Discount);
     }
+
+    public function calculateTaxTotal(): Money
+    {
+        $subtotal = money($this->subtotal, CurrencyAccessor::getDefaultCurrency());
+
+        return $this->taxes->reduce(
+            fn (Money $carry, Adjustment $tax) => $carry->add($subtotal->multiply($tax->rate / 100)),
+            money(0, CurrencyAccessor::getDefaultCurrency())
+        );
+    }
+
+    public function calculateDiscountTotal(): Money
+    {
+        $subtotal = money($this->subtotal, CurrencyAccessor::getDefaultCurrency());
+
+        return $this->discounts->reduce(
+            fn (Money $carry, Adjustment $discount) => $carry->add($subtotal->multiply($discount->rate / 100)),
+            money(0, CurrencyAccessor::getDefaultCurrency())
+        );
+    }
 }

app/Observers/DocumentLineItemObserver.php

@@ -27,7 +27,7 @@ class DocumentLineItemObserver
      */
     public function deleted(DocumentLineItem $documentLineItem): void
     {
-        //
+        $documentLineItem->adjustments()->detach();
     }
 
     /**

app/Providers/MacroServiceProvider.php

@@ -81,6 +81,9 @@ class MacroServiceProvider extends ServiceProvider
         });
 
         TextColumn::macro('currency', function (string | Closure | null $currency = null, ?bool $convert = null): static {
+            $currency ??= CurrencyAccessor::getDefaultCurrency();
+            $convert ??= true;
+
             $this->formatStateUsing(static function (TextColumn $column, $state) use ($currency, $convert): ?string {
                 if (blank($state)) {
                     return null;

app/Utilities/Currency/CurrencyConverter.php

@@ -56,6 +56,13 @@ class CurrencyConverter
         return money($amount, $currency, true)->format();
     }
 
+    public static function convertCentsToFloat(int $amount, ?string $currency = null): float
+    {
+        $currency ??= CurrencyAccessor::getDefaultCurrency();
+
+        return money($amount, $currency)->getValue();
+    }
+
     public static function handleCurrencyChange(Set $set, $state): void
     {
         $currency = currency($state);

app/View/Models/InvoiceTotalViewModel.php

@@ -32,15 +32,30 @@ class InvoiceTotalViewModel
             return $carry + $taxAmount;
         }, 0);
 
-        $grandTotal = $subtotal + $taxTotal;
+        $discountTotal = $lineItems->reduce(function ($carry, $item) {
+            $quantity = $item['quantity'] ?? 0;
+            $unitPrice = $item['unit_price'] ?? 0;
+            $salesDiscounts = $item['salesDiscounts'] ?? [];
+            $lineTotal = $quantity * $unitPrice;
+
+            $discountAmount = Adjustment::whereIn('id', $salesDiscounts)
+                ->pluck('rate')
+                ->sum(fn ($rate) => $lineTotal * ($rate / 100));
+
+            return $carry + $discountAmount;
+        }, 0);
+
+        $grandTotal = $subtotal + ($taxTotal - $discountTotal);
 
         $subTotalFormatted = CurrencyConverter::formatToMoney($subtotal);
         $taxTotalFormatted = CurrencyConverter::formatToMoney($taxTotal);
+        $discountTotalFormatted = CurrencyConverter::formatToMoney($discountTotal);
         $grandTotalFormatted = CurrencyConverter::formatToMoney($grandTotal);
 
         return [
             'subtotal' => $subTotalFormatted,
             'taxTotal' => $taxTotalFormatted,
+            'discountTotal' => $discountTotalFormatted,
             'grandTotal' => $grandTotalFormatted,
         ];
     }

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.330.1",
+            "version": "3.330.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "136749f15d1dbff07064ef5ba1c2f08b96cf78ff"
+                "reference": "4ac43cc8356fb16a494c3631c8f39f6e7555f00a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/136749f15d1dbff07064ef5ba1c2f08b96cf78ff",
-                "reference": "136749f15d1dbff07064ef5ba1c2f08b96cf78ff",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/4ac43cc8356fb16a494c3631c8f39f6e7555f00a",
+                "reference": "4ac43cc8356fb16a494c3631c8f39f6e7555f00a",
                 "shasum": ""
             },
             "require": {
@@ -589,9 +589,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.330.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.330.2"
             },
-            "time": "2024-11-25T19:20:00+00:00"
+            "time": "2024-11-26T19:07:56+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -2852,16 +2852,16 @@
         },
         {
             "name": "kirschbaum-development/eloquent-power-joins",
-            "version": "4.0.0",
+            "version": "4.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/kirschbaum-development/eloquent-power-joins.git",
-                "reference": "c6c42a52c5a097cc11761e72782b2d0215692caf"
+                "reference": "3c1af9b86b02f1e39219849c1d2fee7cf77e8638"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/c6c42a52c5a097cc11761e72782b2d0215692caf",
-                "reference": "c6c42a52c5a097cc11761e72782b2d0215692caf",
+                "url": "https://api.github.com/repos/kirschbaum-development/eloquent-power-joins/zipball/3c1af9b86b02f1e39219849c1d2fee7cf77e8638",
+                "reference": "3c1af9b86b02f1e39219849c1d2fee7cf77e8638",
                 "shasum": ""
             },
             "require": {
@@ -2909,9 +2909,9 @@
             ],
             "support": {
                 "issues": "https://github.com/kirschbaum-development/eloquent-power-joins/issues",
-                "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/4.0.0"
+                "source": "https://github.com/kirschbaum-development/eloquent-power-joins/tree/4.0.1"
             },
-            "time": "2024-10-06T12:28:14+00:00"
+            "time": "2024-11-26T13:22:08+00:00"
         },
         {
             "name": "knplabs/knp-snappy",
@@ -2982,23 +2982,23 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.33.2",
+            "version": "v11.34.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "6b9832751cf8eed18b3c73df5071f78f0682aa5d"
+                "reference": "ed07324892c87277b7d37ba76b1a6f93a37401b5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/6b9832751cf8eed18b3c73df5071f78f0682aa5d",
-                "reference": "6b9832751cf8eed18b3c73df5071f78f0682aa5d",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/ed07324892c87277b7d37ba76b1a6f93a37401b5",
+                "reference": "ed07324892c87277b7d37ba76b1a6f93a37401b5",
                 "shasum": ""
             },
             "require": {
                 "brick/math": "^0.9.3|^0.10.2|^0.11|^0.12",
                 "composer-runtime-api": "^2.2",
                 "doctrine/inflector": "^2.0.5",
-                "dragonmantank/cron-expression": "^3.3.2",
+                "dragonmantank/cron-expression": "^3.4",
                 "egulias/email-validator": "^3.2.1|^4.0",
                 "ext-ctype": "*",
                 "ext-filter": "*",
@@ -3008,35 +3008,36 @@
                 "ext-session": "*",
                 "ext-tokenizer": "*",
                 "fruitcake/php-cors": "^1.3",
-                "guzzlehttp/guzzle": "^7.8",
+                "guzzlehttp/guzzle": "^7.8.2",
                 "guzzlehttp/uri-template": "^1.0",
                 "laravel/prompts": "^0.1.18|^0.2.0|^0.3.0",
                 "laravel/serializable-closure": "^1.3|^2.0",
                 "league/commonmark": "^2.2.1",
-                "league/flysystem": "^3.8.0",
+                "league/flysystem": "^3.25.1",
+                "league/flysystem-local": "^3.25.1",
                 "monolog/monolog": "^3.0",
-                "nesbot/carbon": "^2.72.2|^3.0",
+                "nesbot/carbon": "^2.72.2|^3.4",
                 "nunomaduro/termwind": "^2.0",
                 "php": "^8.2",
                 "psr/container": "^1.1.1|^2.0.1",
                 "psr/log": "^1.0|^2.0|^3.0",
                 "psr/simple-cache": "^1.0|^2.0|^3.0",
                 "ramsey/uuid": "^4.7",
-                "symfony/console": "^7.0",
-                "symfony/error-handler": "^7.0",
-                "symfony/finder": "^7.0",
-                "symfony/http-foundation": "^7.0",
-                "symfony/http-kernel": "^7.0",
-                "symfony/mailer": "^7.0",
-                "symfony/mime": "^7.0",
-                "symfony/polyfill-php83": "^1.28",
-                "symfony/process": "^7.0",
-                "symfony/routing": "^7.0",
-                "symfony/uid": "^7.0",
-                "symfony/var-dumper": "^7.0",
+                "symfony/console": "^7.0.3",
+                "symfony/error-handler": "^7.0.3",
+                "symfony/finder": "^7.0.3",
+                "symfony/http-foundation": "^7.0.3",
+                "symfony/http-kernel": "^7.0.3",
+                "symfony/mailer": "^7.0.3",
+                "symfony/mime": "^7.0.3",
+                "symfony/polyfill-php83": "^1.31",
+                "symfony/process": "^7.0.3",
+                "symfony/routing": "^7.0.3",
+                "symfony/uid": "^7.0.3",
+                "symfony/var-dumper": "^7.0.3",
                 "tijsverkoyen/css-to-inline-styles": "^2.2.5",
-                "vlucas/phpdotenv": "^5.4.1",
-                "voku/portable-ascii": "^2.0"
+                "vlucas/phpdotenv": "^5.6.1",
+                "voku/portable-ascii": "^2.0.2"
             },
             "conflict": {
                 "mockery/mockery": "1.6.8",
@@ -3086,29 +3087,32 @@
             },
             "require-dev": {
                 "ably/ably-php": "^1.0",
-                "aws/aws-sdk-php": "^3.235.5",
+                "aws/aws-sdk-php": "^3.322.9",
                 "ext-gmp": "*",
-                "fakerphp/faker": "^1.23",
-                "league/flysystem-aws-s3-v3": "^3.0",
-                "league/flysystem-ftp": "^3.0",
-                "league/flysystem-path-prefixing": "^3.3",
-                "league/flysystem-read-only": "^3.3",
-                "league/flysystem-sftp-v3": "^3.0",
+                "fakerphp/faker": "^1.24",
+                "guzzlehttp/promises": "^2.0.3",
+                "guzzlehttp/psr7": "^2.4",
+                "league/flysystem-aws-s3-v3": "^3.25.1",
+                "league/flysystem-ftp": "^3.25.1",
+                "league/flysystem-path-prefixing": "^3.25.1",
+                "league/flysystem-read-only": "^3.25.1",
+                "league/flysystem-sftp-v3": "^3.25.1",
                 "mockery/mockery": "^1.6.10",
                 "nyholm/psr7": "^1.2",
                 "orchestra/testbench-core": "^9.6",
-                "pda/pheanstalk": "^5.0",
+                "pda/pheanstalk": "^5.0.6",
                 "phpstan/phpstan": "^1.11.5",
-                "phpunit/phpunit": "^10.5|^11.0",
-                "predis/predis": "^2.0.2",
+                "phpunit/phpunit": "^10.5.35|^11.3.6",
+                "predis/predis": "^2.3",
                 "resend/resend-php": "^0.10.0",
-                "symfony/cache": "^7.0",
-                "symfony/http-client": "^7.0",
-                "symfony/psr-http-message-bridge": "^7.0"
+                "symfony/cache": "^7.0.3",
+                "symfony/http-client": "^7.0.3",
+                "symfony/psr-http-message-bridge": "^7.0.3",
+                "symfony/translation": "^7.0.3"
             },
             "suggest": {
                 "ably/ably-php": "Required to use the Ably broadcast driver (^1.0).",
-                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.235.5).",
+                "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage, and SES mail driver (^3.322.9).",
                 "brianium/paratest": "Required to run tests in parallel (^7.0|^8.0).",
                 "ext-apcu": "Required to use the APC cache driver.",
                 "ext-fileinfo": "Required to use the Filesystem class.",
@@ -3122,16 +3126,16 @@
                 "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).",
                 "filp/whoops": "Required for friendly error pages in development (^2.14.3).",
                 "laravel/tinker": "Required to use the tinker console command (^2.0).",
-                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).",
-                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).",
-                "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).",
-                "league/flysystem-read-only": "Required to use read-only disks (^3.3)",
-                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).",
+                "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.25.1).",
+                "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.25.1).",
+                "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.25.1).",
+                "league/flysystem-read-only": "Required to use read-only disks (^3.25.1)",
+                "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.25.1).",
                 "mockery/mockery": "Required to use mocking (^1.6).",
                 "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).",
                 "pda/pheanstalk": "Required to use the beanstalk queue driver (^5.0).",
                 "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
-                "predis/predis": "Required to use the predis connector (^2.0.2).",
+                "predis/predis": "Required to use the predis connector (^2.3).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
                 "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^6.0|^7.0).",
                 "resend/resend-php": "Required to enable support for the Resend mail transport (^0.10.0).",
@@ -3187,7 +3191,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-11-19T22:47:13+00:00"
+            "time": "2024-11-26T21:32:01+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3250,16 +3254,16 @@
         },
         {
             "name": "laravel/sanctum",
-            "version": "v4.0.4",
+            "version": "v4.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "819782c75aaf2b08da1765503893bd2b8023d3b3"
+                "reference": "fe361b9a63407a228f884eb78d7217f680b50140"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/819782c75aaf2b08da1765503893bd2b8023d3b3",
-                "reference": "819782c75aaf2b08da1765503893bd2b8023d3b3",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/fe361b9a63407a228f884eb78d7217f680b50140",
+                "reference": "fe361b9a63407a228f884eb78d7217f680b50140",
                 "shasum": ""
             },
             "require": {
@@ -3310,7 +3314,7 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2024-11-15T14:47:23+00:00"
+            "time": "2024-11-26T14:36:23+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -9632,16 +9636,16 @@
         },
         {
             "name": "laravel/pint",
-            "version": "v1.18.2",
+            "version": "v1.18.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/pint.git",
-                "reference": "f55daaf7eb6c2f49ddf6702fb42e3091c64d8a64"
+                "reference": "cef51821608239040ab841ad6e1c6ae502ae3026"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/pint/zipball/f55daaf7eb6c2f49ddf6702fb42e3091c64d8a64",
-                "reference": "f55daaf7eb6c2f49ddf6702fb42e3091c64d8a64",
+                "url": "https://api.github.com/repos/laravel/pint/zipball/cef51821608239040ab841ad6e1c6ae502ae3026",
+                "reference": "cef51821608239040ab841ad6e1c6ae502ae3026",
                 "shasum": ""
             },
             "require": {
@@ -9652,13 +9656,13 @@
                 "php": "^8.1.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^3.64.0",
-                "illuminate/view": "^10.48.20",
-                "larastan/larastan": "^2.9.8",
+                "friendsofphp/php-cs-fixer": "^3.65.0",
+                "illuminate/view": "^10.48.24",
+                "larastan/larastan": "^2.9.11",
                 "laravel-zero/framework": "^10.4.0",
                 "mockery/mockery": "^1.6.12",
-                "nunomaduro/termwind": "^1.15.1",
-                "pestphp/pest": "^2.35.1"
+                "nunomaduro/termwind": "^1.17.0",
+                "pestphp/pest": "^2.36.0"
             },
             "bin": [
                 "builds/pint"
@@ -9694,20 +9698,20 @@
                 "issues": "https://github.com/laravel/pint/issues",
                 "source": "https://github.com/laravel/pint"
             },
-            "time": "2024-11-20T09:33:46+00:00"
+            "time": "2024-11-26T15:34:00+00:00"
         },
         {
             "name": "laravel/sail",
-            "version": "v1.38.0",
+            "version": "v1.39.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sail.git",
-                "reference": "d17abae06661dd6c46d13627b1683a2924259145"
+                "reference": "be9d67a11133535811f9ec4ab5c176a2f47250fc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sail/zipball/d17abae06661dd6c46d13627b1683a2924259145",
-                "reference": "d17abae06661dd6c46d13627b1683a2924259145",
+                "url": "https://api.github.com/repos/laravel/sail/zipball/be9d67a11133535811f9ec4ab5c176a2f47250fc",
+                "reference": "be9d67a11133535811f9ec4ab5c176a2f47250fc",
                 "shasum": ""
             },
             "require": {
@@ -9757,7 +9761,7 @@
                 "issues": "https://github.com/laravel/sail/issues",
                 "source": "https://github.com/laravel/sail"
             },
-            "time": "2024-11-11T20:16:51+00:00"
+            "time": "2024-11-25T23:48:26+00:00"
         },
         {
             "name": "mockery/mockery",

package-lock.json

@@ -1707,9 +1707,9 @@
             }
         },
         "node_modules/nanoid": {
-            "version": "3.3.7",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-            "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+            "version": "3.3.8",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+            "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
             "dev": true,
             "funding": [
                 {

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

@@ -17,6 +17,10 @@
                 <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>
             </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>
+            </tr>
             <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>