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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-22 / +30 lines)
Lines 1-29 Link Here
1
[%- BLOCK account_type_description -%]
1
[%- BLOCK account_type_description -%]
2
    [%- SWITCH account.accounttype -%]
2
    [%- SWITCH account.accounttype -%]
3
        [%- CASE 'Pay'   -%]<span>Payment, thanks</span>
3
        [%- CASE 'Pay'     -%]<span>Payment, thanks</span>
4
        [%- CASE 'Pay00' -%]<span>Payment, thanks (cash via SIP2)</span>
4
        [%- CASE 'Pay00'   -%]<span>Payment, thanks (cash via SIP2)</span>
5
        [%- CASE 'Pay01' -%]<span>Payment, thanks (VISA via SIP2)</span>
5
        [%- CASE 'Pay01'   -%]<span>Payment, thanks (VISA via SIP2)</span>
6
        [%- CASE 'Pay02' -%]<span>Payment, thanks (credit card via SIP2)</span>
6
        [%- CASE 'Pay02'   -%]<span>Payment, thanks (credit card via SIP2)</span>
7
        [%- CASE 'VOID'  -%]<span>Voided</span>
7
        [%- CASE 'VOID'    -%]<span>Voided</span>
8
        [%- CASE 'N'     -%]<span>New card</span>
8
        [%- CASE 'N'       -%]<span>New card</span>
9
        [%- CASE 'F'     -%]<span>Fine</span>
9
        [%- CASE 'OVERDUE' -%]<span>Fine[%- PROCESS account_status_description account=account -%]</span>
10
        [%- CASE 'A'     -%]<span>Account management fee</span>
10
        [%- CASE 'A'       -%]<span>Account management fee</span>
11
        [%- CASE 'M'     -%]<span>Sundry</span>
11
        [%- CASE 'M'       -%]<span>Sundry</span>
12
        [%- CASE 'L'     -%]<span>Lost item</span>
12
        [%- CASE 'L'       -%]<span>Lost item</span>
13
        [%- CASE 'W'     -%]<span>Writeoff</span>
13
        [%- CASE 'W'       -%]<span>Writeoff</span>
14
        [%- CASE 'FU'    -%]<span>Accruing fine</span>
14
        [%- CASE 'HE'      -%]<span>Hold waiting too long</span>
15
        [%- CASE 'HE'    -%]<span>Hold waiting too long</span>
15
        [%- CASE 'Rent'    -%]<span>Rental fee</span>
16
        [%- CASE 'Rent'  -%]<span>Rental fee</span>
16
        [%- CASE 'FOR'     -%]<span>Forgiven</span>
17
        [%- CASE 'FOR'   -%]<span>Forgiven</span>
18
        [%- CASE 'FFOR'  -%]<span>Fine forgiven</span>
17
        [%- CASE 'FFOR'  -%]<span>Fine forgiven</span>
19
        [%- CASE 'LR'    -%]<span>Lost item fee refund</span>
18
        [%- CASE 'LR'      -%]<span>Lost item fee refund</span>
20
        [%- CASE 'PF'    -%]<span>Lost item processing fee</span>
19
        [%- CASE 'PF'    -%]<span>Lost item processing fee</span>
21
        [%- CASE 'PAY'   -%]<span>Payment</span>
20
        [%- CASE 'PAY'     -%]<span>Payment</span>
22
        [%- CASE 'WO'    -%]<span>Writeoff</span>
21
        [%- CASE 'WO'      -%]<span>Writeoff</span>
23
        [%- CASE 'C'     -%]<span>Credit</span>
22
        [%- CASE 'C'       -%]<span>Credit</span>
24
        [%- CASE 'CR'    -%]<span>Credit</span>
23
        [%- CASE 'CR'      -%]<span>Credit</span>
25
        [%- CASE 'Res'   -%]<span>Hold fee</span>
24
        [%- CASE 'Res'     -%]<span>Hold fee</span>
26
        [%- CASE         -%][% account.accounttype | html %]
25
        [%- CASE           -%][% account.accounttype | html %]
27
    [%- END -%]
26
    [%- END -%]
28
[%- END -%]
27
[%- END -%]
29
28
Lines 39-41 Link Here
39
        [%- CASE                  -%][% account_offset.type | html %]
38
        [%- CASE                  -%][% account_offset.type | html %]
40
    [%- END -%]
39
    [%- END -%]
41
[%- END -%]
40
[%- END -%]
41
42
[%- BLOCK account_status_description -%]
43
    [%- SWITCH account.status -%]
44
        [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
45
        [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
46
        [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
47
        [%- CASE              -%]
48
    [%- END -%]
49
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt (-1 / +1 lines)
Lines 79-85 Link Here
79
    [% INCLUDE 'str/members-menu.inc' %]
79
    [% INCLUDE 'str/members-menu.inc' %]
80
    [% Asset.js("js/members-menu.js") | $raw %]
80
    [% Asset.js("js/members-menu.js") | $raw %]
81
    <script>
81
    <script>
82
        var type_fees = {'L':'','F':'','A':'','N':'','M':''};
82
        var type_fees = {'L':'','OVERDUE':'','A':'','N':'','M':''};
83
        [% FOREACH invoice_types_loo IN invoice_types_loop %]
83
        [% FOREACH invoice_types_loo IN invoice_types_loop %]
84
            type_fees['[% invoice_types_loo.authorised_value | html %]'] = "[% invoice_types_loo.lib | html %]";
84
            type_fees['[% invoice_types_loo.authorised_value | html %]'] = "[% invoice_types_loo.lib | html %]";
85
        [% END %]
85
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt (-1 / +1 lines)
Lines 121-127 Link Here
121
                          , [% account.description | html %]
121
                          , [% account.description | html %]
122
                      [% END %]
122
                      [% END %]
123
                      &nbsp;
123
                      &nbsp;
124
                      [% IF ( account.itemnumber AND account.accounttype != 'F' AND account.accounttype != 'FU' ) %]
124
                      [% IF ( account.itemnumber AND account.accounttype != 'OVERDUE' ) %]
125
                          <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>
125
                          <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | uri %]&amp;itemnumber=[% account.itemnumber | uri %]">[% account.item.biblio.title | html %]</a>
126
                      [% END %]
126
                      [% END %]
127
                  </td>
127
                  </td>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-2 / +10 lines)
Lines 35-46 Link Here
35
                        [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
35
                        [% CASE 'Pay02' %]Payment, thanks (credit card via SIP2)
36
                        [% CASE 'VOID' %]Voided
36
                        [% CASE 'VOID' %]Voided
37
                        [% CASE 'N' %]New card
37
                        [% CASE 'N' %]New card
38
                        [% CASE 'F' %]Fine
38
                        [% CASE 'OVERDUE' %]Fine[%- PROCESS account_status_description account=account -%]
39
                        [% CASE 'A' %]Account management fee
39
                        [% CASE 'A' %]Account management fee
40
                        [% CASE 'M' %]Sundry
40
                        [% CASE 'M' %]Sundry
41
                        [% CASE 'L' %]Lost item
41
                        [% CASE 'L' %]Lost item
42
                        [% CASE 'W' %]Writeoff
42
                        [% CASE 'W' %]Writeoff
43
                        [% CASE 'FU' %]Accruing fine
44
                        [% CASE 'HE' %]Hold waiting too long
43
                        [% CASE 'HE' %]Hold waiting too long
45
                        [% CASE 'Rent' %]Rental fee
44
                        [% CASE 'Rent' %]Rental fee
46
                        [% CASE 'FOR' %]Forgiven
45
                        [% CASE 'FOR' %]Forgiven
Lines 116-118 Link Here
116
[% ELSE %]
115
[% ELSE %]
117
    <h4>You have no fines or charges</h4>
116
    <h4>You have no fines or charges</h4>
118
[% END %]
117
[% END %]
118
119
[%- BLOCK account_status_description -%]
120
    [%- SWITCH account.status -%]
121
        [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
122
        [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
123
        [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
124
        [%- CASE              -%]
125
    [%- END -%]
126
[%- END -%]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt (+1 lines)
Lines 68-73 Link Here
68
68
69
                    [% PROCESS 'account-table.inc' ACCOUNT_LINES = ACCOUNT_LINES, ENABLE_OPAC_PAYMENTS = ENABLE_OPAC_PAYMENTS, plugins = plugins %]
69
                    [% PROCESS 'account-table.inc' ACCOUNT_LINES = ACCOUNT_LINES, ENABLE_OPAC_PAYMENTS = ENABLE_OPAC_PAYMENTS, plugins = plugins %]
70
70
71
71
                </div> <!-- / #useraccount -->
72
                </div> <!-- / #useraccount -->
72
            </div> <!-- / .span10 -->
73
            </div> <!-- / .span10 -->
73
        </div> <!-- / .row-fluid -->
74
        </div> <!-- / .row-fluid -->
(-)a/opac/opac-user.pl (-2 / +1 lines)
Lines 196-202 if ( $pending_checkouts->count ) { # Useless test Link Here
196
            {
196
            {
197
                borrowernumber    => $patron->borrowernumber,
197
                borrowernumber    => $patron->borrowernumber,
198
                amountoutstanding => { '>' => 0 },
198
                amountoutstanding => { '>' => 0 },
199
                accounttype       => [ 'F', 'L' ],
199
                accounttype       => [ 'OVERDUE', 'L' ],
200
                itemnumber        => $issue->{itemnumber}
200
                itemnumber        => $issue->{itemnumber}
201
            },
201
            },
202
        );
202
        );
203
- 

Return to bug 22521