feat: add product stock & measure unit; refactor & optimize product tenancy performance

database/factories/MeasureUnitFactory.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace Eclipse\Catalogue\Factories;
+
+use Eclipse\Catalogue\Models\MeasureUnit;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\Eclipse\Catalogue\Models\MeasureUnit>
+ */
+class MeasureUnitFactory extends Factory
+{
+    protected $model = MeasureUnit::class;
+
+    public function definition(): array
+    {
+        $units = ['kg', 'g', 'lbs', 'oz', 'liter', 'ml', 'pieces', 'pcs', 'm', 'cm', 'mm', 'ft', 'in'];
+
+        return [
+            'name' => $this->faker->randomElement($units),
+            'is_default' => false,
+        ];
+    }
+
+    public function default(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'is_default' => true,
+        ]);
+    }
+}

database/factories/ProductDataFactory.php

@@ -21,6 +21,9 @@ public function definition(): array
             'is_active' => $this->faker->boolean(90),
             'available_from_date' => $this->faker->optional()->dateTimeBetween('now', '+3 months'),
             'has_free_delivery' => $this->faker->boolean(20),
+            'stock' => $this->faker->optional(0.7)->randomFloat(5, 0, 10000),
+            'min_stock' => $this->faker->optional(0.5)->randomFloat(5, 0, 100),
+            'date_stocked' => $this->faker->optional(0.6)->date('Y-m-d', '-1 year'),
         ];
 
         if (config('eclipse-catalogue.tenancy.foreign_key')) {
@@ -46,4 +49,13 @@ public function inactive(): static
             'is_active' => false,
         ]);
     }
+
+    public function withStock(?float $stock = null, ?float $minStock = null): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'stock' => $stock ?? $this->faker->randomFloat(5, 1, 1000),
+            'min_stock' => $minStock ?? $this->faker->randomFloat(5, 0, 50),
+            'date_stocked' => $this->faker->dateTimeBetween('-6 months', 'now'),
+        ]);
+    }
 }

database/migrations/2025_09_28_110919_add_measure_unit_id_to_catalogue_products_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
+{
+    public function up(): void
+    {
+        Schema::table('pim_products', function (Blueprint $table) {
+            $table->foreignId('measure_unit_id')
+                ->nullable()
+                ->after('product_type_id')
+                ->constrained('pim_measure_units')
+                ->nullOnDelete()
+                ->cascadeOnUpdate();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('pim_products', function (Blueprint $table) {
+            $table->dropForeign(['measure_unit_id']);
+            $table->dropColumn('measure_unit_id');
+        });
+    }
+};

database/migrations/2025_09_28_110920_add_stock_fields_to_catalogue_product_data_table.php

@@ -0,0 +1,24 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('pim_product_data', function (Blueprint $table) {
+            $table->decimal('stock', 20, 5)->nullable()->after('has_free_delivery');
+            $table->decimal('min_stock', 20, 5)->nullable()->after('stock');
+            $table->date('date_stocked')->nullable()->after('min_stock');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('pim_product_data', function (Blueprint $table) {
+            $table->dropColumn(['stock', 'min_stock', 'date_stocked']);
+        });
+    }
+};

resources/lang/en/product.php

@@ -6,6 +6,10 @@
 
     'fields' => [
         'product_type' => 'Product Type',
+        'measure_unit' => 'Measure Unit',
+        'stock' => 'Stock',
+        'min_stock' => 'Min Stock',
+        'date_stocked' => 'Date Stocked',
         'origin_country_id' => 'Country of Origin',
         'tariff_code_id' => 'Tariff code (CN)',
         'meta_title' => 'Meta Title',
@@ -19,6 +23,10 @@
 
     'placeholders' => [
         'product_type' => 'Select product type (optional)',
+        'measure_unit' => 'Select measure unit (optional)',
+        'stock' => 'Enter stock quantity',
+        'min_stock' => 'Enter minimum stock threshold',
+        'date_stocked' => 'Select date when stock was added',
         'origin_country_id' => 'Select country of origin',
         'tariff_code_id' => 'Select tariff code (CN)',
         'meta_title' => 'SEO meta title',
@@ -29,12 +37,17 @@
     'table' => [
         'columns' => [
             'type' => 'Type',
+            'stock' => 'Stock',
+            'measure_unit' => 'Unit',
+            'min_stock' => 'Min Stock',
+            'date_stocked' => 'Date Stocked',
             'is_active' => 'Active',
         ],
     ],
 
     'filters' => [
         'product_type' => 'Product Types',
+        'measure_unit' => 'Measure Units',
     ],
 
     'sections' => [

src/Filament/Resources/ProductResource.php

@@ -111,6 +111,13 @@ public static function form(Schema $form): Schema
                                         TextInput::make('gross_weight')
                                             ->numeric()
                                             ->suffix('kg'),
+
+                                        Select::make('measure_unit_id')
+                                            ->label(__('eclipse-catalogue::product.fields.measure_unit'))
+                                            ->relationship('measureUnit', 'name')
+                                            ->searchable()
+                                            ->preload()
+                                            ->placeholder(__('eclipse-catalogue::product.placeholders.measure_unit')),
                                     ])
                                     ->columns(2),
 
@@ -245,6 +252,22 @@ public static function form(Schema $form): Schema
 
                                             DateTimePicker::make("tenant_data.{$tenantId}.available_from_date")
                                                 ->label(__('eclipse-catalogue::product.fields.available_from_date')),
+
+                                            TextInput::make("tenant_data.{$tenantId}.stock")
+                                                ->label(__('eclipse-catalogue::product.fields.stock'))
+                                                ->numeric()
+                                                ->step(0.00001)
+                                                ->placeholder(__('eclipse-catalogue::product.placeholders.stock')),
+
+                                            TextInput::make("tenant_data.{$tenantId}.min_stock")
+                                                ->label(__('eclipse-catalogue::product.fields.min_stock'))
+                                                ->numeric()
+                                                ->step(0.00001)
+                                                ->placeholder(__('eclipse-catalogue::product.placeholders.min_stock')),
+
+                                            \Filament\Forms\Components\DatePicker::make("tenant_data.{$tenantId}.date_stocked")
+                                                ->label(__('eclipse-catalogue::product.fields.date_stocked'))
+                                                ->placeholder(__('eclipse-catalogue::product.placeholders.date_stocked')),
                                         ];
                                     },
                                     sectionTitle: __('eclipse-catalogue::product.sections.tenant_settings'),
@@ -685,6 +708,44 @@ public static function table(Table $table): Table
                         return is_array($category->name) ? ($category->name[app()->getLocale()] ?? reset($category->name)) : $category->name;
                     }),
 
+                TextColumn::make('stock')
+                    ->label(__('eclipse-catalogue::product.table.columns.stock'))
+                    ->numeric(5)
+                    ->getStateUsing(function (Product $record) {
+                        return $record->currentTenantData()?->stock;
+                    })
+                    ->suffix(function (Product $record) {
+                        return $record->measureUnit?->name ? ' '.$record->measureUnit->name : '';
+                    })
+                    ->width('120px')
+                    ->toggleable(false),
+
+                TextColumn::make('measureUnit.name')
+                    ->label(__('eclipse-catalogue::product.table.columns.measure_unit'))
+                    ->width('100px')
+                    ->toggleable(false),
+
+                TextColumn::make('min_stock')
+                    ->label(__('eclipse-catalogue::product.table.columns.min_stock'))
+                    ->numeric(5)
+                    ->getStateUsing(function (Product $record) {
+                        return $record->currentTenantData()?->min_stock;
+                    })
+                    ->suffix(function (Product $record) {
+                        return $record->measureUnit?->name ? ' '.$record->measureUnit->name : '';
+                    })
+                    ->width('120px')
+                    ->toggleable(isToggledHiddenByDefault: true),
+
+                TextColumn::make('date_stocked')
+                    ->label(__('eclipse-catalogue::product.table.columns.date_stocked'))
+                    ->getStateUsing(function (Product $record) {
+                        return $record->currentTenantData()?->date_stocked;
+                    })
+                    ->date()
+                    ->width('120px')
+                    ->toggleable(isToggledHiddenByDefault: true),
+
                 TextColumn::make('type.name')
                     ->label(__('eclipse-catalogue::product.table.columns.type')),
 
@@ -731,8 +792,7 @@ public static function table(Table $table): Table
 
                         return $tariffCode->code.' — '.$name;
                     })
-                    ->toggleable()
-                    ->toggledHiddenByDefault()
+                    ->toggleable(isToggledHiddenByDefault: true)
                     ->searchable()
                     ->copyable(),
 
@@ -832,6 +892,12 @@ public static function table(Table $table): Table
 
                         return $query->pluck('name', 'id')->toArray();
                     }),
+                SelectFilter::make('measure_unit_id')
+                    ->label(__('eclipse-catalogue::product.filters.measure_unit'))
+                    ->multiple()
+                    ->relationship('measureUnit', 'name')
+                    ->searchable()
+                    ->preload(),
                 SelectFilter::make('origin_country_id')
                     ->label(__('eclipse-catalogue::product.fields.origin_country_id'))
                     ->multiple()
@@ -923,7 +989,8 @@ public static function table(Table $table): Table
                     RestoreBulkAction::make(),
                     ForceDeleteBulkAction::make(),
                 ]),
-            ]);
+            ])
+            ->deferColumnManager(false);
     }
 
     public static function getPages(): array

src/Filament/Resources/ProductResource/Pages/CreateProduct.php

@@ -52,7 +52,7 @@ protected function getFormMutuallyExclusiveFlagSets(): array
         return [];
     }
 
-    public function form(Schema $schema): Schema
+    public function schema(Schema $schema): Schema
     {
         return $schema;
     }