diff --git a/app/Http/Requests/Bo/Invoices/UpdateInvoiceRequest.php b/app/Http/Requests/Bo/Invoices/UpdateInvoiceRequest.php index 338d9eb..91e9c98 100644 --- a/app/Http/Requests/Bo/Invoices/UpdateInvoiceRequest.php +++ b/app/Http/Requests/Bo/Invoices/UpdateInvoiceRequest.php @@ -21,6 +21,7 @@ class UpdateInvoiceRequest extends StoreInvoiceRequest $rules = array_merge($rules, parent::rules()); } $rules = array_merge($rules, [ + 'comment' => 'sometimes|nullable|string|min:15', 'sent_client_date' => 'required_with:signed_date,sent_accounting_date|sometimes|nullable|date', 'signed_date' => 'required_with:sent_accounting_date|sometimes|nullable|date', 'sent_accounting_date' => 'sometimes|nullable|date', diff --git a/resources/views/bo/pages/invoices/form-inputs.blade.php b/resources/views/bo/pages/invoices/form-inputs.blade.php index 0a9f2d6..058b0c7 100644 --- a/resources/views/bo/pages/invoices/form-inputs.blade.php +++ b/resources/views/bo/pages/invoices/form-inputs.blade.php @@ -8,7 +8,7 @@ @if($invoiceModel->status !== \App\Enums\Invoices\InvoiceStatusEnum::opened) {{ __('Impossible de mettre à jour les informations d\'un devis :status.', ['status' => $invoiceModel->status->label()]) }} @elseif($invoiceModel->signed_date) - {{ __('Impossible de mettre à jour les informations d\'un devis déjà signé, seule la section "État" est prise en compte') }} + {{ __('Impossible de mettre à jour les informations d\'un devis déjà signé, seule les sections "État" et "Commentaires" sont pris en compte') }} @endif @@ -215,8 +215,6 @@
@if($invoiceModel->sent_client_date) - - @else @include('bo.partials.inputs.text-html', [ 'id' => 'invoiceComment', 'label' => __('Commentaire du :model', [ @@ -229,6 +227,8 @@ 'number' => 15 ]), ]) + @else + @endif
diff --git a/resources/views/layout/app.blade.php b/resources/views/layout/app.blade.php index b43cde2..d657902 100644 --- a/resources/views/layout/app.blade.php +++ b/resources/views/layout/app.blade.php @@ -13,12 +13,12 @@ - - - - - - + + + + + + @@ -32,17 +32,17 @@ @include('layout.nav') -
-
+
+
@auth - @foreach ($informations as $information) - - @endforeach + @foreach ($informations as $information) + + @endforeach @endauth @include('modules.flash-messages') @@ -54,7 +54,7 @@ @include('layout.footer') @stack('scriptsConstants') @include('modules.script-constants') - @vite(['resources/ts/bo.ts']) + @vite(['resources/ts/bo/bo.ts']) @stack('scripts')