View | Details | Raw Unified | Return to bug 22588
Collapse All | Expand All

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-2 / +2 lines)
Lines 60-67 Link Here
60
                        [%- IF ACCOUNT_LINE.description %][% ACCOUNT_LINE.description | html %][% END %]
60
                        [%- IF ACCOUNT_LINE.description %][% ACCOUNT_LINE.description | html %][% END %]
61
                        [% IF ACCOUNT_LINE.itemnumber %]([% ACCOUNT_LINE.item.biblio.title | html %])[% END %]
61
                        [% IF ACCOUNT_LINE.itemnumber %]([% ACCOUNT_LINE.item.biblio.title | html %])[% END %]
62
                    </td>
62
                    </td>
63
                    [% IF ( ACCOUNT_LINE.amount <= 0 ) %]<td class="credit">[% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amount | $Price %][% END %]</td>
63
                    [% IF ( ACCOUNT_LINE.is_credit ) %]<td class="credit">[% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amount | $Price %][% END %]</td>
64
                    [% IF ( ACCOUNT_LINE.amountoutstanding <= 0 ) %]<td class="credit">[% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amountoutstanding | $Price %][% END %]</td>
64
                    [% IF ( ACCOUNT_LINE.is_credit ) %]<td class="credit">[% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amountoutstanding | $Price %][% END %]</td>
65
                </tr>
65
                </tr>
66
            [% END %]
66
            [% END %]
67
        </tbody>
67
        </tbody>
(-)a/opac/opac-account.pl (-6 / +4 lines)
Lines 40-53 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
40
);
40
);
41
41
42
my $patron = Koha::Patrons->find( $borrowernumber );
42
my $patron = Koha::Patrons->find( $borrowernumber );
43
my $total = $patron->account->balance;
43
my $account = $patron->account;
44
my @accts = Koha::Account::Lines->search(
44
my $total = $account->balance;
45
    { borrowernumber => $patron->borrowernumber },
45
my $accountlines = $account->lines;
46
    { order_by       => { -desc => 'accountlines_id' } }
47
);
48
46
49
$template->param(
47
$template->param(
50
    ACCOUNT_LINES => \@accts,
48
    ACCOUNT_LINES => $accountlines,
51
    total         => $total,
49
    total         => $total,
52
    accountview   => 1,
50
    accountview   => 1,
53
    message       => scalar $query->param('message') || q{},
51
    message       => scalar $query->param('message') || q{},
(-)a/opac/sco/sco-main.pl (-7 / +4 lines)
Lines 278-288 if ($borrower) { Link Here
278
        m/priority/ and $show_priority = 1;
278
        m/priority/ and $show_priority = 1;
279
    }
279
    }
280
280
281
    my $total = $patron->account->balance;
281
    my $account = $patron->account;
282
    my @accts = Koha::Account::Lines->search(
282
    my $total = $account->balance;
283
        { borrowernumber => $borrower->{borrowernumber} },
283
    my $accountlines = $account->lines;
284
        { order_by       => { -desc => 'accountlines_id' } }
285
    );
286
284
287
    my $holds = $patron->holds;
285
    my $holds = $patron->holds;
288
286
Lines 301-307 if ($borrower) { Link Here
301
        SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
299
        SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
302
        AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
300
        AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
303
        howpriority   => $show_priority,
301
        howpriority   => $show_priority,
304
        ACCOUNT_LINES => \@accts,
302
        ACCOUNT_LINES => $accountlines,
305
        total => $total,
303
        total => $total,
306
    );
304
    );
307
305
308
- 

Return to bug 22588