-
-
-
-
-
-
-
+
+ +++ ++
-
+
+
- + - + - {{ trans('admin/users/general.info') }} - - + {{ trans('admin/users/general.info') }} + + + +
-
+
+
+
+
+ {{ trans('general.assigned') }}
+ {!! ($consumable->users_consumables > 0 ) ? '
'.number_format($consumable->users_consumables).' ' : '' !!} + + +
- @can('consumables.files', $consumable)
- -
-
-
-
- {{ trans('general.file_uploads') }}
- {!! ($consumable->uploads->count() > 0 ) ? '
'.number_format($consumable->uploads->count()).' ' : '' !!} - - -
- @endcan
+ @can('consumables.files', $consumable)
+ -
+
+
+
+
+ {{ trans('general.file_uploads') }}
+ {!! ($consumable->uploads->count() > 0 ) ? '
'.number_format($consumable->uploads->count()).' ' : '' !!} + + +
+ @endcan
- - - - - - - - {{ trans('general.history') }} - - - +
- + + + + + + {{ trans('general.history') }} + + + - @can('update', $consumable) -
- - - {{ trans('button.upload') }} - - - @endcan + @can('update', $consumable) +
- + + {{ trans('button.upload') }} + + + @endcan -
++-- -+ +-+-++ @if ($consumable->image!='') +-+ ++ @endif -+
+ {{ trans('button.edit') }} + + @endcan + + @can('create', Consumable::class) + + + + @endcan + + @can('checkout', $consumable) + @if ($consumable->numRemaining() > 0) + + @else +
+ ++ ++ @endif + @endif + + + @can('delete', $consumable) ++ @if ($consumable->deleted_at=='') + + {{ trans('general.delete') }} + @endif ++ @endcan + + + + ++ ++ + + ++ +++ ++ + + @if ($consumable->company) ++ {{ trans('admin/users/table.name') }} +++ {{ $consumable->name }} ++++ @endif + + + @if ($consumable->category) ++ {{ trans('general.company') }} +++ {{ $consumable->company->name }} ++++ @endif + + + + @if ($consumable->numRemaining()) ++ {{ trans('general.category') }} +++ {{ $consumable->category->name }} ++++ @endif + + + @if ($consumable->min_amt) ++ {{ trans('general.remaining') }} +++ @if ($consumable->numRemaining() < (int) $consumable->min_amt) + + + @endif + {{ $consumable->numRemaining() }} ++++ @endif + + + @if ($consumable->location) ++ {{ trans('general.min_amt') }} +++ {{ $consumable->min_amt }} ++++ @endif + + + @if ($consumable->supplier) ++ {{ trans('general.location') }} +++ {{ $consumable->location->name }} ++++ @endif + + + @if ($consumable->manufacturer) ++ {{ trans('general.supplier') }} +++ {{ $consumable->supplier->name }} ++++ @endif + + @if ($consumable->purchase_cost) ++ {{ trans('general.manufacturer') }} +++ {{ $consumable->manufacturer->name }} ++++ @endif + + @if ($consumable->order_number) ++ {{ trans('general.purchase_cost') }} +++ {{ $snipeSettings->default_currency }} + {{ Helper::formatCurrencyOutput($consumable->purchase_cost) }} ++++ @endif + + @if ($consumable->item_no) ++ {{ trans('general.order_number') }} +++ {{ $consumable->order_number }} + + {{ trans('general.copy_to_clipboard') }} + + ++++ @endif + + @if ($consumable->model_number) ++ {{ trans('admin/consumables/general.item_no') }} +++ + {{ $consumable->item_no }} + + {{ trans('general.copy_to_clipboard') }} + + ++++ @endif + + + @if ($consumable->purchase_date) ++ {{ trans('general.model_no') }} +++ + {{ $consumable->model_number }} + + {{ trans('general.copy_to_clipboard') }} + + ++++ @endif + + @if ($consumable->created_at) + ++ {{ trans('general.purchase_date') }} +++ {{ \App\Helpers\Helper::getFormattedDateObject($consumable->purchase_date, 'datetime', false) }} ++++ @endif + + @if ($consumable->updated_at) + ++ {{ trans('general.created_at') }} +++ {{ \App\Helpers\Helper::getFormattedDateObject($consumable->created_at, 'datetime')['formatted']}} ++++ @endif + + @if ($consumable->admin) + ++ {{ trans('general.updated_at') }} +++ {{ \App\Helpers\Helper::getFormattedDateObject($consumable->updated_at, 'datetime')['formatted']}} ++++ @endif + + @if ($consumable->notes) + ++ {{ trans('general.created_by') }} +++ + @if ($consumable->admin->deleted_at == '') + {{ $consumable->admin->present()->fullName }} + @else ++{{ $consumable->admin->present()->fullName }}+ @endif + ++ ++ @endif ++ {{ trans('admin/users/table.notes') }} +++ {!! nl2br(Helper::parseEscapedMarkedownInline($consumable->notes)) !!} ++ ++ +- + +- -
-- - -{{ trans('general.image') }} -{{ trans('general.user') }} -- {{ trans('general.date') }} - -{{ trans('general.notes') }} -{{ trans('general.admin') }} -+ + +{{ trans('general.image') }} +{{ trans('general.user') }} ++ {{ trans('general.date') }} + +{{ trans('general.notes') }} +{{ trans('general.admin') }} +- -- +--+- - - @can('consumables.files', $consumable) -++ ++ +++++ +++ +
++ + + + @if ($consumable->uploads->count() > 0) + @foreach ($consumable->uploads as $file) +{{trans('general.file_type')}} +{{ trans('general.image') }} +{{ trans('general.file_name') }} +{{ trans('general.filesize') }} +{{ trans('general.notes') }} +{{ trans('general.download') }} +{{ trans('general.created_at') }} +{{ trans('table.actions') }} ++ + @endforeach + @else ++ + {{ Helper::filetype_icon($file->filename) }} + + ++ @if ($file->filename) + @if ( Helper::checkUploadIsImage($file->get_src('consumables'))) + ++ @endif + @endif +
+ {{ $file->filename }} + ++ {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/consumables/'.$file->filename) ? Storage::size('private_uploads/consumables/'.$file->filename) : '') }} + + ++ @if ($file->note) + {!! nl2br(Helper::parseEscapedMarkedownInline($file->note)) !!} + @endif + ++ @if ($file->filename) + + + {{ trans('general.download') }} + + + + + + @endif + +{{ $file->created_at }} ++ + + {{ trans('general.delete') }} + + + ++ + @endif + +{{ trans('general.no_results') }} ++-+-- -- @endcan - ---- -
-- - - - @if ($consumable->uploads->count() > 0) - @foreach ($consumable->uploads as $file) -{{trans('general.file_type')}} -{{ trans('general.image') }} -{{ trans('general.file_name') }} -{{ trans('general.filesize') }} -{{ trans('general.notes') }} -{{ trans('general.download') }} -{{ trans('general.created_at') }} -{{ trans('table.actions') }} -- - @endforeach - @else -- - {{ Helper::filetype_icon($file->filename) }} - - -- @if ($file->filename) - @if ( Helper::checkUploadIsImage($file->get_src('consumables'))) - -- {{ $file->filename }} - -- {{ @Helper::formatFilesizeUnits(Storage::exists('private_uploads/consumables/'.$file->filename) ? Storage::size('private_uploads/consumables/'.$file->filename) : '') }} - - -- @if ($file->note) - {!! nl2br(Helper::parseEscapedMarkedownInline($file->note)) !!} - @endif - -- @if ($file->filename) - - - {{ trans('general.download') }} - - - - - - @endif - -{{ $file->created_at }} -- - - {{ trans('general.delete') }} - - - -- - @endif - -{{ trans('general.no_results') }} -- ---+ @can('update', \App\Models\User::class) + @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id]) + @endcan -@can('consumables.files', \App\Models\Consumable::class) - @include ('modals.upload-file', ['item_type' => 'consumable', 'item_id' => $consumable->id]) -@endcan @stop @section('moar_scripts') - + $('#dataConfirmModal').on('show.bs.modal', function (event) { + var content = $(event.relatedTarget).data('content'); + var title = $(event.relatedTarget).data('title'); + $(this).find(".modal-body").text(content); + $(this).find(".modal-header").text(title); + }); -@include ('partials.bootstrap-table', ['exportFile' => 'consumable' . $consumable->name . '-export', 'search' => false]) -@stop + + + + @include ('partials.bootstrap-table', ['simple_view' => true]) +@endsection \ No newline at end of file diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 08c751754a..837a95b3be 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -7,6 +7,9 @@ + + +--- - - @if ($consumable->image!='') -- -- -- @endif - - @if ($consumable->purchase_date) -- {{ trans('general.purchase_date') }}: - {{ Helper::getFormattedDateObject($consumable->purchase_date, 'date', false) }} -- @endif - - @if ($consumable->purchase_cost) -- {{ trans('general.purchase_cost') }}: - {{ $snipeSettings->default_currency }} - {{ Helper::formatCurrencyOutput($consumable->purchase_cost) }} -- @endif - - @if ($consumable->item_no) -- {{ trans('admin/consumables/general.item_no') }}: - {{ $consumable->item_no }} -- @endif - - @if ($consumable->model_number) -- {{ trans('general.model_no') }}: - {{ $consumable->model_number }} -- @endif - - @if ($consumable->manufacturer) -- {{ trans('general.manufacturer') }}: - {{ $consumable->manufacturer->name }} -- @endif - - @if ($consumable->order_number) -- {{ trans('general.order_number') }}: - {{ $consumable->order_number }} -- @endif - - @if ($consumable->notes) - -- - {{ trans('general.notes') }}: - --- {!! nl2br(Helper::parseEscapedMarkedownInline($consumable->notes)) !!} -- - @endif - - @can('checkout', \App\Models\Consumable::class) - --- @can('update', \App\Models\Consumable::class) - - @endcan - - @can('delete', $consumable) -
- @if ($consumable->numRemaining() > 0) - - {{ trans('general.checkout') }} - - @else - - @endif -- @if ($consumable->deleted_at=='') - - {{ trans('general.delete') }} - @endif -- @endcan - - @endcan - -