From c78f499a2a333122ac8daa21058049767e2e4b42 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 19 Oct 2020 13:54:58 +0100 Subject: [PATCH] Bug 26734: Update sample notices to use standardised syntax This patch updates the default notices shiped with Koha to use the new syntax. Test plan 1/ Install Koha afresh 2/ Check the notices print as expected 3/ Signoff Signed-off-by: Kyle M Hall --- .../mysql/en/mandatory/sample_notices.yml | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml index e58c0075af..1f85e0b56e 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.yml +++ b/installer/data/mysql/en/mandatory/sample_notices.yml @@ -47,11 +47,13 @@ tables: code: ACCOUNT_CREDIT branchcode: "" name: "Account payment" - is_html: 0 + is_html: 1 title: "Account payment" message_transport_type: print lang: default content: + - "[% USE Price %]" + - "[% PROCESS 'accounts.inc' %]" - "" - "[% IF ( LibraryName ) %]" - " " @@ -67,13 +69,13 @@ tables: - " " - " " - " " - " " - " " - " " - " " - " " @@ -83,22 +85,20 @@ tables: - " " - " " - "" - - " [% FOREACH account IN accounts %]" - - " " - - " " - - " " - - " " - - " [% IF ( account.amountcredit ) %]" - - " " + - " " + - " " + - " " + - " " + - " " + - " " - "" - - " [% END %]" - "" - " " - " " - - " [% IF ( totalcredit ) %]" + - " [% IF ( credit.patron.account.balance >= 0 ) %]" - " " - "" - "
" - - "

[% Branches.GetName( patron.branchcode ) | html %]

" + - "

[% Branches.GetName( credit.patron.branchcode ) | html %]

" - "
" - - " Received with thanks from [% patron.firstname | html %] [% patron.surname | html %]
" - - " Card number: [% patron.cardnumber | html %]
" + - " Received with thanks from [% credit.patron.firstname | html %] [% credit.patron.surname | html %]
" + - " Card number: [% credit.patron.cardnumber | html %]
" - "
Amount
[% account.date | $KohaDates %]" - - " [% PROCESS account_type_description account=account %]" - - " [%- IF account.description %], [% account.description | html %][% END %]" - - " [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %]
[% credit.date | $KohaDates %]" + - " [% PROCESS account_type_description account=credit %]" + - " [%- IF credit.description %], [% credit.description | html %][% END %]" + - " [% credit.note | html %][% credit.amount | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %][% ELSE %][% END %][% credit.patron.account.balance | $Price %]
" @@ -107,11 +107,13 @@ tables: code: ACCOUNT_DEBIT branchcode: "" name: "Account fee" - is_html: 0 + is_html: 1 title: "Account fee" message_transport_type: print lang: default content: + - "[% USE Price %]" + - "[% PROCESS 'accounts.inc' %]" - "" - " [% IF ( LibraryName ) %]" - " " @@ -128,13 +130,13 @@ tables: - " " - " " - " " - " " - " " - " " - " " - " " @@ -145,23 +147,21 @@ tables: - " " - " " - "" - - " [% FOREACH account IN accounts %]" - - " " - - " " - - " " - - " " - - " [% IF ( account.amountcredit ) %]" - - " [% IF ( account.amountoutstandingcredit ) %]" - - " " - - " [% END %]" + - " " + - " " + - " " + - " " + - " " + - " " + - " " - "" - " " - " " - " " - - " [% IF ( totalcredit ) %]" + - " [% IF ( debit.patron.account.balance <= 0 ) %]" - " " - " " - "
" - - "

[% Branches.GetName( patron.branchcode ) | html %]

" + - "

[% Branches.GetName( debit.patron.branchcode ) | html %]

" - "
" - - " Bill to: [% patron.firstname | html %] [% patron.surname | html %]
" - - " Card number: [% patron.cardnumber | html %]
" + - " Bill to: [% debit.patron.firstname | html %] [% debit.patron.surname | html %]
" + - " Card number: [% debit.patron.cardnumber | html %]
" - "
Amount outstanding
[% account.date | $KohaDates%]" - - " [% PROCESS account_type_description account=account %]" - - " [%- IF account.description %], [% account.description | html %][% END %]" - - " [% account.note | html %][% ELSE %][% END %][% account.amount | $Price %][% ELSE %][% END %][% account.amountoutstanding | $Price %]
[% debit.date | $KohaDates%]" + - " [% PROCESS account_type_description account=debit %]" + - " [%- IF debit.description %], [% debit.description | html %][% END %]" + - " [% debit.note | html %][% debit.amount | $Price %][% debit.amountoutstanding | $Price %]
Total outstanding dues as on date: [% ELSE %][% END %][% total | $Price %][% ELSE %][% END %][% debit.patron.account.balance | $Price %]
" -- 2.20.1