From 860627023f90a34d1cc78055a6562b1d70abfdfa Mon Sep 17 00:00:00 2001 From: simith Date: Wed, 3 Sep 2014 08:57:26 -0400 Subject: [PATCH] Bug 11882 - Add a new button to the checkout confirmation dialog when checking out a reserved item 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 --- circ/circulation.pl | 11 +++++++++++ .../prog/en/modules/circ/circulation.tt | 20 +++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/circ/circulation.pl b/circ/circulation.pl index c766e88..7ec54b3 100755 --- a/circ/circulation.pl +++ b/circ/circulation.pl @@ -499,6 +499,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 18f145c..2b94c84 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -42,7 +42,9 @@ var MSG_ADD_MESSAGE = _("Add a new message"); var MSG_EXPORT_SELECT_CHECKOUTS = _("You must select checkout(s) to export"); [% IF ( borrowernumber ) %]if($.cookie("holdfor") != [% borrowernumber %]){ $.cookie("holdfor",null, { path: "/", expires: 0 }); }[% ELSE %]$.cookie("holdfor",null, { path: "/", expires: 0 });[% END %] [% UNLESS ( borrowernumber ) %][% UNLESS ( selectborrower ) %]window.onload=function(){ $('#findborrower').focus(); };[% END %][% END %] - +function Dopop(link) { + var newin = window.open(link, 'popup', 'width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top'); +} $(document).ready(function() { [% IF !( CircAutoPrintQuickSlip == 'clear' ) %] // listen submit to trigger qslip on empty checkout @@ -289,16 +291,20 @@ $(document).ready(function() { [% END %] [% IF ( RESERVED ) %] -
- - + + + + +
[% END %] [% IF ( RESERVE_WAITING ) %] -
- - + + + + +
[% END %] -- 1.9.1