wip

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

@@ -3,6 +3,7 @@
 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;
@@ -128,6 +129,28 @@ class InvoiceResource extends Resource
                                     ->minDate(static function (Forms\Get $get) {
                                         return $get('date') ?? now();
                                     }),
+                                Forms\Components\Select::make('discount_method')
+                                    ->label('Discount Method')
+                                    ->options([
+                                        'line_items' => 'Per Line Item Discounts',
+                                        'invoice' => 'Invoice Level Discount',
+                                    ])
+                                    ->selectablePlaceholder(false)
+                                    ->default('line_items')
+                                    ->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,15 +261,25 @@ class InvoiceResource extends Resource
                                     $invoice->updateApprovalTransaction();
                                 }
                             })
-                            ->headers([
-                                Header::make('Items')->width('15%'),
-                                Header::make('Description')->width('25%'),
-                                Header::make('Quantity')->width('10%'),
-                                Header::make('Price')->width('10%'),
-                                Header::make('Taxes')->width('15%'),
-                                Header::make('Discounts')->width('15%'),
-                                Header::make('Amount')->width('10%')->align('right'),
-                            ])
+                            ->headers(function (Forms\Get $get) {
+                                $hasDiscounts = $get('discount_method') === 'line_items';
+
+                                $headers = [
+                                    Header::make('Items')->width($hasDiscounts ? '15%' : '20%'),
+                                    Header::make('Description')->width($hasDiscounts ? '25%' : '30%'),  // Increase when no discounts
+                                    Header::make('Quantity')->width('10%'),
+                                    Header::make('Price')->width('10%'),
+                                    Header::make('Taxes')->width($hasDiscounts ? '15%' : '20%'),       // Increase when no discounts
+                                ];
+
+                                if ($hasDiscounts) {
+                                    $headers[] = Header::make('Discounts')->width('15%');
+                                }
+
+                                $headers[] = Header::make('Amount')->width('10%')->align('right');
+
+                                return $headers;
+                            })
                             ->schema([
                                 Forms\Components\Select::make('offering_id')
                                     ->relationship('sellableOffering', 'name')
@@ -262,7 +295,11 @@ class InvoiceResource extends Resource
                                             $set('description', $offeringRecord->description);
                                             $set('unit_price', $offeringRecord->price);
                                             $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
-                                            $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
+
+                                            $discountMethod = $get('../../discount_method');
+                                            if ($discountMethod === 'line_items') {
+                                                $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
+                                            }
                                         }
                                     }),
                                 Forms\Components\TextInput::make('description'),
@@ -287,6 +324,11 @@ class InvoiceResource extends Resource
                                     ->preload()
                                     ->multiple()
                                     ->live()
+                                    ->hidden(function (Forms\Get $get) {
+                                        $discountMethod = $get('../../discount_method');
+
+                                        return $discountMethod === 'invoice';
+                                    })
                                     ->searchable(),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()

app/Models/Accounting/Invoice.php

@@ -3,9 +3,11 @@
 namespace App\Models\Accounting;
 
 use App\Casts\MoneyCast;
+use App\Casts\RateCast;
 use App\Collections\Accounting\InvoiceCollection;
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\JournalEntryType;
 use App\Enums\Accounting\TransactionType;
@@ -51,6 +53,8 @@ class Invoice extends Model
         'last_sent',
         'status',
         'currency_code',
+        'discount_computation',
+        'discount_rate',
         'subtotal',
         'tax_total',
         'discount_total',
@@ -69,6 +73,8 @@ class Invoice extends Model
         'paid_at' => 'datetime',
         'last_sent' => 'datetime',
         'status' => InvoiceStatus::class,
+        'discount_computation' => AdjustmentComputation::class,
+        'discount_rate' => RateCast::class,
         'subtotal' => MoneyCast::class,
         'tax_total' => MoneyCast::class,
         'discount_total' => MoneyCast::class,

app/Providers/MacroServiceProvider.php

@@ -19,7 +19,6 @@ use Filament\Infolists\Components\TextEntry;
 use Filament\Tables\Columns\TextColumn;
 use Illuminate\Support\Carbon;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Support\Str;
 
 class MacroServiceProvider extends ServiceProvider
 {
@@ -104,7 +103,7 @@ class MacroServiceProvider extends ServiceProvider
         });
 
         TextInput::macro('rate', function (string | Closure | null $computation = null): static {
-            $this->extraAttributes(['wire:key' => Str::random()])
+            $this
                 ->prefix(static function (TextInput $component) use ($computation) {
                     $computation = $component->evaluate($computation);
 

app/View/Models/InvoiceTotalViewModel.php

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

composer.lock

@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.334.1",
+            "version": "3.334.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "3938b3467f64a30fed7ee1762a6785f808a5ae4d"
+                "reference": "b19afc076bb1cc2617bdef76efd41587596109e7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3938b3467f64a30fed7ee1762a6785f808a5ae4d",
-                "reference": "3938b3467f64a30fed7ee1762a6785f808a5ae4d",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b19afc076bb1cc2617bdef76efd41587596109e7",
+                "reference": "b19afc076bb1cc2617bdef76efd41587596109e7",
                 "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.1"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.334.2"
             },
-            "time": "2024-12-05T01:17:41+00:00"
+            "time": "2024-12-09T19:30:23+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -695,17 +695,17 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                },
                 "laravel": {
-                    "providers": [
-                        "Barryvdh\\Snappy\\ServiceProvider"
-                    ],
                     "aliases": {
                         "PDF": "Barryvdh\\Snappy\\Facades\\SnappyPdf",
                         "SnappyImage": "Barryvdh\\Snappy\\Facades\\SnappyImage"
-                    }
+                    },
+                    "providers": [
+                        "Barryvdh\\Snappy\\ServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
                 }
             },
             "autoload": {
@@ -6301,16 +6301,16 @@
         },
         {
             "name": "spatie/color",
-            "version": "1.6.1",
+            "version": "1.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/color.git",
-                "reference": "4c540ffbef68a3df3d209718ae06deaab081e708"
+                "reference": "b4fac074a9e5999dcca12cbfab0f7c73e2684d6d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/color/zipball/4c540ffbef68a3df3d209718ae06deaab081e708",
-                "reference": "4c540ffbef68a3df3d209718ae06deaab081e708",
+                "url": "https://api.github.com/repos/spatie/color/zipball/b4fac074a9e5999dcca12cbfab0f7c73e2684d6d",
+                "reference": "b4fac074a9e5999dcca12cbfab0f7c73e2684d6d",
                 "shasum": ""
             },
             "require": {
@@ -6348,7 +6348,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/color/issues",
-                "source": "https://github.com/spatie/color/tree/1.6.1"
+                "source": "https://github.com/spatie/color/tree/1.6.2"
             },
             "funding": [
                 {
@@ -6356,7 +6356,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-18T15:00:47+00:00"
+            "time": "2024-12-09T16:20:38+00:00"
         },
         {
             "name": "spatie/invade",
@@ -6419,16 +6419,16 @@
         },
         {
             "name": "spatie/laravel-package-tools",
-            "version": "1.16.6",
+            "version": "1.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/laravel-package-tools.git",
-                "reference": "1f26942dc1e5c49eacfced34fdbc29ed234bd7b3"
+                "reference": "9ab30fd24f677e5aa370ea4cf6b41c517d16cf85"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/1f26942dc1e5c49eacfced34fdbc29ed234bd7b3",
-                "reference": "1f26942dc1e5c49eacfced34fdbc29ed234bd7b3",
+                "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/9ab30fd24f677e5aa370ea4cf6b41c517d16cf85",
+                "reference": "9ab30fd24f677e5aa370ea4cf6b41c517d16cf85",
                 "shasum": ""
             },
             "require": {
@@ -6437,10 +6437,10 @@
             },
             "require-dev": {
                 "mockery/mockery": "^1.5",
-                "orchestra/testbench": "^7.7|^8.0",
-                "pestphp/pest": "^1.22",
-                "phpunit/phpunit": "^9.5.24",
-                "spatie/pest-plugin-test-time": "^1.1"
+                "orchestra/testbench": "^7.7|^8.0|^9.0",
+                "pestphp/pest": "^1.22|^2",
+                "phpunit/phpunit": "^9.5.24|^10.5",
+                "spatie/pest-plugin-test-time": "^1.1|^2.2"
             },
             "type": "library",
             "autoload": {
@@ -6467,7 +6467,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/laravel-package-tools/issues",
-                "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.6"
+                "source": "https://github.com/spatie/laravel-package-tools/tree/1.17.0"
             },
             "funding": [
                 {
@@ -6475,7 +6475,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2024-11-18T15:02:02+00:00"
+            "time": "2024-12-09T16:29:14+00:00"
         },
         {
             "name": "squirephp/model",
@@ -7714,8 +7714,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -7790,8 +7790,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -7951,8 +7951,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -8109,8 +8109,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -8189,8 +8189,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -8271,8 +8271,8 @@
             "type": "library",
             "extra": {
                 "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
                 }
             },
             "autoload": {
@@ -12769,16 +12769,16 @@
         },
         {
             "name": "spatie/ray",
-            "version": "1.41.3",
+            "version": "1.41.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/spatie/ray.git",
-                "reference": "e2ecbc17a493dab635f3cf026858b46f0ccbb053"
+                "reference": "c5dbda0548c1881b30549ccc0b6d485f7471aaa5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/spatie/ray/zipball/e2ecbc17a493dab635f3cf026858b46f0ccbb053",
-                "reference": "e2ecbc17a493dab635f3cf026858b46f0ccbb053",
+                "url": "https://api.github.com/repos/spatie/ray/zipball/c5dbda0548c1881b30549ccc0b6d485f7471aaa5",
+                "reference": "c5dbda0548c1881b30549ccc0b6d485f7471aaa5",
                 "shasum": ""
             },
             "require": {
@@ -12838,7 +12838,7 @@
             ],
             "support": {
                 "issues": "https://github.com/spatie/ray/issues",
-                "source": "https://github.com/spatie/ray/tree/1.41.3"
+                "source": "https://github.com/spatie/ray/tree/1.41.4"
             },
             "funding": [
                 {
@@ -12850,7 +12850,7 @@
                     "type": "other"
                 }
             ],
-            "time": "2024-12-02T12:33:18+00:00"
+            "time": "2024-12-09T11:32:15+00:00"
         },
         {
             "name": "symfony/polyfill-iconv",

database/migrations/2024_11_27_223015_create_invoices_table.php

@@ -27,6 +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->integer('discount_rate')->default(0);
             $table->integer('subtotal')->default(0);
             $table->integer('tax_total')->default(0);
             $table->integer('discount_total')->default(0);

package-lock.json

@@ -1218,9 +1218,9 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.71",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.71.tgz",
-            "integrity": "sha512-dB68l59BI75W1BUGVTAEJy45CEVuEGy9qPVVQ8pnHyHMn36PLPPoE1mjLH+lo9rKulO3HC2OhbACI/8tCqJBcA==",
+            "version": "1.5.72",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.72.tgz",
+            "integrity": "sha512-ZpSAUOZ2Izby7qnZluSrAlGgGQzucmFbN0n64dYzocYxnxV5ufurpj3VgEe4cUp7ir9LmeLxNYo8bVnlM8bQHw==",
             "dev": true,
             "license": "ISC"
         },