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

Bug 21673: Use Koha::Account::Lines->total_amountoutstanding when needed 

There are several times the same pattern to retrieve the sum of
amountoutstanding columns for Koha::Account::Line set.
We should use Koha::Account::Lines->total_outstanding instead.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2018-10-25 16:55:32 -03:00 committed by Nick Clemens
parent 1e5e9f5e80
commit 4d28bc7d3c
3 changed files with 16 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Koha/Account.pm
View File

@ -421,19 +421,11 @@ Return the balance (sum of amountoutstanding columns)
sub balance {
my ($self) = @_;
my $fines = Koha::Account::Lines->search(
return Koha::Account::Lines->search(
{
borrowernumber => $self->{patron_id},
},
{
select => [ { sum => 'amountoutstanding' } ],
as => ['total_amountoutstanding'],
}
);
return ( $fines->count )
? $fines->next->get_column('total_amountoutstanding') + 0
: 0;
)->total_outstanding;
}
=head3 outstanding_debits
@ -509,19 +501,12 @@ sub non_issues_charges {
}
@not_fines = map { substr( $_, 0, $ACCOUNT_TYPE_LENGTH ) } uniq(@not_fines);
my $non_issues_charges = Koha::Account::Lines->search(
return Koha::Account::Lines->search(
{
borrowernumber => $self->{patron_id},
accounttype => { -not_in => \@not_fines }
},
{
select => [ { sum => 'amountoutstanding' } ],
as => ['non_issues_charges'],
}
);
return $non_issues_charges->count
? $non_issues_charges->next->get_column('non_issues_charges') + 0
: 0;
)->total_outstanding;
}
=head3 lines

12
Koha/Account/Lines.pm
View File

@ -46,9 +46,17 @@ empty it returns 0.
sub total_outstanding {
my ( $self ) = @_;
my $total = sum0( $self->get_column('amountoutstanding') );
my $lines = $self->search(
{},
{
select => [ { sum => 'amountoutstanding' } ],
as => ['total_amountoutstanding'],
}
);
return $total;
return $lines->count
? $lines->next->get_column('total_amountoutstanding') + 0
: 0;
}
=head2 Internal methods

9
opac/opac-user.pl
View File

@ -199,9 +199,8 @@ if ( $pending_checkouts->count ) { # Useless test
accounttype => [ 'F', 'FU', 'L' ],
itemnumber => $issue->{itemnumber}
},
{ select => [ { sum => 'amountoutstanding' } ], as => ['charges'] }
);
$issue->{charges} = $charges->count ? $charges->next->get_column('charges') : 0;
$issue->{charges} = $charges->total_outstanding;
my $rental_fines = Koha::Account::Lines->search(
{
@ -209,13 +208,9 @@ if ( $pending_checkouts->count ) { # Useless test
amountoutstanding => { '>' => 0 },
accounttype => 'Rent',
itemnumber => $issue->{itemnumber}
},
{
select => [ { sum => 'amountoutstanding' } ],
as => ['rental_fines']
}
);
$issue->{rentalfines} = $rental_fines->count ? $rental_fines->next->get_column('rental_fines') : 0;
$issue->{rentalfines} = $rental_fines->total_outstanding
my $marcrecord = GetMarcBiblio({
biblionumber => $issue->{'biblionumber'},