@@ -, +, @@
---
koha-tmpl/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(-)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc
@@ -54,8 +54,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 %]
--- a/opac/opac-account.pl
+++ a/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{},
--- a/opac/sco/sco-main.pl
+++ a/opac/sco/sco-main.pl
@@ -277,11 +277,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;
@@ -300,7 +298,7 @@ if ($borrower) {
SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
howpriority => $show_priority,
- ACCOUNT_LINES => \@accts,
+ ACCOUNT_LINES => $accountlines,
total => $total,
);
--