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 54-61 Link Here
54
                        [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description | html %][% END %]
54
                        [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description | html %][% END %]
55
                        [% IF ACCOUNT_LINE.itemnumber %]([% ACCOUNT_LINE.item.biblio.title | html %])[% END %]
55
                        [% IF ACCOUNT_LINE.itemnumber %]([% ACCOUNT_LINE.item.biblio.title | html %])[% END %]
56
                    </td>
56
                    </td>
57
                    [% IF ( ACCOUNT_LINE.amount <= 0 ) %]<td class="credit">[% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amount | $Price %][% END %]</td>
57
                    [% IF ( ACCOUNT_LINE.is_credit ) %]<td class="credit">[% ACCOUNT_LINE.amount * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amount | $Price %][% END %]</td>
58
                    [% IF ( ACCOUNT_LINE.amountoutstanding <= 0 ) %]<td class="credit">[% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amountoutstanding | $Price %][% END %]</td>
58
                    [% IF ( ACCOUNT_LINE.is_credit ) %]<td class="credit">[% ACCOUNT_LINE.amountoutstanding * -1 | $Price %][% ELSE %]<td class="debit">[% ACCOUNT_LINE.amountoutstanding | $Price %][% END %]</td>
59
                </tr>
59
                </tr>
60
            [% END %]
60
            [% END %]
61
        </tbody>
61
        </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 277-287 if ($borrower) { Link Here
277
        m/priority/ and $show_priority = 1;
277
        m/priority/ and $show_priority = 1;
278
    }
278
    }
279
279
280
    my $total = $patron->account->balance;
280
    my $account = $patron->account;
281
    my @accts = Koha::Account::Lines->search(
281
    my $total = $account->balance;
282
        { borrowernumber => $borrower->{borrowernumber} },
282
    my $accountlines = $account->lines;
283
        { order_by       => { -desc => 'accountlines_id' } }
284
    );
285
283
286
    my $holds = $patron->holds;
284
    my $holds = $patron->holds;
287
285
Lines 300-306 if ($borrower) { Link Here
300
        SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
298
        SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
301
        AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
299
        AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
302
        howpriority   => $show_priority,
300
        howpriority   => $show_priority,
303
        ACCOUNT_LINES => \@accts,
301
        ACCOUNT_LINES => $accountlines,
304
        total => $total,
302
        total => $total,
305
    );
303
    );
306
304
307
- 

Return to bug 22588