@@ -, +, @@ checkouts --- C4/Circulation.pm | 8 ++++- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 26 +++++++-------- .../prog/en/modules/circ/circulation.tt | 4 +++ t/db_dependent/Circulation.t | 38 +++++++++++++++++++++- 4 files changed, 61 insertions(+), 15 deletions(-) --- a/C4/Circulation.pm +++ a/C4/Circulation.pm @@ -938,7 +938,12 @@ sub CanBookBeIssued { $item->{'itemnumber'} ); if ( $CanBookBeRenewed == 0 ) { # no more renewals allowed - $issuingimpossible{NO_MORE_RENEWALS} = 1; + if ( $renewerror eq 'onsite_checkout' ) { + $issuingimpossible{NO_RENEWAL_FOR_ONSITE_CHECKOUTS} = 1; + } + else { + $issuingimpossible{NO_MORE_RENEWALS} = 1; + } } else { $needsconfirmation{RENEW_ISSUE} = 1; @@ -2667,6 +2672,7 @@ sub CanBookBeRenewed { my $item = GetItem($itemnumber) or return ( 0, 'no_item' ); my $itemissue = GetItemIssue($itemnumber) or return ( 0, 'no_checkout' ); + return ( 0, 'onsite_checkout' ) if $itemissue->{onsite_checkout}; $borrowernumber ||= $itemissue->{borrowernumber}; my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber ) --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -328,6 +328,8 @@ $(document).ready(function() { span_style = "display: none"; span_class = "renewals-allowed"; + } else if ( oObj.can_renew_error == "onsite_checkout" ) { + // Don't display something if it's an onsite checkout } else { content += "" + oObj.can_renew_error @@ -339,20 +341,18 @@ $(document).ready(function() { var can_force_renew = ( oObj.onsite_checkout == 0 ) && ( oObj.can_renew_error != "on_reserve" ); var can_renew = ( oObj.renewals_remaining > 0 && !oObj.can_renew_error ); - if ( oObj.onsite_checkout == 0 ) { - if ( can_renew || can_force_renew ) { - content += "" - + "" - + ""; - - content += "(" - + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed ) - + ")"; + if ( can_renew || can_force_renew ) { + content += "" + + "" + + ""; + + content += "(" + + RENEWALS_REMAINING.format( oObj.renewals_remaining, oObj.renewals_allowed ) + + ")"; } content += ""; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -481,6 +481,10 @@ $(document).ready(function() {