From f1b7846a89a4f5c54d79d7d88f4f158915160851 Mon Sep 17 00:00:00 2001
From: Alex Buckley <alexbuckley@catalyst.net.nz>
Date: Wed, 6 Apr 2022 12:40:01 +0000
Subject: [PATCH] Bug 23538: (follow-up) Fix up notices

- Add toolkit template (TT) syntax to notices
- Add TT conditionals to notices
- Add translated notice

Sponsored-by: Catalyst IT

https://bugs.koha-community.org/show_bug.cgi?id=23528
---
 ...lAddressForPatronRegistrations_sysprefs.pl | 21 ++++++++++---------
 .../mysql/en/mandatory/sample_notices.yml     | 21 ++++++++++---------
 .../fr-FR/1-Obligatoire/sample_notices.sql    | 16 ++++++++++++++
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/installer/data/mysql/atomicupdate/bug23538-add_EmailPatronRegistrations_and_EmailAddressForPatronRegistrations_sysprefs.pl b/installer/data/mysql/atomicupdate/bug23538-add_EmailPatronRegistrations_and_EmailAddressForPatronRegistrations_sysprefs.pl
index 55082df006..daa80ba933 100755
--- a/installer/data/mysql/atomicupdate/bug23538-add_EmailPatronRegistrations_and_EmailAddressForPatronRegistrations_sysprefs.pl
+++ b/installer/data/mysql/atomicupdate/bug23538-add_EmailPatronRegistrations_and_EmailAddressForPatronRegistrations_sysprefs.pl
@@ -11,17 +11,18 @@ return {
 
         $dbh->do(q{INSERT IGNORE INTO letter (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES ( 'members', 'OPAC_REG', '', 'New OPAC self-registration submitted', 1, 'New OPAC self-registration',
             '<h3>New OPAC self-registration</h3>
-            <p><h4>Self-registration made by</h4>
+            <p><h4>Self-registration made:</h4>
             <ul>
-            <li><<borrowers.firstname>> <<borrowers.surname>></li>
-            <li>Email: <<borrowers.email>></li>
-            <li>Phone: <<borrowers.phone>></li>
-            <li>Mobile: <<borrowers.mobile>></li>
-            <li>Fax: <<borrowers.fax>></li>
-            <li>Secondary email: <<borrowers.emailpro>></li>
-            <li>Secondary phone:<<borrowers.phonepro>></li>
-            <li>Home library: <<borrowers.branchcode>></li>
-            <li>Patron category: <<borrowers.categorycode>></li>
+            <li>[% borrower.firstname %] [% borrower.surname %]</li>
+            [% IF borrower.cardnumber %]<li>Cardnumber: [% borrower.cardnumber %]</li>[% END %]
+            [% IF borrower.email %]<li>Email: [% borrower.email %]</li>[% END %]
+            [% IF borrower.phone %]<li>Phone: [% borrower.phone %]</li>[% END %]
+            [% IF borrower.mobile %]<li>Mobile: [% borrower.mobile %]</li>[% END %]
+            [% IF borrower.fax %]<li>Fax: [% borrower.fax %]</li>[% END %]
+            [% IF borrower.emailpro %]<li>Secondary email: [% borrower.emailpro %]</li>[% END %]
+            [% IF borrower.phonepro %]<li>Secondary phone:[% borrower.phonepro %]</li>[% END %]
+            [% IF borrower.branchcode %]<li>Home library: [% borrower.branchcode %]</li>[% END %]
+            [% IF borrower.categorycode %]<li>Patron category: [% borrower.categorycode %]</li>[% END %]
             </ul>
             </p>', 'email', 'default') });
     },
diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml
index 953d158355..6834d911a1 100644
--- a/installer/data/mysql/en/mandatory/sample_notices.yml
+++ b/installer/data/mysql/en/mandatory/sample_notices.yml
@@ -1646,16 +1646,17 @@ tables:
           lang: default
           content:
             - "<h3>New OPAC self-registration</h3>"
-            - "<p><h4>Self-registration made by</h4>"
+            - "<p><h4>Self-registration made:</h4>"
             - "<ul>"
-            - "<li><<borrowers.firstname>> <<borrowers.surname>></li>"
-            - "<li>Email: <<borrowers.email>></li>"
-            - "<li>Phone: <<borrowers.phone>></li>"
-            - "<li>Mobile: <<borrowers.mobile>></li>"
-            - "<li>Fax: <<borrowers.fax>></li>"
-            - "<li>Secondary email: <<borrowers.emailpro>></li>"
-            - "<li>Secondary phone:<<borrowers.phonepro>></li>"
-            - "<li>Home library: <<borrowers.branchcode>></li>"
-            - "<li>Temporary patron category: <<borrowers.categorycode>></li>"
+            - "<li> [% borrower.firstname %] [% borrower.surname %]</li>"
+            - "[% IF borrower.cardnumber %]<li>Cardnumber: [% borrower.cardnumber %]</li>[% END %]"
+            - "[% IF borrower.email %]<li>Email: [% borrower.email %]</li>[% END %]"
+            - "[% IF borrower.phone %]<li>Phone: [% borrower.phone %]</li>[% END %]"
+            - "[% IF borrower.mobile %]<li>Mobile: [% borrower.mobile %]</li>[% END %]"
+            - "[% IF borrower.fax %]<li>Fax: [% borrower.fax %]</li>[% END %]"
+            - "[% IF borrower.emailpro %]<li>Secondary email: [% borrower.emailpro %]</li>[% END %]"
+            - "[% IF borrower.phonepro %]<li>Secondary phone: [% borrower.phonepro %]</li>[% END %]"
+            - "[% IF borrower.branchcode %]<li>Home library: [% borrower.branchcode %]</li>[% END %]"
+            - "[% IF borrower.categorycode %]<li>Temporary patron category: [% borrower.categorycode %]</li>[% END %]"
             - "</ul>"
             - "</p>"
diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
index fa662135bb..755dc40157 100644
--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql
@@ -503,3 +503,19 @@ INSERT IGNORE INTO letter (module, code, name, title, content, message_transport
     [% END %]
 [% END %]
 ", 'email');
+
+INSERT IGNORE INTO letter (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`, `lang`) VALUES ( 'members', 'OPAC_REG', '', 'New OPAC self-registration submitted', 1, 'New OPAC self-registration','<h3>New OPAC self-registration</h3>
+    <p><h4>Self-registration made:</h4>
+    <ul>
+    <li>[% borrower.firstname %] [% borrower.surname %]</li>
+    [% IF borrower.cardnumber %]<li>Cardnumber: [% borrower.cardnumber %]</li>[% END %]
+    [% IF borrower.email %]<li>Email: [% borrower.email %]</li>[% END %]
+    [% IF borrower.phone %]<li>Phone: [% borrower.phone %]</li>[% END %]
+    [% IF borrower.mobile %]<li>Mobile: [% borrower.mobile %]</li>[% END %]
+    [% IF borrower.fax %]<li>Fax: [% borrower.fax %]</li>[% END %]
+    [% IF borrower.emailpro %]<li>Secondary email: [% borrower.emailpro %]</li>[% END %]
+    [% IF borrower.phonepro %]<li>Secondary phone:[% borrower.phonepro %]</li>[% END %]
+    [% IF borrower.branchcode %]<li>Home library: [% borrower.branchcode %]</li>[% END %]
+    [% IF borrower.categorycode %]<li>Patron category: [% borrower.categorycode %]</li>[% END %]
+    </ul>
+   </p>', 'email', 'default')
-- 
2.20.1