From 7238c24ca5bbdc4fa7f4031bea0f757af666dda0 Mon Sep 17 00:00:00 2001 From: Nadim Salloum Date: Wed, 20 Oct 2021 15:24:41 +0200 Subject: [PATCH] allow last_check_date to be empty --- app/Http/Controllers/CarController.php | 11 +++++++---- app/Models/Car.php | 6 +++++- resources/js/Pages/Cars/Create.vue | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/CarController.php b/app/Http/Controllers/CarController.php index 6ea6a64..f9fa000 100644 --- a/app/Http/Controllers/CarController.php +++ b/app/Http/Controllers/CarController.php @@ -318,10 +318,13 @@ class CarController extends Controller $request->validate($this->getValidationRules()); - $request->merge([ - 'initial_date' => Carbon::parse($request->get('initial_date'))->format('Y-m-d'), - 'last_check_date' => Carbon::parse($request->get('last_check_date'))->format('Y-m-d'), - ]); + if ($request->get('initial_date')) { + $request->merge(['initial_date' => Carbon::parse($request->get('initial_date'))->format('Y-m-d')]); + } + + if ($request->get('last_check_date')) { + $request->merge(['last_check_date' => Carbon::parse($request->get('last_check_date'))->format('Y-m-d')]); + } return Car::create($request->all()); } diff --git a/app/Models/Car.php b/app/Models/Car.php index 769b87f..6f13c3e 100644 --- a/app/Models/Car.php +++ b/app/Models/Car.php @@ -62,7 +62,11 @@ class Car extends Model public function getLastCheckDateFormattedAttribute() { - return Carbon::parse($this->last_check_date)->format('d.m.Y'); + if ($this->last_check_date) { + return Carbon::parse($this->last_check_date)->format('d.m.Y'); + } + + return null; } public function getDeletedAtAttribute($deleted_at) diff --git a/resources/js/Pages/Cars/Create.vue b/resources/js/Pages/Cars/Create.vue index 7120614..cffa188 100644 --- a/resources/js/Pages/Cars/Create.vue +++ b/resources/js/Pages/Cars/Create.vue @@ -46,7 +46,7 @@ export default { colour: null, car_model_id: null, initial_date: new Date().toJSON().slice(0,10).split('-').reverse().join('.'), - last_check_date: new Date().toJSON().slice(0,10).split('-').reverse().join('.'), + last_check_date: null, kilometers: null, known_damage: null, notes: null,