Merge branch 'main' into feat/types

# Conflicts:
#	database/migrations/2025_08_08_082024_create_product_types_table.php

Author: SlimDeluxe

.github/workflows/linter.yml

@@ -22,7 +22,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
+          # Checkout the actual branch, not a specific commit
+          ref: ${{ github.head_ref || github.ref_name }}
+          # Fetch the full history to avoid shallow clone issues
+          fetch-depth: 0
 
       - name: Run Laravel Pint
         uses: aglipanci/laravel-pint-action@latest

.github/workflows/release-please.yml

@@ -19,18 +19,24 @@ permissions:
 jobs:
   test:
 
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
 
-    # Define the matrix of different PHP and dependency versions
+    # Define the matrix of different PHP, Laravel, and testbench versions
     strategy:
       # Fail the whole workflow if one of the jobs fails
       fail-fast: true
       matrix:
-        os: [ ubuntu-latest ]
         php: [ 8.2, 8.3, 8.4 ]
-        dependency-version: [ prefer-lowest, prefer-stable ]
-
-    name: ${{ matrix.os }} / PHP ${{ matrix.php }} / ${{ matrix.dependency-version }}
+        laravel: [ 11.*, 12.* ]
+        dependency-version: [ prefer-stable ]
+        include:
+          # Laravel 12 uses Orchestra Testbench 10
+          - laravel: 12.*
+            testbench: 10.*
+          # Laravel 11 uses Orchestra Testbench 9
+          - laravel: 11.*
+            testbench: 9.*
+    name: PHP ${{ matrix.php }} / L${{ matrix.laravel }} / ${{ matrix.dependency-version }}
 
     steps:
 
@@ -51,7 +57,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: vendor
-          key: ${{ runner.os }}-php-${{ matrix.php }}-${{ matrix.dependency-version }}-${{ hashFiles('**/composer.lock') }}
+          key: php-${{ matrix.php }}-laravel-${{ matrix.laravel }}-${{ matrix.dependency-version }}-${{ hashFiles('**/composer.lock') }}
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
@@ -61,14 +67,16 @@ jobs:
           # extensions: mbstring, gd, intl
 
       - name: Install dependencies
-        run: composer update --prefer-dist --no-progress --${{ matrix.dependency-version }}
+        run: |
+          composer require "laravel/framework:${{ matrix.laravel }}" "orchestra/testbench:${{ matrix.testbench }}" "filament/support:^3.3" --no-interaction --no-update
+          composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress --no-interaction
 
       - name: Run test suite
         run: composer test -- --coverage-clover ./coverage.xml
 
       - name: Upload coverage reports to Codecov
         # Make sure the Codecov action is only executed once
-        if: matrix.os == 'ubuntu-latest' && matrix.php == '8.2' && matrix.dependency-version == 'prefer-stable'
+        if: matrix.php == '8.2' && matrix.laravel == '12.*' && matrix.dependency-version == 'prefer-stable'
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/test-runner.yml

@@ -1,12 +1,12 @@
-#file: noinspection ComposeUnknownKeys
+#file: noinspection ComposeUnknownKeys,YAMLSchemaValidation
 name: eclipse-catalogue
 services:
   appserver:
     type: php:custom
     xdebug: "debug,develop,coverage"
     via: cli
     overrides:
-      image: slimdeluxe/php:8.2-v1.1
+      image: slimdeluxe/php:8.2-v1.3
 tooling:
   php:
     service: appserver

.lando.dist.yml

@@ -48,16 +48,19 @@
         "bezhansalleh/filament-shield": "^3.3",
         "datalinx/php-utils": "^2.5",
         "eclipsephp/common": "dev-main",
+        "eclipsephp/world-plugin": "dev-main",
         "filament/filament": "^3.3",
         "filament/spatie-laravel-media-library-plugin": "^3.2",
         "filament/spatie-laravel-translatable-plugin": "^3.2",
+        "laravel/framework": "^11.0|^12.0",
         "solution-forest/filament-tree": "^2.1",
         "spatie/laravel-package-tools": "^1.19",
-        "spatie/laravel-translatable": "^6.11"
+        "spatie/laravel-translatable": "^6.11",
+        "nben/filament-record-nav": "^1.0"
     },
     "require-dev": {
         "laravel/pint": "^1.21",
-        "orchestra/testbench": "^10.1",
+        "orchestra/testbench": "^9.0|^10.1",
         "pestphp/pest": "^3.7",
         "pestphp/pest-plugin-livewire": "^3.0"
     },
@@ -79,6 +82,7 @@
             "@php vendor/bin/testbench serve --ansi"
         ],
         "setup": [
+            "npm install",
             "@php vendor/bin/testbench vendor:publish --provider='Spatie\\Permission\\PermissionServiceProvider'",
             "@php vendor/bin/testbench vendor:publish --tag='filament-shield-config'",
             "@php vendor/bin/testbench vendor:publish --provider='Laravel\\Scout\\ScoutServiceProvider'",

composer.json

@@ -0,0 +1,65 @@
+<?php
+
+namespace Eclipse\Catalogue\Factories;
+
+use Eclipse\Catalogue\Models\PriceList;
+use Eclipse\Catalogue\Models\PriceListData;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\Eclipse\Catalogue\Models\PriceListData>
+ */
+class PriceListDataFactory extends Factory
+{
+    protected $model = PriceListData::class;
+
+    public function definition(): array
+    {
+        $definition = [
+            'price_list_id' => PriceList::factory(),
+            'is_active' => $this->faker->boolean(80), // 80% chance of being active
+            'is_default' => false,
+            'is_default_purchase' => false,
+        ];
+
+        // Add tenant foreign key if configured
+        if (config('eclipse-catalogue.tenancy.foreign_key')) {
+            $tenantModel = config('eclipse-catalogue.tenancy.model');
+            if (class_exists($tenantModel)) {
+                $definition[config('eclipse-catalogue.tenancy.foreign_key')] = $tenantModel::factory();
+            }
+        }
+
+        return $definition;
+    }
+
+    public function active(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'is_active' => true,
+        ]);
+    }
+
+    public function inactive(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'is_active' => false,
+        ]);
+    }
+
+    public function defaultSelling(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'is_default' => true,
+            'is_default_purchase' => false,
+        ]);
+    }
+
+    public function defaultPurchase(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'is_default' => false,
+            'is_default_purchase' => true,
+        ]);
+    }
+}

database/factories/PriceListDataFactory.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace Eclipse\Catalogue\Factories;
+
+use Eclipse\Catalogue\Models\PriceList;
+use Eclipse\World\Models\Currency;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends \Illuminate\Database\Eloquent\Factories\Factory<\Eclipse\Catalogue\Models\PriceList>
+ */
+class PriceListFactory extends Factory
+{
+    protected $model = PriceList::class;
+
+    public function definition(): array
+    {
+        // Get existing currencies or create a default one
+        $currencies = Currency::all();
+        if ($currencies->isEmpty()) {
+            Currency::create(['id' => 'EUR', 'name' => 'Euro', 'is_active' => true]);
+            $currencies = Currency::all();
+        }
+
+        return [
+            'currency_id' => $currencies->random()->id,
+            'name' => $this->faker->words(2, true).' Price List',
+            'code' => strtoupper($this->faker->unique()->lexify('PL???')),
+            'tax_included' => $this->faker->boolean(),
+            'notes' => $this->faker->optional()->sentence(),
+        ];
+    }
+
+    public function withTaxIncluded(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'tax_included' => true,
+        ]);
+    }
+
+    public function withoutTax(): static
+    {
+        return $this->state(fn (array $attributes) => [
+            'tax_included' => false,
+        ]);
+    }
+}

database/factories/PriceListFactory.php

@@ -0,0 +1,57 @@
+<?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::create('pim_price_lists', function (Blueprint $table) {
+            $table->id();
+            $table->string('currency_id', 3);
+            $table->foreign('currency_id')
+                ->references('id')
+                ->on('world_currencies')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+            $table->string('name');
+            $table->string('code')->nullable();
+            $table->boolean('tax_included');
+            $table->string('notes')->nullable();
+            $table->timestamps();
+            $table->softDeletes();
+        });
+
+        // More price list data, optionally in tenant-scope
+        Schema::create('pim_price_list_data', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('price_list_id')
+                ->constrained('pim_price_lists')
+                ->cascadeOnUpdate()
+                ->cascadeOnDelete();
+
+            // Add foreign key for tenant if it's configured in the catalogue config
+            if (config('eclipse-catalogue.tenancy.model')) {
+                $tenantClass = config('eclipse-catalogue.tenancy.model');
+                /** @var \Illuminate\Database\Eloquent\Model $tenant */
+                $tenant = new $tenantClass;
+                $table->foreignId(config('eclipse-catalogue.tenancy.foreign_key'))
+                    ->constrained($tenant->getTable(), $tenant->getKeyName())
+                    ->cascadeOnUpdate()
+                    ->cascadeOnDelete();
+            }
+
+            $table->boolean('is_active')->default(true);
+            $table->boolean('is_default')->default(false);
+            $table->boolean('is_default_purchase')->default(false);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('pim_price_list_data');
+        Schema::dropIfExists('pim_price_lists');
+    }
+};

database/migrations/2025_07_29_142749_create_price_lists_table.php

@@ -4,7 +4,6 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
     public function up(): void
     {
         Schema::create('pim_product_types', function (Blueprint $table) {

database/migrations/2025_08_08_082024_create_product_types_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('catalogue_products', function (Blueprint $table) {
+            $table->foreignId('product_type_id')
+                ->nullable()
+                ->after('category_id')
+                ->constrained('pim_product_types')
+                ->cascadeOnUpdate()
+                ->restrictOnDelete();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('catalogue_products', function (Blueprint $table) {
+            $table->dropForeign(['product_type_id']);
+            $table->dropColumn('product_type_id');
+        });
+    }
+};