diff --git a/app/Http/Controllers/Bo/InvoiceController.php b/app/Http/Controllers/Bo/InvoiceController.php index 2114000..c9e27d3 100644 --- a/app/Http/Controllers/Bo/InvoiceController.php +++ b/app/Http/Controllers/Bo/InvoiceController.php @@ -182,7 +182,10 @@ class InvoiceController extends Controller return $invoice->generateInvoice() ->stream(Str::slug(trans('Devis :appname :date - ref :ref', [ 'appname' => config('app.name'), - 'date' => $invoice->created_at->isoFormat('YYYY-MM-DD'), + 'date' => + $invoice->created_at !== $invoice->updated_at ? + $invoice->updated_at->isoFormat('YYYY-MM-DD') : + $invoice->created_at->isoFormat('YYYY-MM-DD'), 'ref' => $invoice->ref, ])) . '.pdf'); } @@ -202,7 +205,7 @@ class InvoiceController extends Controller { $model = $request->targetModel; return DB::transaction(function () use ($model) { - $models = $model::orderBy('name', 'ASC')->paginate(12); + $models = $model::query()->orderBy('name', 'ASC')->paginate(12); return \response()->json($models ?? 500); }); } diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php index 44c5ca3..fdba0de 100644 --- a/app/Models/Invoice.php +++ b/app/Models/Invoice.php @@ -192,30 +192,30 @@ class Invoice extends Model 'packages' => $packages, ], [ - 'mode' => '', - 'format' => 'A4', - 'default_font_size' => '12', - 'default_font' => 'sans-serif', - 'margin_left' => 0, - 'margin_right' => 0, - 'margin_top' => 0, - 'margin_bottom' => 0, - 'margin_header' => 0, - 'margin_footer' => 0, - 'orientation' => 'P', - 'title' => __('Devis Équipe Web :ref', ['ref' => $this->ref]), - 'author' => 'Equipe Web', - 'watermark' => '', - 'show_watermark' => false, - 'watermark_font' => 'sans-serif', - 'display_mode' => 'fullpage', - 'watermark_text_alpha' => 0.1, - 'custom_font_dir' => '', + 'mode' => '', + 'format' => 'A4', + 'default_font_size' => '12', + 'default_font' => 'sans-serif', + 'margin_left' => 0, + 'margin_right' => 0, + 'margin_top' => 0, + 'margin_bottom' => 0, + 'margin_header' => 0, + 'margin_footer' => 0, + 'orientation' => 'P', + 'title' => __('Devis Équipe Web :ref', ['ref' => $this->ref]), + 'author' => 'Equipe Web', + 'watermark' => '', + 'show_watermark' => false, + 'watermark_font' => 'sans-serif', + 'display_mode' => 'fullpage', + 'watermark_text_alpha' => 0.1, + 'custom_font_dir' => '', 'custom_font_data' => [], - 'auto_language_detection' => false, - 'temp_dir' => ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir(), - 'pdfa' => false, - 'pdfaauto' => false, + 'auto_language_detection' => false, + 'temp_dir' => ini_get('upload_tmp_dir') ? ini_get('upload_tmp_dir') : sys_get_temp_dir(), + 'pdfa' => false, + 'pdfaauto' => false, ] ); return $pdf; diff --git a/resources/ts/bo/components/InvoiceTasksComponent.vue b/resources/ts/bo/components/InvoiceTasksComponent.vue index 02028b8..93b573f 100644 --- a/resources/ts/bo/components/InvoiceTasksComponent.vue +++ b/resources/ts/bo/components/InvoiceTasksComponent.vue @@ -31,7 +31,6 @@ {{ __("Montant") }} -