Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 35840: (QA follow-up) Tidy and critic fix

Browse source 
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit e0554260c7)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Martin Renvoize 2024-03-08 14:40:01 +00:00 committed by Fridolin Somers
parent a2848e9ee8
commit c2f992e7a0
2 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
C4/Circulation.pm
View file

@ -819,8 +819,9 @@ sub CanBookBeIssued {
#
# BORROWER STATUS
#
if ( $patron->category->category_type eq 'X' && ( $item_object->barcode )) {
# stats only borrower -- add entry to statistics table, and return issuingimpossible{STATS} = 1 .
if ( $patron->category->category_type eq 'X' && ( $item_object->barcode ) ) {
# stats only borrower -- add entry to statistics table, and return issuingimpossible{STATS} = 1 .
C4::Stats::UpdateStats(
{
branch => C4::Context->userenv->{'branch'},
@ -835,8 +836,10 @@ sub CanBookBeIssued {
}
);
my $block_lost_return = C4::Context->preference("BlockReturnOfLostItems") ? 1 : 0;
my ( $stats_return, $stats_messages, $stats_iteminformation, $stats_borrower ) =
AddReturn( $item_object->barcode, C4::Context->userenv->{'branch'}, undef, undef, 1 ) if $item_object->onloan;
my ( $stats_return, $stats_messages, $stats_iteminformation, $stats_borrower );
( $stats_return, $stats_messages, $stats_iteminformation, $stats_borrower ) =
AddReturn( $item_object->barcode, C4::Context->userenv->{'branch'}, undef, undef, 1 )
if $item_object->onloan;
ModDateLastSeen( $item_object->itemnumber, $block_lost_return ); # FIXME Move to Koha::Item
return (
{

22
t/db_dependent/Circulation.t
View file

@ -2479,7 +2479,7 @@ subtest 'CanBookBeIssued + Koha::Patron->is_debarred|has_overdues' => sub {
subtest 'CanBookBeIssued + Statistic patrons "X"' => sub {
plan tests => 14;
my $library = $builder->build_object( { class => 'Koha::Libraries' } );
my $library = $builder->build_object( { class => 'Koha::Libraries' } );
my $patron_category_x = $builder->build_object(
{
class => 'Koha::Patron::Categories',
@ -2505,7 +2505,10 @@ subtest 'CanBookBeIssued + Statistic patrons "X"' => sub {
);
my ( $error, $question, $alerts ) = CanBookBeIssued( $patron, $item_1->barcode );
is( $error->{STATS}, 1, '"Error" flag "STATS" must be set if CanBookBeIssued is called with a statistic patron (category_type=X)' );
is(
$error->{STATS}, 1,
'"Error" flag "STATS" must be set if CanBookBeIssued is called with a statistic patron (category_type=X)'
);
my $stat = Koha::Statistics->search( { itemnumber => $item_1->itemnumber } )->next;
is( $stat->branch, C4::Context->userenv->{'branch'}, 'Recorded a branch' );
@ -2532,15 +2535,24 @@ subtest 'CanBookBeIssued + Statistic patrons "X"' => sub {
my $item_3 = $builder->build_sample_item( { library => $library->branchcode } );
CanBookBeIssued( $patron, $item_3->barcode );
$item_3->discard_changes;
is( Koha::Statistics->search( { itemnumber => $item_3->itemnumber } )->count, 1, 'Single entry recorded in the stats table' );
is(
Koha::Statistics->search( { itemnumber => $item_3->itemnumber } )->count, 1,
'Single entry recorded in the stats table'
);
my $item_4 = $builder->build_sample_item( { library => $library->branchcode } );
AddIssue( $patron_2, $item_4->barcode );
$item_4->discard_changes;
is( Koha::Statistics->search( { itemnumber => $item_4->itemnumber } )->count, 1, 'Issue should be recorded in statistics table for item 4.' );
is(
Koha::Statistics->search( { itemnumber => $item_4->itemnumber } )->count, 1,
'Issue should be recorded in statistics table for item 4.'
);
CanBookBeIssued( $patron, $item_4->barcode );
$item_4->discard_changes;
is( Koha::Statistics->search( { itemnumber => $item_4->itemnumber } )->count, 3, 'Issue, return, and localuse should be recorded in statistics table for item 4.' );
is(
Koha::Statistics->search( { itemnumber => $item_4->itemnumber } )->count, 3,
'Issue, return, and localuse should be recorded in statistics table for item 4.'
);
# TODO There are other tests to provide here
};