diff --git a/app/Enums/Projects/ProjectStatusEnum.php b/app/Enums/Projects/ProjectStatusEnum.php deleted file mode 100644 index 3818864..0000000 --- a/app/Enums/Projects/ProjectStatusEnum.php +++ /dev/null @@ -1,31 +0,0 @@ -name => "Nouveau", - self::specification->name => "Spécifications", - self::validated->name => "Validé", - self::development->name => "En développement", - self::recipe->name => "En recettage", - self::production->name => "En production", - self::finished->name => "Terminé", - ]; -} diff --git a/app/Http/Controllers/Bo/InvoiceController.php b/app/Http/Controllers/Bo/InvoiceController.php index 489e6ab..f00561a 100644 --- a/app/Http/Controllers/Bo/InvoiceController.php +++ b/app/Http/Controllers/Bo/InvoiceController.php @@ -156,14 +156,14 @@ class InvoiceController extends Controller ->route('bo.invoices.edit', $invoice) ->with('success', __( 'crud.messages.has_been_updated', - ['model' => Str::singular(__('models.classes.invoices'))] + ['model' => __('models.classes.invoices')] )); } //end if return redirect() ->back() ->with('error', __( 'crud.messages.cannot_be_updated', - ['model' => Str::singular(__('models.classes.invoices'))] + ['model' => __('models.classes.invoices')] )); }); } diff --git a/app/Http/Requests/Bo/Brands/StoreBrandRequest.php b/app/Http/Requests/Bo/Brands/StoreBrandRequest.php index d000081..7b5261c 100644 --- a/app/Http/Requests/Bo/Brands/StoreBrandRequest.php +++ b/app/Http/Requests/Bo/Brands/StoreBrandRequest.php @@ -25,7 +25,7 @@ class StoreBrandRequest extends FormRequest public function rules() { return [ - 'name' => 'required|string|max:255', + 'name' => 'required|string|min:3|max:255', 'sites' => 'nullable|array', 'sites.*.id' => 'required|exists:sites,id' ]; diff --git a/app/Http/Requests/Bo/Informations/StoreInformationRequest.php b/app/Http/Requests/Bo/Informations/StoreInformationRequest.php index c1f5bf3..c1c18e0 100644 --- a/app/Http/Requests/Bo/Informations/StoreInformationRequest.php +++ b/app/Http/Requests/Bo/Informations/StoreInformationRequest.php @@ -27,8 +27,8 @@ class StoreInformationRequest extends FormRequest public function rules() { return [ - 'title' => 'required|string|max:255', - 'message' => 'required|string|max:255', + 'title' => 'required|string|min:3|max:255', + 'message' => 'required|string|min:3|max:255', 'type' => [ 'required', Rule::in(collect(InfoColorsEnum::cases())->pluck('value')->all()), diff --git a/app/Http/Requests/Bo/Packages/StorePackageRequest.php b/app/Http/Requests/Bo/Packages/StorePackageRequest.php index 1d64258..179cf88 100644 --- a/app/Http/Requests/Bo/Packages/StorePackageRequest.php +++ b/app/Http/Requests/Bo/Packages/StorePackageRequest.php @@ -25,8 +25,8 @@ class StorePackageRequest extends FormRequest public function rules() { return [ - 'name' => 'required|string|max:255', - 'amount' => 'required|numeric|regex:/^\d+(\.\d{1,2})?$/', + 'name' => 'required|string|min:3|max:255', + 'amount' => 'required|numeric|min:0|regex:/^\d+(\.\d{1,2})?$/', ]; } diff --git a/app/Http/Requests/Bo/Projects/StoreProjectRequest.php b/app/Http/Requests/Bo/Projects/StoreProjectRequest.php index de1f729..918ff18 100644 --- a/app/Http/Requests/Bo/Projects/StoreProjectRequest.php +++ b/app/Http/Requests/Bo/Projects/StoreProjectRequest.php @@ -2,10 +2,8 @@ namespace App\Http\Requests\Bo\Projects; -use App\Enums\Projects\ProjectStatusEnum; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Gate; -use Illuminate\Validation\Rule; class StoreProjectRequest extends FormRequest { @@ -28,10 +26,6 @@ class StoreProjectRequest extends FormRequest { return [ 'name' => 'required|string|min:3|max:255|unique:projects,name', - 'status' => [ - 'required', - Rule::in(collect(ProjectStatusEnum::cases())->pluck('value')->all()), - ], 'site_id' => 'required|exists:sites,id', ]; } diff --git a/app/Http/Requests/Bo/TicketTypes/UpdateTicketTypeRequest.php b/app/Http/Requests/Bo/TicketTypes/UpdateTicketTypeRequest.php index d6ba55c..759f50f 100644 --- a/app/Http/Requests/Bo/TicketTypes/UpdateTicketTypeRequest.php +++ b/app/Http/Requests/Bo/TicketTypes/UpdateTicketTypeRequest.php @@ -2,10 +2,8 @@ namespace App\Http\Requests\Bo\TicketTypes; -use App\Enums\Tickets\TicketTypeEnum; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Gate; -use Illuminate\Validation\Rules\Enum; class UpdateTicketTypeRequest extends FormRequest { @@ -27,7 +25,6 @@ class UpdateTicketTypeRequest extends FormRequest public function rules(): array { return [ - 'type' => ['required', new Enum(TicketTypeEnum::class)], 'template' => 'required|string|min:3|max:255', ]; } diff --git a/app/Models/Project.php b/app/Models/Project.php index 3b6c703..4461b3c 100644 --- a/app/Models/Project.php +++ b/app/Models/Project.php @@ -2,13 +2,11 @@ namespace App\Models; -use App\Enums\Projects\ProjectStatusEnum; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; /** * @property string $name - * @property ProjectStatusEnum $status * @property Site $site_id */ class Project extends Model @@ -22,19 +20,9 @@ class Project extends Model */ protected $fillable = [ 'name', - 'status', 'site_id' ]; - /** - * The attributes that should be cast to native types. - * - * @var array - */ - protected $casts = [ - 'status' => ProjectStatusEnum::class - ]; - // * RELATIONSHIPS. /** diff --git a/database/migrations/2023_08_17_164511_remove_status_from_projects_table.php b/database/migrations/2023_08_17_164511_remove_status_from_projects_table.php new file mode 100644 index 0000000..ee77e6e --- /dev/null +++ b/database/migrations/2023_08_17_164511_remove_status_from_projects_table.php @@ -0,0 +1,32 @@ +dropColumn('status'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down(): void + { + Schema::table('projects', function (Blueprint $table) { + $table->unsignedSmallInteger('status')->default(0)->comment('Enum ProjectStatus')->after('name'); + }); + } +}; diff --git a/resources/ts/bo/components/InputTextAutoComponent.vue b/resources/ts/bo/components/InputTextAutoComponent.vue index 8e2dc88..6189b76 100644 --- a/resources/ts/bo/components/InputTextAutoComponent.vue +++ b/resources/ts/bo/components/InputTextAutoComponent.vue @@ -13,7 +13,6 @@ :placeholder="intPlaceholder" :required="intRequired" @input="onInput" - @blur="onBlur" v-model="intValue" /> @@ -80,18 +79,6 @@ export default defineComponent({ }; }, methods: { - onBlur() { - const el = textarea.value; - if (!el) { - throw new Error("undefined textarea element"); - } - // * Remove every new line char - el.value = el.value.replace(/[\n\r]/g, ""); - this.$nextTick(() => { - el.style.height = "auto"; - el.style.height = `${el.scrollHeight}px`; - }); - }, onInput() { const el = textarea.value; if (!el) { diff --git a/resources/views/bo/pages/brands/form-inputs.blade.php b/resources/views/bo/pages/brands/form-inputs.blade.php index 2d1d231..a724e8e 100644 --- a/resources/views/bo/pages/brands/form-inputs.blade.php +++ b/resources/views/bo/pages/brands/form-inputs.blade.php @@ -49,7 +49,7 @@ 'helper' => __('Séléctionnez les sites à associer à cet utilisateur (minimum 0, maximum :max)', [ 'max' => count($siteModels) ]), - 'required' => true, + 'required' => false, ]) diff --git a/resources/views/bo/pages/invoices/create.blade.php b/resources/views/bo/pages/invoices/create.blade.php index 5293e1f..ae61d0a 100644 --- a/resources/views/bo/pages/invoices/create.blade.php +++ b/resources/views/bo/pages/invoices/create.blade.php @@ -1,7 +1,7 @@ @extends('layout.app', ['brParam' => $invoiceModel]) -@section('title', __('Création d\'un :model', ['model' => Str::singular(__('models.classes.invoices'))])) -@section('description', __('Création d\'un tout nouveau :model', ['model' => Str::singular(__('models.classes.invoices'))])) +@section('title', __('Création d\'un :model', ['model' => __('models.classes.invoices')])) +@section('description', __('Création d\'un tout nouveau :model', ['model' => __('models.classes.invoices')])) @section('breadcrumb', request()->route()->getName()) @section('content') @@ -22,7 +22,7 @@ class="btn btn-primary" data-bs-toggle="tooltip" data-bs-placement="top" - title="{{ __('crud.helpers.save_model', ['model' => Str::singular(__('models.classes.invoices'))]) }}"> + title="{{ __('crud.helpers.save_model', ['model' => __('models.classes.invoices')]) }}"> {{ __('crud.actions.save') }} @@ -37,7 +37,7 @@ class="btn btn-primary" data-bs-toggle="tooltip" data-bs-placement="top" - title="{{ __('crud.helpers.save_model', ['model' => Str::singular(__('models.classes.invoices'))]) }}"> + title="{{ __('crud.helpers.save_model', ['model' => __('models.classes.invoices')]) }}"> {{ __('crud.actions.save') }} diff --git a/resources/views/bo/pages/invoices/form-inputs.blade.php b/resources/views/bo/pages/invoices/form-inputs.blade.php index 731db72..184494a 100644 --- a/resources/views/bo/pages/invoices/form-inputs.blade.php +++ b/resources/views/bo/pages/invoices/form-inputs.blade.php @@ -340,7 +340,7 @@ -@if($invoiceModel->status === \App\Enums\Invoices\InvoiceStatusEnum::opened) +@if($invoiceModel->status === \App\Enums\Invoices\InvoiceStatusEnum::opened || $invoiceModel->status === null) @push('scripts')