From 48588f6a9ee601aebb7b06bba6fd16a746738a70 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 9 Jul 2025 20:08:19 +0100
Subject: [PATCH 1/2] Small UI sugar on the acceptance/signature screen

Signed-off-by: snipe <snipe@snipe.net>
---
 .../lang/en-US/admin/settings/general.php     |  2 +-
 resources/lang/en-US/general.php              |  2 +
 .../views/account/accept/create.blade.php     | 47 +++++++++++--------
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index fdbb0d8c52..4e8143a517 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -55,7 +55,7 @@ return [
     'default_eula_text_placeholder' => 'Add your default EULA text',
     'default_language'			=> 'Default Language',
     'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
-    'acceptance_note'           => 'Add a note for your decision (Optional)',
+    'acceptance_note'           => 'Add a note for your decision (required if declining)',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 8ef27aac6b..5100422325 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -346,6 +346,8 @@ return [
     'audit_overdue'         => 'Overdue for Audit',
     'accept'                => 'Accept :asset',
     'i_accept'              => 'I accept',
+    'i_decline_item'        => 'I decline this item',
+    'i_accept_item'         => 'I accept this item',
     'i_decline'             => 'I decline',
     'accept_decline'        => 'Accept/Decline',
     'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php
index 797c527535..961d2fc700 100644
--- a/resources/views/account/accept/create.blade.php
+++ b/resources/views/account/accept/create.blade.php
@@ -89,7 +89,7 @@
                             </div>
 
                             @if (auth()->user()->email!='')
-                                <div class="col-md-12" style="padding-top: 20px; display: none;" id="toggleShow">
+                                <div class="col-md-12" style="padding-top: 20px; display: none;" id="showEmailBox">
                                     <label class="form-control">
                                         <input type="checkbox" value="1" name="send_copy" id="send_copy" checked="checked" aria-label="send_copy">
                                         {{ trans('mail.send_pdf_copy') }} ({{ auth()->user()->email }})
@@ -99,8 +99,13 @@
                         @endif
 
                     </div> <!-- / box-body -->
-                    <div class="box-footer text-right">
-                        <button type="submit" class="btn btn-success" id="submit-button"><i class="fa fa-check icon-white" aria-hidden="true"></i> {{ trans('general.submit') }}</button>
+                    <div class="box-footer text-right" style="display: none;" id="showSubmit">
+                        <button type="submit" class="btn btn-success" id="submit-button">
+                            <i class="fa fa-check icon-white" aria-hidden="true" id="submitIcon"></i>
+                            <span id="buttonText">
+                                {{ trans('general.i_accept_item') }}
+                            </span>
+                        </button>
                     </div><!-- /.box-footer -->
                 </div> <!-- / box-default -->
             </div> <!-- / col -->
@@ -113,9 +118,6 @@
 
     <script nonce="{{ csrf_token() }}">
 
-
-
-
         var wrapper = document.getElementById("signature-pad"),
             clearButton = wrapper.querySelector("[data-action=clear]"),
             saveButton = wrapper.querySelector("[data-action=save]"),
@@ -145,21 +147,26 @@
             signaturePad.clear();
         });
 
-        $('#submit-button').on("click", function (event) {
-            if (signaturePad.isEmpty()) {
-                alert("Please provide signature first.");
-                return false;
-            } else {
-                $('#signature_output').val(signaturePad.toDataURL());
-            }
-        });
+        $('[name="asset_acceptance"]').on('change', function() {
+
+            if ($(this).is(':checked') && $(this).attr('id') == 'declined') {
+                $("#showEmailBox").hide();
+                $("#showSubmit").show();
+                $("#submit-button").removeClass("btn-success").addClass("btn-danger").show();
+                $("#submitIcon").removeClass("fa-check").addClass("fa-times");
+                $("#buttonText").text('{{ trans('general.i_decline_item') }}');
+                $("#note").prop('required', true);
+
+            } else if ($(this).is(':checked') && $(this).attr('id') == 'accepted') {
+                $("#showEmailBox").show();
+                $("#showSubmit").show();
+                $("#submit-button").removeClass("btn-danger").addClass("btn-success").show();
+                $("#submitIcon").removeClass("fa-check").addClass("fa-check");
+                $("#buttonText").text('{{ trans('general.i_accept_item') }}');
+                $("#note").prop('required', false);
+
+
 
-        $('[name="asset_acceptance"]').on('change', function(){
-            if ($(this).is(':checked') && $(this).attr('id') == 'accepted' ) {
-                $("#toggleShow").show();
-            }
-            else{
-                $("#toggleShow").hide();
             }
 
         });

From 0573dc136af09dec2f7d22c4c5cbc26976e1ceab Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 9 Jul 2025 20:16:30 +0100
Subject: [PATCH 2/2] Put the sig check back

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/account/accept/create.blade.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php
index 961d2fc700..cb877240bb 100644
--- a/resources/views/account/accept/create.blade.php
+++ b/resources/views/account/accept/create.blade.php
@@ -147,6 +147,15 @@
             signaturePad.clear();
         });
 
+        $('#submit-button').on("click", function (event) {
+            if (signaturePad.isEmpty()) {
+                alert("Please provide signature first.");
+                return false;
+            } else {
+                $('#signature_output').val(signaturePad.toDataURL());
+            }
+        });
+        
         $('[name="asset_acceptance"]').on('change', function() {
 
             if ($(this).is(':checked') && $(this).attr('id') == 'declined') {