From 626969cc1cd573896c12647ac95832a16e79b8d0 Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Wed, 17 Jan 2024 15:45:53 +0000
Subject: [PATCH] Bug 35535: Allow for cancellation of holds with or without a
 reason

TO TEST:
1. APPLY PATCH
2. Have at least 1 HOLD_CANCELLATION auth value.
3. Check in a waiting hold and make sure you can cancel a hold when
   selecting the reason.
4. Also try a cancelling this hold without giving a reason.
5. Delete all HOLD_CANCELLATION auth values.
6. Try checking in another hold, there should be no dropdown for
   choosing a reason.
7. The hold should cancel.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
index 2abde7f9c5..cbf476b0d3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -705,7 +705,7 @@
                                                         [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
                                                         [% IF hold_cancellation.count %]
                                                             <select name="cancellation-reason" id="cancellation-reason">
-                                                                <option value="NULL">No reason given</option>
+                                                                <option value="">No reason given</option>
                                                                 [% FOREACH reason IN hold_cancellation %]
                                                                     <option value="[% reason.authorised_value | html %]">[% reason.lib | html %]</option>
                                                                 [% END %]
@@ -1562,7 +1562,11 @@
                 this.form.submit();
             });
             $('.cancel-hold').on("click",function(e){
-                let cancel_reason = document.getElementById('cancellation-reason').value;
+                let cancel_form = document.getElementById('cancellation-reason');
+                let cancel_reason = '';
+                if ( cancel_form ) {
+                    cancel_reason = cancel_form.value;
+                }
                 this.form.cancel_reserve.value = 1;
                 this.form.cancel_reason.value = cancel_reason;
                 this.form.submit();
-- 
2.30.2