Skip to content

Commit 75cfcb8

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents 63a4d1a + 41da31c commit 75cfcb8

File tree

14 files changed

+113
-48
lines changed

14 files changed

+113
-48
lines changed

‎app/Http/Transformers/AccessoriesTransformer.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public function transformAccessory(Accessory $accessory)
3636
'qty' => ($accessory->qty) ? (int) $accessory->qty : null,
3737
'purchase_date' => ($accessory->purchase_date) ? Helper::getFormattedDateObject($accessory->purchase_date, 'date') : null,
3838
'purchase_cost' => Helper::formatCurrencyOutput($accessory->purchase_cost),
39+
'total_cost' => Helper::formatCurrencyOutput($accessory->totalCostSum()),
3940
'order_number' => ($accessory->order_number) ? e($accessory->order_number) : null,
4041
'min_qty' => ($accessory->min_amt) ? (int) $accessory->min_amt : null, // Legacy - should phase out - replaced by below, for the bootstrap table formatter
4142
'min_amt' => ($accessory->min_amt) ? (int) $accessory->min_amt : null,

‎app/Http/Transformers/ComponentsTransformer.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public function transformComponent(Component $component)
4343
'order_number' => e($component->order_number),
4444
'purchase_date' => Helper::getFormattedDateObject($component->purchase_date, 'date'),
4545
'purchase_cost' => Helper::formatCurrencyOutput($component->purchase_cost),
46+
'total_cost' => Helper::formatCurrencyOutput($component->totalCostSum()),
4647
'remaining' => (int) $component->numRemaining(),
4748
'company' => ($component->company) ? [
4849
'id' => (int) $component->company->id,

‎app/Http/Transformers/ConsumablesTransformer.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public function transformConsumable(Consumable $consumable)
3737
'remaining' => $consumable->numRemaining(),
3838
'order_number' => e($consumable->order_number),
3939
'purchase_cost' => Helper::formatCurrencyOutput($consumable->purchase_cost),
40+
'total_cost' => Helper::formatCurrencyOutput($consumable->totalCostSum()),
4041
'purchase_date' => Helper::getFormattedDateObject($consumable->purchase_date, 'date'),
4142
'qty' => (int) $consumable->qty,
4243
'notes' => ($consumable->notes) ? Helper::parseEscapedMarkedownInline($consumable->notes) : null,

‎app/Models/Accessory.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,10 @@ public function declinedCheckout(User $declinedBy, $signature)
357357

358358
$accessory_checkout->limit(1)->delete();
359359
}
360+
public function totalCostSum() {
361+
362+
return $this->purchase_cost !== null ? $this->qty * $this->purchase_cost : null;
363+
}
360364

361365
/**
362366
* -----------------------------------------------

‎app/Models/Component.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,10 @@ public function numRemaining()
288288
return $this->qty - $this->numCheckedOut();
289289
}
290290

291+
public function totalCostSum() {
291292

293+
return $this->purchase_cost !== null ? $this->qty * $this->purchase_cost : null;
294+
}
292295
/**
293296
* -----------------------------------------------
294297
* BEGIN MUTATORS

‎app/Models/Consumable.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,10 @@ public function numRemaining()
312312

313313
return $remaining;
314314
}
315+
public function totalCostSum() {
315316

317+
return $this->purchase_cost !== null ? $this->qty * $this->purchase_cost : null;
318+
}
316319
/**
317320
* -----------------------------------------------
318321
* BEGIN MUTATORS

‎app/Presenters/AccessoryPresenter.php‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ public static function dataTableLayout()
121121
'searchable' => true,
122122
'sortable' => true,
123123
'title' => trans('general.unit_cost'),
124+
'class' => 'text-right text-padding-number-cell',
125+
], [
126+
'field' => 'total_cost',
127+
'searchable' => true,
128+
'sortable' => true,
129+
'title' => trans('general.total_cost'),
124130
'footerFormatter' => 'sumFormatterQuantity',
125131
'class' => 'text-right text-padding-number-cell',
126132
], [

‎app/Presenters/ComponentPresenter.php‎

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,25 @@ public static function dataTableLayout()
7979
'title' => trans('general.manufacturer'),
8080
'visible' => false,
8181
'formatter' => 'manufacturersLinkObjFormatter',
82+
], [
83+
'field' => 'location',
84+
'searchable' => true,
85+
'sortable' => true,
86+
'title' => trans('general.location'),
87+
'formatter' => 'locationsLinkObjFormatter',
88+
], [
89+
'field' => 'order_number',
90+
'searchable' => true,
91+
'sortable' => true,
92+
'title' => trans('general.order_number'),
93+
'visible' => true,
94+
], [
95+
'field' => 'purchase_date',
96+
'searchable' => true,
97+
'sortable' => true,
98+
'title' => trans('general.purchase_date'),
99+
'visible' => true,
100+
'formatter' => 'dateDisplayFormatter',
82101
], [
83102
'field' => 'min_amt',
84103
'searchable' => false,
@@ -104,32 +123,19 @@ public static function dataTableLayout()
104123
'class' => 'text-right text-padding-number-cell',
105124
'footerFormatter' => 'qtySumFormatter',
106125
], [
107-
'field' => 'location',
108-
'searchable' => true,
109-
'sortable' => true,
110-
'title' => trans('general.location'),
111-
'formatter' => 'locationsLinkObjFormatter',
112-
], [
113-
'field' => 'order_number',
114-
'searchable' => true,
115-
'sortable' => true,
116-
'title' => trans('general.order_number'),
117-
'visible' => true,
118-
], [
119-
'field' => 'purchase_date',
126+
'field' => 'purchase_cost',
120127
'searchable' => true,
121128
'sortable' => true,
122-
'title' => trans('general.purchase_date'),
129+
'title' => trans('general.unit_cost'),
123130
'visible' => true,
124-
'formatter' => 'dateDisplayFormatter',
131+
'class' => 'text-right',
125132
], [
126-
'field' => 'purchase_cost',
133+
'field' => 'total_cost',
127134
'searchable' => true,
128135
'sortable' => true,
129-
'title' => trans('general.unit_cost'),
130-
'visible' => true,
136+
'title' => trans('general.total_cost'),
131137
'footerFormatter' => 'sumFormatterQuantity',
132-
'class' => 'text-right',
138+
'class' => 'text-right text-padding-number-cell',
133139
], [
134140
'field' => 'notes',
135141
'searchable' => true,

‎app/Presenters/ConsumablePresenter.php‎

Lines changed: 36 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -67,42 +67,19 @@ public static function dataTableLayout()
6767
'searchable' => true,
6868
'sortable' => true,
6969
'title' => trans('general.model_no'),
70-
], [
71-
'field' => 'item_no',
72-
'searchable' => true,
73-
'sortable' => true,
74-
'title' => trans('admin/consumables/general.item_no'),
75-
], [
76-
'field' => 'qty',
77-
'searchable' => false,
78-
'sortable' => true,
79-
'title' => trans('admin/components/general.total'),
80-
'visible' => true,
81-
'class' => 'text-right text-padding-number-cell',
82-
'footerFormatter' => 'qtySumFormatter',
83-
], [
84-
'field' => 'remaining',
85-
'searchable' => false,
86-
'sortable' => true,
87-
'title' => trans('admin/components/general.remaining'),
88-
'visible' => true,
89-
'class' => 'text-right text-padding-number-cell',
90-
'footerFormatter' => 'qtySumFormatter',
91-
], [
92-
'field' => 'min_amt',
93-
'searchable' => false,
94-
'sortable' => true,
95-
'title' => trans('general.min_amt'),
96-
'visible' => true,
97-
'formatter' => 'minAmtFormatter',
98-
'class' => 'text-right text-padding-number-cell',
9970
], [
10071
'field' => 'location',
10172
'searchable' => true,
10273
'sortable' => true,
10374
'title' => trans('general.location'),
10475
'formatter' => 'locationsLinkObjFormatter',
10576
], [
77+
'field' => 'item_no',
78+
'searchable' => true,
79+
'sortable' => true,
80+
'title' => trans('admin/consumables/general.item_no'),
81+
], [
82+
10683
'field' => 'manufacturer',
10784
'searchable' => true,
10885
'sortable' => true,
@@ -122,12 +99,42 @@ public static function dataTableLayout()
12299
'title' => trans('general.purchase_date'),
123100
'visible' => true,
124101
'formatter' => 'dateDisplayFormatter',
102+
], [
103+
'field' => 'min_amt',
104+
'searchable' => false,
105+
'sortable' => true,
106+
'title' => trans('general.min_amt'),
107+
'visible' => true,
108+
'formatter' => 'minAmtFormatter',
109+
'class' => 'text-right text-padding-number-cell',
110+
], [
111+
'field' => 'qty',
112+
'searchable' => false,
113+
'sortable' => true,
114+
'title' => trans('admin/components/general.total'),
115+
'visible' => true,
116+
'class' => 'text-right text-padding-number-cell',
117+
'footerFormatter' => 'qtySumFormatter',
118+
], [
119+
'field' => 'remaining',
120+
'searchable' => false,
121+
'sortable' => true,
122+
'title' => trans('admin/components/general.remaining'),
123+
'visible' => true,
124+
'class' => 'text-right text-padding-number-cell',
125+
'footerFormatter' => 'qtySumFormatter',
125126
], [
126127
'field' => 'purchase_cost',
127128
'searchable' => true,
128129
'sortable' => true,
129130
'title' => trans('general.unit_cost'),
130131
'visible' => true,
132+
'class' => 'text-right text-padding-number-cell',
133+
], [
134+
'field' => 'total_cost',
135+
'searchable' => true,
136+
'sortable' => true,
137+
'title' => trans('general.total_cost'),
131138
'footerFormatter' => 'sumFormatterQuantity',
132139
'class' => 'text-right text-padding-number-cell',
133140
], [

‎resources/lang/en-US/general.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@
309309
'total_licenses' => 'total licenses',
310310
'total_accessories' => 'total accessories',
311311
'total_consumables' => 'total consumables',
312+
'total_cost' => 'Total Cost',
312313
'type' => 'Type',
313314
'undeployable' => 'Un-deployable',
314315
'unknown_admin' => 'Unknown Admin',

0 commit comments

Comments
 (0)