From b74be6724b4b25c73b1e6f22d0ba270b50af755c Mon Sep 17 00:00:00 2001 From: Josef Moravec Date: Thu, 28 Mar 2019 08:53:46 +0000 Subject: [PATCH] Bug 22588: (follow-up) Simplify getting accounts even more Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens --- .../opac-tmpl/bootstrap/en/includes/account-table.inc | 4 ++-- opac/opac-account.pl | 10 ++++------ opac/sco/sco-main.pl | 10 ++++------ 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index 1b88abfe0a..09748807e4 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -60,8 +60,8 @@ [%- IF ACCOUNT_LINE.description %][% ACCOUNT_LINE.description | html %][% END %] [% IF ACCOUNT_LINE.itemnumber %]([% ACCOUNT_LINE.item.biblio.title | html %])[% END %] - [% IF ( ACCOUNT_LINE.amount <= 0 ) %][% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %][% ACCOUNT_LINE.amount | $Price %][% END %] - [% IF ( ACCOUNT_LINE.amountoutstanding <= 0 ) %][% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %][% ACCOUNT_LINE.amountoutstanding | $Price %][% END %] + [% IF ( ACCOUNT_LINE.is_credit ) %][% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %][% ACCOUNT_LINE.amount | $Price %][% END %] + [% IF ( ACCOUNT_LINE.is_credit ) %][% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %][% ACCOUNT_LINE.amountoutstanding | $Price %][% END %] [% END %] diff --git a/opac/opac-account.pl b/opac/opac-account.pl index 4e4d789a4d..9c47e35755 100755 --- a/opac/opac-account.pl +++ b/opac/opac-account.pl @@ -40,14 +40,12 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( ); my $patron = Koha::Patrons->find( $borrowernumber ); -my $total = $patron->account->balance; -my @accts = Koha::Account::Lines->search( - { borrowernumber => $patron->borrowernumber }, - { order_by => { -desc => 'accountlines_id' } } -); +my $account = $patron->account; +my $total = $account->balance; +my $accountlines = $account->lines; $template->param( - ACCOUNT_LINES => \@accts, + ACCOUNT_LINES => $accountlines, total => $total, accountview => 1, message => scalar $query->param('message') || q{}, diff --git a/opac/sco/sco-main.pl b/opac/sco/sco-main.pl index 83c7f2a895..bbaaf703ee 100755 --- a/opac/sco/sco-main.pl +++ b/opac/sco/sco-main.pl @@ -278,11 +278,9 @@ if ($borrower) { m/priority/ and $show_priority = 1; } - my $total = $patron->account->balance; - my @accts = Koha::Account::Lines->search( - { borrowernumber => $borrower->{borrowernumber} }, - { order_by => { -desc => 'accountlines_id' } } - ); + my $account = $patron->account; + my $total = $account->balance; + my $accountlines = $account->lines; my $holds = $patron->holds; @@ -301,7 +299,7 @@ if ($borrower) { SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'), AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), howpriority => $show_priority, - ACCOUNT_LINES => \@accts, + ACCOUNT_LINES => $accountlines, total => $total, ); -- 2.39.5