From ca4283c5853f836d9be4bf7c66e6e3de1b0b33f7 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 10 Mar 2023 10:46:51 +0000
Subject: [PATCH] Bug 29046: Add 'EmailFieldPrecedence' preference

This patch adds a new EmailFieldPrecidence systempreference to allow
users to set the precicence in which patron email fields should be used
for communications.

Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose@inlibro.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 installer/data/mysql/atomicupdate/bug_29046.pl   | 16 ++++++++++++++++
 installer/data/mysql/mandatory/sysprefs.sql      |  1 +
 .../en/modules/admin/preferences/patrons.pref    |  6 ++++++
 3 files changed, 23 insertions(+)
 create mode 100755 installer/data/mysql/atomicupdate/bug_29046.pl

diff --git a/installer/data/mysql/atomicupdate/bug_29046.pl b/installer/data/mysql/atomicupdate/bug_29046.pl
new file mode 100755
index 0000000000..7b33f82ae2
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_29046.pl
@@ -0,0 +1,16 @@
+use Modern::Perl;
+
+return {
+    bug_number => "29046",
+    description => "Allow setting first_valid_email_address field precedence order",
+    up => sub {
+        my ($args) = @_;
+        my ($dbh, $out) = @$args{qw(dbh out)};
+
+        $dbh->do(q{
+            INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES
+            ('EmailFieldPrecedence', 'email|emailpro|B_email', NULL, 'Ordered list of patron email fields to use when AutoEmailPrimaryAddress is set to first valid', 'multi')
+        });
+        say $out "Added new system preference 'EmailFieldPrecedence'";
+    },
+};
diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql
index 5a967c00dd..a9e8a97e49 100644
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ b/installer/data/mysql/mandatory/sysprefs.sql
@@ -212,6 +212,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
 ('ElasticsearchCrossFields', '1', '', 'Enable "cross_fields" option for searches using Elastic search.', 'YesNo'),
 ('EmailAddressForPatronRegistrations', '', '', ' If you choose EmailAddressForPatronRegistrations you have to enter a valid email address: ', 'free'),
 ('EmailAddressForSuggestions','','',' If you choose EmailAddressForSuggestions you have to enter a valid email address: ','free'),
+('EmailFieldPrecedence','email|emailpro|B_email','','Ordered list of patron email fields to use when AutoEmailPrimaryAddress is set to first valid','multiple'),
 ('EmailFieldPrimary','OFF','email|emailpro|B_email|cardnumber|OFF','Defines the default email address field where patron email notices are sent.','Choice'),
 ('emailLibrarianWhenHoldIsPlaced','0',NULL,'If ON, emails the librarian whenever a hold is placed','YesNo'),
 ('EmailOverduesNoEmail','1',NULL,'Send send overdues of patrons without email address to staff','YesNo'),
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
index b2ed2e5fe4..92b66cbb01 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -183,6 +183,12 @@ Patrons:
                cardnumber: cardnumber
                "OFF": first valid email address
          - 'for sending out email notices.'
+     -
+         - Use the following patron email fields in order of highest precedence first
+         - pref: EmailFieldPrecedence
+           class: multi
+         - when selecting which email address to use to send patron notices.
+         - '<br><strong>NOTE:</strong> This preference only takes effect if <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=AutoEmailPrimaryAddress">AutoEmailPrimaryAddress</a> is set to <strong>first valid<strong>'
      -
          - pref: TalkingTechItivaPhoneNotification
            choices:
-- 
2.39.5