From 95ec28a2ada8aad4d6e627b91890eab4314aa25e Mon Sep 17 00:00:00 2001
From: Andrii Veremeienko <averemeienko@jabra.com>
Date: Sat, 9 Oct 2021 14:32:13 +0300
Subject: [PATCH] Bug 23479: Hold cancellation confirmation too generic
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Solution was to specify patron's name in format "<patron.firstname> <patron.surname> (<patron.cardnumber>)"
and biblio's title in the hold cancellation message.

e.g.:
"Are you sure you want to cancel hold of Охрана окружающей среды в републике Беларусь for John Doe (12)?"

How to test:
1. Go to the item search;
2. Search for the book you want to place hold for;
3. Select existing patron to place hold for him;
4. Place hold;
5. Go to koha/reserve/request.pl;
6. Click on "Cancel hold" button for hold from the list (red X icon on the grid);
7. Observe that text displayed on cancellation modal window contains patron's name and biblio's title;

Signed-off-by: David Nind <david@davidnind.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc   | 7 ++++++-
 koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 7 ++++++-
 reserve/request.pl                                         | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
index 516b04f322..2bc30c7a54 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc
@@ -190,7 +190,12 @@
         [%- END -%]
             [%- END -%]
             <td>
-                <a class="cancel-hold" title="Cancel hold" data-borrowernumber="[% hold.borrowernumber | html %]" data-biblionumber="[% hold.biblionumber | html %]" data-id="[% hold.reserve_id | html %]" href="request.pl?action=cancel&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
+                <a class="cancel-hold" title="Cancel hold"
+                data-borrower-name="[% hold.patron.firstname | html %] [% hold.patron.surname | html %] ([% hold.patron.cardnumber | html %])"
+                data-biblio-title="[% hold.biblio_title | html %]"
+                data-borrowernumber="[% hold.borrowernumber | html %]" data-biblionumber="[% hold.biblionumber | html %]"
+                data-id="[% hold.reserve_id | html %]"
+                href="request.pl?action=cancel&amp;borrowernumber=[% hold.borrowernumber | html %]&amp;biblionumber=[% hold.biblionumber | html %]&amp;reserve_id=[% hold.reserve_id | html %]&amp;date=[% hold.date | html %]">
                     <img src="[% interface | html %]/[% theme | html %]/img/x.png" alt="Cancel" />
                 </a>
             </td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
index 14cc35a319..8dcb0c02bc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
@@ -1043,7 +1043,7 @@
                 </div>
 
                 <div class="modal-body">
-                    <p>Are you sure you want to cancel this hold?</p>
+                    <p id="cancellation-text"></p>
 
                     <fieldset class="action">
                         [% SET hold_cancellation = AuthorisedValues.GetAuthValueDropbox('HOLD_CANCELLATION') %]
@@ -1560,6 +1560,11 @@
             let cancel_link;
             $(".cancel-hold").on("click",function(e) {
                 e.preventDefault;
+                var borrower_name = $(this).data('borrower-name');
+                var biblio_title = $(this).data('biblio-title');
+
+                $("#cancellation-text").html(`Are you sure you want to cancel hold of <b>${biblio_title}</b> for <b>${borrower_name}</b>?`);
+
                 cancel_link = $(this);
                 $('#cancelModal').modal();
                 return false;
diff --git a/reserve/request.pl b/reserve/request.pl
index 95a7fd43d1..e8e6a09bc7 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -692,6 +692,7 @@ foreach my $biblionumber (@biblionumbers) {
         $reserve{'date'}           = $res->reservedate;
         $reserve{'borrowernumber'} = $res->borrowernumber();
         $reserve{'biblionumber'}   = $res->biblionumber();
+        $reserve{'biblio_title'}   = $biblio->title;
         $reserve{'patron'}         = $res->borrower;
         $reserve{'notes'}          = $res->reservenotes();
         $reserve{'waiting_date'}   = $res->waitingdate();
-- 
2.20.1