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

some more cleanup

Browse Source
This commit is contained in:
slong753
2023-07-18 10:14:00 -05:00
committed by spencerrlongg
parent 20367eecc9
commit 774f21bb7f
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AssetModelsController.php
+6 -2
View File
@@ -94,7 +94,8 @@ class AssetModelsController extends Controller
if ($model->save()) {
if ($request->filled('eol')) {
$newEol = $model->eol;
$model->assets()->whereNotNull('purchase_date')->whereNull('eol_explicit')->update(['asset_eol_date' => DB::raw('DATE_ADD(purchase_date, INTERVAL :newEol MONTH)', ['newEol' => $newEol])]);
$model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)
->update(['asset_eol_date' => DB::raw('DATE_ADD(purchase_date, INTERVAL :newEol MONTH)', ['newEol' => $newEol])]);
}
if ($this->shouldAddDefaultValues($request->input())) {
if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
@@ -184,7 +185,10 @@ class AssetModelsController extends Controller
if ($model->save()) {
if ($model->wasChanged('eol')) {
$newEol = $model->eol;
$model->assets()->whereNotNull('purchase_date')->whereNull('eol_explicit')->update(['asset_eol_date' => DB::raw('DATE_ADD(purchase_date, INTERVAL :newEol MONTH)', ['newEol' => $newEol])]);
$model->assets()->whereNotNull('purchase_date')->where('eol_explicit', false)
//this DB::raw is so that we can use an ->update() which is _much_ faster than foreaching
//but, laravel doesn't have a way to access a column inside an update
->update(['asset_eol_date' => DB::raw('DATE_ADD(purchase_date, INTERVAL :newEol MONTH)', ['newEol' => $newEol])]);
}
return redirect()->route('models.index')->with('success', trans('admin/models/message.update.success'));
}
app/Http/Controllers/Assets/AssetsController.php
+1 -1
View File
@@ -391,7 +391,7 @@ class AssetsController extends Controller
if ($asset->save()) {
if($asset->wasChanged('purchase_date')){
if($asset->wasChanged('purchase_date') && !$asset->explicit_eol){
$asset->asset_eol_date = Carbon::parse($asset->purchase_date)->addMonths($asset->model->eol)->format('Y-m-d');
}
return redirect()->route('hardware.show', $assetId)