README.md

@@ -1,9 +1,4 @@
 # Changelog
-**2025-04-20**
-- Fixed #155 - Invoice internal ID should be 5 digits
-- Fixed #154 - Logo name doesn't get replicated
-- Fixed #153 - Improved product service form again
-
 **2025-04-13**
 - Fixed #132 - Inches / cm toggle for order page (and show unit on pdf)
 - Fixed #148 - Change amount label to unit price on order form (also textarea)

app/Filament/Admin/Resources/OrderResource.php

@@ -219,11 +219,11 @@ public static function form(Form $form): Form
                 ->label('Product Services')
                 ->addActionLabel('Add new product service')
                 ->schema([
-                    Grid::make(9)
+                    Grid::make(19)
                         ->schema([
                             Select::make('serviceType')
-                                ->columnSpan(2)
                                 ->options(ServiceType::all()->pluck('value', 'id'))
+                                ->columnSpan(4)
                                 ->placeholder('Select...')
                                 ->searchable()
                                 ->createOptionForm([
@@ -239,15 +239,17 @@ public static function form(Form $form): Form
                                 ->createOptionUsing(function (array $data): int {
                                     return ServiceType::create($data)->getKey();
                                 }),
-
                             TextInput::make('serviceFileName')
-                                ->columnSpan(2)
                                 ->datalist(ServiceFile::all()->unique('name')->pluck('name')->toArray())
+                                ->columnSpan(3)
                                 ->label('Logo Name'),
-
                             TextInput::make('placement')
-                                ->columnSpan(2)
+                                ->datalist(ProductService::all()->unique('placement')->pluck('placement')->toArray())
-                                ->datalist(ProductService::all()->unique('placement')->pluck('placement')->toArray()),
+                                ->columnSpan(3),
+                            TextInput::make('serviceFileSetupNumber')
+                                ->label('Setup')
+                                ->columnSpan(1)
+                                ->rules('numeric'),
 
                             Cluster::make([
                                 TextInput::make('serviceFileWidth')
@@ -258,47 +260,43 @@ public static function form(Form $form): Form
                                     ->rules('numeric'),
                             ])
                                 ->label('Dimensions')
-                                ->columnSpan(2),
+                                ->columnSpan(4),
+
+                            TextInput::make('amount')
+                                ->label('Quantity')
+                                ->prefix('#')
+                                ->columnSpan(2)
+                                ->rules('numeric'),
+
+                            TextInput::make('amount_price')
+                                ->label('Unit price')
+                                ->prefix('$')
+                                ->columnSpan(2)
+                                ->rules('numeric'),
+                        ]),
+
+                    Grid::make(19)
+                        ->schema([
+                            TextInput::make('serviceFileCode')
+                                ->label('Code')
+                                ->datalist(ServiceFile::all()->unique('code')->pluck('code')->toArray())
+                                ->columnSpan(2)
+                                ->placeholder('A1234'),
 
                             Select::make('serviceFileSizeUnit')
-                                ->columnSpan(1)
+                                ->columnSpan(2)
                                 ->selectablePlaceholder(false)
                                 ->label('Unit')
                                 ->options([
                                     'in' => 'Inches',
                                     'cm' => 'cm',
                                 ]),
-                        ]),
-
-                    Grid::make(9)
-                        ->schema([
-                            TextInput::make('serviceFileCode')
-                                ->columnSpan(1)
-                                ->label('Code')
-                                ->datalist(ServiceFile::all()->unique('code')->pluck('code')->toArray()),
-
-                            TextInput::make('serviceFileSetupNumber')
-                                ->columnSpan(1)
-                                ->label('Setup Number')
-                                ->rules('numeric'),
-
-                            TextInput::make('amount')
-                                ->columnSpan(1)
-                                ->label('Quantity')
-                                ->prefix('#')
-                                ->rules('numeric'),
-
-                            TextInput::make('amount_price')
-                                ->columnSpan(1)
-                                ->label('Unit price')
-                                ->prefix('$')
-                                ->rules('numeric'),
 
                             Textarea::make('notes')
-                                ->columnSpan(5)
+                                ->placeholder('Thread colors... (press enter for new line)')
-                                ->placeholder('Thread colors (press enter for new line)')
                                 ->autosize()
-                                ->rows(1),
+                                ->rows(1)
+                                ->columnSpan(15),
                         ]),
                 ])
                 ->reorderable()

app/Filament/Admin/Resources/OrderResource/Pages/EditOrder.php

@@ -200,7 +200,6 @@ protected function getHeaderActions(): array
                     foreach ($this->record->productServices as $service) {
                         /** @var ServiceFile $newServiceFile */
                         $newServiceFile = $service->serviceFile->replicate();
-                        $newServiceFile->save();
 
                         $newService                  = $service->replicate();
                         $newService->order_id        = $replica->id;

app/Observers/InvoiceObserver.php

@@ -22,7 +22,9 @@ public function creating(Invoice $invoice): void
      */
     public function created(Invoice $invoice): void
     {
-        $invoice->internal_id = 'TN'.$invoice->id + 40000;
+
+        //        $invoice->internal_id = 'TN4'.str_pad($invoice->id, 4, '0', STR_PAD_LEFT);
+        $invoice->internal_id = 'TN'.$invoice->id + 4000;
         $invoice->saveQuietly();
 
         $invoice->calculateTotals();

tests/Unit/InvoiceTest.php

@@ -54,7 +54,7 @@
         ->assertHasNoErrors();
 
     $this->assertDatabaseHas('invoices', [
-        'internal_id' => 'TN40001',
+        'internal_id' => 'TN4001',
         'customer_id' => $formData['customer_id'],
         'status'      => $formData['status'],
         'has_gst'     => $formData['has_gst'],
@@ -65,7 +65,7 @@
         'hst_rate'    => $hst_rate,
     ]);
 
-    $invoice = Invoice::where('internal_id', 'TN40001')->firstOrFail();
+    $invoice = Invoice::where('internal_id', 'TN4001')->firstOrFail();
 
     $this->assertEquals($invoice->orders->isEmpty(), true);
 });