A free open source IT asset/license management system
Meh
snipe09bec664064b
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.phpindex c03412052e..6bf1aa50da 100755--- a/app/Http/Controllers/Assets/AssetsController.php+++ b/app/Http/Controllers/Assets/AssetsController.php@@ -364,7 +364,7 @@ class AssetsController extends Controller$total_asset_cost = ($asset->assignedAssets()?->AssetsForShow()) ? $asset->assignedAssets()?->AssetsForShow()?->sum('purchase_cost') : 0;$total_license_cost = ($asset->licenses) ? $asset->licenses->sum('purchase_cost') : 0;$total_accessory_cost = ($asset->accessories) ? $asset->accessories()->sum('purchase_cost') : 0;- $total_component_cost = ($asset->components) ? $asset->getComponentCost() : 0;+ $total_component_cost = ($asset->components) ? $asset->components->sum('purchase_cost') : 0;$total_cost_for_asset = $total_license_cost + $total_asset_cost + $total_maintenance_cost;diff --git a/app/Models/Asset.php b/app/Models/Asset.phpindex 0280c60101..2470d1ab80 100644--- a/app/Models/Asset.php+++ b/app/Models/Asset.php@@ -766,12 +766,16 @@ class Asset extends Depreciablepublic function accessories(){- return $this->morphMany(AccessoryCheckout::class, 'assigned', 'assigned_type', 'assigned_to');- // return $this->hasManyThrough(Accessory::class, AccessoryCheckout::class, 'assigned_to', 'id')- // ->where('assigned_type', self::ASSET);- // return $this->hasManyThrough(AccessoryCheckout::class, AssetModel::class, 'id', 'id', 'model_id', 'accessory_id');+ // return $this->belongsToMany('App\Role')->withPivot('column1', 'column2');//+ // return $this->morphMany(AccessoryCheckout::class, 'assigned', 'assigned_type', 'assigned_to');++ return $this->hasManyThrough(Accessory::class, AccessoryCheckout::class, 'assigned_to', 'id')+ ->where('assigned_type', self::ASSET);++ // return $this->hasManyThrough(AccessoryCheckout::class, AssetModel::class, 'id', 'id', 'model_id', 'accessory_id');+// return $this->belongsToMany(AccessoryCheckout::class, 'components_assets', 'asset_id', 'component_id')// ->withPivot('id', 'assigned_qty', 'created_at', 'note', 'created_by');}