feat(product-prices): implement prices

database/migrations/2025_08_18_104934_create_catalogue_product_prices_table.php

@@ -0,0 +1,40 @@
+<?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::create('catalogue_product_prices', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('product_id')
+                ->constrained('catalogue_products')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+            $table->foreignId('price_list_id')
+                ->constrained('pim_price_lists')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+            $table->date('valid_from');
+            $table->date('valid_to')->nullable();
+            $table->decimal('price', 20, 5);
+            $table->boolean('tax_included');
+            $table->timestamps();
+            $table->unique(['product_id', 'price_list_id', 'valid_from'], 'uq_cpp_pid_plid_vf');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('catalogue_product_prices');
+    }
+};

resources/lang/en/product.php

@@ -52,4 +52,23 @@
         'available_from_date' => 'Date/time when the product becomes available',
         'sorting_label' => 'Optional label used to influence sorting within lists',
     ],
+
+    'price' => [
+        'section' => 'Product price list',
+        'list' => 'Price list',
+        'fields' => [
+            'price_list' => 'Price list',
+            'price' => 'Price',
+            'tax_included' => 'Incl. tax',
+            'valid_from' => 'Valid from',
+            'valid_to' => 'Valid to',
+        ],
+        'actions' => [
+            'add' => 'Add price',
+        ],
+        'validation' => [
+            'unique_title' => 'Duplicate price',
+            'unique_body' => 'A price with the same Price List, Price and Valid From already exists in the form.',
+        ],
+    ],
 ];

resources/lang/sl/product.php

@@ -52,4 +52,23 @@
         'available_from_date' => 'Datum/čas, ko bo izdelek na voljo',
         'sorting_label' => 'Neobvezna oznaka, ki vpliva na razvrščanje v seznamih',
     ],
+
+    'price' => [
+        'section' => 'Cenik izdelka',
+        'list' => 'Cenik',
+        'fields' => [
+            'price_list' => 'Cenik',
+            'price' => 'Cena',
+            'tax_included' => 'Z DDV',
+            'valid_from' => 'Velja od',
+            'valid_to' => 'Velja do',
+        ],
+        'actions' => [
+            'add' => 'Dodaj ceno',
+        ],
+        'validation' => [
+            'unique_title' => 'Podvojen vnos cene',
+            'unique_body' => 'Cena z enakim cenikom, ceno in datumom "Velja od" že obstaja v obrazcu.',
+        ],
+    ],
 ];

src/Filament/Resources/ProductResource.php

@@ -8,14 +8,19 @@
 use Eclipse\Catalogue\Forms\Components\GenericTenantFieldsComponent;
 use Eclipse\Catalogue\Models\Category;
 use Eclipse\Catalogue\Models\Group;
+use Eclipse\Catalogue\Models\PriceList;
 use Eclipse\Catalogue\Models\Product;
 use Eclipse\Catalogue\Models\Property;
 use Eclipse\Catalogue\Traits\HandlesTenantData;
 use Eclipse\Catalogue\Traits\HasTenantFields;
 use Eclipse\World\Models\Country;
+use Filament\Forms\Components\Checkbox;
 use Filament\Forms\Components\CheckboxList;
+use Filament\Forms\Components\DatePicker;
+use Filament\Forms\Components\Hidden;
 use Filament\Forms\Components\Placeholder;
 use Filament\Forms\Components\Radio;
+use Filament\Forms\Components\Repeater;
 use Filament\Forms\Components\RichEditor;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
@@ -174,6 +179,7 @@ public static function form(Form $form): Form
                                                 ->searchable()
                                                 ->preload()
                                                 ->placeholder(__('eclipse-catalogue::product.placeholders.category_id')),
+
                                             Select::make("tenant_data.{$tenantId}.groups")
                                                 ->label('Groups')
                                                 ->multiple()
@@ -191,6 +197,7 @@ public static function form(Form $form): Form
                                             TextInput::make("tenant_data.{$tenantId}.sorting_label")
                                                 ->label(__('eclipse-catalogue::product.fields.sorting_label'))
                                                 ->maxLength(255),
+
                                             \Filament\Forms\Components\DateTimePicker::make("tenant_data.{$tenantId}.available_from_date")
                                                 ->label(__('eclipse-catalogue::product.fields.available_from_date')),
                                         ];
@@ -200,6 +207,77 @@ public static function form(Form $form): Form
                                 ),
                             ]),
 
+                        Tabs\Tab::make('Prices')
+                            ->schema([
+                                Section::make(__('eclipse-catalogue::product.price.section'))
+                                    ->schema([
+                                        Repeater::make('prices')
+                                            ->hiddenLabel()
+                                            ->relationship('prices')
+                                            ->schema([
+                                                Hidden::make('id'),
+
+                                                Select::make('price_list_id')
+                                                    ->label(__('eclipse-catalogue::product.price.fields.price_list'))
+                                                    ->relationship('priceList', 'name')
+                                                    ->required()
+                                                    ->preload()
+                                                    ->searchable()
+                                                    ->live()
+                                                    ->afterStateUpdated(function ($state, callable $set) {
+                                                        if (! $state) {
+                                                            return;
+                                                        }
+                                                        $pl = PriceList::query()->select('id', 'tax_included')->find($state);
+                                                        if ($pl) {
+                                                            $set('tax_included', (bool) $pl->tax_included);
+                                                        }
+                                                    }),
+
+                                                TextInput::make('price')
+                                                    ->label(__('eclipse-catalogue::product.price.fields.price'))
+                                                    ->numeric()
+                                                    ->rule('decimal:0,5')
+                                                    ->required(),
+
+                                                Checkbox::make('tax_included')
+                                                    ->label(__('eclipse-catalogue::product.price.fields.tax_included'))
+                                                    ->inline(false)
+                                                    ->default(false),
+
+                                                DatePicker::make('valid_from')
+                                                    ->label(__('eclipse-catalogue::product.price.fields.valid_from'))
+                                                    ->native(false)
+                                                    ->required(),
+
+                                                DatePicker::make('valid_to')
+                                                    ->label(__('eclipse-catalogue::product.price.fields.valid_to'))
+                                                    ->native(false)
+                                                    ->nullable(),
+                                            ])
+                                            ->minItems(0)
+                                            ->reorderable(false)
+                                            ->columns(5)
+                                            ->createItemButtonLabel(__('eclipse-catalogue::product.price.actions.add'))
+                                            ->rule(function (Get $get) {
+                                                return function (string $attribute, $value, $fail) {
+                                                    $seen = [];
+                                                    foreach ($value as $row) {
+                                                        if (! $row['price_list_id'] || ! $row['valid_from']) {
+                                                            continue;
+                                                        }
+                                                        $key = $row['price_list_id'].'_'.$row['valid_from'];
+                                                        if (isset($seen[$key])) {
+                                                            $fail(__('eclipse-catalogue::product.price.validation.unique_body'));
+                                                        }
+                                                        $seen[$key] = true;
+                                                    }
+                                                };
+                                            }),
+                                    ])
+                                    ->compact(),
+                            ]),
+
                         Tabs\Tab::make('Properties')
                             ->schema([
                                 Section::make('Product Type Selection')

src/Forms/Components/GenericTenantFieldsComponent.php

@@ -121,9 +121,26 @@ protected static function makeTenantFields(int $tenantId, string $tenantName, ar
         if ($extraFieldsBuilder) {
             $extra = $extraFieldsBuilder($tenantId, $tenantName);
             if (is_array($extra)) {
+                // For extra fields, also persist on change if supported
+                $enhancedExtra = [];
+                foreach ($extra as $component) {
+                    // Ensure extra components push state immediately while editing
+                    if (method_exists($component, 'live')) {
+                        $component = $component->live();
+                    }
+                    if (method_exists($component, 'afterStateUpdated')) {
+                        $component = $component->afterStateUpdated(function ($state, callable $set, callable $get) use ($tenantId) {
+                            $currentData = $get("tenant_data.{$tenantId}") ?? [];
+                            $allTenantData = $get('all_tenant_data') ?? [];
+                            $allTenantData[$tenantId] = $currentData;
+                            $set('all_tenant_data', $allTenantData);
+                        });
+                    }
+                    $enhancedExtra[] = $component;
+                }
                 $schema = [
                     ...$schema,
-                    ...$extra,
+                    ...$enhancedExtra,
                 ];
             }
         }

src/Models/Product.php

@@ -32,6 +32,7 @@ class Product extends Model implements HasMedia
         'gross_weight',
         'name',
         'product_type_id',
+        'category_id',
         'short_description',
         'description',
         'origin_country_id',
@@ -54,6 +55,7 @@ class Product extends Model implements HasMedia
         'meta_title' => 'array',
         'meta_description' => 'array',
         'deleted_at' => 'datetime',
+        'category_id' => 'integer',
         'product_type_id' => 'integer',
         'available_from_date' => 'datetime',
         'is_active' => 'boolean',
@@ -100,14 +102,6 @@ public function originCountry(): BelongsTo
         return $this->belongsTo(Country::class, 'origin_country_id', 'id');
     }
 
-    /**
-     * Get all per-tenant data rows for this product.
-     */
-    public function productData(): HasMany
-    {
-        return $this->hasMany(ProductData::class, 'product_id');
-    }
-
     public function groups(): BelongsToMany
     {
         return $this->belongsToMany(Group::class, 'pim_group_has_product', 'product_id', 'group_id')
@@ -124,6 +118,22 @@ public function getHasFreeDeliveryAttribute(): bool
         return $this->getTenantFlagValue('has_free_delivery');
     }
 
+    /**
+     * Get all per-tenant data rows for this product.
+     */
+    public function productData(): HasMany
+    {
+        return $this->hasMany(ProductData::class, 'product_id');
+    }
+
+    /**
+     * Prices relationship.
+     */
+    public function prices(): HasMany
+    {
+        return $this->hasMany(\Eclipse\Catalogue\Models\Product\Price::class);
+    }
+
     public function getAvailableFromDateAttribute()
     {
         return $this->currentTenantData()?->available_from_date;

src/Models/Product/Price.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace Eclipse\Catalogue\Models\Product;
+
+use Eclipse\Catalogue\Models\PriceList;
+use Eclipse\Catalogue\Models\Product;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class Price extends Model
+{
+    protected $table = 'catalogue_product_prices';
+
+    protected $fillable = [
+        'id',
+        'product_id',
+        'price_list_id',
+        'valid_from',
+        'valid_to',
+        'price',
+        'tax_included',
+    ];
+
+    public function product(): BelongsTo
+    {
+        return $this->belongsTo(Product::class);
+    }
+
+    public function priceList(): BelongsTo
+    {
+        return $this->belongsTo(PriceList::class);
+    }
+
+    protected function casts(): array
+    {
+        return [
+            'valid_from' => 'date',
+            'valid_to' => 'date',
+            'tax_included' => 'boolean',
+        ];
+    }
+}