From 5090eadb5d5fbf6cd8b4d358f01331e374c4e41d Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Tue, 26 Jun 2018 14:31:40 +0000 Subject: [PATCH] Bug 20990: Make same changes that were made to outstanding_debits Signed-off-by: Kyle M Hall --- Koha/Account.pm | 18 ++++-------------- t/db_dependent/Koha/Account.t | 6 +++++- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/Koha/Account.pm b/Koha/Account.pm index 57d5193400..d7555321c7 100644 --- a/Koha/Account.pm +++ b/Koha/Account.pm @@ -415,7 +415,7 @@ sub outstanding_debits { } ); - # sum returns undef it list is empty + # sum returns undef if list is empty my $total = sum( $lines->get_column('amountoutstanding') ) + 0; return ( $total, $lines ); @@ -430,19 +430,6 @@ my ( $total, $lines ) = Koha::Account->new({ patron_id => $patron_id })->outstan sub outstanding_credits { my ($self) = @_; - my $outstanding_credits = Koha::Account::Lines->search( - { borrowernumber => $self->{patron_id}, - amountoutstanding => { '<' => 0 } - }, - { select => [ { sum => 'amountoutstanding' } ], - as => ['outstanding_credits_total'], - } - ); - my $total - = ( $outstanding_credits->count ) - ? $outstanding_credits->next->get_column('outstanding_credits_total') + 0 - : 0; - my $lines = Koha::Account::Lines->search( { borrowernumber => $self->{patron_id}, @@ -450,6 +437,9 @@ sub outstanding_credits { } ); + # sum returns undef if list is empty + my $total = sum( $lines->get_column('amountoutstanding') ) + 0; + return ( $total, $lines ); } diff --git a/t/db_dependent/Koha/Account.t b/t/db_dependent/Koha/Account.t index 6c8e8b5cba..58b2444946 100755 --- a/t/db_dependent/Koha/Account.t +++ b/t/db_dependent/Koha/Account.t @@ -67,7 +67,7 @@ subtest 'outstanding_debits() tests' => sub { subtest 'outstanding_credits() tests' => sub { - plan tests => 5; + plan tests => 7; $schema->storage->txn_begin; @@ -91,6 +91,10 @@ subtest 'outstanding_credits() tests' => sub { $i++; } + ( $total, $lines ) = Koha::Account->new({ patron_id => 'InvalidBorrowernumber' })->outstanding_credits(); + is( $total, 0, "Total if no outstanding credits is 0" ); + is( $lines->count, 0, "With no outstanding credits, we get back a Lines object with 0 lines" ); + $schema->storage->txn_rollback; }; -- 2.15.2 (Apple Git-101.1)