Merge branch 'development' of git.niisse.net:nisse/topnotch_website into development

app/Filament/Admin/Resources/QuoteResource.php

@@ -40,7 +40,6 @@ public static function form(Form $form): Form
                         ->columnSpan(1),
 
                     DatePicker::make('date')
-                        ->default(today())
                         ->required(),
 
                     TextArea::make('notes')
@@ -65,9 +64,7 @@ public static function form(Form $form): Form
                             ->prefix('$'),
                         TextInput::make('run_charge')
                             ->prefix('$'),
-                    ])
+                    ]),
-                    ->addActionLabel('Add Embroidery Entry')
-                    ->defaultItems(0),
 
                 TableRepeater::make('screenPrintEntries')
                     ->relationship('screenPrintEntries')
@@ -89,11 +86,8 @@ public static function form(Form $form): Form
                             ->prefix('$'),
                         TextInput::make('poly_ink')
                             ->prefix('$'),
-                        TextInput::make('other_charges')
+                        TextInput::make('other_charges'),
-                            ->prefix('$'),
+                    ]),
-                    ])
-                    ->addActionLabel('Add Screen Print Entry')
-                    ->defaultItems(0),
 
                 TableRepeater::make('heatTransferEntries')
                     ->relationship('heatTransferEntries')
@@ -102,15 +96,13 @@ public static function form(Form $form): Form
                             ->label('Logo name'),
                         TextInput::make('quantity')
                             ->prefix('#'),
-                        TextInput::make('width')
+                        TextInput::make('Width')
                             ->suffix('"'),
-                        TextInput::make('height')
+                        TextInput::make('Height')
                             ->suffix('"'),
                         TextInput::make('price')
                             ->prefix('$'),
-                    ])
+                    ]),
-                    ->addActionLabel('Add Heat Transfer Entry')
-                    ->defaultItems(0),
             ])->columns(1);
     }
 

app/Models/EmbroideryEntry.php

@@ -14,7 +14,7 @@ class EmbroideryEntry extends Model
         'width',
         'height',
         'placement',
-        'stitch_count',
+        'stitches',
         'digitizing_cost',
         'run_charge',
     ];

database/migrations/020_create_embroidery_entries_table.php

@@ -21,7 +21,7 @@ public function up(): void
             $table->decimal('width', 6, 2)->nullable();
             $table->decimal('height', 6, 2)->nullable();
             $table->string('placement')->nullable();
-            $table->string('stitch_count')->nullable();
+            $table->string('stitches')->nullable();
             $table->string('digitizing_cost')->nullable();
             $table->string('run_charge')->nullable();
             $table->text('notes')->nullable();