From 97407f011a74f4ee8edf241ff11ceda3c58955d9 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 4 Aug 2015 10:38:29 +0100 Subject: [PATCH] Bug 14470: Do not allow renew for on-site checkouts At the opac, the renew checkbox should not be displayed if it's an on-site checkout (same on the intranet). On the way, this patch adds a specific message to the intranet if the librarian try to renew an on-site checkout. Indeed before this patch a renew was allowed if the barcode was scanned. Test plan: 1/ Create an on-site checkout for a patron 2/ Confirm that the checkbox 'renew' is not displayed on the checkout list tables 3/ At the OPAC, the renew should not be allowed (no checkbox) 4/ Try to check the item out to the same patron, confirm that you get a specifig message to inform you the renew is not allowed for on-site 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(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index 7813e33..cf83dc6 100644 --- a/C4/Circulation.pm +++ b/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 ) diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js index 23a8426..485c292 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ b/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 += ""; 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 6b55227..c13a35c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -481,6 +481,10 @@ $(document).ready(function() {
  • No more renewals possible
    • [% END %] + [% IF NO_RENEWAL_FOR_ONSITE_CHECKOUTS %] +
  • This issue can not be renewed, it's an on-site checkout
    • + [% END %] + [%IF ( AGE_RESTRICTION ) %]
  • Age restriction [% AGE_RESTRICTION %].
    • [% END %] diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index 30a5fe7..499da7f 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -27,7 +27,7 @@ use C4::Overdues qw(UpdateFine); use Koha::DateUtils; use Koha::Database; -use Test::More tests => 61; +use Test::More tests => 63; BEGIN { use_ok('C4::Circulation'); @@ -594,6 +594,42 @@ C4::Context->dbh->do("DELETE FROM accountlines"); is ( $count, 0, "Calling UpdateFine on non-existant fine with an amount of 0 does not result in an empty fine" ); } +{ + # Don't allow renewing onsite checkout + my $barcode = 'R00000XXX'; + my $branch = 'CPL'; + + #Create another record + my $biblio = MARC::Record->new(); + $biblio->append_fields( + MARC::Field->new('100', ' ', ' ', a => 'Anonymous'), + MARC::Field->new('245', ' ', ' ', a => 'A title'), + ); + my ($biblionumber, $biblioitemnumber) = AddBiblio($biblio, ''); + + my (undef, undef, $itemnumber) = AddItem( + { + homebranch => $branch, + holdingbranch => $branch, + barcode => $barcode, + }, + $biblionumber + ); + + my $borrowernumber = AddMember( + firstname => 'fn', + surname => 'dn', + categorycode => 'S', + branchcode => $branch, + ); + + my $borrower = GetMember( borrowernumber => $borrowernumber ); + my $issue = AddIssue( $borrower, $barcode, undef, undef, undef, undef, { onsite_checkout => 1 } ); + my ( $renewed, $error ) = CanBookBeRenewed( $borrowernumber, $itemnumber ); + is( $renewed, 0, 'CanBookBeRenewed should not allow to renew on-site checkout' ); + is( $error, 'onsite_checkout', 'A correct error code should be returned by CanBookBeRenewed for on-site checkout' ); +} + $dbh->rollback; 1; -- 2.1.0