From 43b0ef8f535bb1bd8341997d25675741b2ad0776 Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 18 Jul 2019 13:05:48 +0000
Subject: [PATCH] Bug 23328: Some check-in messages should be dismissable

There are several cases where the check-in process displays a modal
asking for confirmation. There are several cases where confirming or
dismissing the modal unnecessarily reloads the page. In cases where no
server-side action is necessary, the modal should be dismissed without
submitting a form.

To test, apply the patch and go to Circulation -> Check in

With AutomaticItemReturn enabled and AllowReturnToBranch set to "any
library,"

 - Check in an item which belongs at another library and is not already
   in-transit. In the confirmation modal which appears, clicking the
   "OK" button should close the modal without reloading the page.
 - Check in another item from anther branch. In the confirmation modal
   clicking the "Print slip" button should trigger a pop-up window for
   printing a slip but the modal should be dismissed without reloading
   the page.
 - Check in an item which is already in-transit to another branch. In
   the confirmation modal, clicking either the "OK" or "Print transfer
   slip" buttons should dismiss the modal without reloading the page.
   - Clicking the "Cancel transfer" button should work as before: The
     page reloads and the transfer is canceled.

With AutomaticItemReturn disabled,

 - Check in an item belonging to another library. The confirmation modal
   should ask you whether you want to "Transfer now?" Clicking "No"
   should dismiss the modal without reloading the page. The other
   options should reload the page and initiate the transfer.

With AllowReturnToBranch set to "only the library the item is from,"

 - Check in an item belonging to another library. You should see a
   "Cannot check in" modal. Clicking the "OK" button should close the
   modal without reloading the page.

Signed-off-by: Maryse Simard <maryse.simard@inlibro.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../prog/en/modules/circ/returns.tt           | 27 +++++--------------
 1 file changed, 7 insertions(+), 20 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 510d4b911a..8619258484 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
@@ -195,7 +195,7 @@
                         </p>
                     </div>
                     <div class="modal-footer">
-                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
+                        <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
                     </div>
                 </form>
             </div>
@@ -222,23 +222,9 @@
                 </div>
                 <div class="modal-footer">
                     <!-- CONFIRM -->
-                    <form method="post" action="returns.pl" name="mainform">
-                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
-                        [% FOREACH inputloo IN inputloop %]
-                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
-                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
-                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
-                        [% END %]
-                    </form>
+                    <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
                     <!-- PRINT SLIP -->
-                    <form method="post" action="returns.pl" name="mainform">
-                        <button type="submit" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
-                        [% FOREACH inputloo IN inputloop %]
-                            <input type="hidden" name="ri-[% inputloo.counter | html %]" value="[% inputloo.barcode | html %]" />
-                            <input type="hidden" name="dd-[% inputloo.counter | html %]" value="[% inputloo.duedate | html %]" />
-                            <input type="hidden" name="bn-[% inputloo.counter | html %]" value="[% inputloo.borrowernumber | html %]" />
-                        [% END %]
-                    </form>
+                    <button type="button" data-dismiss="modal" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% TransferWaitingAt | html %]&amp;op=slip"><i class="fa fa-print"></i> Print transfer slip</button>
                     <!-- CANCEL TRANSFER -->
                     <form method="post" action="returns.pl" name="mainform">
                         <button class="btn btn-default deny" type="submit"><i class="fa fa-times"></i> Cancel transfer</button>
@@ -421,10 +407,11 @@
                     <div class="modal-footer">
                         [% IF !transfer %]
                         <button type="submit" name="dotransfer" value="Yes" class="btn btn-default approve"><i class="fa fa-check"></i> Yes</button>
-                        <button type="submit" name="dotransfer" value="Yes" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Yes, print slip</button><button type="submit" class="btn btn-default deny" name="notransfer" value="No"><i class="fa fa-times"></i> No</button>
+                        <button type="submit" name="dotransfer" value="Yes" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Yes, print slip</button>
+                        <button type="button" data-dismiss="modal" class="btn btn-default deny" name="notransfer" value="No"><i class="fa fa-times"></i> No</button>
                         [% ELSE %]
-                        <button type="submit" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
-                        <button type="submit" name="dotransfer" value="Yes" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button>
+                        <button type="button" data-dismiss="modal" class="btn btn-default approve"><i class="fa fa-check"></i> OK</button>
+                        <button type="button" data-dismiss="modal" name="dotransfer" class="btn btn-default print openWin" data-url="transfer-slip.pl?transferitem=[% itemnumber | html %]&amp;branchcode=[% returnbranch | html %]&amp;op=slip"><i class="fa fa-print"></i> Print slip</button>
                         [% END %]
                         <input type="hidden" name="return_date_override" value="[% return_date_override | html %]" />
                         <input type="hidden" name="return_date_override_remember" value="[% return_date_override_remember | html %]" />
-- 
2.39.5