Attachment #112077 for bug #26697

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




    </span>
[%- END -%]

[%- BLOCK offset_type_description -%]
    [%- SWITCH account_offset.type -%]
        [%- CASE 'Credit Applied' -%]<span>Credit applied</span>
        [%- CASE 'Payment'        -%]<span>Payment</span>
        [%- CASE 'Manual Credit'  -%]<span>Manual credit</span>
        [%- CASE 'Manual Debit'   -%]<span>Manual invoice</span>
        [%- CASE 'Lost Item'      -%]<span>Lost item returned</span>
        [%- CASE 'Writeoff'       -%]<span>Writeoff</span>
        [%- CASE 'Void Payment'   -%]<span>Void payment</span>
        [%- CASE 'CANCELLATION'   -%]<span>Cancelled charge</span>
        [%- CASE                  -%][% account_offset.type | html %]
    [%- END -%]
[%- END -%]

[%- BLOCK account_status_description -%]
    [%- SWITCH account.status -%]
        [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>

        [%- CASE              -%]
    [%- END -%]
[%- END -%]

[%- BLOCK offset_type_description -%]
    [%- SWITCH account_offset.type -%]
        [%- CASE 'Credit Applied' -%]<span>Credit applied</span>
        [%- CASE 'Payment'        -%]<span>Payment</span>
        [%- CASE 'Manual Credit'  -%]<span>Manual credit</span>
        [%- CASE 'Manual Debit'   -%]<span>Manual invoice</span>
        [%- CASE 'Lost Item'      -%]<span>Lost item returned</span>
        [%- CASE 'Writeoff'       -%]<span>Writeoff</span>
        [%- CASE 'Void Payment'   -%]<span>Void payment</span>
        [%- CASE 'CANCELLATION'   -%]<span>Cancelled charge</span>
        [%- CASE                  -%][% account_offset.type | html %]
    [%- END -%]
[%- END -%]




[% PROCESS 'accounts.inc' %]
<form method="post" action="opac-account-pay.pl" class="form-horizontal">
    [% IF ( ACCOUNT_LINES ) %]
        <table class="table table-bordered table-striped" id="finestable">

        </fieldset>
    [% END # /IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %]
</form>

[%- BLOCK account_type_description -%]
    <span>
        [%- IF account.credit_type_code -%]
            [%- SWITCH account.credit_type_code -%]
                [%- CASE 'PAYMENT'          -%]Payment
                [%- CASE 'WRITEOFF'         -%]Writeoff
                [%- CASE 'FORGIVEN'         -%]Forgiven
                [%- CASE 'CREDIT'           -%]Credit
                [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
                [%- CASE 'REFUND'           -%]Refund
                [%- CASE 'CANCELLATION'     -%]Cancelled charge
                [%- CASE                    -%][% account.credit_type.description | html %]
            [%- END -%]
        [%- ELSIF account.debit_type_code -%]
            [%- SWITCH account.debit_type_code -%]
                [%- CASE 'ACCOUNT'          -%]Account creation fee
                [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
                [%- CASE 'LOST'             -%]Lost item
                [%- CASE 'MANUAL'           -%]Manual fee
                [%- CASE 'NEW_CARD'         -%]New card
                [%- CASE 'OVERDUE'          -%]Fine
                [%- CASE 'PROCESSING'       -%]Lost item processing fee
                [%- CASE 'RENT'             -%]Rental fee
                [%- CASE 'RENT_DAILY'       -%]Daily rental fee
                [%- CASE 'RENT_RENEW'       -%]Renewal of rental item
                [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
                [%- CASE 'RESERVE'          -%]Hold fee
                [%- CASE 'RESERVE_EXPIRED'  -%]Hold waiting too long
                [%- CASE 'Payout'           -%]Payout
                [%- CASE                    -%][% account.debit_type.description | html %]
            [%- END -%]
        [%- END -%]
        [%- PROCESS account_status_description account=account -%]
    </span>
[%- END # /BLOCK account_type_description -%]

[%- BLOCK account_status_description -%]
    [%- SWITCH account.status -%]
            [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
            [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
            [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
            [%- CASE 'REFUNDED'   -%]<span> (Refunded)</span>
            [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
            [%- CASE 'VOID'       -%]<span> (Voided)</span>
            [%- CASE 'LOST'       -%]<span> (Lost)</span>
            [%- CASE 'CANCELLED'  -%]<span> (Cancelled)</span>
            [%- CASE              -%]
        [%- END -%]
[%- END -%]




[%- BLOCK account_type_description -%]
    <span>
        [%- IF account.credit_type_code -%]
            [%- SWITCH account.credit_type_code -%]
                [%- CASE 'PAYMENT'          -%]Payment
                [%- CASE 'WRITEOFF'         -%]Writeoff
                [%- CASE 'FORGIVEN'         -%]Forgiven
                [%- CASE 'CREDIT'           -%]Credit
                [%- CASE 'LOST_FOUND'       -%]Lost item fee refund
                [%- CASE 'REFUND'           -%]Refund
                [%- CASE 'CANCELLATION'     -%]Cancelled charge
                [%- CASE                    -%][% account.credit_type.description | html %]
            [%- END -%]
        [%- ELSIF account.debit_type_code -%]
            [%- SWITCH account.debit_type_code -%]
                [%- CASE 'ACCOUNT'          -%]Account creation fee
                [%- CASE 'ACCOUNT_RENEW'    -%]Account renewal fee
                [%- CASE 'LOST'             -%]Lost item
                [%- CASE 'MANUAL'           -%]Manual fee
                [%- CASE 'NEW_CARD'         -%]New card
                [%- CASE 'OVERDUE'          -%]Fine
                [%- CASE 'PROCESSING'       -%]Lost item processing fee
                [%- CASE 'RENT'             -%]Rental fee
                [%- CASE 'RENT_DAILY'       -%]Daily rental fee
                [%- CASE 'RENT_RENEW'       -%]Renewal of rental item
                [%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
                [%- CASE 'RESERVE'          -%]Hold fee
                [%- CASE 'RESERVE_EXPIRED'  -%]Hold waiting too long
                [%- CASE 'Payout'           -%]Payout
                [%- CASE                    -%][% account.debit_type.description | html %]
            [%- END -%]
        [%- END -%]
        [%- PROCESS account_status_description account=account -%]
    </span>
[%- END -%]

[%- BLOCK account_status_description -%]
    [%- SWITCH account.status -%]
            [%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
            [%- CASE 'RETURNED'   -%]<span> (Returned)</span>
            [%- CASE 'REPLACED'   -%]<span> (Replaced)</span>
            [%- CASE 'REFUNDED'   -%]<span> (Refunded)</span>
            [%- CASE 'FORGIVEN'   -%]<span> (Forgiven)</span>
            [%- CASE 'VOID'       -%]<span> (Voided)</span>
            [%- CASE 'LOST'       -%]<span> (Lost)</span>
            [%- CASE 'CANCELLED'  -%]<span> (Cancelled)</span>
            [%- CASE              -%]
        [%- END -%]
[%- END -%]

Return to bug 26697

Lines 34-53 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc (-14 / +14 lines)
34	</span>	34	</span>
35	[%- END -%]	35	[%- END -%]
36		36
37	[%- BLOCK offset_type_description -%]
38	[%- SWITCH account_offset.type -%]
39	[%- CASE 'Credit Applied' -%]<span>Credit applied</span>
40	[%- CASE 'Payment' -%]<span>Payment</span>
41	[%- CASE 'Manual Credit' -%]<span>Manual credit</span>
42	[%- CASE 'Manual Debit' -%]<span>Manual invoice</span>
43	[%- CASE 'Lost Item' -%]<span>Lost item returned</span>
44	[%- CASE 'Writeoff' -%]<span>Writeoff</span>
45	[%- CASE 'Void Payment' -%]<span>Void payment</span>
46	[%- CASE 'CANCELLATION' -%]<span>Cancelled charge</span>
47	[%- CASE -%][% account_offset.type \| html %]
48	[%- END -%]
49	[%- END -%]
50
51	[%- BLOCK account_status_description -%]	37	[%- BLOCK account_status_description -%]
52	[%- SWITCH account.status -%]	38	[%- SWITCH account.status -%]
53	[%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>	39	[%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
Lines 61-63 Link Here
61	[%- CASE -%]	47	[%- CASE -%]
62	[%- END -%]	48	[%- END -%]
63	[%- END -%]	49	[%- END -%]
		50
		51	[%- BLOCK offset_type_description -%]
		52	[%- SWITCH account_offset.type -%]
		53	[%- CASE 'Credit Applied' -%]<span>Credit applied</span>
		54	[%- CASE 'Payment' -%]<span>Payment</span>
		55	[%- CASE 'Manual Credit' -%]<span>Manual credit</span>
		56	[%- CASE 'Manual Debit' -%]<span>Manual invoice</span>
		57	[%- CASE 'Lost Item' -%]<span>Lost item returned</span>
		58	[%- CASE 'Writeoff' -%]<span>Writeoff</span>
		59	[%- CASE 'Void Payment' -%]<span>Void payment</span>
		60	[%- CASE 'CANCELLATION' -%]<span>Cancelled charge</span>
		61	[%- CASE -%][% account_offset.type \| html %]
		62	[%- END -%]
		63	[%- END -%]

Lines 1-3 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc (-50 / +1 lines)
		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-221 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 'REFUND' -%]Refund
183	[%- CASE 'CANCELLATION' -%]Cancelled charge
184	[%- CASE -%][% account.credit_type.description \| html %]
185	[%- END -%]
186	[%- ELSIF account.debit_type_code -%]
187	[%- SWITCH account.debit_type_code -%]
188	[%- CASE 'ACCOUNT' -%]Account creation fee
189	[%- CASE 'ACCOUNT_RENEW' -%]Account renewal fee
190	[%- CASE 'LOST' -%]Lost item
191	[%- CASE 'MANUAL' -%]Manual fee
192	[%- CASE 'NEW_CARD' -%]New card
193	[%- CASE 'OVERDUE' -%]Fine
194	[%- CASE 'PROCESSING' -%]Lost item processing fee
195	[%- CASE 'RENT' -%]Rental fee
196	[%- CASE 'RENT_DAILY' -%]Daily rental fee
197	[%- CASE 'RENT_RENEW' -%]Renewal of rental item
198	[%- CASE 'RENT_DAILY_RENEW' -%]Renewal of daily rental item
199	[%- CASE 'RESERVE' -%]Hold fee
200	[%- CASE 'RESERVE_EXPIRED' -%]Hold waiting too long
201	[%- CASE 'Payout' -%]Payout
202	[%- CASE -%][% account.debit_type.description \| html %]
203	[%- END -%]
204	[%- END -%]
205	[%- PROCESS account_status_description account=account -%]
206	</span>
207	[%- END # /BLOCK account_type_description -%]
208
209	[%- BLOCK account_status_description -%]
210	[%- SWITCH account.status -%]
211	[%- CASE 'UNRETURNED' -%]<span> (Accruing)</span>
212	[%- CASE 'RETURNED' -%]<span> (Returned)</span>
213	[%- CASE 'REPLACED' -%]<span> (Replaced)</span>
214	[%- CASE 'REFUNDED' -%]<span> (Refunded)</span>
215	[%- CASE 'FORGIVEN' -%]<span> (Forgiven)</span>
216	[%- CASE 'VOID' -%]<span> (Voided)</span>
217	[%- CASE 'LOST' -%]<span> (Lost)</span>
218	[%- CASE 'CANCELLED' -%]<span> (Cancelled)</span>
219	[%- CASE -%]
220	[%- END -%]
221	[%- END -%]