From 0a8bbbdb2068671f646333921285e058d11393d0 Mon Sep 17 00:00:00 2001
From: Alex Buckley <alexbuckley@catalyst.net.nz>
Date: Wed, 19 Apr 2017 14:01:30 +1200
Subject: [PATCH] Bug 18438 - Implemented data-dismiss="modal" attribute on
 'Confirm hold' and 'confirm' buttons so when they are cliked the modal box
 dissapears and any warning messages that were hidden by the box are now
 visible.

The form is submitted via the js onclick function when the 'Comfirm holds' button is clicked because the checkin needs to be triggered by clicking this button.

However when the 'Confirm' button is displayed this means that the item
was not checked out when the user is trying to check it back in. In
which case the check in does not need to be triggered and so in this
patch the 'Confirm' button does not submt the form it simply closes the
modal box to show any warning messages behind.

Test plan:
1. Check out an item to one patron whilst having that item also being on
hold to another patron

2. Check the item back in

3. Notice a modal box appears greying out the background with three
buttons 'Confirm hold', 'Print and confirm' and 'Ignore'. Click confirm
and notice that the page refreshes and no yellow warning messages are
able to be displayed

4. Now that you have checked the item in. Try checking it in a second
time by clicking on the Checkin tab and writing in the barcode.

5. The modal box will appear again, this time with three buttons
'Confirm', 'Print and confirm' and 'Cancel hold'

6. Click the 'Confirm' button and the page refreshes again and the
yellow warning message hidden by the modal box is not properly displayed
to the user

7. Apply patch

8. Try checking in the item again, and this time after clicking the
'confirm' button on the modal box notice that the yellow warning message
is displayed telling the user the item was "Not checked out"

9. Drop the hold on the item and make sure it is not checked out.

10. Repeat steps 1 and 2 and notice after clicking the 'Confirm hold'
button the page refreshes and the item is successfully checked back in
---
 koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 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 e1c8c0b..4f4b560 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -36,6 +36,7 @@
 function Dopop(link) {
     var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
     $("#barcode").focus();
+    $(".btn btn-default approve").onClickConfirm();
 }
 $(document).ready(function () {
     $(".modal").modal({ backdrop: 'static' }).on('shown', function() {
@@ -47,6 +48,10 @@ $(document).ready(function () {
     [% IF print_slip %]
         Dopop('hold-transfer-slip.pl?borrowernumber=[% borrowernumber %]&amp;biblionumber=[% biblionumber %]');
     [% END %]
+    [% IF confirm %]
+        $(".modal").modal().off;
+    [% END %]
+
 
     var columns_settings = [% ColumnsSettings.GetColumns( 'circ', 'returns', 'checkedintable', 'json' ) %]
     var returns_table = KohaTable("#checkedintable", {
@@ -331,7 +336,7 @@ $(document).ready(function () {
                 <div class="modal-footer">
                     <input type="hidden" name="cancel_reserve" value="0" />
 
-                    <button type="submit" class="btn btn-default approve">
+                    <button data-dismiss="modal" type="submit" class="btn btn-default approve">
                         <i class="fa fa-check"></i> Confirm
                     </button>
 
@@ -535,7 +540,6 @@ $(document).ready(function () {
                         <input type="hidden" name="dd-[% inputloo.counter %]" value="[% inputloo.duedate %]" />
                         <input type="hidden" name="bn-[% inputloo.counter %]" value="[% inputloo.borrowernumber %]" />
                     [% END %]
-
                     <input type="hidden" name="itemnumber" value="[% itemnumber %]" />
                     <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
                     <input type="hidden" name="biblionumber" value="[% itembiblionumber %]" />
@@ -547,17 +551,16 @@ $(document).ready(function () {
                     <input type="hidden" name="return_date_override" value="[% return_date_override %]" />
                     <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember %]" />
                 </div>
-
                 <div class="modal-footer">
                     [% IF ( transfertodo ) %]
-                        <button type="submit" class="btn btn-default approve">
+                        <button data-dismiss="modal" type="submit" class="btn btn-default approve">
                             <i class="fa fa-check"></i> Confirm hold and transfer
                         </button>
                         <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit()">
                             <i class="fa fa-print"></i> Print slip, transfer, and confirm
                         </button>
                     [% ELSE %]
-                        <button type="submit" class="btn btn-default approve">
+                        <button data-dismiss="modal" type="submit" class="btn btn-default approve" onclick="this.form.submit();">
                             <i class="fa fa-check"></i> Confirm hold
                         </button>
                         <button type="submit" class="btn btn-default print" onclick="this.form.print_slip.value = 1; this.form.submit();">
-- 
2.1.4