@@ -, +, @@ picked up. --- .../prog/en/includes/accounts.inc | 74 +++++++++---------- .../bootstrap/en/includes/account-table.inc | 52 +------------ .../bootstrap/en/includes/accounts.inc | 72 ++++++++++++++++++ 3 files changed, 110 insertions(+), 88 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc @@ -9,34 +9,6 @@ [%- END -%] -[%- BLOCK offset_type_description -%] - [%- SWITCH account_offset.type -%] - [%- CASE 'Credit Applied' -%]Credit applied - [%- CASE 'Payment' -%]Payment - [%- CASE 'Manual Credit' -%]Manual credit - [%- CASE 'Manual Debit' -%]Manual invoice - [%- CASE 'Lost Item' -%]Lost item returned - [%- CASE 'Writeoff' -%]Writeoff - [%- CASE 'Void Payment' -%]Void payment - [%- CASE 'CANCELLATION' -%]Cancelled charge - [%- CASE -%][% account_offset.type | html %] - [%- END -%] -[%- END -%] - -[%- BLOCK account_status_description -%] - [%- SWITCH account.status -%] - [%- CASE 'UNRETURNED' -%] (Accruing) - [%- CASE 'RETURNED' -%] (Returned) - [%- CASE 'REPLACED' -%] (Replaced) - [%- CASE 'REFUNDED' -%] (Refunded) - [%- CASE 'FORGIVEN' -%] (Forgiven) - [%- CASE 'VOID' -%] (Voided) - [%- CASE 'LOST' -%] (Lost) - [%- CASE 'CANCELLED' -%] (Cancelled) - [%- CASE -%] - [%- END -%] -[%- END -%] - [%- BLOCK debit_type_description -%] [%- SWITCH debit_type.code -%] [%- CASE 'ACCOUNT' -%]Account creation fee @@ -59,14 +31,42 @@ [%- BLOCK credit_type_description -%] [%- SWITCH credit_type.code -%] - [%- CASE 'PAYMENT' -%]Payment - [%- CASE 'WRITEOFF' -%]Writeoff - [%- CASE 'FORGIVEN' -%]Forgiven - [%- CASE 'CREDIT' -%]Credit - [%- CASE 'LOST_FOUND' -%]Lost item fee refund - [%- CASE 'OVERPAYMENT' -%]Overpayment refund - [%- CASE 'REFUND' -%]Refund - [%- CASE 'CANCELLATION' -%]Cancelled charge - [%- CASE -%][% credit_type.description | html %] + [%- CASE 'PAYMENT' -%]Payment + [%- CASE 'WRITEOFF' -%]Writeoff + [%- CASE 'FORGIVEN' -%]Forgiven + [%- CASE 'CREDIT' -%]Credit + [%- CASE 'LOST_FOUND' -%]Lost item fee refund + [%- CASE 'OVERPAYMENT' -%]Overpayment refund + [%- CASE 'REFUND' -%]Refund + [%- CASE 'CANCELLATION' -%]Cancelled charge + [%- CASE -%][% credit_type.description | html %] + [%- END -%] +[%- END -%] + +[%- BLOCK account_status_description -%] + [%- SWITCH account.status -%] + [%- CASE 'UNRETURNED' -%] (Accruing) + [%- CASE 'RETURNED' -%] (Returned) + [%- CASE 'REPLACED' -%] (Replaced) + [%- CASE 'REFUNDED' -%] (Refunded) + [%- CASE 'FORGIVEN' -%] (Forgiven) + [%- CASE 'VOID' -%] (Voided) + [%- CASE 'LOST' -%] (Lost) + [%- CASE 'CANCELLED' -%] (Cancelled) + [%- CASE -%] + [%- END -%] +[%- END -%] + +[%- BLOCK offset_type_description -%] + [%- SWITCH account_offset.type -%] + [%- CASE 'Credit Applied' -%]Credit applied + [%- CASE 'Payment' -%]Payment + [%- CASE 'Manual Credit' -%]Manual credit + [%- CASE 'Manual Debit' -%]Manual invoice + [%- CASE 'Lost Item' -%]Lost item returned + [%- CASE 'Writeoff' -%]Writeoff + [%- CASE 'Void Payment' -%]Void payment + [%- CASE 'CANCELLATION' -%]Cancelled charge + [%- CASE -%][% account_offset.type | html %] [%- END -%] [%- END -%] --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -1,3 +1,4 @@ +[% PROCESS 'accounts.inc' %]