@@ -, +, @@
---
.../bug_24499-add_EnhancedMessaging_syspref.pl | 11 +++++++++++
installer/data/mysql/mandatory/sysprefs.sql | 9 ++-------
.../en/modules/admin/preferences/patrons.pref | 16 ++++++++++++----
.../prog/en/modules/members/moremember.tt | 7 +++++--
misc/cronjobs/advance_notices.pl | 8 ++++----
5 files changed, 34 insertions(+), 17 deletions(-)
create mode 100755 installer/data/mysql/atomicupdate/bug_24499-add_EnhancedMessaging_syspref.pl
--- a/installer/data/mysql/atomicupdate/bug_24499-add_EnhancedMessaging_syspref.pl
+++ a/installer/data/mysql/atomicupdate/bug_24499-add_EnhancedMessaging_syspref.pl
@@ -0,0 +1,11 @@
+use Modern::Perl;
+
+return {
+ bug_number => "BUG_24499",
+ description => "Add new system preference EnhancedMessaging",
+ up => sub {
+ my ($args) = @_;
+ my ($dbh, $out) = @$args{qw(dbh out)};
+ $dbh->do(q{INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('EnhancedMessaging', '1', NULL, "Send/Don't send notifications througt misc/cronjobs/advance_notices.pl", 'YesNo') });
+ },
+ };
--- a/installer/data/mysql/mandatory/sysprefs.sql
+++ a/installer/data/mysql/mandatory/sysprefs.sql
@@ -218,14 +218,9 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
('EnableOpacSearchHistory','1','YesNo','Enable or disable opac search history',''),
('EnablePointOfSale','0',NULL,'Enable the point of sale feature to allow anonymous transactions with the accounting system. (Requires UseCashRegisters)','YesNo'),
('EnableSearchHistory','0','','Enable or disable search history','YesNo'),
-('EnableItemGroups','0','','Enable the item groups feature','YesNo'),
-('EnableItemGroupHolds','0','','Enable item groups holds feature','YesNo'),
+('EnhancedMessaging','1','NULL','If ON, send notifications throught the misc/cronjobs/advance_notices.pl.','YesNo'),
('EnhancedMessagingPreferences','1','','If ON, allows patrons to select to receive additional messages about items due or nearly due.','YesNo'),
-('EnhancedMessagingPreferencesOPAC', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'),
-('ERMModule', '0', NULL, 'Enable the e-resource management module', 'YesNo'),
-('ERMProviders', 'local', 'local|ebsco', 'Set the providers for the ERM module', 'Choice'),
-('ERMProviderEbscoApiKey', '', '', 'API key for EBSCO', 'free'),
-('ERMProviderEbscoCustomerID', '', '', 'Customer ID for EBSCO', 'free'),
+('EnhancedMessagingPreferencesOPAC', '1', NULL, 'If ON, show patrons messaging setting on the OPAC. Requires EnhancedMessaging is ON', 'YesNo'),
('expandedSearchOption','0',NULL,'If ON, set advanced search to be expanded by default','YesNo'),
('ExpireReservesAutoFill','0',NULL,'Automatically fill the next hold with a automatically canceled expired waiting hold.','YesNo'),
('ExpireReservesAutoFillEmail','', NULL,'Send email notification of hold filled from automatically expired/cancelled hold to this address. If not defined, Koha will fallback to the library reply-to address','Free'),
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref
@@ -138,21 +138,29 @@ Patrons:
- days.
- "
NOTE: This system preference requires the misc/cronjobs/membership_expiry.pl
cronjob. Ask your system administrator to schedule it."
Notices and notifications:
+ -
+ - pref: EnhancedMessaging
+ choices:
+ 1: Send
+ 0: Don't send
+ - "notifications throught misc/cronjobs/advance_notices.pl
."
+ - '
NOTE: This only applies to courtesy notices.'
+
+ - "
NOTE: This system preference requires the misc/cronjobs/process_message_queue.pl
and the misc/cronjobs/advance_notices.pl
cronjob. Ask your system administrator to schedule them."
-
- pref: EnhancedMessagingPreferences
choices:
1: Allow
0: "Don't allow"
- - "staff to manage which notices patrons will receive and when they will receive them."
- - '
NOTE: This only applies to courtesy notices. To manage if patrons have also access to these settings, use EnhancedMessagingPreferencesOPAC.'
- - "
NOTE: This system preference requires the misc/cronjobs/process_message_queue.pl
and the misc/cronjobs/advance_notices.pl
cronjob. Ask your system administrator to schedule them."
+ - "staff to manage which notices patrons when they will receive them."
+ - '
NOTE: To manage if patrons have also access to these settings, use EnhancedMessagingPreferencesOPAC.'
-
- pref: EnhancedMessagingPreferencesOPAC
choices:
1: Show
0: "Don't show"
- "patron messaging setting on the OPAC."
- - '
NOTE: EnhancedMessagingPreferences must be enabled.'
+ - '
NOTE: EnhancedMessaging must be enabled.'
-
- pref: AutoEmailNewUser
choices:
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -337,11 +337,15 @@
[% # /div#patron-extended-attributes %]
[% END %]
[% END %]
-
[% IF ( EnhancedMessagingPreferences ) %]