From bb61d5bc384102fe1dc8db4e69bfdb797337b968 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 8 Sep 2017 12:47:03 -0300 Subject: [PATCH] Bug 19276: (bug 17829 follow-up) Fix Statistic patrons behaviour Bug 17829 must have been handle this specific case: GetMember set category_type, but now $borrower is a Koha::Patron unblessed and does not contain the category_type. The fix is to call ->category->category_type on the Koha::Patron object to be able to know if they are a statistic patrons. Test plan: Run the tests Tests pass, as does QA test tool Signed-off-by: Alex Buckley Signed-off-by: Kyle M Hall Signed-off-by: Jonathan Druart --- C4/Circulation.pm | 5 ++-- t/db_dependent/Circulation.t | 44 ++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/C4/Circulation.pm b/C4/Circulation.pm index abb4c50a66..a5b2fceb81 100644 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -720,7 +720,8 @@ sub CanBookBeIssued { # # BORROWER STATUS # - if ( $borrower->{'category_type'} eq 'X' && ( $item->{barcode} )) { + my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ); + if ( $patron->category->category_type eq 'X' && ( $item->{barcode} )) { # stats only borrower -- add entry to statistics table, and return issuingimpossible{STATS} = 1 . &UpdateStats({ branch => C4::Context->userenv->{'branch'}, @@ -814,7 +815,7 @@ sub CanBookBeIssued { $alerts{OTHER_CHARGES} = sprintf( "%.2f", $other_charges ); } - my $patron = Koha::Patrons->find( $borrower->{borrowernumber} ); + $patron = Koha::Patrons->find( $borrower->{borrowernumber} ); if ( my $debarred_date = $patron->is_debarred ) { # patron has accrued fine days or has a restriction. $count is a date if ($debarred_date eq '9999-12-31') { diff --git a/t/db_dependent/Circulation.t b/t/db_dependent/Circulation.t index 28521e8d41..ce766d66e1 100755 --- a/t/db_dependent/Circulation.t +++ b/t/db_dependent/Circulation.t @@ -1360,6 +1360,50 @@ subtest 'CanBookBeIssued + Koha::Patron->is_debarred|has_overdues' => sub { is( $error->{USERBLOCKEDNOENDDATE}, '9999-12-31', 'USERBLOCKEDNOENDDATE should be 9999-12-31 for unlimited debarments' ); }; +subtest 'CanBookBeIssued + Statistic patrons "X"' => sub { + plan tests => 1; + + my $library = $builder->build_object( { class => 'Koha::Libraries' } ); + my $patron_category = $builder->build_object( + { + class => 'Koha::Patron::Categories', + value => { category_type => 'X' } + } + ); + my $patron = $builder->build_object( + { + class => 'Koha::Patrons', + value => { + categorycode => $patron_category->categorycode, + gonenoaddress => undef, + lost => undef, + debarred => undef, + borrowernotes => "" + } + } + ); + my $biblioitem_1 = $builder->build( { source => 'Biblioitem' } ); + my $item_1 = $builder->build( + { + source => 'Item', + value => { + homebranch => $library->branchcode, + holdingbranch => $library->branchcode, + notforloan => 0, + itemlost => 0, + withdrawn => 0, + restricted => 0, + biblionumber => $biblioitem_1->{biblionumber} + } + } + ); + + my ( $error, $question, $alerts ) = CanBookBeIssued( $patron->unblessed, $item_1->{barcode} ); + is( $error->{STATS}, 1, '"Error" flag "STATS" must be set if CanBookBeIssued is called with a statistic patron (category_type=X)' ); + + # TODO There are other tests to provide here +}; + subtest 'MultipleReserves' => sub { plan tests => 3; -- 2.39.5