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

Bug 25508: Only return renewal outcomes to the controller 

There are a few cases where the `renew_item` method in
Koha::Account::Line will return `undef`. For these cases, we should not
pass the error up the chain to the controllers as it leads to malformed
error messages in the UI.

Test plan
1 - Make sure FinesMode is on, RenewAccruingItemWhenPaid is off
2 - Checkout an item to a patron and make it overdue (can backdate the
    checkout)
3 - Make sure the itemtype has fines that will be charged
4 - Charge the fines:
    Set finesMode = production
    perl misc/cronjobs/fines.pl -v
5 - Check the fine appears on the patrons account
6 - Pay off the fine
7 - Receive alert after payment that reads: "The fines on
    the following items were paid off, renewal results are
    displayed below:
        No title ( ): Not renewed - Unknown error"
8 - Apply the patch
9 - Repeat steps 1 through 6 and note that you no longer trigger the
    error message.

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Martin Renvoize 2021-03-24 16:38:32 +00:00 committed by Jonathan Druart
parent 66ad8f7727
commit d4dc15ee36
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Koha/Account.pm
View File

@ -203,9 +203,9 @@ sub pay {
# If we need to make a note of the item associated with this line,
# in order that we can potentially renew it, do so.
my $amt = $old_amountoutstanding - $amount_to_pay;
if ($fine->renewable) {
if ( $fine->renewable ) {
my $outcome = $fine->renew_item;
push @{$renew_outcomes}, $outcome;
push @{$renew_outcomes}, $outcome if $outcome;
}
if ( C4::Context->preference('MarkLostItemsAsReturned') =~ m|onpayment|

13
Koha/Account/Line.pm
View File

@ -901,7 +901,9 @@ sub renewable {
$self->debit_type_code &&
$self->debit_type_code eq 'OVERDUE' &&
$self->status &&
$self->status eq 'UNRETURNED'
$self->status eq 'UNRETURNED' &&
$self->item &&
$self->patron
) ? 1 : 0;
}
@ -919,19 +921,14 @@ sub renew_item {
my $outcome = {};
# We want to reject the call to renew if any of these apply:
# We want to reject the call to renew if:
# - The RenewAccruingItemWhenPaid syspref is off
# - The line item doesn't have an item attached to it
# - The line item doesn't have a patron attached to it
#
# OR
# - The RenewAccruingItemInOpac syspref is off
# AND
# - There is an interface param passed and it's value is 'opac'
if (
!C4::Context->preference('RenewAccruingItemWhenPaid') ||
!$self->item ||
!$self->patron ||
(
!C4::Context->preference('RenewAccruingItemInOpac') &&
$params->{interface} &&