From 4dfa570936db87dfe79fcb0a8830054065efa077 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 16 Oct 2020 15:57:30 +0100 Subject: [PATCH] Bug 26697: Make account.inc consistent between staff and opac Test plan - Regression 1/ Login to the OPAC as a user with various account charges and payments. 2/ Navigate to the 'Your charges' page. 3/ Compare the display of the table before and after applying the patchset. They should match. Test plan - Sync 1/ Compare koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc with koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc. 2/ They files should match after the patch is applied. Test plan - Translation 1) ./translate update fr-CA 2) Open fr-CA-opac-bootstrap.po and translated this part msgid "" "%s %s %sPayment %sWriteoff %sForgiven %sCredit %sLost item fee refund " "%sRefund %s%s %s %s %s %sAccount creation fee %sAccount renewal fee %sLost " "item %sManual fee %sNew card %sFine %sLost item processing fee %sRental fee " "%sDaily rental fee %sRenewal of rental item %sRenewal of daily rental item " "%sHold fee %sHold waiting too long %s%s %s %s %s " 3) ./translate install fr-CA 4) Login to the OPAC as a patron with various charges 5) Check 'My charges' (in fr-CA) to confirm the translations have been picked up. Signed-off-by: Caroline Cyr La Rose Signed-off-by: Katrin Fischer Signed-off-by: Jonathan Druart --- .../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 diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc index 4761dae46b..6c5450b0de 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/accounts.inc +++ b/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 -%] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc index 6b61db13bc..a3b6b935d5 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/account-table.inc @@ -1,3 +1,4 @@ +[% PROCESS 'accounts.inc' %]
[% IF ( ACCOUNT_LINES ) %] @@ -169,54 +170,3 @@ [% END # /IF ENABLE_OPAC_PAYMENTS && DISPLAY_PAYMENT_BLOCK %] - -[%- BLOCK account_type_description -%] - - [%- 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 'OVERPAYMENT' -%]Overpayment 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 -%] - -[%- END # /BLOCK account_type_description -%] - -[%- 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 -%] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc new file mode 100644 index 0000000000..6c5450b0de --- /dev/null +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/accounts.inc @@ -0,0 +1,72 @@ +[%- BLOCK account_type_description -%] + + [%- IF account.credit_type_code -%] + [%- PROCESS credit_type_description credit_type = account.credit_type -%] + [%- ELSIF account.debit_type_code -%] + [%- PROCESS debit_type_description debit_type = account.debit_type -%] + [%- END -%] + [%- PROCESS account_status_description account=account -%] + +[%- END -%] + +[%- BLOCK debit_type_description -%] + [%- SWITCH 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 -%][% debit_type.description | html %] + [%- END -%] +[%- END -%] + +[%- 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 %] + [%- 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 -%] -- 2.39.5