Bug 27753: (follow-up) Update logic in AddReturn

The new logic in AddReturn was flawed, we were missing return messages
due to moving the if statement too high and catching more code than
intended.

Mentored-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Laura Escamilla 2024-04-30 14:21:35 +00:00 committed by Katrin Fischer
parent c808bf3465
commit ace383ad96
Signed by: kfischer
GPG key ID: 0EF6E2C03357A834

View file

@ -2535,29 +2535,29 @@ sub AddReturn {
}
if ( C4::Context->preference('ClaimReturnedLostValue') ) {
my $autoClaimReturnCheckin = C4::Context->preference('AutoClaimReturnStatusOnCheckin');
if ($autoClaimReturnCheckin) {
my $claim = Koha::Checkouts::ReturnClaims->find(
{
itemnumber => $item->id,
resolution => undef,
}
);
if ($claim) {
my $patron_id = $patron->borrowernumber;
my $resolution = $autoClaimReturnCheckin;
my $autoClaimReturnCheckin = C4::Context->preference('AutoClaimReturnStatusOnCheckin');
if ($autoClaimReturnCheckin) {
$claim->resolve(
{
resolution => $resolution,
resolved_by => $patron_id,
}
);
$messages->{ClaimAutoResolved} = $claim;
} else {
$messages->{ReturnClaims} = $claim if $claim;
my $patron_id = $patron->borrowernumber;
my $resolution = $autoClaimReturnCheckin;
$claim->resolve(
{
resolution => $resolution,
resolved_by => $patron_id,
}
);
$messages->{ClaimAutoResolved} = $claim;
} else {
$messages->{ReturnClaims} = $claim;
}
}
}