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

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
snipe
2025-06-14 12:17:43 +01:00
parent a850a9bb83 f666cba104
commit ec411fa0db
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exceptions/Handler.php
View File

@@ -145,6 +145,8 @@ class Handler extends ExceptionHandler
$route = 'licenses.index';
} elseif ($route === 'customfields.index') {
$route = 'fields.index';
} elseif ($route === 'customfieldsets.index') {
$route = 'fields.index';
}
return redirect()

16
app/Presenters/ConsumablePresenter.php
View File

@@ -72,14 +72,6 @@ class ConsumablePresenter extends Presenter
'searchable' => true,
'sortable' => true,
'title' => trans('admin/consumables/general.item_no'),
], [
'field' => 'min_amt',
'searchable' => false,
'sortable' => true,
'title' => trans('general.min_amt'),
'visible' => true,
'formatter' => 'minAmtFormatter',
'class' => 'text-right text-padding-number-cell',
], [
'field' => 'qty',
'searchable' => false,
@@ -96,6 +88,14 @@ class ConsumablePresenter extends Presenter
'visible' => true,
'class' => 'text-right text-padding-number-cell',
'footerFormatter' => 'qtySumFormatter',
], [
'field' => 'min_amt',
'searchable' => false,
'sortable' => true,
'title' => trans('general.min_amt'),
'visible' => true,
'formatter' => 'minAmtFormatter',
'class' => 'text-right text-padding-number-cell',
], [
'field' => 'location',
'searchable' => true,

11
resources/views/consumables/view.blade.php
View File

@@ -189,6 +189,17 @@
</div>
@endif
<!-- total -->
@if ($consumable->qty)
<div class="row">
<div class="col-md-3">
{{ trans('admin/components/general.total') }}
</div>
<div class="col-md-9">
{{ $consumable->qty }}
</div>
</div>
@endif
<!-- remaining -->
@if ($consumable->numRemaining())