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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-37 / +37 lines)
Lines 9-42 Link Here
9
    </span>
9
    </span>
10
[%- END -%]
10
[%- END -%]
11
11
12
[%- BLOCK offset_type_description -%]
13
    [%- SWITCH account_offset.type -%]
14
        [%- CASE 'Credit Applied' -%]<span>Credit applied</span>
15
        [%- CASE 'Payment'        -%]<span>Payment</span>
16
        [%- CASE 'Manual Credit'  -%]<span>Manual credit</span>
17
        [%- CASE 'Manual Debit'   -%]<span>Manual invoice</span>
18
        [%- CASE 'Lost Item'      -%]<span>Lost item returned</span>
19
        [%- CASE 'Writeoff'       -%]<span>Writeoff</span>
20
        [%- CASE 'Void Payment'   -%]<span>Void payment</span>
21
        [%- CASE 'CANCELLATION'   -%]<span>Cancelled charge</span>
22
        [%- CASE                  -%][% account_offset.type | html %]
23
    [%- END -%]
24
[%- END -%]
25
26
[%- BLOCK account_status_description -%]
27
    [%- SWITCH account.status -%]
28
        [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
29
        [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
30
        [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
31
        [%- CASE 'REFUNDED'   -%]<span> (Refunded)</span>
32
        [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
33
        [%- CASE 'VOID'       -%]<span> (Voided)</span>
34
        [%- CASE 'LOST'       -%]<span> (Lost)</span>
35
        [%- CASE 'CANCELLED'  -%]<span> (Cancelled)</span>
36
        [%- CASE              -%]
37
    [%- END -%]
38
[%- END -%]
39
40
[%- BLOCK debit_type_description -%]
12
[%- BLOCK debit_type_description -%]
41
    [%- SWITCH debit_type.code -%]
13
    [%- SWITCH debit_type.code -%]
42
        [%- CASE 'ACCOUNT'          -%]Account creation fee
14
        [%- CASE 'ACCOUNT'          -%]Account creation fee
Lines 59-72 Link Here
59
31
60
[%- BLOCK credit_type_description -%]
32
[%- BLOCK credit_type_description -%]
61
    [%- SWITCH credit_type.code -%]
33
    [%- SWITCH credit_type.code -%]
62
        [%- CASE 'PAYMENT'          -%]Payment
34
        [%- CASE 'PAYMENT'      -%]Payment
63
        [%- CASE 'WRITEOFF'         -%]Writeoff
35
        [%- CASE 'WRITEOFF'     -%]Writeoff
64
        [%- CASE 'FORGIVEN'         -%]Forgiven
36
        [%- CASE 'FORGIVEN'     -%]Forgiven
65
        [%- CASE 'CREDIT'           -%]Credit
37
        [%- CASE 'CREDIT'       -%]Credit
66
        [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
38
        [%- CASE 'LOST_FOUND'   -%]Lost item fee refund
67
        [%- CASE 'OVERPAYMENT'      -%]Overpayment refund
39
        [%- CASE 'OVERPAYMENT'  -%]Overpayment refund
68
        [%- CASE 'REFUND'           -%]Refund
40
        [%- CASE 'REFUND'       -%]Refund
69
        [%- CASE 'CANCELLATION'     -%]Cancelled charge
41
        [%- CASE 'CANCELLATION' -%]Cancelled charge
70
        [%- CASE                    -%][% credit_type.description | html %]
42
        [%- CASE                -%][% credit_type.description | html %]
43
    [%- END -%]
44
[%- END -%]
45
46
[%- BLOCK account_status_description -%]
47
    [%- SWITCH account.status -%]
48
        [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
49
        [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
50
        [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
51
        [%- CASE 'REFUNDED'   -%]<span> (Refunded)</span>
52
        [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
53
        [%- CASE 'VOID'       -%]<span> (Voided)</span>
54
        [%- CASE 'LOST'       -%]<span> (Lost)</span>
55
        [%- CASE 'CANCELLED'  -%]<span> (Cancelled)</span>
56
        [%- CASE              -%]
57
    [%- END -%]
58
[%- END -%]
59
60
[%- BLOCK offset_type_description -%]
61
    [%- SWITCH account_offset.type -%]
62
        [%- CASE 'Credit Applied' -%]<span>Credit applied</span>
63
        [%- CASE 'Payment'        -%]<span>Payment</span>
64
        [%- CASE 'Manual Credit'  -%]<span>Manual credit</span>
65
        [%- CASE 'Manual Debit'   -%]<span>Manual invoice</span>
66
        [%- CASE 'Lost Item'      -%]<span>Lost item returned</span>
67
        [%- CASE 'Writeoff'       -%]<span>Writeoff</span>
68
        [%- CASE 'Void Payment'   -%]<span>Void payment</span>
69
        [%- CASE 'CANCELLATION'   -%]<span>Cancelled charge</span>
70
        [%- CASE                  -%][% account_offset.type | html %]
71
    [%- END -%]
71
    [%- END -%]
72
[%- END -%]
72
[%- END -%]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-51 / +1 lines)
Lines 1-3 Link Here
1
[% PROCESS 'accounts.inc' %]
1
<form method="post" action="opac-account-pay.pl" class="form-horizontal">
2
<form method="post" action="opac-account-pay.pl" class="form-horizontal">
2
    [% IF ( ACCOUNT_LINES ) %]
3
    [% IF ( ACCOUNT_LINES ) %]
3
        <table class="table table-bordered table-striped" id="finestable">
4
        <table class="table table-bordered table-striped" id="finestable">
Lines 169-222 Link Here
169
        </fieldset>
170
        </fieldset>
170
    [% END # /IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %]
171
    [% END # /IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %]
171
</form>
172
</form>
172
173
[%- BLOCK account_type_description -%]
174
    <span>
175
        [%- IF account.credit_type_code -%]
176
            [%- SWITCH account.credit_type_code -%]
177
                [%- CASE 'PAYMENT'          -%]Payment
178
                [%- CASE 'WRITEOFF'         -%]Writeoff
179
                [%- CASE 'FORGIVEN'         -%]Forgiven
180
                [%- CASE 'CREDIT'           -%]Credit
181
                [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
182
                [%- CASE 'OVERPAYMENT'      -%]Overpayment refund
183
                [%- CASE 'REFUND'           -%]Refund
184
                [%- CASE 'CANCELLATION'     -%]Cancelled charge
185
                [%- CASE                    -%][% account.credit_type.description | html %]
186
            [%- END -%]
187
        [%- ELSIF account.debit_type_code -%]
188
            [%- SWITCH account.debit_type_code -%]
189
                [%- CASE 'ACCOUNT'          -%]Account creation fee
190
                [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
191
                [%- CASE 'LOST'             -%]Lost item
192
                [%- CASE 'MANUAL'           -%]Manual fee
193
                [%- CASE 'NEW_CARD'         -%]New card
194
                [%- CASE 'OVERDUE'          -%]Fine
195
                [%- CASE 'PROCESSING'       -%]Lost item processing fee
196
                [%- CASE 'RENT'             -%]Rental fee
197
                [%- CASE 'RENT_DAILY'       -%]Daily rental fee
198
                [%- CASE 'RENT_RENEW'       -%]Renewal of rental item
199
                [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
200
                [%- CASE 'RESERVE'          -%]Hold fee
201
                [%- CASE 'RESERVE_EXPIRED'  -%]Hold waiting too long
202
                [%- CASE 'Payout'           -%]Payout
203
                [%- CASE                    -%][% account.debit_type.description | html %]
204
            [%- END -%]
205
        [%- END -%]
206
        [%- PROCESS account_status_description account=account -%]
207
    </span>
208
[%- END # /BLOCK account_type_description -%]
209
210
[%- BLOCK account_status_description -%]
211
    [%- SWITCH account.status -%]
212
            [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
213
            [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
214
            [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
215
            [%- CASE 'REFUNDED'   -%]<span> (Refunded)</span>
216
            [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
217
            [%- CASE 'VOID'       -%]<span> (Voided)</span>
218
            [%- CASE 'LOST'       -%]<span> (Lost)</span>
219
            [%- CASE 'CANCELLED'  -%]<span> (Cancelled)</span>
220
            [%- CASE              -%]
221
        [%- END -%]
222
[%- END -%]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc (-1 / +72 lines)
Line 0 Link Here
0
- 
1
[%- BLOCK account_type_description -%]
2
    <span>
3
    [%- IF account.credit_type_code -%]
4
        [%- PROCESS credit_type_description credit_type = account.credit_type -%]
5
    [%- ELSIF account.debit_type_code -%]
6
        [%- PROCESS debit_type_description debit_type = account.debit_type -%]
7
    [%- END -%]
8
    [%- PROCESS account_status_description account=account -%]
9
    </span>
10
[%- END -%]
11
12
[%- BLOCK debit_type_description -%]
13
    [%- SWITCH debit_type.code -%]
14
        [%- CASE 'ACCOUNT'          -%]Account creation fee
15
        [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
16
        [%- CASE 'LOST'             -%]Lost item
17
        [%- CASE 'MANUAL'           -%]Manual fee
18
        [%- CASE 'NEW_CARD'         -%]New card
19
        [%- CASE 'OVERDUE'          -%]Fine
20
        [%- CASE 'PROCESSING'       -%]Lost item processing fee
21
        [%- CASE 'RENT'             -%]Rental fee
22
        [%- CASE 'RENT_DAILY'       -%]Daily rental fee
23
        [%- CASE 'RENT_RENEW'       -%]Renewal of rental item
24
        [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
25
        [%- CASE 'RESERVE'          -%]Hold fee
26
        [%- CASE 'RESERVE_EXPIRED'  -%]Hold waiting too long
27
        [%- CASE 'Payout'           -%]Payout
28
        [%- CASE                    -%][% debit_type.description | html %]
29
    [%- END -%]
30
[%- END -%]
31
32
[%- BLOCK credit_type_description -%]
33
    [%- SWITCH credit_type.code -%]
34
        [%- CASE 'PAYMENT'      -%]Payment
35
        [%- CASE 'WRITEOFF'     -%]Writeoff
36
        [%- CASE 'FORGIVEN'     -%]Forgiven
37
        [%- CASE 'CREDIT'       -%]Credit
38
        [%- CASE 'LOST_FOUND'   -%]Lost item fee refund
39
        [%- CASE 'OVERPAYMENT'  -%]Overpayment refund
40
        [%- CASE 'REFUND'       -%]Refund
41
        [%- CASE 'CANCELLATION' -%]Cancelled charge
42
        [%- CASE                -%][% credit_type.description | html %]
43
    [%- END -%]
44
[%- END -%]
45
46
[%- BLOCK account_status_description -%]
47
    [%- SWITCH account.status -%]
48
        [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
49
        [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
50
        [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
51
        [%- CASE 'REFUNDED'   -%]<span> (Refunded)</span>
52
        [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
53
        [%- CASE 'VOID'       -%]<span> (Voided)</span>
54
        [%- CASE 'LOST'       -%]<span> (Lost)</span>
55
        [%- CASE 'CANCELLED'  -%]<span> (Cancelled)</span>
56
        [%- CASE              -%]
57
    [%- END -%]
58
[%- END -%]
59
60
[%- BLOCK offset_type_description -%]
61
    [%- SWITCH account_offset.type -%]
62
        [%- CASE 'Credit Applied' -%]<span>Credit applied</span>
63
        [%- CASE 'Payment'        -%]<span>Payment</span>
64
        [%- CASE 'Manual Credit'  -%]<span>Manual credit</span>
65
        [%- CASE 'Manual Debit'   -%]<span>Manual invoice</span>
66
        [%- CASE 'Lost Item'      -%]<span>Lost item returned</span>
67
        [%- CASE 'Writeoff'       -%]<span>Writeoff</span>
68
        [%- CASE 'Void Payment'   -%]<span>Void payment</span>
69
        [%- CASE 'CANCELLATION'   -%]<span>Cancelled charge</span>
70
        [%- CASE                  -%][% account_offset.type | html %]
71
    [%- END -%]
72
[%- END -%]

Return to bug 26697