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:
parent
c808bf3465
commit
ace383ad96
1 changed files with 14 additions and 14 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue