From d528126f1537750834ad8e1c323ac503a5804f4a Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 30 Sep 2025 12:31:44 -0700
Subject: [PATCH 1/2] right hand table loading, need styling and translations

---
 resources/lang/ca-ES/admin/users/general.php  |  1 +
 resources/views/licenses/checkout.blade.php   | 19 +++++-
 .../partials/licenses-assigned.blade.php      | 67 +++++++++++++++++++
 3 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 resources/views/partials/licenses-assigned.blade.php

diff --git a/resources/lang/ca-ES/admin/users/general.php b/resources/lang/ca-ES/admin/users/general.php
index cecf786ce230..9c09efec756a 100644
--- a/resources/lang/ca-ES/admin/users/general.php
+++ b/resources/lang/ca-ES/admin/users/general.php
@@ -7,6 +7,7 @@
     'bulk_update_warn'	=> 'You are about to edit the properties of :user_count users. Please note that you cannot change your own user attributes using this form, and must make edits to your own user individually.',
     'bulk_update_help'	=> 'This form allows you to update multiple users at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged.',
     'current_assets'    => 'Assets currently checked out to this user',
+    'current_items'     => ':item currently checked out to this user',
     'clone'             => 'Clone User',
     'contact_user'      => 'Contact :name',
     'edit'              => 'Edit User',
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php
index c033acf0f410..8ac008443e18 100755
--- a/resources/views/licenses/checkout.blade.php
+++ b/resources/views/licenses/checkout.blade.php
@@ -15,7 +15,7 @@
 @section('content')
 <div class="row">
         <!-- left column -->
-    <div class="col-md-8">
+    <div class="col-md-7">
         <form class="form-horizontal" method="post" action="" autocomplete="off">
             {{csrf_field()}}
 
@@ -115,6 +115,21 @@
             </div> <!-- /.box-->
         </form>
     </div> <!-- /.col-md-7-->
+    <!-- right column -->
+    <div class="col-md-5" id="current_license_box" style="display:none;">
+        <div class="box box-primary">
+            <div class="box-header with-border">
+                <h2 class="box-title">{{ trans('admin/users/general.current_items', ['item' => trans('general.licenses')]) }}</h2>
+            </div>
+            <div class="box-body">
+                <div id="current_license_content">
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
-
 @stop
+
+@section('moar_scripts')
+    @include('partials.licenses-assigned')
+@endsection
\ No newline at end of file
diff --git a/resources/views/partials/licenses-assigned.blade.php b/resources/views/partials/licenses-assigned.blade.php
new file mode 100644
index 000000000000..02532bb2760f
--- /dev/null
+++ b/resources/views/partials/licenses-assigned.blade.php
@@ -0,0 +1,67 @@
+<script nonce="{{ csrf_token() }}">
+
+    // create the assigned assets listing box for the right side of the screen
+    $(function() {
+        $('#assigned_user').on("change",function () {
+            var userid = $('#assigned_user option:selected').val();
+
+            if(userid=='') {
+                console.warn('no user selected');
+                $('#current_license_box').fadeOut();
+                $('#current_license_content').html("");
+            } else {
+
+                $.ajax({
+                    type: 'GET',
+                    url: '{{ config('app.url') }}/api/v1/users/' + userid + '/licenses',
+                    headers: {
+                        "X-Requested-With": 'XMLHttpRequest',
+                        "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+                    },
+
+                    dataType: 'json',
+                    success: function (data) {
+                        $('#current_license_box').fadeIn();
+
+                        var table_html = '<div class="row">';
+                        table_html += '<div class="col-md-12">';
+                        table_html += '<table class="table table-striped">';
+                        table_html += '<thead><tr>';
+                        table_html += '<th>{{ trans('admin/licenses/form.name') }}</th>';
+                        table_html += '<th>{{ trans('admin/licenses/form.license_key') }}</th>';
+                        table_html += '</tr></thead><tbody>';
+
+                        $('#current_license_content').append('');
+
+                        if (data.rows.length > 0) {
+
+                            for (var i in data.rows) {
+                                var license = data.rows[i];
+                                table_html += '<tr>';
+                                table_html += '<td><a href="{{ config('app.url') }}/licenses/' + license.id + '">';
+
+                                if ((license.name == '') && (license.name != null)) {
+                                    table_html += " " + license.name;
+                                } else {
+                                    table_html += license.name;
+                                }
+
+                                table_html += '</a></td>';
+                                table_html += '<td class="col-md-4">' + license.product_key + '</td>';
+                                table_html += "</tr>";
+                            }
+                        } else {
+                            table_html += '<tr><td colspan="4">{{ trans('admin/users/message.user_has_no_assets_assigned') }}</td></tr>';
+                        }
+                        $('#current_license_content').html(table_html + '</tbody></table></div></div>');
+
+                    },
+                    error: function (data) {
+                        $('#current_license_box').fadeOut();
+                    }
+                });
+            }
+        });
+    });
+</script>
+<?php

From 8c56aa95750914fd679756e8347ee8778046cdc9 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Tue, 30 Sep 2025 12:42:46 -0700
Subject: [PATCH 2/2] changed the wrong language file

---
 resources/lang/ca-ES/admin/users/general.php        |  1 -
 resources/lang/en-US/admin/users/general.php        |  1 +
 .../views/partials/licenses-assigned.blade.php      | 13 +++++++------
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/lang/ca-ES/admin/users/general.php b/resources/lang/ca-ES/admin/users/general.php
index 9c09efec756a..cecf786ce230 100644
--- a/resources/lang/ca-ES/admin/users/general.php
+++ b/resources/lang/ca-ES/admin/users/general.php
@@ -7,7 +7,6 @@
     'bulk_update_warn'	=> 'You are about to edit the properties of :user_count users. Please note that you cannot change your own user attributes using this form, and must make edits to your own user individually.',
     'bulk_update_help'	=> 'This form allows you to update multiple users at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged.',
     'current_assets'    => 'Assets currently checked out to this user',
-    'current_items'     => ':item currently checked out to this user',
     'clone'             => 'Clone User',
     'contact_user'      => 'Contact :name',
     'edit'              => 'Edit User',
diff --git a/resources/lang/en-US/admin/users/general.php b/resources/lang/en-US/admin/users/general.php
index fa0f478d4bb0..1851733bd097 100644
--- a/resources/lang/en-US/admin/users/general.php
+++ b/resources/lang/en-US/admin/users/general.php
@@ -7,6 +7,7 @@
     'bulk_update_warn'	=> 'You are about to edit the properties of :user_count users. Please note that you cannot change your own user attributes using this form, and must make edits to your own user individually.',
     'bulk_update_help'	=> 'This form allows you to update multiple users at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged.',
     'current_assets'    => 'Assets currently checked out to this user',
+    'current_items'     => ':item currently checked out to this user',
     'clone'             => 'Clone User',
     'contact_user'      => 'Contact :name',
     'edit'              => 'Edit User',
diff --git a/resources/views/partials/licenses-assigned.blade.php b/resources/views/partials/licenses-assigned.blade.php
index 02532bb2760f..7218c346d6e9 100644
--- a/resources/views/partials/licenses-assigned.blade.php
+++ b/resources/views/partials/licenses-assigned.blade.php
@@ -1,6 +1,6 @@
 <script nonce="{{ csrf_token() }}">
-
-    // create the assigned assets listing box for the right side of the screen
+    let canViewKeys = @json(Gate::check('viewKeys', $license));
+    // create the assigned licenses listing box for the right side of the screen
     $(function() {
         $('#assigned_user').on("change",function () {
             var userid = $('#assigned_user option:selected').val();
@@ -45,10 +45,11 @@
                                 } else {
                                     table_html += license.name;
                                 }
-
-                                table_html += '</a></td>';
-                                table_html += '<td class="col-md-4">' + license.product_key + '</td>';
-                                table_html += "</tr>";
+                                    table_html += '</a></td>';
+                                if (canViewKeys) {
+                                    table_html += '<td class="col-md-4">' + license.product_key + '</td>';
+                                }
+                                    table_html += "</tr>";
                             }
                         } else {
                             table_html += '<tr><td colspan="4">{{ trans('admin/users/message.user_has_no_assets_assigned') }}</td></tr>';