From 46b41f8d7333b2699b40a25826c519b863d819d7 Mon Sep 17 00:00:00 2001
From: Paul Derscheid <paul.derscheid@lmscloud.de>
Date: Wed, 23 Oct 2024 16:43:16 +0000
Subject: [PATCH] Bug 38222: Add handling for cancellation reasons to cancel
 booking modal template, associated script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Sponsored-by: Büchereizentrale Schleswig-Holstein <https://www.bz-sh.de/>
Signed-off-by: LEBSimonsen <simonsen@bz-sh.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../en/includes/modals/cancel_booking.inc     | 19 +++++++++++++++++++
 .../prog/js/cancel_booking_modal.js           | 18 +++++++++++++-----
 2 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/cancel_booking.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/cancel_booking.inc
index c9940bc8dcb..5cc699d8999 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/cancel_booking.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/cancel_booking.inc
@@ -1,3 +1,4 @@
+[% USE AuthorisedValues %]
 <!-- Cancel booking modal -->
 <div class="modal" id="cancelBookingModal" tabindex="-1" role="dialog" aria-labelledby="cancelBookingLabel">
     <form method="get" id="cancelBookingForm">
@@ -11,6 +12,24 @@
                     <div id="cancel_booking_result"></div>
                     <input type="hidden" name="booking_id" id="cancel_booking_id">
                     <p>Are you sure you want to cancel this booking?</p>
+                    <fieldset class="brief">
+                        [% SET booking_cancellation = AuthorisedValues.GetAuthValueDropbox('BOOKING_CANCELLATION') %]
+                        <div class="combobox-container">
+                            <label for="cancellation-reason" class="form-label">Cancellation Reason:</label>
+                            <input type="text" id="cancellation-reason" name="cancellation_reason" class="form-control" />
+                            <ul id="cancellation-reason-list" class="dropdown-menu position-fixed" style="max-height: 200px; overflow-y: auto; max-width: fit-content;">
+                                [% IF booking_cancellation.count %]
+                                    [% FOR reason IN booking_cancellation %]
+                                        <li>
+                                            <button type="button" class="dropdown-item" data-id="[% reason.authorised_value | html %]">
+                                                [% reason.lib | html %]
+                                            </button>
+                                        </li>
+                                    [% END %]
+                                [% END %]
+                            </ul>
+                        </div>
+                    </fieldset> <!-- /.brief -->
                 </div> <!-- /.modal-body -->
                 <div class="modal-footer">
                     <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> Yes, cancel booking</button>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/cancel_booking_modal.js b/koha-tmpl/intranet-tmpl/prog/js/cancel_booking_modal.js
index 9201494066b..4cfdbafa1fc 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/cancel_booking_modal.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/cancel_booking_modal.js
@@ -9,12 +9,13 @@
     async function handleSubmit(e) {
         e.preventDefault();
 
-        const bookingIdInput = document.getElementById("cancel_booking_id");
-        if (!bookingIdInput) {
+        const target = e.target;
+        if (!(target instanceof HTMLFormElement)) {
             return;
         }
 
-        const bookingId = bookingIdInput.value;
+        const formData = new FormData(target);
+        const bookingId = formData.get("booking_id");
         if (!bookingId) {
             return;
         }
@@ -22,7 +23,10 @@
         let [error, response] = await catchError(
             fetch(`/api/v1/bookings/${bookingId}`, {
                 method: "PATCH",
-                body: JSON.stringify({ status: "cancelled" }),
+                body: JSON.stringify({
+                    status: "cancelled",
+                    cancellation_reason: formData.get("cancellation_reason"),
+                }),
                 headers: {
                     "Content-Type": "application/json",
                 },
@@ -43,7 +47,11 @@
 
         cancel_success = true;
         bookings_table?.api().ajax.reload();
-        timeline?.itemsData.remove(Number(booking_id));
+        try {
+            timeline?.itemsData.remove(Number(bookingId));
+        } catch {
+            console.info("Timeline component not found. Skipping...");
+        }
 
         $("#cancelBookingModal").modal("hide");
 
-- 
2.47.0