ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
slong753
2023-07-18 10:54:51 -05:00
committed by spencerrlongg
parent 5948679a4a
commit 75d7e3e1a0
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Assets/AssetsController.php
+2 -1
View File
@@ -394,7 +394,8 @@ class AssetsController extends Controller
if ($asset->save()) {
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');
$asset_eol_date = Carbon::parse($asset->purchase_date)->addMonths($asset->model->eol)->format('Y-m-d');
$asset->update(['asset_eol_date' => $asset_eol_date]);
}
return redirect()->route('hardware.show', $assetId)
->with('success', trans('admin/hardware/message.update.success'));