A free open source IT asset/license management system
Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold
Marcus Moored29e09a3ffd9
diff --cc resources/views/account/accept/create.blade.phpindex 7bf98d7cad,61528ef728..cb8753b5d5--- a/resources/views/account/accept/create.blade.php+++ b/resources/views/account/accept/create.blade.php@@@ -38,13 -38,8 +38,13 @@@<div class="panel box box-default"><div class="box-header with-border"><h2 class="box-title">- {{ $acceptance->checkoutable->display_name }}- {{ (($acceptance->checkoutable) && ($acceptance->checkoutable->serial)) ? ' - '.trans('general.serial_number').': '.$acceptance->checkoutable->serial : '' }}+ <div>- {{$acceptance->checkoutable->present()->name()}}++ {{ $acceptance->checkoutable->display_name }}+ @if ($acceptance->qty > 1)+ <strong>×{{ $acceptance->qty }}</strong>+ @endif+ </div>+ <div>{{ (($acceptance->checkoutable) && ($acceptance->checkoutable->serial)) ? trans('general.serial_number').': '.$acceptance->checkoutable->serial : '' }}</div></h2></div><div class="box-body">diff --cc resources/views/account/accept/index.blade.phpindex 0ccaa7c0cf,52045fc86d..8f216b3ad3--- a/resources/views/account/accept/index.blade.php+++ b/resources/views/account/accept/index.blade.php@@@ -31,7 -31,7 +31,8 @@@<thead><tr><th>{{ trans('general.name')}}</th>- <th>{{ trans('general.qty') }}</th>+ <th>{{ trans('general.type')}}</th>++ <th>{{ trans('general.qty') }}</th><th>{{ trans('general.serial_number')}}</th><th>{{ trans('table.actions')}}</th></tr>@@@ -41,8 -41,8 +42,9 @@@<tr>@if ($acceptance->checkoutable)<td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->present()->name : '' }}</td>- <td>{{ $acceptance->qty }}</td>- <td>{{ $acceptance->checkoutable_item_type }}</td>- <td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->serial : '' }}</td>++ <td>{{ $acceptance->checkoutable_item_type }}</td>++ <td>{{ $acceptance->qty }}</td>+ <td>{{ ($acceptance->checkoutable) ? $acceptance->checkoutable->serial : '' }}</td><td><a href="{{ route('account.accept.item', $acceptance) }}" class="btn btn-default btn-sm">{{ trans('general.accept_decline') }}</a></td>@else<td> ----- </td>