From 09258d25dd7c02b395d55b84fd3b6204abd37fd0 Mon Sep 17 00:00:00 2001 From: simith Date: Wed, 3 Sep 2014 08:57:26 -0400 Subject: [PATCH] [Signed-off] 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 Followed test plan. Works as expected. Signed-off-by: Marc VĂ©ron --- circ/circulation.pl | 11 ++++++++++ .../prog/en/modules/circ/circulation.tt | 21 ++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/circ/circulation.pl b/circ/circulation.pl index 6e9f449..dc41405 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -554,6 +554,17 @@ my $relatives_issues_count = Koha::Database->new()->schema()->resultset('Issue') ->count( { borrowernumber => \@relatives } ); +(my $returned, my $messages) = AddReturn( $barcode, $branch); +if ( $messages->{'ResFound'}) { + my $reserve = $messages->{'ResFound'}; + # get biblio description + my $biblio = GetBiblioFromItemNumber($reserve->{'itemnumber'}); + $template->param( + reserveborrowernumber => $reserve->{'borrowernumber'}, + itembiblionumber => $biblio->{'biblionumber'} + ); +} + $template->param( lib_messages_loop => $lib_messages_loop, bor_messages_loop => $bor_messages_loop, 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 6963c90..eb9477f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -59,6 +59,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) { @@ -324,6 +327,24 @@ $(document).ready(function() { [% END %] +[% IF ( RESERVED ) %] +
+ + + + +
+[% END %] + +[% IF ( RESERVE_WAITING ) %] +
+ + + + +
+[% END %] +
[% IF (forceallow) %][% END %] -- 1.7.10.4