From 5873f5a70839d28fa7f925ed751cc29198033472 Mon Sep 17 00:00:00 2001
From: simith <simith@inlibro.com>
Date: Thu, 26 Feb 2015 13:21:21 -0500
Subject: [PATCH] Bug 11882 - Add a new button to the checkout confirmation
 dialog when checking out a reserved item
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This patch adds a "Don't Check Out and Print Slip" button to the dialog that appears
        when trying to checkout a reserved item.

Test case :
* Put a hold on an item for User A.
* Try to check out it item with User B.
* The "Please confirm checkout" box should appear. The "Don't Check Out and Print Slip" button should appear in this box.
* Click on the "Don't Check Out and Print Slip" button.
* A print popup will appear

Signed-off-by: Nick <Nick@quechelibrary.org>

Followed test plan, works as expected.
Signed-off-by: Marc Véron <veron@veron.ch>
---
 circ/circulation.pl                                 |  7 +++++++
 .../prog/en/modules/circ/circulation.tt             | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/circ/circulation.pl b/circ/circulation.pl
index 982669c..ab5e301 100755
--- a/circ/circulation.pl
+++ b/circ/circulation.pl
@@ -377,6 +377,13 @@ if ($barcode) {
     
     my ( $od, $issue, $fines ) = GetMemberIssuesAndFines($borrowernumber);
     $template->param( issuecount => $issue );
+
+    if ($question->{RESERVE_WAITING} or $question->{RESERVED}){
+        $template->param(
+            reserveborrowernumber => $question->{'resborrowernumber'},
+            itembiblionumber => $getmessageiteminfo->{'biblionumber'}
+        );
+    }
 }
 
 # reload the borrower info for the sake of reseting the flags.....
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
index c1613ad..0388eaa 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
@@ -60,6 +60,9 @@ function toggle_onsite_checkout(){
     }
 }
 
+function Dopop(link) {
+    var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
+}
 $(document).ready(function() {
     $('#mainform').on('submit',function() {
         $('#barcode').on('keypress',function(event) {
@@ -325,6 +328,24 @@ $(document).ready(function() {
 </form>
 [% END %]
 
+[% IF ( RESERVED ) %]
+<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
+    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
+    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
+    <input class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();" value="Don't Check Out and Print Slip (P)">
+</form>
+[% END %]
+
+[% IF ( RESERVE_WAITING ) %]
+<form method="get" action="/cgi-bin/koha/circ/circulation.pl">
+    <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
+    <input type="hidden" name="duedatespec" value="[% duedatespec %]" />
+    <input type="hidden" name="stickyduedate" value="[% stickyduedate %]" />
+    <input class="print" type="submit" onclick="Dopop('hold-transfer-slip.pl?borrowernumber=[% reserveborrowernumber %]&amp;biblionumber=[% itembiblionumber %]&amp;op=slip');this.form.submit();" value="Don't Check Out and Print Slip (P)">
+</form>
+[% END %]
+
 <form method="get" action="/cgi-bin/koha/circ/circulation.pl">
     [% IF (forceallow) %]<input type="hidden" name="forceallow" value="1">[% END %]
     <input type="hidden" name="borrowernumber" value="[% borrowernumber %]" />
-- 
2.1.0