From e595c7e145696a5a740ebfcf982025274a48765b Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Wed, 23 Apr 2025 11:12:41 +0200 Subject: [PATCH 1/2] feat: :sparkles: you can now edit the sent accounting date even when the date is present if you are admin --- .../views/bo/pages/invoices/form-inputs.blade.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/resources/views/bo/pages/invoices/form-inputs.blade.php b/resources/views/bo/pages/invoices/form-inputs.blade.php index 0589f7f..72e0922 100644 --- a/resources/views/bo/pages/invoices/form-inputs.blade.php +++ b/resources/views/bo/pages/invoices/form-inputs.blade.php @@ -74,6 +74,19 @@ 'helper' => __('Doît être une date réelle et existante.'), ]) @elseif ($invoiceModel->sent_accounting_date) + @can('isAdmin') + @include('bo.partials.inputs.date', [ + 'id' => 'invoiceSentaccountingdate', + 'label' => __('Date d\'envoi du :model à la comptabilité', [ + 'model' => __('models.classes.invoices'), + ]), + 'name' => 'sent_accounting_date', + 'defaultValue' => false, + 'required' => true, + 'model' => $invoiceModel ?? null, + 'helper' => __('Doît être une date réelle et existante.'), + ]) + @endcan

{{ __('Envoyé à la comptabilité le :date', ['date' => \Carbon\Carbon::parse($invoiceModel->sent_accounting_date)->format('d/m/Y') ?? 'xxx']) }}

From e66af8dc92a00e1ae3f320be1dc2d2975e874401 Mon Sep 17 00:00:00 2001 From: Nicolas Demangeat Date: Wed, 23 Apr 2025 11:41:38 +0200 Subject: [PATCH 2/2] fix: refacto condition --- .../bo/pages/invoices/form-inputs.blade.php | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/resources/views/bo/pages/invoices/form-inputs.blade.php b/resources/views/bo/pages/invoices/form-inputs.blade.php index 72e0922..058ba1e 100644 --- a/resources/views/bo/pages/invoices/form-inputs.blade.php +++ b/resources/views/bo/pages/invoices/form-inputs.blade.php @@ -61,7 +61,7 @@ {{-- SENT_ACCOUNTING_DATE --}}
- @if ($invoiceModel->status === \App\Enums\Invoices\InvoiceStatusEnum::opened and !$invoiceModel->sent_accounting_date) + @if ($invoiceModel->status === \App\Enums\Invoices\InvoiceStatusEnum::opened) @include('bo.partials.inputs.date', [ 'id' => 'invoiceSentaccountingdate', 'label' => __('Date d\'envoi du :model à la comptabilité', [ @@ -73,23 +73,6 @@ 'model' => $invoiceModel ?? null, 'helper' => __('Doît être une date réelle et existante.'), ]) - @elseif ($invoiceModel->sent_accounting_date) - @can('isAdmin') - @include('bo.partials.inputs.date', [ - 'id' => 'invoiceSentaccountingdate', - 'label' => __('Date d\'envoi du :model à la comptabilité', [ - 'model' => __('models.classes.invoices'), - ]), - 'name' => 'sent_accounting_date', - 'defaultValue' => false, - 'required' => true, - 'model' => $invoiceModel ?? null, - 'helper' => __('Doît être une date réelle et existante.'), - ]) - @endcan -

- {{ __('Envoyé à la comptabilité le :date', ['date' => \Carbon\Carbon::parse($invoiceModel->sent_accounting_date)->format('d/m/Y') ?? 'xxx']) }} -

@endif
{{-- STATUS --}}