From c19299147051d6137bbbae90db6e2aef3b2b7b60 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Mon, 13 Nov 2023 14:31:12 +0100 Subject: [PATCH 1/4] remove condition in invoices form-inputs --- .../bo/pages/invoices/form-inputs.blade.php | 660 +++++++++--------- 1 file changed, 331 insertions(+), 329 deletions(-) diff --git a/resources/views/bo/pages/invoices/form-inputs.blade.php b/resources/views/bo/pages/invoices/form-inputs.blade.php index 058b0c7..0589f7f 100644 --- a/resources/views/bo/pages/invoices/form-inputs.blade.php +++ b/resources/views/bo/pages/invoices/form-inputs.blade.php @@ -1,357 +1,359 @@
{{-- DATES/STATUS --}} @if (request()->routeIs('bo.invoices.edit')) - @if($invoiceModel->status !== \App\Enums\Invoices\InvoiceStatusEnum::opened || $invoiceModel->signed_date) -
- -@if($invoiceModel->status === \App\Enums\Invoices\InvoiceStatusEnum::opened || $invoiceModel->status === null) -@push('scripts') - -@endpush +@if ($invoiceModel->status === \App\Enums\Invoices\InvoiceStatusEnum::opened || $invoiceModel->status === null) + @push('scripts') + + @endpush @endif From ab43676c0a0ee73ab00b6c9ea1d546e034d93f4e Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Tue, 14 Nov 2023 09:37:49 +0100 Subject: [PATCH 2/4] update invoices request --- .../Bo/Invoices/StoreInvoiceRequest.php | 4 +- .../bo/components/InvoiceTasksComponent.vue | 1 - .../bo/pages/packages/form-inputs.blade.php | 34 +++--- .../views/bo/pages/packages/index.blade.php | 109 ++++++++---------- 4 files changed, 69 insertions(+), 79 deletions(-) diff --git a/app/Http/Requests/Bo/Invoices/StoreInvoiceRequest.php b/app/Http/Requests/Bo/Invoices/StoreInvoiceRequest.php index d20ddd9..0bb858d 100644 --- a/app/Http/Requests/Bo/Invoices/StoreInvoiceRequest.php +++ b/app/Http/Requests/Bo/Invoices/StoreInvoiceRequest.php @@ -49,8 +49,8 @@ class StoreInvoiceRequest extends FormRequest 'object' => 'required|string|min:3|max:255', 'tasks' => 'required|array|min:1', 'tasks.*' => 'required|array', - 'tasks.*.days' => 'required|numeric|min:0.125', - 'tasks.*.amount' => 'required|numeric|min:0.125', + 'tasks.*.days' => 'required|numeric', + 'tasks.*.amount' => 'required|numeric', 'tasks.*.desc' => 'required|string|min:10', 'tasks.*.type' => [ 'required', new Enum(TaskTypeEnum::class) diff --git a/resources/ts/bo/components/InvoiceTasksComponent.vue b/resources/ts/bo/components/InvoiceTasksComponent.vue index 0a5ee13..02028b8 100644 --- a/resources/ts/bo/components/InvoiceTasksComponent.vue +++ b/resources/ts/bo/components/InvoiceTasksComponent.vue @@ -97,7 +97,6 @@ v-model="task.amount" type="number" step="0.01" - min="0" > €
diff --git a/resources/views/bo/pages/packages/form-inputs.blade.php b/resources/views/bo/pages/packages/form-inputs.blade.php index 47a7226..b41edb1 100644 --- a/resources/views/bo/pages/packages/form-inputs.blade.php +++ b/resources/views/bo/pages/packages/form-inputs.blade.php @@ -1,7 +1,7 @@
{{-- NAME --}}
-
+
{{ Str::ucfirst(__('validation.attributes.name')) }}
@@ -21,7 +21,7 @@ 'model' => Str::singular(__('models.classes.packages')), ]), 'min' => 3, - 'max' => 255 + 'max' => 255, ]), 'placeholder' => __(':field du :model', [ 'field' => Str::ucfirst(__('validation.attributes.name')), @@ -34,14 +34,14 @@
{{-- AMOUNT --}}
-
- {{ Str::ucfirst(__('validation.attributes.amount.day')) }} +
+ {{ Str::ucfirst(__('validation.attributes.day')) }}
@include('bo.partials.inputs.int-number', [ 'id' => 'packageAmount', 'label' => __(':field du :model', [ - 'field' => Str::ucfirst(__('validation.attributes.amount.day')), + 'field' => Str::ucfirst(__('validation.attributes.day')), 'model' => Str::singular(__('models.classes.packages')), ]), 'hasWordCounter' => true, @@ -50,12 +50,12 @@ 'model' => $packageModel ?? null, 'helper' => __('validation.min.numeric', [ 'attribute' => __(':field du :model', [ - 'field' => Str::ucfirst(__('validation.attributes.amount.day')), + 'field' => Str::ucfirst(__('validation.attributes.day')), 'model' => Str::singular(__('models.classes.packages')), ]), 'min' => 0, ]), - 'step' => 0.01 + 'step' => 0.01, ])
@@ -64,15 +64,15 @@
@push('scripts') - + submitClone.addEventListener('click', (event) => { + event.preventDefault(); + submit.click(''); + }) + }); + @endpush diff --git a/resources/views/bo/pages/packages/index.blade.php b/resources/views/bo/pages/packages/index.blade.php index 7b44b4c..7628674 100644 --- a/resources/views/bo/pages/packages/index.blade.php +++ b/resources/views/bo/pages/packages/index.blade.php @@ -4,63 +4,54 @@ @section('description', __('Liste de tous les :model', ['model' => __('models.classes.packages')])) @section('content') -
- @include('breadcrumbs.breadcrumb-body') - - - -
-@include('bo.modules.search-bar') - - @if (count($packageModels) > 0) - - @include('bo.modules.table-col-sorter', [ - 'cols' => [ - 'name' => Str::ucfirst(__('validation.attributes.name')), - 'amount' => Str::ucfirst(__('validation.attributes.amount.day')), - ], - ]) - - - @foreach ($packageModels as $packageModel) - - - - - - @endforeach - - @else - - - - @endif -
{{ $packageModel->name }}{{ $packageModel->amount }} -
- - - - @csrf - @method('DELETE') - -
-
{{ __('crud.other.no_model_found', ['model' => Str::singular(__('models.classes.packages'))]) }}
-{!! $packageModels->links() !!} +
+ @include('breadcrumbs.breadcrumb-body') + + + +
+ @include('bo.modules.search-bar') + + @if (count($packageModels) > 0) + + @include('bo.modules.table-col-sorter', [ + 'cols' => [ + 'name' => Str::ucfirst(__('validation.attributes.name')), + 'amount' => Str::ucfirst(__('validation.attributes.day')), + ], + ]) + + + @foreach ($packageModels as $packageModel) + + + + + + @endforeach + + @else + + + + @endif +
{{ $packageModel->name }}{{ $packageModel->amount }} +
+ + + + @csrf + @method('DELETE') + +
+
+ {{ __('crud.other.no_model_found', ['model' => Str::singular(__('models.classes.packages'))]) }}
+ {!! $packageModels->links() !!} @endsection From 8a3e175cd0b02747599c95a2441b4101e41d5c93 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Tue, 14 Nov 2023 09:45:16 +0100 Subject: [PATCH 3/4] update searchfield for invoices --- app/Http/Controllers/Bo/InvoiceController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Bo/InvoiceController.php b/app/Http/Controllers/Bo/InvoiceController.php index f00561a..509a9b7 100644 --- a/app/Http/Controllers/Bo/InvoiceController.php +++ b/app/Http/Controllers/Bo/InvoiceController.php @@ -41,9 +41,10 @@ class InvoiceController extends Controller null, 'firstname', 'lastname', + 'ref', ); } - $searchFields = trans('Nom, Prénom'); + $searchFields = trans('Nom, Prénom, Référence'); /** Sort columns with a query */ $this->sortQuery($invoiceModels); From b762dfc0537c3eba98edd7d3b556ed61a2433b88 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Mon, 11 Dec 2023 11:13:53 +0000 Subject: [PATCH 4/4] Update manifest --- manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yaml b/manifest.yaml index c2639d2..0f65f34 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -144,7 +144,7 @@ spec: containers: - name: ${CI_PROJECT_PATH_SLUG}-scheduled image: $IMAGE_TAG - imagePullPolicy: Always + imagePullPolicy: IfNotPresent command: - "php" args: