From 0e9e31f68b3105e97e88904c2852ae5a39339325 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 4 Dec 2023 11:12:30 -0800 Subject: [PATCH 1/3] adds info needed for license self activation --- resources/views/account/view-assets.blade.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 7481e64c4b..d2db1bf7b3 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -491,7 +491,9 @@ {{ trans('general.name') }} - {{ trans('admin/hardware/form.serial') }} + {{ trans('admin/licenses/form.license_key') }} + {{ trans('admin/licenses/form.to_name') }} + {{ trans('admin/licenses/form.to_email') }} {{ trans('general.category') }} @@ -506,6 +508,18 @@ ------------ @endcan + + @can('viewKeys', $license) + {{ $license->license_name }} + @else + ------------ + @endcan + + @can('viewKeys', $license) + {{$license->license_email}} + @else + ------------ + @endcan {{ $license->category->name }} @endforeach From 15af64a3556871e53f513c3ead7f0742a88b4019 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 5 Dec 2023 10:07:58 -0800 Subject: [PATCH 2/3] fixed the bootstrap column sizes --- resources/views/account/view-assets.blade.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index d2db1bf7b3..e803061b70 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -490,11 +490,12 @@ }'> - {{ trans('general.name') }} + {{ trans('general.name') }} {{ trans('admin/licenses/form.license_key') }} - {{ trans('admin/licenses/form.to_name') }} - {{ trans('admin/licenses/form.to_email') }} - {{ trans('general.category') }} + {{ trans('admin/licenses/form.to_name') }} + {{ trans('admin/licenses/form.to_email') }} + {{ trans('general.category') }} + From a95f0b886244a357cb4da7ab02096adfe66618b2 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 5 Dec 2023 11:07:52 -0800 Subject: [PATCH 3/3] remove column sizes --- resources/views/account/view-assets.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index e803061b70..e8d068576f 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -490,11 +490,11 @@ }'> - {{ trans('general.name') }} - {{ trans('admin/licenses/form.license_key') }} - {{ trans('admin/licenses/form.to_name') }} - {{ trans('admin/licenses/form.to_email') }} - {{ trans('general.category') }} + {{ trans('general.name') }} + {{ trans('admin/licenses/form.license_key') }} + {{ trans('admin/licenses/form.to_name') }} + {{ trans('admin/licenses/form.to_email') }} + {{ trans('general.category') }}