nadim
/
automngr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

allow last_check_date to be empty

shift-build-2464
Nadim Salloum 2021-10-20 15:24:41 +02:00
parent 0bc78164f7
commit 7238c24ca5
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/CarController.php
View File

@ -318,10 +318,13 @@ class CarController extends Controller
$request->validate($this->getValidationRules()); $request->validate($this->getValidationRules());
$request->merge([ if ($request->get('initial_date')) {
'initial_date' => Carbon::parse($request->get('initial_date'))->format('Y-m-d'), $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('last_check_date')) {
$request->merge(['last_check_date' => Carbon::parse($request->get('last_check_date'))->format('Y-m-d')]);
}
return Car::create($request->all()); return Car::create($request->all());
} }

4
app/Models/Car.php
View File

@ -62,9 +62,13 @@ class Car extends Model
public function getLastCheckDateFormattedAttribute() public function getLastCheckDateFormattedAttribute()
{ {
if ($this->last_check_date) {
return Carbon::parse($this->last_check_date)->format('d.m.Y'); return Carbon::parse($this->last_check_date)->format('d.m.Y');
} }
return null;
}
public function getDeletedAtAttribute($deleted_at) public function getDeletedAtAttribute($deleted_at)
{ {
if ($deleted_at) { if ($deleted_at) {

2
resources/js/Pages/Cars/Create.vue
View File

@ -46,7 +46,7 @@ export default {
colour: null, colour: null,
car_model_id: null, car_model_id: null,
initial_date: new Date().toJSON().slice(0,10).split('-').reverse().join('.'), 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, kilometers: null,
known_damage: null, known_damage: null,
notes: null, notes: null,