From dbfc897ff1010dc1d65fba3d771db41608864e66 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 12 Aug 2024 12:26:22 -0700 Subject: [PATCH] handles purchase cost explicit and auto assign in update --- app/Http/Controllers/Assets/AssetsController.php | 11 ++++++++++- app/Models/Asset.php | 12 ++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index 2430cd00fa..4fd1a5db90 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -303,7 +303,16 @@ 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); + if($request->filled('purchase_cost')) { + $asset->purchase_cost = $request->input('purchase_cost', null); + } + else if($asset->model->default_purchase_cost !== null) { + $asset->purchase_cost = $asset->model->default_purchase_cost; + } + else{ + $asset->purchase_cost = null; + } + $asset->purchase_cost_explicit = Asset::purchaseCostExplicit($asset, $request); $asset->purchase_date = $request->input('purchase_date', null); $asset->next_audit_date = $request->input('next_audit_date', null); if ($request->filled('purchase_date') && !$request->filled('asset_eol_date') && ($asset->model->eol > 0)) { diff --git a/app/Models/Asset.php b/app/Models/Asset.php index b3bf126bda..0b15b7b3e2 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -968,6 +968,18 @@ class Asset extends Depreciable } return $cost; } + public static function purchaseCostExplicit($asset, $request) + { + if ($request->input('purchase_cost')) { + if ($asset->model->default_purchase_cost) { + if ($request->input('purchase_cost') !== $asset->model->default_purchase_cost) { + return true; + } + return false; + } + } + return false; + } /** * -----------------------------------------------