@@ -, +, @@ dialog when checking out a reserved item when trying to checkout a reserved item. --- circ/circulation.pl | 11 +++++++++++ .../prog/en/modules/circ/circulation.tt | 20 +++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) --- a/circ/circulation.pl +++ a/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, --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/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 %] --