diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index b64a8b6b4b..6e8c2efef3 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -30,6 +30,7 @@ return [ 'asset_report' => 'Asset Report', 'asset_tag' => 'Asset Tag', 'asset_tags' => 'Asset Tags', + 'available' => 'Available', 'assets_available' => 'Assets available', 'accept_assets' => 'Accept Assets :name', 'accept_assets_menu' => 'Accept Assets', diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 6ed6142738..8466aebb11 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -2,181 +2,191 @@ {{-- Page title --}} @section('title') -{{ trans('admin/licenses/general.view') }} - - {{ $license->name }} -@parent + {{ trans('admin/licenses/general.view') }} + - {{ $license->name }} + @parent @stop {{-- Page content --}} @section('content') -
-
+
+
- -
- - -
-
-
-
+
- @if (!is_null($license->company)) -
-
- {{ trans('general.company') }} +
+
+
+
+ + @if (!is_null($license->company)) +
+
+ {{ trans('general.company') }} +
+
+ {{ $license->company->name }} +
-
- {{ $license->company->name }} -
-
- @endif + @endif - @if ($license->manufacturer) -
-
- {{ trans('admin/hardware/form.manufacturer') }} -
-
- @can('view', \App\Models\Manufacturer::class) - + @if ($license->manufacturer) +
+
+ {{ trans('admin/hardware/form.manufacturer') }} +
+
+ @can('view', \App\Models\Manufacturer::class) + + {{ $license->manufacturer->name }} + + @else {{ $license->manufacturer->name }} - - @else - {{ $license->manufacturer->name }} - @endcan + @endcan - @if ($license->manufacturer->url) -
{{ $license->manufacturer->url }} - @endif + @if ($license->manufacturer->url) +
{{ $license->manufacturer->url }} + @endif - @if ($license->manufacturer->support_url) -
- {{ $license->manufacturer->support_url }} - @endif + @if ($license->manufacturer->support_url) +
+ {{ $license->manufacturer->support_url }} + @endif - @if ($license->manufacturer->support_phone) -
- {{ $license->manufacturer->support_phone }} - @endif + @if ($license->manufacturer->support_phone) +
+ {{ $license->manufacturer->support_phone }} + @endif - @if ($license->manufacturer->support_email) -
{{ $license->manufacturer->support_email }} - @endif + @if ($license->manufacturer->support_email) +
{{ $license->manufacturer->support_email }} + @endif +
-
- @endif + @endif - @if (!is_null($license->serial)) -
-
- {{ trans('admin/licenses/form.license_key') }} - + @if (!is_null($license->serial)) +
+
+ {{ trans('admin/licenses/form.license_key') }} + +
+
+ @can('viewKeys', $license) + {!! nl2br(e($license->serial)) !!} + @else + ------------ + @endcan +
-
- @can('viewKeys', $license) - {!! nl2br(e($license->serial)) !!} - @else - ------------ - @endcan -
-
- @endif + @endif - @if ($license->category) -
-
- {{ trans('general.category') }} + @if ($license->category) +
+
+ {{ trans('general.category') }} +
+
+ {{ $license->category->name }} +
-
- {{ $license->category->name }} -
-
- @endif + @endif - @if ($license->license_name!='') -
-
- {{ trans('admin/licenses/form.to_name') }} + @if ($license->license_name!='') +
+
+ {{ trans('admin/licenses/form.to_name') }} +
+
+ {{ $license->license_name }} +
-
- {{ $license->license_name }} -
-
- @endif + @endif - @if ($license->license_email!='') -
-
- - {{ trans('admin/licenses/form.to_email') }} - + @if ($license->license_email!='') +
+
+ + {{ trans('admin/licenses/form.to_email') }} + +
+
+ {{ $license->license_email }} +
-
- {{ $license->license_email }} -
-
- @endif + @endif - @if ($license->supplier) + @if ($license->supplier)
@@ -184,13 +194,13 @@
@if ($license->supplier->deleted_at=='') - @can('view', \App\Models\Supplier::class) - + @can('view', \App\Models\Supplier::class) + + {{ $license->supplier->name }} + + @else {{ $license->supplier->name }} - - @else - {{ $license->supplier->name }} - @endcan + @endcan @if ($license->supplier->url)
{{ $license->supplier->url }} @@ -228,133 +238,133 @@ @endif
- @endif - - - @if (isset($license->expiration_date)) -
-
- - {{ trans('admin/licenses/form.expiration') }} - -
-
- {{ Helper::getFormattedDateObject($license->expiration_date, 'date', false) }} -
-
- @endif - - @if ($license->termination_date) -
-
- - {{ trans('admin/licenses/form.termination_date') }} - -
-
- {{ Helper::getFormattedDateObject($license->termination_date, 'date', false) }} -
-
- @endif - - - @if ($license->depreciation) -
-
- - {{ trans('admin/hardware/form.depreciation') }} - -
-
- {{ $license->depreciation->name }} - ({{ $license->depreciation->months }} - {{ trans('admin/hardware/form.months') }} - ) -
-
- -
-
- - {{ trans('admin/hardware/form.depreciates_on') }} - -
-
- {{ Helper::getFormattedDateObject($license->depreciated_date(), 'date', false) }} -
-
- - -
-
- - {{ trans('admin/hardware/form.fully_depreciated') }} - -
-
- @if ($license->time_until_depreciated()) - @if ($license->time_until_depreciated()->y > 0) - {{ $license->time_until_depreciated()->y }} - {{ trans('admin/hardware/form.years') }}, - @endif - {{ $license->time_until_depreciated()->m }} - {{ trans('admin/hardware/form.months') }} - @endif -
-
- @endif - - @if ($license->purchase_order) -
-
- - {{ trans('admin/licenses/form.purchase_order') }} - -
-
- {{ $license->purchase_order }} -
-
@endif - @if (isset($license->purchase_date)) -
-
- {{ trans('general.purchase_date') }} -
-
- {{ Helper::getFormattedDateObject($license->purchase_date, 'date', false) }} + @if (isset($license->expiration_date)) +
+
+ + {{ trans('admin/licenses/form.expiration') }} + +
+
+ {{ Helper::getFormattedDateObject($license->expiration_date, 'date', false) }} +
+
+ @endif -
-
+ @if ($license->termination_date) +
+
+ + {{ trans('admin/licenses/form.termination_date') }} + +
+
+ {{ Helper::getFormattedDateObject($license->termination_date, 'date', false) }} +
+
+ @endif + + + @if ($license->depreciation) +
+
+ + {{ trans('admin/hardware/form.depreciation') }} + +
+
+ {{ $license->depreciation->name }} + ({{ $license->depreciation->months }} + {{ trans('admin/hardware/form.months') }} + ) +
+
+ +
+
+ + {{ trans('admin/hardware/form.depreciates_on') }} + +
+
+ {{ Helper::getFormattedDateObject($license->depreciated_date(), 'date', false) }} +
+
+ + +
+
+ + {{ trans('admin/hardware/form.fully_depreciated') }} + +
+
+ @if ($license->time_until_depreciated()) + @if ($license->time_until_depreciated()->y > 0) + {{ $license->time_until_depreciated()->y }} + {{ trans('admin/hardware/form.years') }}, + @endif + {{ $license->time_until_depreciated()->m }} + {{ trans('admin/hardware/form.months') }} + @endif +
+
+ @endif + + @if ($license->purchase_order) +
+
+ + {{ trans('admin/licenses/form.purchase_order') }} + +
+
+ {{ $license->purchase_order }} +
+
+ @endif + + + @if (isset($license->purchase_date)) +
+
+ {{ trans('general.purchase_date') }} +
+
+ {{ Helper::getFormattedDateObject($license->purchase_date, 'date', false) }} + +
+
@endif @if ($license->purchase_cost > 0) -
-
- - {{ trans('general.purchase_cost') }} - +
+
+ + {{ trans('general.purchase_cost') }} + +
+
+ {{ $snipeSettings->default_currency }} + {{ Helper::formatCurrencyOutput($license->purchase_cost) }} +
-
- {{ $snipeSettings->default_currency }} - {{ Helper::formatCurrencyOutput($license->purchase_cost) }} -
-
@endif @if ($license->order_number) -
-
- - {{ trans('general.order_number') }} - +
+
+ + {{ trans('general.order_number') }} + +
+
+ {{ $license->order_number }} +
-
- {{ $license->order_number }} -
-
@endif
@@ -369,27 +379,27 @@
@if (($license->seats) && ($license->seats) > 0) -
-
- - {{ trans('admin/licenses/form.seats') }} - -
-
+
+
+ + {{ trans('admin/licenses/form.seats') }} + +
+
- @if ($license->remaincount() <= ($license->min_amt - \App\Models\Setting::getSettings()->alert_threshold)) - + @if ($license->remaincount() <= ($license->min_amt - \App\Models\Setting::getSettings()->alert_threshold)) + {{ trans('general.warning') }} - @endif + @endif - {{ $license->seats }} + {{ $license->seats }} @if ($license->remaincount() <= ($license->min_amt - \App\Models\Setting::getSettings()->alert_threshold)) @endif +
-
@endif @@ -406,204 +416,233 @@ @if ($license->notes) -
-
- - {{ trans('general.notes') }} - +
+
+ + {{ trans('general.notes') }} + +
+
+ {!! nl2br(Helper::parseEscapedMarkedownInline($license->notes)) !!} +
-
- {!! nl2br(Helper::parseEscapedMarkedownInline($license->notes)) !!} -
-
@endif -
+
+
+ +
- - -
-
+
-
-
-
+
+
+
-
+
- id, 'status' => 'assigned']) }}" + data-export-options='{ "fileName": "export-seats-{{ str_slug($license->name) }}-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] }'> -
+ + +
-
+
+
-
-
+
+
+
+
- @can('licenses.files', $license) -
- -
- @endcan + +
-
-
-
-
- + + + @endcan + +
+
+
+
+
-
-
-
+ data-url="{{ route('api.activity.index', ['item_id' => $license->id, 'item_type' => 'license']) }}"> + +
+
-
-
+
+
-
+
-
-
-
+
+
+
- @can('update', $license) - - - {{ trans('admin/licenses/general.edit') }} - - - - {{ trans('admin/licenses/general.clone') }} - @endcan - - @can('checkout', $license) - - @if ($license->availCount()->count() > 0) - - - - {{ trans('general.checkout') }} + @can('update', $license) + + + {{ trans('admin/licenses/general.edit') }} + + + {{ trans('admin/licenses/general.clone') }} + @endcan - - - {{ trans('admin/licenses/general.bulk.checkout_all.button') }} - + @can('checkout', $license) - @else + @if ($license->availCount()->count() > 0) + + + + {{ trans('general.checkout') }} + + + + + {{ trans('admin/licenses/general.bulk.checkout_all.button') }} + + + @else {{ trans('general.checkout') }} - + {{ trans('admin/licenses/general.bulk.checkout_all.button') }} - @endif - @endcan + @endif + @endcan - @can('checkin', $license) + @can('checkin', $license) - @if (($license->seats - $license->availCount()->count()) <= 0 ) - + @if (($license->seats - $license->availCount()->count()) <= 0 ) + {{ trans('admin/licenses/general.bulk.checkin_all.button') }} - @elseif (! $license->reassignable) - + @elseif (! $license->reassignable) + {{ trans('admin/licenses/general.bulk.checkin_all.button') }} - @else - - - {{ trans('admin/licenses/general.bulk.checkin_all.button') }} - - @endif - @endcan + @else + + + {{ trans('admin/licenses/general.bulk.checkin_all.button') }} + + @endif + @endcan - @can('delete', $license) + @can('delete', $license) - @if ($license->availCount()->count() == $license->seats) - - - {{ trans('general.delete') }} - - @else + @if ($license->availCount()->count() == $license->seats) + + + {{ trans('general.delete') }} + + @else {{ trans('general.delete') }} - @endif - @endcan -
+ @endif + @endcan +
-
+
-@can('checkin', \App\Models\License::class) - @include ('modals.confirm-action', - [ - 'modal_name' => 'checkinFromAllModal', - 'route' => route('licenses.bulkcheckin', $license->id), - 'title' => trans('general.modal_confirm_generic'), - 'body' => trans_choice('admin/licenses/general.bulk.checkin_all.modal', 2, ['checkedout_seats_count' => $checkedout_seats_count]) - ]) -@endcan + @can('checkin', \App\Models\License::class) + @include ('modals.confirm-action', + [ + 'modal_name' => 'checkinFromAllModal', + 'route' => route('licenses.bulkcheckin', $license->id), + 'title' => trans('general.modal_confirm_generic'), + 'body' => trans_choice('admin/licenses/general.bulk.checkin_all.modal', 2, ['checkedout_seats_count' => $checkedout_seats_count]) + ]) + @endcan -@can('checkout', \App\Models\License::class) - @include ('modals.confirm-action', - [ - 'modal_name' => 'checkoutFromAllModal', - 'route' => route('licenses.bulkcheckout', $license->id), - 'title' => trans('general.modal_confirm_generic'), - 'body' => trans_choice('admin/licenses/general.bulk.checkout_all.modal', 2, ['available_seats_count' => $available_seats_count]) - ]) -@endcan + @can('checkout', \App\Models\License::class) + @include ('modals.confirm-action', + [ + 'modal_name' => 'checkoutFromAllModal', + 'route' => route('licenses.bulkcheckout', $license->id), + 'title' => trans('general.modal_confirm_generic'), + 'body' => trans_choice('admin/licenses/general.bulk.checkout_all.modal', 2, ['available_seats_count' => $available_seats_count]) + ]) + @endcan -@can('update', \App\Models\License::class) - @include ('modals.upload-file', ['item_type' => 'license', 'item_id' => $license->id]) -@endcan + @can('update', \App\Models\License::class) + @include ('modals.upload-file', ['item_type' => 'license', 'item_id' => $license->id]) + @endcan @stop