From 48260952a4c88753660fd5ce972829f0cc48613b Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Thu, 7 Aug 2025 14:45:16 +0200 Subject: [PATCH] feat: Update EAN Code type --- app/Http/Requests/Bo/Products/StoreProductRequest.php | 1 - app/Http/Requests/Bo/Products/UpdateProductRequest.php | 1 - app/Models/Product.php | 2 +- composer.json | 4 ++-- .../migrations/2021_08_18_162010_create_products_table.php | 2 +- resources/views/pages/products/form-inputs.blade.php | 7 ++----- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/Http/Requests/Bo/Products/StoreProductRequest.php b/app/Http/Requests/Bo/Products/StoreProductRequest.php index 542f000..3ccfbdf 100644 --- a/app/Http/Requests/Bo/Products/StoreProductRequest.php +++ b/app/Http/Requests/Bo/Products/StoreProductRequest.php @@ -43,7 +43,6 @@ class StoreProductRequest extends FormRequest 'name' => 'required|string|min:3|max:255', 'ean_code' => [ 'required', - 'numeric', 'unique:products,ean_code', 'regex:/^[0-9]{7}$|^[0-9]{8}$|^[0-9]{13}$/', ], diff --git a/app/Http/Requests/Bo/Products/UpdateProductRequest.php b/app/Http/Requests/Bo/Products/UpdateProductRequest.php index 2076dfa..83c3662 100644 --- a/app/Http/Requests/Bo/Products/UpdateProductRequest.php +++ b/app/Http/Requests/Bo/Products/UpdateProductRequest.php @@ -29,7 +29,6 @@ class UpdateProductRequest extends StoreProductRequest return array_merge(parent::rules(), [ 'ean_code' => [ 'required', - 'numeric', Rule::unique('products', 'ean_code')->ignore($productModel->id), 'regex:/^[0-9]{7}$|^[0-9]{8}$|^[0-9]{13}$/', ], diff --git a/app/Models/Product.php b/app/Models/Product.php index c268e29..ffaed68 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -17,7 +17,7 @@ use Illuminate\Database\Eloquent\Relations\HasMany; * @property string $picture Path of the picture * @property string $picture_alt Alt text for the picture * @property string $picture_title Title text for the picture - * @property integer $ean_code Ean code + * @property string $ean_code Ean code * @property-read \Illuminate\Support\Carbon $created_at Creation Date. * @property-read \Illuminate\Support\Carbon $updated_at Last update Date. * diff --git a/composer.json b/composer.json index 4d22d62..def7626 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,10 @@ { "name": "uwil/gen-game-web", - "version": "2.4.10", + "version": "2.5.10", "type": "project", "description": "Game generator", "support": { - "email": "equipe.web@ldc.fr" + "email": "digital@ldc.fr" }, "keywords": [ "game", diff --git a/database/migrations/2021_08_18_162010_create_products_table.php b/database/migrations/2021_08_18_162010_create_products_table.php index c7c4653..d853002 100644 --- a/database/migrations/2021_08_18_162010_create_products_table.php +++ b/database/migrations/2021_08_18_162010_create_products_table.php @@ -20,7 +20,7 @@ return new class extends Migration $table->string('picture_alt')->nullable()->comment('Attribut alt de l\'image du produit'); $table->string('picture_title')->nullable()->comment('Attribut title de l\'image du produit'); - $table->unsignedBigInteger('ean_code')->comment('Code EAN du produit pour la participation au jeu'); + $table->string('ean_code')->comment('Code EAN du produit pour la participation au jeu'); $table->foreignId('range_id')->before('created_at')->references('id') ->on('ranges')->onDelete('cascade'); diff --git a/resources/views/pages/products/form-inputs.blade.php b/resources/views/pages/products/form-inputs.blade.php index d1d07d2..468b45c 100644 --- a/resources/views/pages/products/form-inputs.blade.php +++ b/resources/views/pages/products/form-inputs.blade.php @@ -110,7 +110,7 @@ {{ Str::ucfirst(__('validation.custom.ean_code')) }}
- @include('back::partials.inputs.int-number', [ + @include('back::partials.inputs.varchar', [ 'id' => 'productEANCode', 'label' => __(':field', [ 'field' => Str::ucfirst(__('validation.custom.ean_code')), @@ -122,10 +122,7 @@ 'attribute' => __(':field', [ 'field' => Str::ucfirst(__('validation.custom.ean_code')), ]), - ]), - // Unsigned between 7 and 13 digits - 'min' => 1000000, - 'max' => 9999999999999, + ]) ])