@@ -, +, @@ --- C4/Circulation.pm | 5 ++--- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 10 +++++----- .../prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/members/readingrec.tt | 13 ++++++------- t/db_dependent/Circulation.t | 2 +- 5 files changed, 15 insertions(+), 17 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -1189,11 +1189,10 @@ AddIssue does the following things : sub AddIssue { my ( $borrower, $barcode, $datedue, $cancelreserve, $issuedate, $sipmode, $params ) = @_; - my $onsite_checkout = $params->{onsite_checkout}; - my $auto_renew = $params->{auto_renew}; + my $onsite_checkout = $params && $params->{onsite_checkout} ? 1 : 0; + my $auto_renew = $params && $params->{auto_renew}; my $dbh = C4::Context->dbh; my $barcodecheck=CheckValidBarcode($barcode); - $onsite_checkout = ( $onsite_checkout ? 1 : 0 ); if ($datedue && ref $datedue ne 'DateTime') { $datedue = dt_from_string($datedue); --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -307,11 +307,11 @@ $(document).ready(function() { span_class = "renewals-allowed"; } - content += "" - + "" - + ""; + if ( oObj.renewals_remaining && oObj.onsite_checkout == 0 ) { + content += "" + + "" + + ""; - if ( oObj.renewals_remaining && onsite_checkout == 0 ) { content += "(" + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed ) + ")"; @@ -444,7 +444,7 @@ $(document).ready(function() { var onsite_checkout = ''; if ( oObj.onsite_checkout == 1 ) { - onsite_checkout += " ("+INHOUSE_USE+")"; + onsite_checkout += " (" + INHOUSE_USE + ")"; } title += " " --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -533,7 +533,7 @@ No patron matched [% message %] [% END %] - [% IF onsite_checkout_feature %] + [% IF Koha.Preference('On-site checkouts') %]