Skip to content

A free open source IT asset/license management system

add total cost to accessories

Godfrey M384652b3df38
diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php
index 491871e122..c7af414d08 100644
--- a/app/Http/Transformers/AccessoriesTransformer.php
+++ b/app/Http/Transformers/AccessoriesTransformer.php
@@ -36,6 +36,7 @@ class AccessoriesTransformer
'qty' => ($accessory->qty) ? (int) $accessory->qty : null,
'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null,
'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
+ 'total_cost' => Helper::formatCurrencyOutput($accessory->totalCostSum()),
'order_number' => ($accessory->order_number) ? e($accessory->order_number) : null,
'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null, // Legacy - should phase out - replaced by below, for the bootstrap table formatter
'min_amt' => ($accessory->min_amt) ? (int) $accessory->min_amt : null,
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index 29984a1c2b..8efd68ef7e 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -357,6 +357,10 @@ class Accessory extends SnipeModel
$accessory_checkout->limit(1)->delete();
}
+ public function totalCostSum() {
+
+ return $this->purchase_cost !== null ? $this->qty * $this->purchase_cost : null;
+ }
/**
* -----------------------------------------------
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index 6d04e18b6a..d4aaa768c3 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -121,6 +121,12 @@ class AccessoryPresenter extends Presenter
'searchable' => true,
'sortable' => true,
'title' => trans('general.unit_cost'),
+ 'class' => 'text-right text-padding-number-cell',
+ ], [
+ 'field' => 'total_cost',
+ 'searchable' => true,
+ 'sortable' => true,
+ 'title' => trans('general.total_cost'),
'footerFormatter' => 'sumFormatterQuantity',
'class' => 'text-right text-padding-number-cell',
], [
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index b7c62a8aa7..61b7c9f809 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -309,6 +309,7 @@ return [
'total_licenses' => 'total licenses',
'total_accessories' => 'total accessories',
'total_consumables' => 'total consumables',
+ 'total_cost' => 'Total Cost',
'type' => 'Type',
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index e0f276e755..9851d46140 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -244,6 +244,18 @@
</div>
</div>
@endif
+ @if ($accessory->purchase_cost)
+ <div class="row">
+ <div class="col-md-3" style="padding-bottom: 10px;">
+ <strong>
+ {{ trans('general.total_cost') }}
+ </strong>
+ </div>
+ <div class="col-md-9" style="word-wrap: break-word;">
+ {{ Helper::formatCurrencyOutput($accessory->totalCostSum()) }}
+ </div>
+ </div>
+ @endif
<div class="row">
<div class="col-md-3" style="padding-bottom: 10px;">