diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index d94197e303..302131d45c 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -310,10 +310,12 @@ class AssetsController extends Controller $asset->status_id = $request->input('status_id', null); $asset->warranty_months = $request->input('warranty_months', null); $asset->purchase_cost = $request->input('purchase_cost', null); + $asset->purchase_date = $request->input('purchase_date', null); if ($request->filled('purchase_date') && !$request->filled('asset_eol_date')) { + $asset->purchase_date = $request->input('purchase_date', null); $asset->asset_eol_date = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d'); } elseif ($request->filled('asset_eol_date')) { - $asset->explicit_eol = request('explicit_eol', null); + $asset->eol_explicit = request('eol_explicit', null); } else { $asset->purchase_date = $request->input('purchase_date', null); @@ -391,7 +393,7 @@ class AssetsController extends Controller if ($asset->save()) { - if($asset->wasChanged('purchase_date') && !$asset->explicit_eol){ + if($asset->wasChanged('purchase_date') && $asset->eol_explicit == false){ $asset->asset_eol_date = Carbon::parse($asset->purchase_date)->addMonths($asset->model->eol)->format('Y-m-d'); } return redirect()->route('hardware.show', $assetId)