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

Development 3.x

app/Concerns/ManagesLineItems.php

@@ -16,7 +16,7 @@ trait ManagesLineItems
 {
     protected function handleLineItems(Model $record, Collection $lineItems): void
     {
-        foreach ($lineItems as $itemData) {
+        foreach ($lineItems as $index => $itemData) {
             $lineItem = isset($itemData['id'])
                 ? $record->lineItems->find($itemData['id'])
                 : $record->lineItems()->make();
@@ -26,6 +26,7 @@ trait ManagesLineItems
                 'description' => $itemData['description'],
                 'quantity' => $itemData['quantity'],
                 'unit_price' => $itemData['unit_price'],
+                'line_number' => $index + 1,
             ]);
 
             if (! $lineItem->exists) {

app/DTO/DocumentDTO.php

@@ -26,7 +26,7 @@ readonly class DocumentDTO
         public string $date,
         public string $dueDate,
         public string $currencyCode,
-        public string $subtotal,
+        public ?string $subtotal,
         public ?string $discount,
         public ?string $tax,
         public string $total,
@@ -50,6 +50,15 @@ readonly class DocumentDTO
 
         $currencyCode = $document->currency_code ?? CurrencyAccessor::getDefaultCurrency();
 
+        $discount = $document->discount_total > 0 ? self::formatToMoney($document->discount_total, $currencyCode) : null;
+        $tax = $document->tax_total > 0 ? self::formatToMoney($document->tax_total, $currencyCode) : null;
+
+        if (! $discount && ! $tax) {
+            $subtotal = null;
+        } else {
+            $subtotal = self::formatToMoney($document->subtotal, $currencyCode);
+        }
+
         return new self(
             header: $document->header,
             subheader: $document->subheader,
@@ -61,9 +70,9 @@ readonly class DocumentDTO
             date: $document->documentDate(),
             dueDate: $document->dueDate(),
             currencyCode: $currencyCode,
-            subtotal: self::formatToMoney($document->subtotal, $currencyCode),
-            discount: self::formatToMoney($document->discount_total, $currencyCode),
-            tax: self::formatToMoney($document->tax_total, $currencyCode),
+            subtotal: $subtotal,
+            discount: $discount,
+            tax: $tax,
             total: self::formatToMoney($document->total, $currencyCode),
             amountDue: self::formatToMoney($document->amountDue(), $currencyCode),
             company: CompanyDTO::fromModel($document->company),

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

@@ -2,6 +2,7 @@
 
 namespace App\Filament\Company\Clusters\Settings\Resources;
 
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Setting\Font;
 use App\Enums\Setting\PaymentTerms;
@@ -51,6 +52,9 @@ class DocumentDefaultResource extends Resource
                     ->softRequired()
                     ->localizeLabel()
                     ->options(PaymentTerms::class),
+                Forms\Components\Select::make('discount_method')
+                    ->softRequired()
+                    ->options(DocumentDiscountMethod::class),
             ])->columns();
     }
 

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

@@ -16,6 +16,7 @@ use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CreateOfferingSelect;
 use App\Filament\Forms\Components\CreateVendorSelect;
+use App\Filament\Forms\Components\CustomTableRepeater;
 use App\Filament\Forms\Components\DocumentTotals;
 use App\Filament\Tables\Actions\ReplicateBulkAction;
 use App\Filament\Tables\Columns;
@@ -29,7 +30,6 @@ use App\Models\Common\Vendor;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
-use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Closure;
 use Filament\Forms;
@@ -166,8 +166,8 @@ class BillResource extends Resource
                                 Forms\Components\Select::make('discount_method')
                                     ->label('Discount method')
                                     ->options(DocumentDiscountMethod::class)
-                                    ->selectablePlaceholder(false)
-                                    ->default(DocumentDiscountMethod::PerLineItem)
+                                    ->softRequired()
+                                    ->default($settings->discount_method)
                                     ->afterStateUpdated(function ($state, Forms\Set $set) {
                                         $discountMethod = DocumentDiscountMethod::parse($state);
 
@@ -178,28 +178,32 @@ class BillResource extends Resource
                                     ->live(),
                             ])->grow(true),
                         ])->from('md'),
-                        TableRepeater::make('lineItems')
+                        CustomTableRepeater::make('lineItems')
+                            ->hiddenLabel()
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
+                            ->reorderable()
+                            ->orderColumn('line_number')
+                            ->reorderAtStart()
+                            ->cloneable()
+                            ->addActionLabel('Add an item')
                             ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 
                                 $headers = [
                                     Header::make($settings->resolveColumnLabel('item_name', 'Items'))
-                                        ->width($hasDiscounts ? '15%' : '20%'),
-                                    Header::make('Description')
-                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                        ->width('30%'),
                                     Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
                                         ->width('10%'),
                                     Header::make($settings->resolveColumnLabel('price_name', 'Price'))
                                         ->width('10%'),
-                                    Header::make('Taxes')
-                                        ->width($hasDiscounts ? '20%' : '30%'),
                                 ];
 
                                 if ($hasDiscounts) {
-                                    $headers[] = Header::make('Discounts')->width('20%');
+                                    $headers[] = Header::make('Adjustments')->width('30%');
+                                } else {
+                                    $headers[] = Header::make('Taxes')->width('30%');
                                 }
 
                                 $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
@@ -209,61 +213,68 @@ class BillResource extends Resource
                                 return $headers;
                             })
                             ->schema([
-                                CreateOfferingSelect::make('offering_id')
-                                    ->label('Item')
-                                    ->required()
-                                    ->live()
-                                    ->purchasable()
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
-                                        $offeringId = $state;
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-                                        $isPerLineItem = $discountMethod->isPerLineItem();
+                                Forms\Components\Group::make([
+                                    CreateOfferingSelect::make('offering_id')
+                                        ->label('Item')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select item')
+                                        ->required()
+                                        ->live()
+                                        ->inlineSuffix()
+                                        ->purchasable()
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
+                                            $offeringId = $state;
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                            $isPerLineItem = $discountMethod->isPerLineItem();
+
+                                            $existingTaxIds = [];
+                                            $existingDiscountIds = [];
+
+                                            if ($record) {
+                                                $existingTaxIds = $record->purchaseTaxes()->pluck('adjustments.id')->toArray();
+                                                if ($isPerLineItem) {
+                                                    $existingDiscountIds = $record->purchaseDiscounts()->pluck('adjustments.id')->toArray();
+                                                }
+                                            }
 
-                                        $existingTaxIds = [];
-                                        $existingDiscountIds = [];
+                                            $with = [
+                                                'purchaseTaxes' => static function ($query) use ($existingTaxIds) {
+                                                    $query->where(static function ($query) use ($existingTaxIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingTaxIds);
+                                                    });
+                                                },
+                                            ];
 
-                                        if ($record) {
-                                            $existingTaxIds = $record->purchaseTaxes()->pluck('adjustments.id')->toArray();
                                             if ($isPerLineItem) {
-                                                $existingDiscountIds = $record->purchaseDiscounts()->pluck('adjustments.id')->toArray();
+                                                $with['purchaseDiscounts'] = static function ($query) use ($existingDiscountIds) {
+                                                    $query->where(static function ($query) use ($existingDiscountIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingDiscountIds);
+                                                    });
+                                                };
                                             }
-                                        }
 
-                                        $with = [
-                                            'purchaseTaxes' => static function ($query) use ($existingTaxIds) {
-                                                $query->where(static function ($query) use ($existingTaxIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingTaxIds);
-                                                });
-                                            },
-                                        ];
-
-                                        if ($isPerLineItem) {
-                                            $with['purchaseDiscounts'] = static function ($query) use ($existingDiscountIds) {
-                                                $query->where(static function ($query) use ($existingDiscountIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingDiscountIds);
-                                                });
-                                            };
-                                        }
+                                            $offeringRecord = Offering::with($with)->find($offeringId);
 
-                                        $offeringRecord = Offering::with($with)->find($offeringId);
-
-                                        if (! $offeringRecord) {
-                                            return;
-                                        }
+                                            if (! $offeringRecord) {
+                                                return;
+                                            }
 
-                                        $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
+                                            $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
 
-                                        $set('description', $offeringRecord->description);
-                                        $set('unit_price', $unitPrice);
-                                        $set('purchaseTaxes', $offeringRecord->purchaseTaxes->pluck('id')->toArray());
+                                            $set('description', $offeringRecord->description);
+                                            $set('unit_price', $unitPrice);
+                                            $set('purchaseTaxes', $offeringRecord->purchaseTaxes->pluck('id')->toArray());
 
-                                        if ($isPerLineItem) {
-                                            $set('purchaseDiscounts', $offeringRecord->purchaseDiscounts->pluck('id')->toArray());
-                                        }
-                                    }),
-                                Forms\Components\TextInput::make('description'),
+                                            if ($isPerLineItem) {
+                                                $set('purchaseDiscounts', $offeringRecord->purchaseDiscounts->pluck('id')->toArray());
+                                            }
+                                        }),
+                                    Forms\Components\TextInput::make('description')
+                                        ->placeholder('Enter item description')
+                                        ->hiddenLabel(),
+                                ])->columnSpan(1),
                                 Forms\Components\TextInput::make('quantity')
                                     ->required()
                                     ->numeric()
@@ -277,32 +288,40 @@ class BillResource extends Resource
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
-                                CreateAdjustmentSelect::make('purchaseTaxes')
-                                    ->label('Taxes')
-                                    ->category(AdjustmentCategory::Tax)
-                                    ->type(AdjustmentType::Purchase)
-                                    ->adjustmentsRelationship('purchaseTaxes')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->preload()
-                                    ->multiple()
-                                    ->live()
-                                    ->searchable(),
-                                CreateAdjustmentSelect::make('purchaseDiscounts')
-                                    ->label('Discounts')
-                                    ->category(AdjustmentCategory::Discount)
-                                    ->type(AdjustmentType::Purchase)
-                                    ->adjustmentsRelationship('purchaseDiscounts')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->multiple()
-                                    ->live()
-                                    ->hidden(function (Forms\Get $get) {
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                Forms\Components\Group::make([
+                                    CreateAdjustmentSelect::make('purchaseTaxes')
+                                        ->label('Taxes')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select taxes')
+                                        ->category(AdjustmentCategory::Tax)
+                                        ->type(AdjustmentType::Purchase)
+                                        ->adjustmentsRelationship('purchaseTaxes')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->preload()
+                                        ->multiple()
+                                        ->live()
+                                        ->searchable(),
+                                    CreateAdjustmentSelect::make('purchaseDiscounts')
+                                        ->label('Discounts')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select discounts')
+                                        ->category(AdjustmentCategory::Discount)
+                                        ->type(AdjustmentType::Purchase)
+                                        ->adjustmentsRelationship('purchaseDiscounts')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->multiple()
+                                        ->live()
+                                        ->hidden(function (Forms\Get $get) {
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
 
-                                        return $discountMethod->isPerDocument();
-                                    })
-                                    ->searchable(),
+                                            return $discountMethod->isPerDocument();
+                                        })
+                                        ->searchable(),
+                                ])->columnSpan(1),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
                                     ->extraAttributes(['class' => 'text-left sm:text-right'])

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

@@ -252,7 +252,7 @@ class ClientResource extends Resource
                 Tables\Columns\TextColumn::make('name')
                     ->searchable()
                     ->sortable()
-                    ->description(static fn (Client $client) => $client->primaryContact->full_name),
+                    ->description(static fn (Client $client) => $client->primaryContact?->full_name),
                 Tables\Columns\TextColumn::make('primaryContact.email')
                     ->label('Email')
                     ->searchable()
@@ -260,7 +260,7 @@ class ClientResource extends Resource
                 Tables\Columns\TextColumn::make('primaryContact.phones')
                     ->label('Phone')
                     ->toggleable()
-                    ->state(static fn (Client $client) => $client->primaryContact->first_available_phone),
+                    ->state(static fn (Client $client) => $client->primaryContact?->first_available_phone),
                 Tables\Columns\TextColumn::make('billingAddress.address_string')
                     ->label('Billing address')
                     ->searchable()

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

@@ -16,6 +16,7 @@ use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateClientSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CreateOfferingSelect;
+use App\Filament\Forms\Components\CustomTableRepeater;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
@@ -30,7 +31,6 @@ use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
-use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -164,8 +164,8 @@ class EstimateResource extends Resource
                                 Forms\Components\Select::make('discount_method')
                                     ->label('Discount method')
                                     ->options(DocumentDiscountMethod::class)
-                                    ->selectablePlaceholder(false)
-                                    ->default(DocumentDiscountMethod::PerLineItem)
+                                    ->softRequired()
+                                    ->default($settings->discount_method)
                                     ->afterStateUpdated(function ($state, Forms\Set $set) {
                                         $discountMethod = DocumentDiscountMethod::parse($state);
 
@@ -176,28 +176,32 @@ class EstimateResource extends Resource
                                     ->live(),
                             ])->grow(true),
                         ])->from('md'),
-                        TableRepeater::make('lineItems')
+                        CustomTableRepeater::make('lineItems')
+                            ->hiddenLabel()
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
+                            ->reorderable()
+                            ->orderColumn('line_number')
+                            ->reorderAtStart()
+                            ->cloneable()
+                            ->addActionLabel('Add an item')
                             ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 
                                 $headers = [
                                     Header::make($settings->resolveColumnLabel('item_name', 'Items'))
-                                        ->width($hasDiscounts ? '15%' : '20%'),
-                                    Header::make('Description')
-                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                        ->width('30%'),
                                     Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
                                         ->width('10%'),
                                     Header::make($settings->resolveColumnLabel('price_name', 'Price'))
                                         ->width('10%'),
-                                    Header::make('Taxes')
-                                        ->width($hasDiscounts ? '20%' : '30%'),
                                 ];
 
                                 if ($hasDiscounts) {
-                                    $headers[] = Header::make('Discounts')->width('20%');
+                                    $headers[] = Header::make('Adjustments')->width('30%');
+                                } else {
+                                    $headers[] = Header::make('Taxes')->width('30%');
                                 }
 
                                 $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
@@ -207,61 +211,68 @@ class EstimateResource extends Resource
                                 return $headers;
                             })
                             ->schema([
-                                CreateOfferingSelect::make('offering_id')
-                                    ->label('Item')
-                                    ->required()
-                                    ->live()
-                                    ->sellable()
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
-                                        $offeringId = $state;
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-                                        $isPerLineItem = $discountMethod->isPerLineItem();
+                                Forms\Components\Group::make([
+                                    CreateOfferingSelect::make('offering_id')
+                                        ->label('Item')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select item')
+                                        ->required()
+                                        ->live()
+                                        ->inlineSuffix()
+                                        ->sellable()
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
+                                            $offeringId = $state;
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                            $isPerLineItem = $discountMethod->isPerLineItem();
+
+                                            $existingTaxIds = [];
+                                            $existingDiscountIds = [];
+
+                                            if ($record) {
+                                                $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
+                                                if ($isPerLineItem) {
+                                                    $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                                }
+                                            }
 
-                                        $existingTaxIds = [];
-                                        $existingDiscountIds = [];
+                                            $with = [
+                                                'salesTaxes' => static function ($query) use ($existingTaxIds) {
+                                                    $query->where(static function ($query) use ($existingTaxIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingTaxIds);
+                                                    });
+                                                },
+                                            ];
 
-                                        if ($record) {
-                                            $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
                                             if ($isPerLineItem) {
-                                                $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                                $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
+                                                    $query->where(static function ($query) use ($existingDiscountIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingDiscountIds);
+                                                    });
+                                                };
                                             }
-                                        }
 
-                                        $with = [
-                                            'salesTaxes' => static function ($query) use ($existingTaxIds) {
-                                                $query->where(static function ($query) use ($existingTaxIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingTaxIds);
-                                                });
-                                            },
-                                        ];
-
-                                        if ($isPerLineItem) {
-                                            $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
-                                                $query->where(static function ($query) use ($existingDiscountIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingDiscountIds);
-                                                });
-                                            };
-                                        }
-
-                                        $offeringRecord = Offering::with($with)->find($offeringId);
+                                            $offeringRecord = Offering::with($with)->find($offeringId);
 
-                                        if (! $offeringRecord) {
-                                            return;
-                                        }
+                                            if (! $offeringRecord) {
+                                                return;
+                                            }
 
-                                        $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
+                                            $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
 
-                                        $set('description', $offeringRecord->description);
-                                        $set('unit_price', $unitPrice);
-                                        $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
+                                            $set('description', $offeringRecord->description);
+                                            $set('unit_price', $unitPrice);
+                                            $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
 
-                                        if ($isPerLineItem) {
-                                            $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
-                                        }
-                                    }),
-                                Forms\Components\TextInput::make('description'),
+                                            if ($isPerLineItem) {
+                                                $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
+                                            }
+                                        }),
+                                    Forms\Components\TextInput::make('description')
+                                        ->placeholder('Enter item description')
+                                        ->hiddenLabel(),
+                                ])->columnSpan(1),
                                 Forms\Components\TextInput::make('quantity')
                                     ->required()
                                     ->numeric()
@@ -274,32 +285,40 @@ class EstimateResource extends Resource
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
-                                CreateAdjustmentSelect::make('salesTaxes')
-                                    ->label('Taxes')
-                                    ->category(AdjustmentCategory::Tax)
-                                    ->type(AdjustmentType::Sales)
-                                    ->adjustmentsRelationship('salesTaxes')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->preload()
-                                    ->multiple()
-                                    ->live()
-                                    ->searchable(),
-                                CreateAdjustmentSelect::make('salesDiscounts')
-                                    ->label('Discounts')
-                                    ->category(AdjustmentCategory::Discount)
-                                    ->type(AdjustmentType::Sales)
-                                    ->adjustmentsRelationship('salesDiscounts')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->multiple()
-                                    ->live()
-                                    ->hidden(function (Forms\Get $get) {
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                Forms\Components\Group::make([
+                                    CreateAdjustmentSelect::make('salesTaxes')
+                                        ->label('Taxes')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select taxes')
+                                        ->category(AdjustmentCategory::Tax)
+                                        ->type(AdjustmentType::Sales)
+                                        ->adjustmentsRelationship('salesTaxes')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->preload()
+                                        ->multiple()
+                                        ->live()
+                                        ->searchable(),
+                                    CreateAdjustmentSelect::make('salesDiscounts')
+                                        ->label('Discounts')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select discounts')
+                                        ->category(AdjustmentCategory::Discount)
+                                        ->type(AdjustmentType::Sales)
+                                        ->adjustmentsRelationship('salesDiscounts')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->multiple()
+                                        ->live()
+                                        ->hidden(function (Forms\Get $get) {
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
 
-                                        return $discountMethod->isPerDocument();
-                                    })
-                                    ->searchable(),
+                                            return $discountMethod->isPerDocument();
+                                        })
+                                        ->searchable(),
+                                ])->columnSpan(1),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
                                     ->extraAttributes(['class' => 'text-left sm:text-right'])

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

@@ -18,6 +18,7 @@ use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateClientSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CreateOfferingSelect;
+use App\Filament\Forms\Components\CustomTableRepeater;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
@@ -33,7 +34,6 @@ use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
-use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Closure;
 use Filament\Forms;
@@ -177,8 +177,8 @@ class InvoiceResource extends Resource
                                 Forms\Components\Select::make('discount_method')
                                     ->label('Discount method')
                                     ->options(DocumentDiscountMethod::class)
-                                    ->selectablePlaceholder(false)
-                                    ->default(DocumentDiscountMethod::PerLineItem)
+                                    ->softRequired()
+                                    ->default($settings->discount_method)
                                     ->afterStateUpdated(function ($state, Forms\Set $set) {
                                         $discountMethod = DocumentDiscountMethod::parse($state);
 
@@ -189,28 +189,32 @@ class InvoiceResource extends Resource
                                     ->live(),
                             ])->grow(true),
                         ])->from('md'),
-                        TableRepeater::make('lineItems')
+                        CustomTableRepeater::make('lineItems')
+                            ->hiddenLabel()
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
+                            ->reorderable()
+                            ->orderColumn('line_number')
+                            ->reorderAtStart()
+                            ->cloneable()
+                            ->addActionLabel('Add an item')
                             ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 
                                 $headers = [
                                     Header::make($settings->resolveColumnLabel('item_name', 'Items'))
-                                        ->width($hasDiscounts ? '15%' : '20%'),
-                                    Header::make('Description')
-                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                        ->width('30%'),
                                     Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
                                         ->width('10%'),
                                     Header::make($settings->resolveColumnLabel('price_name', 'Price'))
                                         ->width('10%'),
-                                    Header::make('Taxes')
-                                        ->width($hasDiscounts ? '20%' : '30%'),
                                 ];
 
                                 if ($hasDiscounts) {
-                                    $headers[] = Header::make('Discounts')->width('20%');
+                                    $headers[] = Header::make('Adjustments')->width('30%');
+                                } else {
+                                    $headers[] = Header::make('Taxes')->width('30%');
                                 }
 
                                 $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
@@ -220,61 +224,68 @@ class InvoiceResource extends Resource
                                 return $headers;
                             })
                             ->schema([
-                                CreateOfferingSelect::make('offering_id')
-                                    ->label('Item')
-                                    ->required()
-                                    ->live()
-                                    ->sellable()
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
-                                        $offeringId = $state;
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-                                        $isPerLineItem = $discountMethod->isPerLineItem();
+                                Forms\Components\Group::make([
+                                    CreateOfferingSelect::make('offering_id')
+                                        ->label('Item')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select item')
+                                        ->required()
+                                        ->live()
+                                        ->inlineSuffix()
+                                        ->sellable()
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
+                                            $offeringId = $state;
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                            $isPerLineItem = $discountMethod->isPerLineItem();
+
+                                            $existingTaxIds = [];
+                                            $existingDiscountIds = [];
+
+                                            if ($record) {
+                                                $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
+                                                if ($isPerLineItem) {
+                                                    $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                                }
+                                            }
 
-                                        $existingTaxIds = [];
-                                        $existingDiscountIds = [];
+                                            $with = [
+                                                'salesTaxes' => static function ($query) use ($existingTaxIds) {
+                                                    $query->where(static function ($query) use ($existingTaxIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingTaxIds);
+                                                    });
+                                                },
+                                            ];
 
-                                        if ($record) {
-                                            $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
                                             if ($isPerLineItem) {
-                                                $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                                $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
+                                                    $query->where(static function ($query) use ($existingDiscountIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingDiscountIds);
+                                                    });
+                                                };
                                             }
-                                        }
 
-                                        $with = [
-                                            'salesTaxes' => static function ($query) use ($existingTaxIds) {
-                                                $query->where(static function ($query) use ($existingTaxIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingTaxIds);
-                                                });
-                                            },
-                                        ];
-
-                                        if ($isPerLineItem) {
-                                            $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
-                                                $query->where(static function ($query) use ($existingDiscountIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingDiscountIds);
-                                                });
-                                            };
-                                        }
+                                            $offeringRecord = Offering::with($with)->find($offeringId);
 
-                                        $offeringRecord = Offering::with($with)->find($offeringId);
-
-                                        if (! $offeringRecord) {
-                                            return;
-                                        }
+                                            if (! $offeringRecord) {
+                                                return;
+                                            }
 
-                                        $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
+                                            $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
 
-                                        $set('description', $offeringRecord->description);
-                                        $set('unit_price', $unitPrice);
-                                        $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
+                                            $set('description', $offeringRecord->description);
+                                            $set('unit_price', $unitPrice);
+                                            $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
 
-                                        if ($isPerLineItem) {
-                                            $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
-                                        }
-                                    }),
-                                Forms\Components\TextInput::make('description'),
+                                            if ($isPerLineItem) {
+                                                $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
+                                            }
+                                        }),
+                                    Forms\Components\TextInput::make('description')
+                                        ->placeholder('Enter item description')
+                                        ->hiddenLabel(),
+                                ])->columnSpan(1),
                                 Forms\Components\TextInput::make('quantity')
                                     ->required()
                                     ->numeric()
@@ -287,32 +298,40 @@ class InvoiceResource extends Resource
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
-                                CreateAdjustmentSelect::make('salesTaxes')
-                                    ->label('Taxes')
-                                    ->category(AdjustmentCategory::Tax)
-                                    ->type(AdjustmentType::Sales)
-                                    ->adjustmentsRelationship('salesTaxes')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->preload()
-                                    ->multiple()
-                                    ->live()
-                                    ->searchable(),
-                                CreateAdjustmentSelect::make('salesDiscounts')
-                                    ->label('Discounts')
-                                    ->category(AdjustmentCategory::Discount)
-                                    ->type(AdjustmentType::Sales)
-                                    ->adjustmentsRelationship('salesDiscounts')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->multiple()
-                                    ->live()
-                                    ->hidden(function (Forms\Get $get) {
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                Forms\Components\Group::make([
+                                    CreateAdjustmentSelect::make('salesTaxes')
+                                        ->label('Taxes')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select taxes')
+                                        ->category(AdjustmentCategory::Tax)
+                                        ->type(AdjustmentType::Sales)
+                                        ->adjustmentsRelationship('salesTaxes')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->preload()
+                                        ->multiple()
+                                        ->live()
+                                        ->searchable(),
+                                    CreateAdjustmentSelect::make('salesDiscounts')
+                                        ->label('Discounts')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select discounts')
+                                        ->category(AdjustmentCategory::Discount)
+                                        ->type(AdjustmentType::Sales)
+                                        ->adjustmentsRelationship('salesDiscounts')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->multiple()
+                                        ->live()
+                                        ->hidden(function (Forms\Get $get) {
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
 
-                                        return $discountMethod->isPerDocument();
-                                    })
-                                    ->searchable(),
+                                            return $discountMethod->isPerDocument();
+                                        })
+                                        ->searchable(),
+                                ])->columnSpan(1),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
                                     ->extraAttributes(['class' => 'text-left sm:text-right'])

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

@@ -15,6 +15,7 @@ use App\Filament\Forms\Components\CreateAdjustmentSelect;
 use App\Filament\Forms\Components\CreateClientSelect;
 use App\Filament\Forms\Components\CreateCurrencySelect;
 use App\Filament\Forms\Components\CreateOfferingSelect;
+use App\Filament\Forms\Components\CustomTableRepeater;
 use App\Filament\Forms\Components\DocumentFooterSection;
 use App\Filament\Forms\Components\DocumentHeaderSection;
 use App\Filament\Forms\Components\DocumentTotals;
@@ -27,7 +28,6 @@ use App\Models\Common\Offering;
 use App\Utilities\Currency\CurrencyAccessor;
 use App\Utilities\Currency\CurrencyConverter;
 use App\Utilities\RateCalculator;
-use Awcodes\TableRepeater\Components\TableRepeater;
 use Awcodes\TableRepeater\Header;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -90,8 +90,8 @@ class RecurringInvoiceResource extends Resource
                                 Forms\Components\Select::make('discount_method')
                                     ->label('Discount method')
                                     ->options(DocumentDiscountMethod::class)
-                                    ->selectablePlaceholder(false)
-                                    ->default(DocumentDiscountMethod::PerLineItem)
+                                    ->softRequired()
+                                    ->default($settings->discount_method)
                                     ->afterStateUpdated(function ($state, Forms\Set $set) {
                                         $discountMethod = DocumentDiscountMethod::parse($state);
 
@@ -102,28 +102,32 @@ class RecurringInvoiceResource extends Resource
                                     ->live(),
                             ])->grow(true),
                         ])->from('md'),
-                        TableRepeater::make('lineItems')
+                        CustomTableRepeater::make('lineItems')
+                            ->hiddenLabel()
                             ->relationship()
                             ->saveRelationshipsUsing(null)
                             ->dehydrated(true)
+                            ->reorderable()
+                            ->orderColumn('line_number')
+                            ->reorderAtStart()
+                            ->cloneable()
+                            ->addActionLabel('Add an item')
                             ->headers(function (Forms\Get $get) use ($settings) {
                                 $hasDiscounts = DocumentDiscountMethod::parse($get('discount_method'))->isPerLineItem();
 
                                 $headers = [
                                     Header::make($settings->resolveColumnLabel('item_name', 'Items'))
-                                        ->width($hasDiscounts ? '15%' : '20%'),
-                                    Header::make('Description')
-                                        ->width($hasDiscounts ? '15%' : '20%'),
+                                        ->width('30%'),
                                     Header::make($settings->resolveColumnLabel('unit_name', 'Quantity'))
                                         ->width('10%'),
                                     Header::make($settings->resolveColumnLabel('price_name', 'Price'))
                                         ->width('10%'),
-                                    Header::make('Taxes')
-                                        ->width($hasDiscounts ? '20%' : '30%'),
                                 ];
 
                                 if ($hasDiscounts) {
-                                    $headers[] = Header::make('Discounts')->width('20%');
+                                    $headers[] = Header::make('Adjustments')->width('30%');
+                                } else {
+                                    $headers[] = Header::make('Taxes')->width('30%');
                                 }
 
                                 $headers[] = Header::make($settings->resolveColumnLabel('amount_name', 'Amount'))
@@ -133,61 +137,68 @@ class RecurringInvoiceResource extends Resource
                                 return $headers;
                             })
                             ->schema([
-                                CreateOfferingSelect::make('offering_id')
-                                    ->label('Item')
-                                    ->required()
-                                    ->live()
-                                    ->sellable()
-                                    ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
-                                        $offeringId = $state;
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-                                        $isPerLineItem = $discountMethod->isPerLineItem();
+                                Forms\Components\Group::make([
+                                    CreateOfferingSelect::make('offering_id')
+                                        ->label('Item')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select item')
+                                        ->required()
+                                        ->live()
+                                        ->inlineSuffix()
+                                        ->sellable()
+                                        ->afterStateUpdated(function (Forms\Set $set, Forms\Get $get, $state, ?DocumentLineItem $record) {
+                                            $offeringId = $state;
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+                                            $isPerLineItem = $discountMethod->isPerLineItem();
+
+                                            $existingTaxIds = [];
+                                            $existingDiscountIds = [];
+
+                                            if ($record) {
+                                                $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
+                                                if ($isPerLineItem) {
+                                                    $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                                }
+                                            }
 
-                                        $existingTaxIds = [];
-                                        $existingDiscountIds = [];
+                                            $with = [
+                                                'salesTaxes' => static function ($query) use ($existingTaxIds) {
+                                                    $query->where(static function ($query) use ($existingTaxIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingTaxIds);
+                                                    });
+                                                },
+                                            ];
 
-                                        if ($record) {
-                                            $existingTaxIds = $record->salesTaxes()->pluck('adjustments.id')->toArray();
                                             if ($isPerLineItem) {
-                                                $existingDiscountIds = $record->salesDiscounts()->pluck('adjustments.id')->toArray();
+                                                $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
+                                                    $query->where(static function ($query) use ($existingDiscountIds) {
+                                                        $query->where('status', AdjustmentStatus::Active)
+                                                            ->orWhereIn('adjustments.id', $existingDiscountIds);
+                                                    });
+                                                };
                                             }
-                                        }
-
-                                        $with = [
-                                            'salesTaxes' => static function ($query) use ($existingTaxIds) {
-                                                $query->where(static function ($query) use ($existingTaxIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingTaxIds);
-                                                });
-                                            },
-                                        ];
-
-                                        if ($isPerLineItem) {
-                                            $with['salesDiscounts'] = static function ($query) use ($existingDiscountIds) {
-                                                $query->where(static function ($query) use ($existingDiscountIds) {
-                                                    $query->where('status', AdjustmentStatus::Active)
-                                                        ->orWhereIn('adjustments.id', $existingDiscountIds);
-                                                });
-                                            };
-                                        }
 
-                                        $offeringRecord = Offering::with($with)->find($offeringId);
+                                            $offeringRecord = Offering::with($with)->find($offeringId);
 
-                                        if (! $offeringRecord) {
-                                            return;
-                                        }
+                                            if (! $offeringRecord) {
+                                                return;
+                                            }
 
-                                        $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
+                                            $unitPrice = CurrencyConverter::convertToFloat($offeringRecord->price, $get('../../currency_code') ?? CurrencyAccessor::getDefaultCurrency());
 
-                                        $set('description', $offeringRecord->description);
-                                        $set('unit_price', $unitPrice);
-                                        $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
+                                            $set('description', $offeringRecord->description);
+                                            $set('unit_price', $unitPrice);
+                                            $set('salesTaxes', $offeringRecord->salesTaxes->pluck('id')->toArray());
 
-                                        if ($isPerLineItem) {
-                                            $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
-                                        }
-                                    }),
-                                Forms\Components\TextInput::make('description'),
+                                            if ($isPerLineItem) {
+                                                $set('salesDiscounts', $offeringRecord->salesDiscounts->pluck('id')->toArray());
+                                            }
+                                        }),
+                                    Forms\Components\TextInput::make('description')
+                                        ->placeholder('Enter item description')
+                                        ->hiddenLabel(),
+                                ])->columnSpan(1),
                                 Forms\Components\TextInput::make('quantity')
                                     ->required()
                                     ->numeric()
@@ -200,32 +211,40 @@ class RecurringInvoiceResource extends Resource
                                     ->live()
                                     ->maxValue(9999999999.99)
                                     ->default(0),
-                                CreateAdjustmentSelect::make('salesTaxes')
-                                    ->label('Taxes')
-                                    ->category(AdjustmentCategory::Tax)
-                                    ->type(AdjustmentType::Sales)
-                                    ->adjustmentsRelationship('salesTaxes')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->preload()
-                                    ->multiple()
-                                    ->live()
-                                    ->searchable(),
-                                CreateAdjustmentSelect::make('salesDiscounts')
-                                    ->label('Discounts')
-                                    ->category(AdjustmentCategory::Discount)
-                                    ->type(AdjustmentType::Sales)
-                                    ->adjustmentsRelationship('salesDiscounts')
-                                    ->saveRelationshipsUsing(null)
-                                    ->dehydrated(true)
-                                    ->multiple()
-                                    ->live()
-                                    ->hidden(function (Forms\Get $get) {
-                                        $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
-
-                                        return $discountMethod->isPerDocument();
-                                    })
-                                    ->searchable(),
+                                Forms\Components\Group::make([
+                                    CreateAdjustmentSelect::make('salesTaxes')
+                                        ->label('Taxes')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select taxes')
+                                        ->category(AdjustmentCategory::Tax)
+                                        ->type(AdjustmentType::Sales)
+                                        ->adjustmentsRelationship('salesTaxes')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->preload()
+                                        ->multiple()
+                                        ->live()
+                                        ->searchable(),
+                                    CreateAdjustmentSelect::make('salesDiscounts')
+                                        ->label('Discounts')
+                                        ->hiddenLabel()
+                                        ->placeholder('Select discounts')
+                                        ->category(AdjustmentCategory::Discount)
+                                        ->type(AdjustmentType::Sales)
+                                        ->adjustmentsRelationship('salesDiscounts')
+                                        ->saveRelationshipsUsing(null)
+                                        ->dehydrated(true)
+                                        ->inlineSuffix()
+                                        ->multiple()
+                                        ->live()
+                                        ->hidden(function (Forms\Get $get) {
+                                            $discountMethod = DocumentDiscountMethod::parse($get('../../discount_method'));
+
+                                            return $discountMethod->isPerDocument();
+                                        })
+                                        ->searchable(),
+                                ])->columnSpan(1),
                                 Forms\Components\Placeholder::make('total')
                                     ->hiddenLabel()
                                     ->extraAttributes(['class' => 'text-left sm:text-right'])

app/Filament/Forms/Components/CustomTableRepeater.php

@@ -4,10 +4,25 @@ namespace App\Filament\Forms\Components;
 
 use Awcodes\TableRepeater\Components\TableRepeater;
 use Closure;
+use Filament\Forms\Components\Actions\Action;
 
 class CustomTableRepeater extends TableRepeater
 {
-    protected bool | Closure | null $spreadsheet = null;
+    protected bool | Closure $spreadsheet = false;
+
+    protected bool | Closure $reorderAtStart = false;
+
+    /**
+     * @var array<string> | Closure | null
+     */
+    protected array | Closure | null $excludedAttributesForCloning = [
+        'id',
+        'line_number',
+        'created_by',
+        'updated_by',
+        'created_at',
+        'updated_at',
+    ];
 
     public function spreadsheet(bool | Closure $condition = true): static
     {
@@ -18,13 +33,45 @@ class CustomTableRepeater extends TableRepeater
 
     public function isSpreadsheet(): bool
     {
-        return $this->evaluate($this->spreadsheet) ?? false;
+        return (bool) $this->evaluate($this->spreadsheet);
+    }
+
+    public function reorderAtStart(bool | Closure $condition = true): static
+    {
+        $this->reorderAtStart = $condition;
+
+        return $this;
+    }
+
+    public function isReorderAtStart(): bool
+    {
+        return $this->evaluate($this->reorderAtStart) && $this->isReorderable();
+    }
+
+    /**
+     * @param  array<string> | Closure | null  $attributes
+     */
+    public function excludeAttributesForCloning(array | Closure | null $attributes): static
+    {
+        $this->excludedAttributesForCloning = $attributes;
+
+        return $this;
+    }
+
+    /**
+     * @return array<string> | null
+     */
+    public function getExcludedAttributesForCloning(): ?array
+    {
+        return $this->evaluate($this->excludedAttributesForCloning);
     }
 
     protected function setUp(): void
     {
         parent::setUp();
 
+        $this->minItems(1);
+
         $this->extraAttributes(function (): array {
             $attributes = [];
 
@@ -34,5 +81,42 @@ class CustomTableRepeater extends TableRepeater
 
             return $attributes;
         });
+
+        $this->reorderAction(function (Action $action) {
+            if ($this->isReorderAtStart()) {
+                $action->icon('heroicon-m-bars-3');
+            }
+
+            return $action;
+        });
+
+        $this->cloneAction(function (Action $action) {
+            return $action
+                ->action(function (array $arguments, CustomTableRepeater $component): void {
+                    $newUuid = $component->generateUuid();
+                    $items = $component->getState();
+
+                    $clone = $items[$arguments['item']];
+
+                    foreach ($component->getExcludedAttributesForCloning() as $attribute) {
+                        unset($clone[$attribute]);
+                    }
+
+                    if ($newUuid) {
+                        $items[$newUuid] = $clone;
+                    } else {
+                        $items[] = $clone;
+                    }
+
+                    $component->state($items);
+                    $component->collapsed(false, shouldMakeComponentCollapsible: false);
+                    $component->callAfterStateUpdated();
+                });
+        });
+    }
+
+    public function getView(): string
+    {
+        return 'filament.forms.components.custom-table-repeater';
     }
 }

app/Models/Accounting/Document.php

@@ -27,7 +27,7 @@ abstract class Document extends Model
 
     public function lineItems(): MorphMany
     {
-        return $this->morphMany(DocumentLineItem::class, 'documentable');
+        return $this->morphMany(DocumentLineItem::class, 'documentable')->orderBy('line_number');
     }
 
     public function hasLineItems(): bool

app/Models/Accounting/DocumentLineItem.php

@@ -36,6 +36,7 @@ class DocumentLineItem extends Model
         'unit_price',
         'tax_total',
         'discount_total',
+        'line_number',
         'created_by',
         'updated_by',
     ];

app/Models/Setting/DocumentDefault.php

@@ -4,6 +4,7 @@ namespace App\Models\Setting;
 
 use App\Concerns\Blamable;
 use App\Concerns\CompanyOwned;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\DocumentType;
 use App\Enums\Setting\Font;
 use App\Enums\Setting\PaymentTerms;
@@ -32,6 +33,7 @@ class DocumentDefault extends Model
         'show_logo',
         'number_prefix',
         'payment_terms',
+        'discount_method',
         'header',
         'subheader',
         'terms',
@@ -51,6 +53,7 @@ class DocumentDefault extends Model
         'type' => DocumentType::class,
         'show_logo' => 'boolean',
         'payment_terms' => PaymentTerms::class,
+        'discount_method' => DocumentDiscountMethod::class,
         'font' => Font::class,
         'template' => Template::class,
         'item_name' => AsArrayObject::class,

app/Providers/Filament/CompanyPanelProvider.php

@@ -298,18 +298,9 @@ class CompanyPanelProvider extends PanelProvider
     protected function configureSelect(): void
     {
         Select::configureUsing(function (Select $select): void {
-            $isSelectable = fn (): bool => ! $this->hasRequiredRule($select);
-
             $select
                 ->native(false)
-                ->selectablePlaceholder($isSelectable);
+                ->selectablePlaceholder(fn (Select $component) => ! $component->isRequired());
         });
     }
-
-    protected function hasRequiredRule(Select $component): bool
-    {
-        $rules = $component->getValidationRules();
-
-        return in_array('required', $rules, true);
-    }
 }

app/Utilities/RateCalculator.php

@@ -28,8 +28,12 @@ class RateCalculator
         return (int) round($decimalRate * self::PERCENTAGE_SCALING_FACTOR);
     }
 
-    public static function parseLocalizedRate(string $value): int
+    public static function parseLocalizedRate(?string $value): int
     {
+        if (! $value) {
+            return 0;
+        }
+
         $format = Localization::firstOrFail()->number_format->value;
         [$decimalMark, $thousandsSeparator] = NumberFormat::from($format)->getFormattingParameters();
 

composer.lock

@@ -368,16 +368,16 @@
         },
         {
             "name": "awcodes/filament-table-repeater",
-            "version": "v3.1.2",
+            "version": "v3.1.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awcodes/filament-table-repeater.git",
-                "reference": "1cdfdd0fefbcc183960b4623cab17f6db880029e"
+                "reference": "fd8df8fbb94a41d0a031a75ef739538290a14a8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awcodes/filament-table-repeater/zipball/1cdfdd0fefbcc183960b4623cab17f6db880029e",
-                "reference": "1cdfdd0fefbcc183960b4623cab17f6db880029e",
+                "url": "https://api.github.com/repos/awcodes/filament-table-repeater/zipball/fd8df8fbb94a41d0a031a75ef739538290a14a8c",
+                "reference": "fd8df8fbb94a41d0a031a75ef739538290a14a8c",
                 "shasum": ""
             },
             "require": {
@@ -431,7 +431,7 @@
             ],
             "support": {
                 "issues": "https://github.com/awcodes/filament-table-repeater/issues",
-                "source": "https://github.com/awcodes/filament-table-repeater/tree/v3.1.2"
+                "source": "https://github.com/awcodes/filament-table-repeater/tree/v3.1.3"
             },
             "funding": [
                 {
@@ -439,7 +439,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-04-21T14:01:12+00:00"
+            "time": "2025-05-03T14:59:55+00:00"
         },
         {
             "name": "aws/aws-crt-php",
@@ -497,16 +497,16 @@
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.343.2",
+            "version": "3.343.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "95d43e71d3395622394b36079f2fb2289d3284b3"
+                "reference": "d7ad5f6bdee792a16d2c9d5a3d9b56acfaaaf979"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/95d43e71d3395622394b36079f2fb2289d3284b3",
-                "reference": "95d43e71d3395622394b36079f2fb2289d3284b3",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/d7ad5f6bdee792a16d2c9d5a3d9b56acfaaaf979",
+                "reference": "d7ad5f6bdee792a16d2c9d5a3d9b56acfaaaf979",
                 "shasum": ""
             },
             "require": {
@@ -588,9 +588,9 @@
             "support": {
                 "forum": "https://github.com/aws/aws-sdk-php/discussions",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.2"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.343.3"
             },
-            "time": "2025-05-01T18:05:02+00:00"
+            "time": "2025-05-02T18:04:58+00:00"
         },
         {
             "name": "aws/aws-sdk-php-laravel",
@@ -6794,16 +6794,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.2.5",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "e51498ea18570c062e7df29d05a7003585b19b88"
+                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/e51498ea18570c062e7df29d05a7003585b19b88",
-                "reference": "e51498ea18570c062e7df29d05a7003585b19b88",
+                "url": "https://api.github.com/repos/symfony/console/zipball/0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
+                "reference": "0e2e3f38c192e93e622e41ec37f4ca70cfedf218",
                 "shasum": ""
             },
             "require": {
@@ -6867,7 +6867,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.2.5"
+                "source": "https://github.com/symfony/console/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -6883,7 +6883,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-12T08:11:12+00:00"
+            "time": "2025-04-07T19:09:28+00:00"
         },
         {
             "name": "symfony/css-selector",
@@ -7314,16 +7314,16 @@
         },
         {
             "name": "symfony/html-sanitizer",
-            "version": "v7.2.3",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/html-sanitizer.git",
-                "reference": "91443febe34cfa5e8e00425f892e6316db95bc23"
+                "reference": "1bd0c8fd5938d9af3f081a7c43d360ddefd494ca"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/html-sanitizer/zipball/91443febe34cfa5e8e00425f892e6316db95bc23",
-                "reference": "91443febe34cfa5e8e00425f892e6316db95bc23",
+                "url": "https://api.github.com/repos/symfony/html-sanitizer/zipball/1bd0c8fd5938d9af3f081a7c43d360ddefd494ca",
+                "reference": "1bd0c8fd5938d9af3f081a7c43d360ddefd494ca",
                 "shasum": ""
             },
             "require": {
@@ -7363,7 +7363,7 @@
                 "sanitizer"
             ],
             "support": {
-                "source": "https://github.com/symfony/html-sanitizer/tree/v7.2.3"
+                "source": "https://github.com/symfony/html-sanitizer/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -7379,20 +7379,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-27T11:08:17+00:00"
+            "time": "2025-03-31T08:29:03+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v7.2.5",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "371272aeb6286f8135e028ca535f8e4d6f114126"
+                "reference": "6023ec7607254c87c5e69fb3558255aca440d72b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/371272aeb6286f8135e028ca535f8e4d6f114126",
-                "reference": "371272aeb6286f8135e028ca535f8e4d6f114126",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6023ec7607254c87c5e69fb3558255aca440d72b",
+                "reference": "6023ec7607254c87c5e69fb3558255aca440d72b",
                 "shasum": ""
             },
             "require": {
@@ -7441,7 +7441,7 @@
             "description": "Defines an object-oriented layer for the HTTP specification",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-foundation/tree/v7.2.5"
+                "source": "https://github.com/symfony/http-foundation/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -7457,20 +7457,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-25T15:54:33+00:00"
+            "time": "2025-04-09T08:14:01+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v7.2.5",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "b1fe91bc1fa454a806d3f98db4ba826eb9941a54"
+                "reference": "f9dec01e6094a063e738f8945ef69c0cfcf792ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/b1fe91bc1fa454a806d3f98db4ba826eb9941a54",
-                "reference": "b1fe91bc1fa454a806d3f98db4ba826eb9941a54",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f9dec01e6094a063e738f8945ef69c0cfcf792ec",
+                "reference": "f9dec01e6094a063e738f8945ef69c0cfcf792ec",
                 "shasum": ""
             },
             "require": {
@@ -7555,7 +7555,7 @@
             "description": "Provides a structured process for converting a Request into a Response",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/http-kernel/tree/v7.2.5"
+                "source": "https://github.com/symfony/http-kernel/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -7571,20 +7571,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-28T13:32:50+00:00"
+            "time": "2025-05-02T09:04:03+00:00"
         },
         {
             "name": "symfony/intl",
-            "version": "v6.4.15",
+            "version": "v6.4.21",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/intl.git",
-                "reference": "b1d5e8d82615b60f229216edfee0b59e2ef66da6"
+                "reference": "b248d227fa10fd6345efd4c1c74efaa1c1de6f76"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/intl/zipball/b1d5e8d82615b60f229216edfee0b59e2ef66da6",
-                "reference": "b1d5e8d82615b60f229216edfee0b59e2ef66da6",
+                "url": "https://api.github.com/repos/symfony/intl/zipball/b248d227fa10fd6345efd4c1c74efaa1c1de6f76",
+                "reference": "b248d227fa10fd6345efd4c1c74efaa1c1de6f76",
                 "shasum": ""
             },
             "require": {
@@ -7638,7 +7638,7 @@
                 "localization"
             ],
             "support": {
-                "source": "https://github.com/symfony/intl/tree/v6.4.15"
+                "source": "https://github.com/symfony/intl/tree/v6.4.21"
             },
             "funding": [
                 {
@@ -7654,20 +7654,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-08T15:28:48+00:00"
+            "time": "2025-04-07T19:02:30+00:00"
         },
         {
             "name": "symfony/mailer",
-            "version": "v7.2.3",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mailer.git",
-                "reference": "f3871b182c44997cf039f3b462af4a48fb85f9d3"
+                "reference": "998692469d6e698c6eadc7ef37a6530a9eabb356"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mailer/zipball/f3871b182c44997cf039f3b462af4a48fb85f9d3",
-                "reference": "f3871b182c44997cf039f3b462af4a48fb85f9d3",
+                "url": "https://api.github.com/repos/symfony/mailer/zipball/998692469d6e698c6eadc7ef37a6530a9eabb356",
+                "reference": "998692469d6e698c6eadc7ef37a6530a9eabb356",
                 "shasum": ""
             },
             "require": {
@@ -7718,7 +7718,7 @@
             "description": "Helps sending emails",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/mailer/tree/v7.2.3"
+                "source": "https://github.com/symfony/mailer/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -7734,20 +7734,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-27T11:08:17+00:00"
+            "time": "2025-04-04T09:50:51+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v7.2.4",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "87ca22046b78c3feaff04b337f33b38510fd686b"
+                "reference": "706e65c72d402539a072d0d6ad105fff6c161ef1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/87ca22046b78c3feaff04b337f33b38510fd686b",
-                "reference": "87ca22046b78c3feaff04b337f33b38510fd686b",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/706e65c72d402539a072d0d6ad105fff6c161ef1",
+                "reference": "706e65c72d402539a072d0d6ad105fff6c161ef1",
                 "shasum": ""
             },
             "require": {
@@ -7802,7 +7802,7 @@
                 "mime-type"
             ],
             "support": {
-                "source": "https://github.com/symfony/mime/tree/v7.2.4"
+                "source": "https://github.com/symfony/mime/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -7818,11 +7818,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-19T08:51:20+00:00"
+            "time": "2025-04-27T13:34:41+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
@@ -7881,7 +7881,7 @@
                 "portable"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -7901,7 +7901,7 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
@@ -7959,7 +7959,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -7979,16 +7979,16 @@
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773"
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773",
-                "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3",
+                "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3",
                 "shasum": ""
             },
             "require": {
@@ -8042,7 +8042,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -8058,11 +8058,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2024-09-10T14:38:51+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -8123,7 +8123,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -8143,19 +8143,20 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341"
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341",
-                "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
                 "shasum": ""
             },
             "require": {
+                "ext-iconv": "*",
                 "php": ">=7.2"
             },
             "provide": {
@@ -8203,7 +8204,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -8219,20 +8220,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2024-12-23T08:48:59+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8"
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
-                "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
                 "shasum": ""
             },
             "require": {
@@ -8283,7 +8284,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -8299,11 +8300,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2025-01-02T08:10:11+00:00"
         },
         {
             "name": "symfony/polyfill-php83",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php83.git",
@@ -8359,7 +8360,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -8379,7 +8380,7 @@
         },
         {
             "name": "symfony/polyfill-uuid",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-uuid.git",
@@ -8438,7 +8439,7 @@
                 "uuid"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-uuid/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -8683,16 +8684,16 @@
         },
         {
             "name": "symfony/string",
-            "version": "v7.2.0",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82"
+                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/446e0d146f991dde3e73f45f2c97a9faad773c82",
-                "reference": "446e0d146f991dde3e73f45f2c97a9faad773c82",
+                "url": "https://api.github.com/repos/symfony/string/zipball/a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
+                "reference": "a214fe7d62bd4df2a76447c67c6b26e1d5e74931",
                 "shasum": ""
             },
             "require": {
@@ -8750,7 +8751,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v7.2.0"
+                "source": "https://github.com/symfony/string/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -8766,20 +8767,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-11-13T13:31:26+00:00"
+            "time": "2025-04-20T20:18:16+00:00"
         },
         {
             "name": "symfony/translation",
-            "version": "v7.2.4",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "283856e6981286cc0d800b53bd5703e8e363f05a"
+                "reference": "e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/283856e6981286cc0d800b53bd5703e8e363f05a",
-                "reference": "283856e6981286cc0d800b53bd5703e8e363f05a",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6",
+                "reference": "e7fd8e2a4239b79a0fd9fb1fef3e0e7f969c6dc6",
                 "shasum": ""
             },
             "require": {
@@ -8845,7 +8846,7 @@
             "description": "Provides tools to internationalize your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/translation/tree/v7.2.4"
+                "source": "https://github.com/symfony/translation/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -8861,7 +8862,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-02-13T10:27:23+00:00"
+            "time": "2025-04-07T19:09:28+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -9017,16 +9018,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v7.2.3",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "82b478c69745d8878eb60f9a049a4d584996f73a"
+                "reference": "9c46038cd4ed68952166cf7001b54eb539184ccb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82b478c69745d8878eb60f9a049a4d584996f73a",
-                "reference": "82b478c69745d8878eb60f9a049a4d584996f73a",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/9c46038cd4ed68952166cf7001b54eb539184ccb",
+                "reference": "9c46038cd4ed68952166cf7001b54eb539184ccb",
                 "shasum": ""
             },
             "require": {
@@ -9080,7 +9081,7 @@
                 "dump"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/v7.2.3"
+                "source": "https://github.com/symfony/var-dumper/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -9096,7 +9097,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-01-17T11:39:41+00:00"
+            "time": "2025-04-09T08:14:01+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -13098,16 +13099,16 @@
         },
         {
             "name": "symfony/polyfill-iconv",
-            "version": "v1.31.0",
+            "version": "v1.32.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-iconv.git",
-                "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956"
+                "reference": "5f3b930437ae03ae5dff61269024d8ea1b3774aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/48becf00c920479ca2e910c22a5a39e5d47ca956",
-                "reference": "48becf00c920479ca2e910c22a5a39e5d47ca956",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/5f3b930437ae03ae5dff61269024d8ea1b3774aa",
+                "reference": "5f3b930437ae03ae5dff61269024d8ea1b3774aa",
                 "shasum": ""
             },
             "require": {
@@ -13158,7 +13159,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.31.0"
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.32.0"
             },
             "funding": [
                 {
@@ -13174,7 +13175,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-09-09T11:45:10+00:00"
+            "time": "2024-09-17T14:58:18+00:00"
         },
         {
             "name": "symfony/stopwatch",
@@ -13240,16 +13241,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v7.2.5",
+            "version": "v7.2.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "4c4b6f4cfcd7e52053f0c8bfad0f7f30fb924912"
+                "reference": "0feafffb843860624ddfd13478f481f4c3cd8b23"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/4c4b6f4cfcd7e52053f0c8bfad0f7f30fb924912",
-                "reference": "4c4b6f4cfcd7e52053f0c8bfad0f7f30fb924912",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/0feafffb843860624ddfd13478f481f4c3cd8b23",
+                "reference": "0feafffb843860624ddfd13478f481f4c3cd8b23",
                 "shasum": ""
             },
             "require": {
@@ -13292,7 +13293,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v7.2.5"
+                "source": "https://github.com/symfony/yaml/tree/v7.2.6"
             },
             "funding": [
                 {
@@ -13308,7 +13309,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-03-03T07:12:39+00:00"
+            "time": "2025-04-04T10:10:11+00:00"
         },
         {
             "name": "ta-tikoma/phpunit-architecture-test",

database/factories/Accounting/BillFactory.php

@@ -2,7 +2,9 @@
 
 namespace Database\Factories\Accounting;
 
+use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\BillStatus;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\PaymentMethod;
 use App\Models\Accounting\Bill;
 use App\Models\Accounting\DocumentLineItem;
@@ -11,6 +13,7 @@ use App\Models\Common\Vendor;
 use App\Models\Company;
 use App\Models\Setting\DocumentDefault;
 use App\Utilities\Currency\CurrencyConverter;
+use App\Utilities\RateCalculator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -49,6 +52,17 @@ class BillFactory extends Factory
             'date' => $billDate,
             'due_date' => Carbon::parse($billDate)->addDays($dueDays),
             'status' => BillStatus::Open,
+            'discount_method' => $this->faker->randomElement(DocumentDiscountMethod::class),
+            'discount_computation' => AdjustmentComputation::Percentage,
+            'discount_rate' => function (array $attributes) {
+                $discountMethod = DocumentDiscountMethod::parse($attributes['discount_method']);
+
+                if ($discountMethod?->isPerDocument()) {
+                    return $this->faker->numberBetween(50000, 200000); // 5% - 20%
+                }
+
+                return 0;
+            },
             'currency_code' => function (array $attributes) {
                 $vendor = Vendor::find($attributes['vendor_id']);
 
@@ -226,7 +240,19 @@ class BillFactory extends Factory
 
         $subtotalCents = $bill->lineItems()->sum('subtotal');
         $taxTotalCents = $bill->lineItems()->sum('tax_total');
-        $discountTotalCents = $bill->lineItems()->sum('discount_total');
+
+        $discountTotalCents = 0;
+
+        if ($bill->discount_method?->isPerLineItem()) {
+            $discountTotalCents = $bill->lineItems()->sum('discount_total');
+        } elseif ($bill->discount_method?->isPerDocument() && $bill->discount_rate) {
+            if ($bill->discount_computation?->isPercentage()) {
+                $scaledRate = RateCalculator::parseLocalizedRate($bill->discount_rate);
+                $discountTotalCents = RateCalculator::calculatePercentage($subtotalCents, $scaledRate);
+            } else {
+                $discountTotalCents = CurrencyConverter::convertToCents($bill->discount_rate, $bill->currency_code);
+            }
+        }
 
         $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
         $currencyCode = $bill->currency_code;

database/factories/Accounting/DocumentLineItemFactory.php

@@ -56,7 +56,11 @@ class DocumentLineItemFactory extends Factory
                 ]);
 
                 $lineItem->salesTaxes()->syncWithoutDetaching($offering->salesTaxes->pluck('id')->toArray());
-                $lineItem->salesDiscounts()->syncWithoutDetaching($offering->salesDiscounts->pluck('id')->toArray());
+
+                // Only sync discounts if the discount method is per_line_item
+                if ($lineItem->documentable->discount_method?->isPerLineItem() ?? true) {
+                    $lineItem->salesDiscounts()->syncWithoutDetaching($offering->salesDiscounts->pluck('id')->toArray());
+                }
 
                 $lineItem->refresh();
 
@@ -88,7 +92,11 @@ class DocumentLineItemFactory extends Factory
                 ]);
 
                 $lineItem->salesTaxes()->syncWithoutDetaching($offering->salesTaxes->pluck('id')->toArray());
-                $lineItem->salesDiscounts()->syncWithoutDetaching($offering->salesDiscounts->pluck('id')->toArray());
+
+                // Only sync discounts if the discount method is per_line_item
+                if ($lineItem->documentable->discount_method?->isPerLineItem() ?? true) {
+                    $lineItem->salesDiscounts()->syncWithoutDetaching($offering->salesDiscounts->pluck('id')->toArray());
+                }
 
                 $lineItem->refresh();
 
@@ -120,7 +128,11 @@ class DocumentLineItemFactory extends Factory
                 ]);
 
                 $lineItem->purchaseTaxes()->syncWithoutDetaching($offering->purchaseTaxes->pluck('id')->toArray());
-                $lineItem->purchaseDiscounts()->syncWithoutDetaching($offering->purchaseDiscounts->pluck('id')->toArray());
+
+                // Only sync discounts if the discount method is per_line_item
+                if ($lineItem->documentable->discount_method?->isPerLineItem() ?? true) {
+                    $lineItem->purchaseDiscounts()->syncWithoutDetaching($offering->purchaseDiscounts->pluck('id')->toArray());
+                }
 
                 $lineItem->refresh();
 

database/factories/Accounting/EstimateFactory.php

@@ -2,6 +2,8 @@
 
 namespace Database\Factories\Accounting;
 
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\EstimateStatus;
 use App\Models\Accounting\DocumentLineItem;
 use App\Models\Accounting\Estimate;
@@ -9,6 +11,7 @@ use App\Models\Common\Client;
 use App\Models\Company;
 use App\Models\Setting\DocumentDefault;
 use App\Utilities\Currency\CurrencyConverter;
+use App\Utilities\RateCalculator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -41,6 +44,17 @@ class EstimateFactory extends Factory
             'date' => $estimateDate,
             'expiration_date' => Carbon::parse($estimateDate)->addDays($this->faker->numberBetween(14, 30)),
             'status' => EstimateStatus::Draft,
+            'discount_method' => $this->faker->randomElement(DocumentDiscountMethod::class),
+            'discount_computation' => AdjustmentComputation::Percentage,
+            'discount_rate' => function (array $attributes) {
+                $discountMethod = DocumentDiscountMethod::parse($attributes['discount_method']);
+
+                if ($discountMethod?->isPerDocument()) {
+                    return $this->faker->numberBetween(50000, 200000); // 5% - 20%
+                }
+
+                return 0;
+            },
             'currency_code' => function (array $attributes) {
                 $client = Client::find($attributes['client_id']);
 
@@ -207,7 +221,19 @@ class EstimateFactory extends Factory
 
         $subtotalCents = $estimate->lineItems()->sum('subtotal');
         $taxTotalCents = $estimate->lineItems()->sum('tax_total');
-        $discountTotalCents = $estimate->lineItems()->sum('discount_total');
+
+        $discountTotalCents = 0;
+
+        if ($estimate->discount_method?->isPerLineItem()) {
+            $discountTotalCents = $estimate->lineItems()->sum('discount_total');
+        } elseif ($estimate->discount_method?->isPerDocument() && $estimate->discount_rate) {
+            if ($estimate->discount_computation?->isPercentage()) {
+                $scaledRate = RateCalculator::parseLocalizedRate($estimate->discount_rate);
+                $discountTotalCents = RateCalculator::calculatePercentage($subtotalCents, $scaledRate);
+            } else {
+                $discountTotalCents = CurrencyConverter::convertToCents($estimate->discount_rate, $estimate->currency_code);
+            }
+        }
 
         $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
         $currencyCode = $estimate->currency_code;

database/factories/Accounting/InvoiceFactory.php

@@ -2,6 +2,8 @@
 
 namespace Database\Factories\Accounting;
 
+use App\Enums\Accounting\AdjustmentComputation;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\InvoiceStatus;
 use App\Enums\Accounting\PaymentMethod;
 use App\Models\Accounting\DocumentLineItem;
@@ -11,6 +13,7 @@ use App\Models\Common\Client;
 use App\Models\Company;
 use App\Models\Setting\DocumentDefault;
 use App\Utilities\Currency\CurrencyConverter;
+use App\Utilities\RateCalculator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -43,6 +46,17 @@ class InvoiceFactory extends Factory
             'date' => $invoiceDate,
             'due_date' => Carbon::parse($invoiceDate)->addDays($this->faker->numberBetween(14, 60)),
             'status' => InvoiceStatus::Draft,
+            'discount_method' => $this->faker->randomElement(DocumentDiscountMethod::class),
+            'discount_computation' => AdjustmentComputation::Percentage,
+            'discount_rate' => function (array $attributes) {
+                $discountMethod = DocumentDiscountMethod::parse($attributes['discount_method']);
+
+                if ($discountMethod?->isPerDocument()) {
+                    return $this->faker->numberBetween(50000, 200000); // 5% - 20%
+                }
+
+                return 0;
+            },
             'currency_code' => function (array $attributes) {
                 $client = Client::find($attributes['client_id']);
 
@@ -251,7 +265,19 @@ class InvoiceFactory extends Factory
 
         $subtotalCents = $invoice->lineItems()->sum('subtotal');
         $taxTotalCents = $invoice->lineItems()->sum('tax_total');
-        $discountTotalCents = $invoice->lineItems()->sum('discount_total');
+
+        $discountTotalCents = 0;
+
+        if ($invoice->discount_method?->isPerLineItem()) {
+            $discountTotalCents = $invoice->lineItems()->sum('discount_total');
+        } elseif ($invoice->discount_method?->isPerDocument() && $invoice->discount_rate) {
+            if ($invoice->discount_computation?->isPercentage()) {
+                $scaledRate = RateCalculator::parseLocalizedRate($invoice->discount_rate);
+                $discountTotalCents = RateCalculator::calculatePercentage($subtotalCents, $scaledRate);
+            } else {
+                $discountTotalCents = CurrencyConverter::convertToCents($invoice->discount_rate, $invoice->currency_code);
+            }
+        }
 
         $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
         $currencyCode = $invoice->currency_code;

database/factories/Accounting/RecurringInvoiceFactory.php

@@ -2,8 +2,10 @@
 
 namespace Database\Factories\Accounting;
 
+use App\Enums\Accounting\AdjustmentComputation;
 use App\Enums\Accounting\DayOfMonth;
 use App\Enums\Accounting\DayOfWeek;
+use App\Enums\Accounting\DocumentDiscountMethod;
 use App\Enums\Accounting\EndType;
 use App\Enums\Accounting\Frequency;
 use App\Enums\Accounting\IntervalType;
@@ -15,6 +17,7 @@ use App\Models\Accounting\RecurringInvoice;
 use App\Models\Common\Client;
 use App\Models\Company;
 use App\Utilities\Currency\CurrencyConverter;
+use App\Utilities\RateCalculator;
 use Illuminate\Database\Eloquent\Factories\Factory;
 use Illuminate\Support\Carbon;
 
@@ -43,6 +46,17 @@ class RecurringInvoiceFactory extends Factory
             'order_number' => $this->faker->unique()->numerify('ORD-####'),
             'payment_terms' => PaymentTerms::Net30,
             'status' => RecurringInvoiceStatus::Draft,
+            'discount_method' => $this->faker->randomElement(DocumentDiscountMethod::class),
+            'discount_computation' => AdjustmentComputation::Percentage,
+            'discount_rate' => function (array $attributes) {
+                $discountMethod = DocumentDiscountMethod::parse($attributes['discount_method']);
+
+                if ($discountMethod?->isPerDocument()) {
+                    return $this->faker->numberBetween(50000, 200000); // 5% - 20%
+                }
+
+                return 0;
+            },
             'currency_code' => function (array $attributes) {
                 $client = Client::find($attributes['client_id']);
 
@@ -301,7 +315,19 @@ class RecurringInvoiceFactory extends Factory
 
         $subtotalCents = $recurringInvoice->lineItems()->sum('subtotal');
         $taxTotalCents = $recurringInvoice->lineItems()->sum('tax_total');
-        $discountTotalCents = $recurringInvoice->lineItems()->sum('discount_total');
+
+        $discountTotalCents = 0;
+
+        if ($recurringInvoice->discount_method?->isPerLineItem()) {
+            $discountTotalCents = $recurringInvoice->lineItems()->sum('discount_total');
+        } elseif ($recurringInvoice->discount_method?->isPerDocument() && $recurringInvoice->discount_rate) {
+            if ($recurringInvoice->discount_computation?->isPercentage()) {
+                $scaledRate = RateCalculator::parseLocalizedRate($recurringInvoice->discount_rate);
+                $discountTotalCents = RateCalculator::calculatePercentage($subtotalCents, $scaledRate);
+            } else {
+                $discountTotalCents = CurrencyConverter::convertToCents($recurringInvoice->discount_rate, $recurringInvoice->currency_code);
+            }
+        }
 
         $grandTotalCents = $subtotalCents + $taxTotalCents - $discountTotalCents;
         $currencyCode = $recurringInvoice->currency_code;

database/migrations/2025_05_03_150845_add_discount_method_to_document_defaults_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('document_defaults', function (Blueprint $table) {
+            $table->string('discount_method')->default('per_document')->after('payment_terms');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('document_defaults', function (Blueprint $table) {
+            $table->dropColumn('discount_method');
+        });
+    }
+};

database/migrations/2025_05_03_152233_update_discount_method_defaults_on_document_tables.php

@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        if (Schema::hasColumn('bills', 'discount_method')) {
+            Schema::table('bills', function (Blueprint $table) {
+                $table->string('discount_method')->default('per_document')->change();
+            });
+        }
+
+        if (Schema::hasColumn('estimates', 'discount_method')) {
+            Schema::table('estimates', function (Blueprint $table) {
+                $table->string('discount_method')->default('per_document')->change();
+            });
+        }
+
+        if (Schema::hasColumn('recurring_invoices', 'discount_method')) {
+            Schema::table('recurring_invoices', function (Blueprint $table) {
+                $table->string('discount_method')->default('per_document')->change();
+            });
+        }
+
+        if (Schema::hasColumn('invoices', 'discount_method')) {
+            Schema::table('invoices', function (Blueprint $table) {
+                $table->string('discount_method')->default('per_document')->change();
+            });
+        }
+    }
+};

database/migrations/2025_05_05_211551_add_sort_order_to_document_line_items.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('document_line_items', function (Blueprint $table) {
+            $table->integer('line_number')->nullable()->after('documentable_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('document_line_items', function (Blueprint $table) {
+            $table->dropColumn('line_number');
+        });
+    }
+};

resources/css/filament/company/form-fields.css

@@ -42,46 +42,46 @@
 }
 
 /* Table Repeater Styles */
-:not(.is-spreadsheet) {
-    .table-repeater-container {
-        @apply rounded-none ring-0;
+.table-repeater-component:not(.is-spreadsheet) {
+    .table-repeater-row {
+        @apply hover:bg-gray-50 dark:hover:bg-white/5 transition-colors;
     }
 
-    .table-repeater-component {
-        @apply space-y-10;
+    .table-repeater-column {
+        @apply p-3;
     }
 
-    .table-repeater-component ul {
-        @apply justify-start;
+    .table-repeater-header {
+        @apply bg-gray-50 dark:bg-white/5 border-b border-gray-200 dark:border-white/5;
     }
 
     .table-repeater-row {
         @apply divide-x-0 !important;
     }
 
-    .table-repeater-column {
-        @apply py-2 !important;
-    }
-
-    .table-repeater-header {
-        @apply rounded-t-none !important;
+    .table-repeater-header tr {
+        @apply divide-x-0 text-sm;
     }
 
-    .table-repeater-rows-wrapper {
-        @apply divide-gray-300 last:border-b last:border-gray-300 dark:divide-white/20 dark:last:border-white/20;
+    .table-repeater-header-column {
+        @apply p-3 text-sm font-semibold text-gray-950 dark:text-white bg-gray-50 dark:bg-white/5;
     }
 
-    .table-repeater-header tr {
-        @apply divide-x-0 text-base sm:text-sm sm:leading-6 !important;
+    /* Chrome, Safari, Edge, Opera */
+    input::-webkit-outer-spin-button,
+    input::-webkit-inner-spin-button {
+        -webkit-appearance: none;
+        margin: 0;
     }
 
-    .table-repeater-header-column {
-        @apply ps-3 pe-3 font-semibold bg-gray-200 dark:bg-gray-800 rounded-none !important;
+    /* Firefox */
+    input[type=number] {
+        -moz-appearance: textfield;
     }
 }
 
 /* Excel/Spreadsheet styling */
-.is-spreadsheet {
+.table-repeater-component.is-spreadsheet {
     .table-repeater-container {
         overflow-x: auto;
         max-width: 100%;
@@ -165,37 +165,6 @@
     }
 }
 
-/* Responsive behavior */
-@media (max-width: theme('screens.sm')) {
-    .table-repeater-component.break-point-sm .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
-@media (max-width: theme('screens.md')) {
-    .table-repeater-component.break-point-md .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
-@media (max-width: theme('screens.lg')) {
-    .table-repeater-component.break-point-lg .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
-@media (max-width: theme('screens.xl')) {
-    .table-repeater-component.break-point-xl .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
-@media (max-width: theme('screens.2xl')) {
-    .table-repeater-component.break-point-2xl .table-repeater-container {
-        overflow-x: visible;
-    }
-}
-
 .is-spreadsheet .table-repeater-column .fi-input-wrp-suffix {
     padding-right: 0 !important;
 }

resources/views/components/company/document-template/container.blade.php

@@ -6,7 +6,7 @@
     <div
         @class([
             'doc-template-paper bg-[#ffffff] dark:bg-gray-800 rounded-sm shadow-xl',
-            'w-full max-w-[820px] max-h-[1024px] overflow-y-auto' => $preview === false,
+            'w-full max-w-[820px] min-h-[1066px] max-h-[1200px] overflow-y-auto' => $preview === false,
             'w-[38.25rem] h-[49.5rem] overflow-hidden' => $preview === true,
         ])
         @style([

resources/views/filament/company/components/document-templates/default.blade.php

@@ -128,7 +128,7 @@
     </x-company.document-template.line-items>
 
     <!-- Footer Notes -->
-    <x-company.document-template.footer class="classic-template-footer min-h-48 flex flex-col text-xs p-6">
+    <x-company.document-template.footer class="default-template-footer min-h-48 flex flex-col text-xs p-6">
         <div>
             <h4 class="font-semibold mb-2">Terms & Conditions</h4>
             <p class="break-words line-clamp-4">{{ $document->terms }}</p>

resources/views/filament/forms/components/custom-table-repeater.blade.php

@@ -0,0 +1,251 @@
+@php
+    use Filament\Forms\Components\Actions\Action;
+    use Filament\Support\Enums\Alignment;
+    use Filament\Support\Enums\MaxWidth;
+
+    $containers = $getChildComponentContainers();
+
+    $addAction = $getAction($getAddActionName());
+    $cloneAction = $getAction($getCloneActionName());
+    $deleteAction = $getAction($getDeleteActionName());
+    $moveDownAction = $getAction($getMoveDownActionName());
+    $moveUpAction = $getAction($getMoveUpActionName());
+    $reorderAction = $getAction($getReorderActionName());
+    $isReorderableWithButtons = $isReorderableWithButtons();
+    $extraItemActions = $getExtraItemActions();
+    $extraActions = $getExtraActions();
+    $visibleExtraItemActions = [];
+    $visibleExtraActions = [];
+
+    $headers = $getHeaders();
+    $renderHeader = $shouldRenderHeader();
+    $stackAt = $getStackAt();
+    $hasContainers = count($containers) > 0;
+    $emptyLabel = $getEmptyLabel();
+    $streamlined = $isStreamlined();
+
+    $reorderAtStart = $isReorderAtStart();
+
+    $statePath = $getStatePath();
+
+    foreach ($extraActions as $extraAction) {
+        $visibleExtraActions = array_filter(
+            $extraActions,
+            fn (Action $action): bool => $action->isVisible(),
+        );
+    }
+
+    foreach ($extraItemActions as $extraItemAction) {
+        $visibleExtraItemActions = array_filter(
+            $extraItemActions,
+            fn (Action $action): bool => $action->isVisible(),
+        );
+    }
+
+    $hasActions = $reorderAction->isVisible()
+        || $cloneAction->isVisible()
+        || $deleteAction->isVisible()
+        || $moveUpAction->isVisible()
+        || $moveDownAction->isVisible()
+        || filled($visibleExtraItemActions);
+@endphp
+
+<x-dynamic-component :component="$getFieldWrapperView()" :field="$field">
+    <div
+        x-data="{}"
+        {{ $attributes->merge($getExtraAttributes())->class([
+            'table-repeater-component space-y-6 relative',
+            'streamlined' => $streamlined,
+            match ($stackAt) {
+                'sm', MaxWidth::Small => 'break-point-sm',
+                'lg', MaxWidth::Large => 'break-point-lg',
+                'xl', MaxWidth::ExtraLarge => 'break-point-xl',
+                '2xl', MaxWidth::TwoExtraLarge => 'break-point-2xl',
+                default => 'break-point-md',
+            }
+        ]) }}
+    >
+        @if (count($containers) || $emptyLabel !== false)
+            <div class="table-repeater-container rounded-sm relative ring-1 ring-gray-950/5 dark:ring-white/20">
+                <table class="w-full">
+                    <thead @class([
+                        'table-repeater-header-hidden sr-only' => ! $renderHeader,
+                        'table-repeater-header overflow-hidden border-b border-gray-950/5 dark:border-white/20' => $renderHeader,
+                    ])>
+                    <tr class="text-xs md:divide-x rtl:divide-x-reverse md:divide-gray-950/5 dark:md:divide-white/20">
+                        {{-- Move actions column to start if reorderAtStart is true --}}
+                        @if ($hasActions && count($containers) && $reorderAtStart)
+                            <th class="table-repeater-header-column w-px first:rounded-tl-sm rtl:first:rounded-tr-sm rtl:first:rounded-tl-none p-2 bg-gray-100 dark:bg-gray-900/60">
+                                <span class="sr-only">
+                                    {{ trans('table-repeater::components.repeater.row_actions.label') }}
+                                </span>
+                            </th>
+                        @endif
+
+                        @foreach ($headers as $key => $header)
+                            <th
+                                @class([
+                                    'table-repeater-header-column p-2 font-medium first:rounded-tl-sm rtl:first:rounded-tr-sm rtl:first:rounded-tl-none last:rounded-tr-sm bg-gray-100 dark:text-gray-300 dark:bg-gray-900/60',
+                                    match($header->getAlignment()) {
+                                      'center', Alignment::Center => 'text-center',
+                                      'right', 'end', Alignment::Right, Alignment::End => 'text-end',
+                                      default => 'text-start'
+                                    }
+                                ])
+                                style="width: {{ $header->getWidth() }}"
+                            >
+                                {{ $header->getLabel() }}
+                                @if ($header->isRequired())
+                                    <span class="whitespace-nowrap">
+                                        <sup class="font-medium text-danger-700 dark:text-danger-400">*</sup>
+                                    </span>
+                                @endif
+                            </th>
+                        @endforeach
+
+                        @if ($hasActions && count($containers))
+                            <th class="table-repeater-header-column w-px last:rounded-tr-sm rtl:last:rounded-tr-none rtl:last:rounded-tl-sm p-2 bg-gray-100 dark:bg-gray-900/60">
+                                <span class="sr-only">
+                                    {{ trans('table-repeater::components.repeater.row_actions.label') }}
+                                </span>
+                            </th>
+                        @endif
+                    </tr>
+                    </thead>
+                    <tbody
+                        x-sortable
+                        wire:end.stop="{{ 'mountFormComponentAction(\'' . $statePath . '\', \'reorder\', { items: $event.target.sortable.toArray() })' }}"
+                        class="table-repeater-rows-wrapper divide-y divide-gray-950/5 dark:divide-white/20"
+                    >
+                    @if (count($containers))
+                        @foreach ($containers as $uuid => $row)
+                            @php
+                                $visibleExtraItemActions = array_filter(
+                                    $extraItemActions,
+                                    fn (Action $action): bool => $action(['item' => $uuid])->isVisible(),
+                                );
+                            @endphp
+                            <tr
+                                wire:key="{{ $this->getId() }}.{{ $row->getStatePath() }}.{{ $field::class }}.item"
+                                x-sortable-item="{{ $uuid }}"
+                                class="table-repeater-row"
+                            >
+                                {{-- Add reorder action column at start if reorderAtStart is true --}}
+                                @if ($hasActions && $reorderAtStart && $reorderAction->isVisible())
+                                    <td class="table-repeater-column p-2 w-px align-top">
+                                        <ul class="flex items-center table-repeater-row-actions gap-x-3 px-2">
+                                            <li x-sortable-handle class="shrink-0">
+                                                {{ $reorderAction }}
+                                            </li>
+                                        </ul>
+                                    </td>
+                                @endif
+
+                                @php($counter = 0)
+                                @foreach($row->getComponents() as $cell)
+                                    @if($cell instanceof \Filament\Forms\Components\Hidden || $cell->isHidden())
+                                        {{ $cell }}
+                                    @else
+                                        <td
+                                            @class([
+                                                'table-repeater-column align-top',
+                                                'p-2' => ! $streamlined,
+                                                'has-hidden-label' => $cell->isLabelHidden(),
+                                                match($headers[$counter++]->getAlignment()) {
+                                                  'center', Alignment::Center => 'text-center',
+                                                  'right', 'end', Alignment::Right, Alignment::End => 'text-end',
+                                                  default => 'text-start'
+                                                }
+                                            ])
+                                            style="width: {{ $cell->getMaxWidth() ?? 'auto' }}"
+                                        >
+                                            {{ $cell }}
+                                        </td>
+                                    @endif
+                                @endforeach
+
+                                @if ($hasActions)
+                                    <td class="table-repeater-column p-2 w-px align-top">
+                                        <ul class="flex items-center table-repeater-row-actions gap-x-3 px-2">
+                                            @foreach ($visibleExtraItemActions as $extraItemAction)
+                                                <li>
+                                                    {{ $extraItemAction(['item' => $uuid]) }}
+                                                </li>
+                                            @endforeach
+
+                                            @if ($reorderAction->isVisible() && ! $reorderAtStart)
+                                                <li x-sortable-handle class="shrink-0">
+                                                    {{ $reorderAction }}
+                                                </li>
+                                            @endif
+
+                                            @if ($isReorderableWithButtons)
+                                                @if (! $loop->first)
+                                                    <li>
+                                                        {{ $moveUpAction(['item' => $uuid]) }}
+                                                    </li>
+                                                @endif
+
+                                                @if (! $loop->last)
+                                                    <li>
+                                                        {{ $moveDownAction(['item' => $uuid]) }}
+                                                    </li>
+                                                @endif
+                                            @endif
+
+                                            @if ($cloneAction->isVisible())
+                                                <li>
+                                                    {{ $cloneAction(['item' => $uuid]) }}
+                                                </li>
+                                            @endif
+
+                                            @if ($deleteAction->isVisible())
+                                                <li>
+                                                    {{ $deleteAction(['item' => $uuid]) }}
+                                                </li>
+                                            @endif
+                                        </ul>
+                                    </td>
+                                @endif
+                            </tr>
+                        @endforeach
+                    @else
+                        <tr class="table-repeater-row table-repeater-empty-row">
+                            <td colspan="{{ count($headers) + intval($hasActions) }}"
+                                class="table-repeater-column table-repeater-empty-column p-4 w-px text-center italic">
+                                {{ $emptyLabel ?: trans('table-repeater::components.repeater.empty.label') }}
+                            </td>
+                        </tr>
+                    @endif
+                    </tbody>
+                </table>
+            </div>
+        @endif
+
+        @if ($addAction->isVisible() || filled($visibleExtraActions))
+            <ul
+                @class([
+                    'relative flex gap-4',
+                    match ($getAddActionAlignment()) {
+                        Alignment::Start, Alignment::Left => 'justify-start',
+                        Alignment::End, Alignment::Right => 'justify-end',
+                        default =>  'justify-center',
+                    },
+                ])
+            >
+                @if ($addAction->isVisible())
+                    <li>
+                        {{ $addAction }}
+                    </li>
+                @endif
+                @if (filled($visibleExtraActions))
+                    @foreach ($visibleExtraActions as $extraAction)
+                        <li>
+                            {{ ($extraAction) }}
+                        </li>
+                    @endforeach
+                @endif
+            </ul>
+        @endif
+    </div>
+</x-dynamic-component>

resources/views/filament/infolists/components/document-templates/classic.blade.php

@@ -107,10 +107,12 @@
             <div class="w-[40%]">
                 <table class="w-full table-fixed whitespace-nowrap">
                     <tbody class="text-sm">
-                    <tr>
-                        <td class="text-right font-semibold py-2">Subtotal:</td>
-                        <td class="text-right py-2">{{ $document->subtotal }}</td>
-                    </tr>
+                    @if($document->subtotal)
+                        <tr>
+                            <td class="text-right font-semibold py-2">Subtotal:</td>
+                            <td class="text-right py-2">{{ $document->subtotal }}</td>
+                        </tr>
+                    @endif
                     @if($document->discount)
                         <tr class="text-success-800 dark:text-success-600">
                             <td class="text-right py-2">Discount:</td>
@@ -144,7 +146,7 @@
     </x-company.document-template.line-items>
 
     <!-- Footer -->
-    <x-company.document-template.footer class="classic-template-footer min-h-48 p-6 text-sm">
+    <x-company.document-template.footer class="default-template-footer min-h-48 p-6 text-sm">
         <h4 class="font-semibold mb-2">Terms & Conditions</h4>
         <p class="break-words line-clamp-4">{{ $document->terms }}</p>
     </x-company.document-template.footer>

resources/views/filament/infolists/components/document-templates/default.blade.php

@@ -90,11 +90,13 @@
             @endforeach
             </tbody>
             <tfoot class="text-sm summary-section">
-            <tr>
-                <td class="pl-6 py-2" colspan="2"></td>
-                <td class="text-right font-semibold py-2">Subtotal:</td>
-                <td class="text-right pr-6 py-2">{{ $document->subtotal }}</td>
-            </tr>
+            @if($document->subtotal)
+                <tr>
+                    <td class="pl-6 py-2" colspan="2"></td>
+                    <td class="text-right font-semibold py-2">Subtotal:</td>
+                    <td class="text-right pr-6 py-2">{{ $document->subtotal }}</td>
+                </tr>
+            @endif
             @if($document->discount)
                 <tr class="text-success-800 dark:text-success-600">
                     <td class="pl-6 py-2" colspan="2"></td>

resources/views/filament/infolists/components/document-templates/modern.blade.php

@@ -92,11 +92,13 @@
             @endforeach
             </tbody>
             <tfoot class="text-sm summary-section">
-            <tr>
-                <td class="pl-6 py-2" colspan="2"></td>
-                <td class="text-right font-semibold py-2">Subtotal:</td>
-                <td class="text-right pr-6 py-2">{{ $document->subtotal }}</td>
-            </tr>
+            @if($document->subtotal)
+                <tr>
+                    <td class="pl-6 py-2" colspan="2"></td>
+                    <td class="text-right font-semibold py-2">Subtotal:</td>
+                    <td class="text-right pr-6 py-2">{{ $document->subtotal }}</td>
+                </tr>
+            @endif
             @if($document->discount)
                 <tr class="text-success-800 dark:text-success-600">
                     <td class="pl-6 py-2" colspan="2"></td>