From 5b4aa5c73ef8be2e8da5b47318f59f1d8bca76c9 Mon Sep 17 00:00:00 2001 From: Deon George Date: Wed, 7 Sep 2022 15:15:02 +1000 Subject: [PATCH] WIP: Fix invoice_next_at date on service update for broadband - must do the others, and create a service validator --- app/Http/Controllers/ServiceController.php | 6 +++++- .../adminlte/service/widget/broadband/update.blade.php | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/ServiceController.php b/app/Http/Controllers/ServiceController.php index 2e9b44d..55bda19 100644 --- a/app/Http/Controllers/ServiceController.php +++ b/app/Http/Controllers/ServiceController.php @@ -405,7 +405,7 @@ class ServiceController extends Controller ->withInput(); } - $o->type->forceFill(Arr::except($x,['start_at'])); + $o->type->forceFill($validator->validated()); } elseif ($request->post($o->product->category)) { $o->type->forceFill($request->post($o->product->category)); @@ -413,6 +413,10 @@ class ServiceController extends Controller $o->type->save(); + // @todo create a validator for service + if ($request->post('invoice_next_at')) + $o->invoice_next_at = $request->invoice_next_at; + // Also update our service start_at date. if ($request->post('start_at')) $o->start_at = $request->start_at; diff --git a/resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php b/resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php index 678c558..f1f922f 100644 --- a/resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php +++ b/resources/views/theme/backend/adminlte/service/widget/broadband/update.blade.php @@ -53,10 +53,10 @@
@include('adminlte::widget.form_date',[ 'label'=>'Billing Start Date', - 'id'=>'start_at', - 'old'=>'broadband.start_at', - 'name'=>'broadband[start_at]', - 'value'=>$o->start_at ? $o->start_at->format('Y-m-d') : ($o->connect_at ? $o->connect_at->format('Y-m-d') : ''), + 'id'=>'invoice_next_at', + 'old'=>'invoice_next_at', + 'name'=>'invoice_next_at', + 'value'=>$o->service->invoice_next_at ? $o->service->invoice_next_at->format('Y-m-d') : ($o->connect_at ? $o->connect_at->format('Y-m-d') : ''), ])