wip

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';
 

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

@@ -9,6 +9,7 @@ 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;
@@ -137,20 +138,14 @@ class InvoiceResource extends Resource
                                     ])
                                     ->selectablePlaceholder(false)
                                     ->default('line_items')
+                                    ->afterStateUpdated(function ($state, Forms\Set $set) {
+                                        $discountMethod = $state;
+
+                                        if ($discountMethod === 'invoice') {
+                                            $set('lineItems.*.salesDiscounts', []);
+                                        }
+                                    })
                                     ->live(),
-                                Forms\Components\Grid::make(2)
-                                    ->schema([
-                                        Forms\Components\Select::make('discount_computation')
-                                            ->label('Discount Computation')
-                                            ->options(AdjustmentComputation::class)
-                                            ->default(AdjustmentComputation::Percentage)
-                                            ->selectablePlaceholder(false)
-                                            ->live(),
-                                        Forms\Components\TextInput::make('discount_rate')
-                                            ->label('Discount Rate')
-                                            ->live()
-                                            ->rate(static fn (Forms\Get $get) => $get('discount_computation')),
-                                    ])->visible(fn (Forms\Get $get) => $get('discount_method') === 'invoice'),
                             ])->grow(true),
                         ])->from('md'),
                         TableRepeater::make('lineItems')
@@ -238,16 +233,29 @@ class InvoiceResource extends Resource
                                 $invoice = $component->getRecord();
 
                                 // Recalculate totals for line items
-                                $invoice->lineItems()->each(function (DocumentLineItem $lineItem) {
+                                // Recalculate totals for line items
+                                $invoice->lineItems()->each(function (DocumentLineItem $lineItem) use ($invoice) {
                                     $lineItem->updateQuietly([
                                         'tax_total' => $lineItem->calculateTaxTotal()->getAmount(),
-                                        'discount_total' => $lineItem->calculateDiscountTotal()->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;
-                                $discountTotal = $invoice->lineItems()->sum('discount_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([
@@ -360,13 +368,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(),
                     ]),

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/Invoice.php

@@ -53,6 +53,7 @@ class Invoice extends Model
         'last_sent',
         'status',
         'currency_code',
+        'discount_method',
         'discount_computation',
         'discount_rate',
         'subtotal',

app/Providers/MacroServiceProvider.php

@@ -102,18 +102,22 @@ class MacroServiceProvider extends ServiceProvider
             return $this;
         });
 
-        TextInput::macro('rate', function (string | Closure | null $computation = null): static {
+        TextInput::macro('rate', function (string | Closure | null $computation = null, bool $showAffix = true): static {
             $this
-                ->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);
-                })
+                ->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/View/Models/InvoiceTotalViewModel.php

@@ -18,7 +18,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);
 
@@ -58,7 +58,7 @@ class InvoiceTotalViewModel
             $discountComputation = $this->data['discount_computation'] ?? AdjustmentComputation::Percentage;
             $discountRate = (float) ($this->data['discount_rate'] ?? 0);
 
-            if ($discountComputation === AdjustmentComputation::Percentage) {
+            if (AdjustmentComputation::parse($discountComputation) === AdjustmentComputation::Percentage) {
                 $discountTotal = $subtotal * ($discountRate / 100);
             } else {
                 $discountTotal = $discountRate;

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.334.2",
+            "version": "3.334.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "b19afc076bb1cc2617bdef76efd41587596109e7"
+                "reference": "6576a9fcfc6ae7c76aed3c6fa4c3864060f72d04"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b19afc076bb1cc2617bdef76efd41587596109e7",
-                "reference": "b19afc076bb1cc2617bdef76efd41587596109e7",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/6576a9fcfc6ae7c76aed3c6fa4c3864060f72d04",
+                "reference": "6576a9fcfc6ae7c76aed3c6fa4c3864060f72d04",
                 "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.334.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.334.3"
             },
-            "time": "2024-12-09T19:30:23+00:00"
+            "time": "2024-12-10T19:41:55+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -2980,16 +2980,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v11.34.2",
+            "version": "v11.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "865da6d73dd353f07a7bcbd778c55966a620121f"
+                "reference": "f1a7aaa3c1235b7a95ccaa58db90e0cd9d8c3fcc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/865da6d73dd353f07a7bcbd778c55966a620121f",
-                "reference": "865da6d73dd353f07a7bcbd778c55966a620121f",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/f1a7aaa3c1235b7a95ccaa58db90e0cd9d8c3fcc",
+                "reference": "f1a7aaa3c1235b7a95ccaa58db90e0cd9d8c3fcc",
                 "shasum": ""
             },
             "require": {
@@ -3013,6 +3013,7 @@
                 "league/commonmark": "^2.2.1",
                 "league/flysystem": "^3.25.1",
                 "league/flysystem-local": "^3.25.1",
+                "league/uri": "^7.5.1",
                 "monolog/monolog": "^3.0",
                 "nesbot/carbon": "^2.72.2|^3.4",
                 "nunomaduro/termwind": "^2.0",
@@ -3096,9 +3097,9 @@
                 "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.6",
+                "php-http/discovery": "^1.15",
                 "phpstan/phpstan": "^1.11.5",
                 "phpunit/phpunit": "^10.5.35|^11.3.6",
                 "predis/predis": "^2.3",
@@ -3130,8 +3131,8 @@
                 "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).",
+                "php-http/discovery": "Required to use PSR-7 bridging features (^1.15).",
                 "phpunit/phpunit": "Required to use assertions and run tests (^10.5|^11.0).",
                 "predis/predis": "Required to use the predis connector (^2.3).",
                 "psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
@@ -3152,6 +3153,7 @@
             },
             "autoload": {
                 "files": [
+                    "src/Illuminate/Collections/functions.php",
                     "src/Illuminate/Collections/helpers.php",
                     "src/Illuminate/Events/functions.php",
                     "src/Illuminate/Filesystem/functions.php",
@@ -3189,7 +3191,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-11-27T15:43:57+00:00"
+            "time": "2024-12-10T16:09:29+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -3252,16 +3254,16 @@
         },
         {
             "name": "laravel/sanctum",
-            "version": "v4.0.5",
+            "version": "v4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/sanctum.git",
-                "reference": "fe361b9a63407a228f884eb78d7217f680b50140"
+                "reference": "9e069e36d90b1e1f41886efa0fe9800a6b354694"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/sanctum/zipball/fe361b9a63407a228f884eb78d7217f680b50140",
-                "reference": "fe361b9a63407a228f884eb78d7217f680b50140",
+                "url": "https://api.github.com/repos/laravel/sanctum/zipball/9e069e36d90b1e1f41886efa0fe9800a6b354694",
+                "reference": "9e069e36d90b1e1f41886efa0fe9800a6b354694",
                 "shasum": ""
             },
             "require": {
@@ -3312,7 +3314,7 @@
                 "issues": "https://github.com/laravel/sanctum/issues",
                 "source": "https://github.com/laravel/sanctum"
             },
-            "time": "2024-11-26T14:36:23+00:00"
+            "time": "2024-11-26T21:18:33+00:00"
         },
         {
             "name": "laravel/serializable-closure",
@@ -3979,16 +3981,16 @@
         },
         {
             "name": "league/oauth1-client",
-            "version": "v1.10.1",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/oauth1-client.git",
-                "reference": "d6365b901b5c287dd41f143033315e2f777e1167"
+                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/d6365b901b5c287dd41f143033315e2f777e1167",
-                "reference": "d6365b901b5c287dd41f143033315e2f777e1167",
+                "url": "https://api.github.com/repos/thephpleague/oauth1-client/zipball/f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
+                "reference": "f9c94b088837eb1aae1ad7c4f23eb65cc6993055",
                 "shasum": ""
             },
             "require": {
@@ -4049,9 +4051,9 @@
             ],
             "support": {
                 "issues": "https://github.com/thephpleague/oauth1-client/issues",
-                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.10.1"
+                "source": "https://github.com/thephpleague/oauth1-client/tree/v1.11.0"
             },
-            "time": "2022-04-15T14:02:14+00:00"
+            "time": "2024-12-10T19:59:05+00:00"
         },
         {
             "name": "league/uri",
@@ -5919,16 +5921,16 @@
         },
         {
             "name": "psy/psysh",
-            "version": "v0.12.6",
+            "version": "v0.12.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/bobthecow/psysh.git",
-                "reference": "3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c"
+                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c",
-                "reference": "3b5ea0efaa791cd1c65ecc493aec3e2aa55ff57c",
+                "url": "https://api.github.com/repos/bobthecow/psysh/zipball/d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
+                "reference": "d73fa3c74918ef4522bb8a3bf9cab39161c4b57c",
                 "shasum": ""
             },
             "require": {
@@ -5992,9 +5994,9 @@
             ],
             "support": {
                 "issues": "https://github.com/bobthecow/psysh/issues",
-                "source": "https://github.com/bobthecow/psysh/tree/v0.12.6"
+                "source": "https://github.com/bobthecow/psysh/tree/v0.12.7"
             },
-            "time": "2024-12-07T20:08:52+00:00"
+            "time": "2024-12-10T01:58:33+00:00"
         },
         {
             "name": "ralouphie/getallheaders",
@@ -7869,8 +7871,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -8035,8 +8037,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -9239,16 +9241,16 @@
     "packages-dev": [
         {
             "name": "brianium/paratest",
-            "version": "v7.6.1",
+            "version": "v7.6.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paratestphp/paratest.git",
-                "reference": "9ac8eda68f17acda4dad4aa02ecdcc327d7e6675"
+                "reference": "ae3c9f1aeda7daa374c904b35ece8f574f56d176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/9ac8eda68f17acda4dad4aa02ecdcc327d7e6675",
-                "reference": "9ac8eda68f17acda4dad4aa02ecdcc327d7e6675",
+                "url": "https://api.github.com/repos/paratestphp/paratest/zipball/ae3c9f1aeda7daa374c904b35ece8f574f56d176",
+                "reference": "ae3c9f1aeda7daa374c904b35ece8f574f56d176",
                 "shasum": ""
             },
             "require": {
@@ -9262,21 +9264,21 @@
                 "phpunit/php-code-coverage": "^11.0.7",
                 "phpunit/php-file-iterator": "^5.1.0",
                 "phpunit/php-timer": "^7.0.1",
-                "phpunit/phpunit": "^11.4.4",
+                "phpunit/phpunit": "^11.5.0",
                 "sebastian/environment": "^7.2.0",
-                "symfony/console": "^6.4.14 || ^7.1.7",
-                "symfony/process": "^6.4.14 || ^7.1.7"
+                "symfony/console": "^6.4.14 || ^7.2.0",
+                "symfony/process": "^6.4.14 || ^7.2.0"
             },
             "require-dev": {
                 "doctrine/coding-standard": "^12.0.0",
                 "ext-pcov": "*",
                 "ext-posix": "*",
-                "phpstan/phpstan": "^2",
-                "phpstan/phpstan-deprecation-rules": "^2",
-                "phpstan/phpstan-phpunit": "^2",
+                "phpstan/phpstan": "^2.0.3",
+                "phpstan/phpstan-deprecation-rules": "^2.0.1",
+                "phpstan/phpstan-phpunit": "^2.0.1",
                 "phpstan/phpstan-strict-rules": "^2",
                 "squizlabs/php_codesniffer": "^3.11.1",
-                "symfony/filesystem": "^6.4.13 || ^7.1.6"
+                "symfony/filesystem": "^6.4.13 || ^7.2.0"
             },
             "bin": [
                 "bin/paratest",
@@ -9316,7 +9318,7 @@
             ],
             "support": {
                 "issues": "https://github.com/paratestphp/paratest/issues",
-                "source": "https://github.com/paratestphp/paratest/tree/v7.6.1"
+                "source": "https://github.com/paratestphp/paratest/tree/v7.6.3"
             },
             "funding": [
                 {
@@ -9328,7 +9330,7 @@
                     "type": "paypal"
                 }
             ],
-            "time": "2024-12-05T10:55:39+00:00"
+            "time": "2024-12-10T13:59:28+00:00"
         },
         {
             "name": "fakerphp/faker",
@@ -10006,38 +10008,38 @@
         },
         {
             "name": "pestphp/pest",
-            "version": "v3.6.0",
+            "version": "v3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pestphp/pest.git",
-                "reference": "918a8fc16996849937e281482bd34f236881ce96"
+                "reference": "9688b83a3d7d0acdda21c01b8aeb933ec9fcd556"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pestphp/pest/zipball/918a8fc16996849937e281482bd34f236881ce96",
-                "reference": "918a8fc16996849937e281482bd34f236881ce96",
+                "url": "https://api.github.com/repos/pestphp/pest/zipball/9688b83a3d7d0acdda21c01b8aeb933ec9fcd556",
+                "reference": "9688b83a3d7d0acdda21c01b8aeb933ec9fcd556",
                 "shasum": ""
             },
             "require": {
-                "brianium/paratest": "^7.6.0",
+                "brianium/paratest": "^7.6.2",
                 "nunomaduro/collision": "^8.5.0",
                 "nunomaduro/termwind": "^2.3.0",
                 "pestphp/pest-plugin": "^3.0.0",
                 "pestphp/pest-plugin-arch": "^3.0.0",
                 "pestphp/pest-plugin-mutate": "^3.0.5",
                 "php": "^8.2.0",
-                "phpunit/phpunit": "^11.4.4"
+                "phpunit/phpunit": "^11.5.0"
             },
             "conflict": {
                 "filp/whoops": "<2.16.0",
-                "phpunit/phpunit": ">11.4.4",
+                "phpunit/phpunit": ">11.5.0",
                 "sebastian/exporter": "<6.0.0",
                 "webmozart/assert": "<1.11.0"
             },
             "require-dev": {
                 "pestphp/pest-dev-tools": "^3.3.0",
                 "pestphp/pest-plugin-type-coverage": "^3.2.0",
-                "symfony/process": "^7.1.8"
+                "symfony/process": "^7.2.0"
             },
             "bin": [
                 "bin/pest"
@@ -10102,7 +10104,7 @@
             ],
             "support": {
                 "issues": "https://github.com/pestphp/pest/issues",
-                "source": "https://github.com/pestphp/pest/tree/v3.6.0"
+                "source": "https://github.com/pestphp/pest/tree/v3.7.0"
             },
             "funding": [
                 {
@@ -10114,7 +10116,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-12-01T22:46:00+00:00"
+            "time": "2024-12-10T11:54:49+00:00"
         },
         {
             "name": "pestphp/pest-plugin",
@@ -11117,16 +11119,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "11.4.4",
+            "version": "11.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "f9ba7bd3c9f3ff54ec379d7a1c2e3f13fe0bbde4"
+                "reference": "0569902506a6c0878930b87ea79ec3b50ea563f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f9ba7bd3c9f3ff54ec379d7a1c2e3f13fe0bbde4",
-                "reference": "f9ba7bd3c9f3ff54ec379d7a1c2e3f13fe0bbde4",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0569902506a6c0878930b87ea79ec3b50ea563f7",
+                "reference": "0569902506a6c0878930b87ea79ec3b50ea563f7",
                 "shasum": ""
             },
             "require": {
@@ -11150,11 +11152,12 @@
                 "sebastian/comparator": "^6.2.1",
                 "sebastian/diff": "^6.0.2",
                 "sebastian/environment": "^7.2.0",
-                "sebastian/exporter": "^6.1.3",
+                "sebastian/exporter": "^6.3.0",
                 "sebastian/global-state": "^7.0.2",
                 "sebastian/object-enumerator": "^6.0.1",
                 "sebastian/type": "^5.1.0",
-                "sebastian/version": "^5.0.2"
+                "sebastian/version": "^5.0.2",
+                "staabm/side-effects-detector": "^1.0.5"
             },
             "suggest": {
                 "ext-soap": "To be able to generate mocks based on WSDL files"
@@ -11165,7 +11168,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "11.4-dev"
+                    "dev-main": "11.5-dev"
                 }
             },
             "autoload": {
@@ -11197,7 +11200,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.4.4"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/11.5.0"
             },
             "funding": [
                 {
@@ -11213,7 +11216,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-27T10:44:52+00:00"
+            "time": "2024-12-06T05:57:38+00:00"
         },
         {
             "name": "pimple/pimple",
@@ -12852,6 +12855,58 @@
             ],
             "time": "2024-12-09T11:32:15+00:00"
         },
+        {
+            "name": "staabm/side-effects-detector",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/staabm/side-effects-detector.git",
+                "reference": "d8334211a140ce329c13726d4a715adbddd0a163"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/staabm/side-effects-detector/zipball/d8334211a140ce329c13726d4a715adbddd0a163",
+                "reference": "d8334211a140ce329c13726d4a715adbddd0a163",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/extension-installer": "^1.4.3",
+                "phpstan/phpstan": "^1.12.6",
+                "phpunit/phpunit": "^9.6.21",
+                "symfony/var-dumper": "^5.4.43",
+                "tomasvotruba/type-coverage": "1.0.0",
+                "tomasvotruba/unused-public": "1.0.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "lib/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "A static analysis tool to detect side effects in PHP code",
+            "keywords": [
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/staabm/side-effects-detector/issues",
+                "source": "https://github.com/staabm/side-effects-detector/tree/1.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/staabm",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-10-20T05:08:20+00:00"
+        },
         {
             "name": "symfony/polyfill-iconv",
             "version": "v1.31.0",

database/migrations/2024_11_27_223015_create_invoices_table.php

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

package-lock.json

@@ -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"
         },

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

@@ -4,31 +4,55 @@
     $data = $this->form->getRawState();
     $viewModel = new \App\View\Models\InvoiceTotalViewModel($this->record, $data);
     extract($viewModel->buildViewData(), \EXTR_SKIP);
+
+    $isInvoiceLevelDiscount = $data['discount_method'] === 'invoice';
 @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($isInvoiceLevelDiscount)
+                <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>
-
-
-
-