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

Bug 35216: Rename error to issuingimpossible 

Test plan:
1 - Apply two patches
2 - Confirm code changes make sense
3 - Confirm you can check out items
4 - Confirm checkout blocks still block

Signed-off-by: Brendan Lawlor <blawlor@clamsnet.org>
Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
(cherry picked from commit 9e789a74c0)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Nick Clemens 2023-11-01 15:39:30 +00:00 committed by Fridolin Somers
parent 7980f263d6
commit 79f32e210f
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
circ/circulation.pl
View File

@ -317,9 +317,9 @@ if (@$barcodes) {
};
# always check for blockers on issuing
my ( $error, $needsconfirmation, $alerts, $messages );
my ( $issuingimpossible, $needsconfirmation, $alerts, $messages );
try {
( $error, $needsconfirmation, $alerts, $messages ) = CanBookBeIssued(
( $issuingimpossible, $needsconfirmation, $alerts, $messages ) = CanBookBeIssued(
$patron,
$barcode, $datedue,
$inprocess,
@ -333,7 +333,7 @@ if (@$barcodes) {
die $_ unless blessed $_ && $_->can('rethrow');
if ( $_->isa('Koha::Exceptions::Calendar::NoOpenDays') ) {
$error = { NO_OPEN_DAYS => 1 };
$issuingimpossible = { NO_OPEN_DAYS => 1 };
} else {
$_->rethrow;
}
@ -353,7 +353,7 @@ if (@$barcodes) {
# Fix for bug 7494: optional checkout-time fallback search for a book
if ( $error->{'UNKNOWN_BARCODE'}
if ( $issuingimpossible->{'UNKNOWN_BARCODE'}
&& C4::Context->preference("itemBarcodeFallbackSearch")
&& not $batch
)
@ -386,17 +386,17 @@ if (@$barcodes) {
my @blocking_error_codes =
( $onsite_checkout and C4::Context->preference("OnSiteCheckoutsForce") )
? qw( UNKNOWN_BARCODE NO_OPEN_DAYS )
: ( keys %$error );
: ( keys %$issuingimpossible );
if ( $error->{BOOKED_TO_ANOTHER} ) {
$template_params->{BOOKED_TO_ANOTHER} = $error->{BOOKED_TO_ANOTHER};
if ( $issuingimpossible->{BOOKED_TO_ANOTHER} ) {
$template_params->{BOOKED_TO_ANOTHER} = $issuingimpossible->{BOOKED_TO_ANOTHER};
$template_params->{IMPOSSIBLE} = 1;
$blocker = 1;
}
foreach my $code ( @blocking_error_codes ) {
if ($error->{$code}) {
$template_params->{$code} = $error->{$code};
if ($issuingimpossible->{$code}) {
$template_params->{$code} = $issuingimpossible->{$code};
$template_params->{IMPOSSIBLE} = 1;
$blocker = 1;