gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 18139: Tidy code 

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Kyle M Hall 2023-12-12 06:57:42 -05:00 committed by Katrin Fischer
parent 9eb8d69ca1
commit e62e1be323
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
C4/Circulation.pm
View File

@ -1027,19 +1027,19 @@ sub CanBookBeIssued {
# if TooMany max_allowed returns 0 the user doesn't have permission to check out this book
if ( $toomany && not exists $needsconfirmation{RENEW_ISSUE} ) {
if ( $toomany->{max_allowed} == 0 ) {
$needsconfirmation{PATRON_CANT} = 1;
$needsconfirmation{PATRON_CANT} = 1;
$needsconfirmation{circulation_rule_PATRON_CANT} = $toomany->{circulation_rule};
}
if ( C4::Context->preference("AllowTooManyOverride") ) {
$needsconfirmation{TOO_MANY} = $toomany->{reason};
$needsconfirmation{current_loan_count} = $toomany->{count};
$needsconfirmation{max_loans_allowed} = $toomany->{max_allowed};
$needsconfirmation{circulation_rule_TOO_MANY} = $toomany->{circulation_rule};
$needsconfirmation{TOO_MANY} = $toomany->{reason};
$needsconfirmation{current_loan_count} = $toomany->{count};
$needsconfirmation{max_loans_allowed} = $toomany->{max_allowed};
$needsconfirmation{circulation_rule_TOO_MANY} = $toomany->{circulation_rule};
} else {
$issuingimpossible{TOO_MANY} = $toomany->{reason};
$issuingimpossible{current_loan_count} = $toomany->{count};
$issuingimpossible{max_loans_allowed} = $toomany->{max_allowed};
$needsconfirmation{circulation_rule_TOO_MANY} = $toomany->{circulation_rule};
$issuingimpossible{TOO_MANY} = $toomany->{reason};
$issuingimpossible{current_loan_count} = $toomany->{count};
$issuingimpossible{max_loans_allowed} = $toomany->{max_allowed};
$needsconfirmation{circulation_rule_TOO_MANY} = $toomany->{circulation_rule};
}
}

22
t/db_dependent/Circulation/TooMany.t
View File

@ -209,8 +209,8 @@ subtest '1 Issuingrule exist with onsiteissueqty=unlimited' => sub {
is_deeply(
$data,
{
reason => 'TOO_MANY_CHECKOUTS',
count => 1,
reason => 'TOO_MANY_CHECKOUTS',
count => 1,
max_allowed => 1,
},
'CO should not be allowed if ConsiderOnSiteCheckoutsAsNormalCheckouts == 1'
@ -289,15 +289,15 @@ subtest '1 Issuingrule exist: 1 CO allowed, 1 OSCO allowed. Do a CO' => sub {
my $issue = C4::Circulation::AddIssue( $patron, $item->barcode, dt_from_string() );
like( $issue->issue_id, qr|^\d+$|, 'The issue should have been inserted' );
t::lib::Mocks::mock_preference('ConsiderOnSiteCheckoutsAsNormalCheckouts', 0);
t::lib::Mocks::mock_preference( 'ConsiderOnSiteCheckoutsAsNormalCheckouts', 0 );
my $data = C4::Circulation::TooMany( $patron, $item );
my $rule = delete $data->{circulation_rule};
is( ref $rule, 'Koha::CirculationRule', 'Circulation rule was returned' );
is_deeply(
$data,
{
reason => 'TOO_MANY_CHECKOUTS',
count => 1,
reason => 'TOO_MANY_CHECKOUTS',
count => 1,
max_allowed => 1,
},
'CO should not be allowed if ConsiderOnSiteCheckoutsAsNormalCheckouts == 0'
@ -357,7 +357,7 @@ subtest '1 Issuingrule exist: 1 CO allowed, 1 OSCO allowed, Do a OSCO' => sub {
my $issue = C4::Circulation::AddIssue( $patron, $item->barcode, dt_from_string(), undef, undef, undef, { onsite_checkout => 1 } );
like( $issue->issue_id, qr|^\d+$|, 'The issue should have been inserted' );
t::lib::Mocks::mock_preference('ConsiderOnSiteCheckoutsAsNormalCheckouts', 0);
t::lib::Mocks::mock_preference( 'ConsiderOnSiteCheckoutsAsNormalCheckouts', 0 );
is(
C4::Circulation::TooMany( $patron, $item ),
undef,
@ -369,22 +369,22 @@ subtest '1 Issuingrule exist: 1 CO allowed, 1 OSCO allowed, Do a OSCO' => sub {
is_deeply(
$data,
{
reason => 'TOO_MANY_ONSITE_CHECKOUTS',
count => 1,
reason => 'TOO_MANY_ONSITE_CHECKOUTS',
count => 1,
max_allowed => 1,
},
'OSCO should not be allowed if ConsiderOnSiteCheckoutsAsNormalCheckouts == 0'
);
t::lib::Mocks::mock_preference('ConsiderOnSiteCheckoutsAsNormalCheckouts', 1);
t::lib::Mocks::mock_preference( 'ConsiderOnSiteCheckoutsAsNormalCheckouts', 1 );
$data = C4::Circulation::TooMany( $patron, $item );
$rule = delete $data->{circulation_rule};
is( ref $rule, 'Koha::CirculationRule', 'Circulation rule was returned' );
is_deeply(
$data,
{
reason => 'TOO_MANY_CHECKOUTS',
count => 1,
reason => 'TOO_MANY_CHECKOUTS',
count => 1,
max_allowed => 1,
},
'CO should not be allowed if ConsiderOnSiteCheckoutsAsNormalCheckouts == 1'