Bugzilla – Attachment 99225 Details for
Bug 21633
Did finesMode = test ever send email?
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21633: Remove finesMode 'test'
Bug-21633-Remove-finesMode-test.patch (text/plain), 5.01 KB, created by
Martin Renvoize (ashimema)
on 2020-02-18 19:57:57 UTC
(
hide
)
Description:
Bug 21633: Remove finesMode 'test'
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-02-18 19:57:57 UTC
Size:
5.01 KB
patch
obsolete
>From 292395aee94428682827d98dd4507ea2790051df Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Fri, 3 Jan 2020 14:56:53 +0000 >Subject: [PATCH] Bug 21633: Remove finesMode 'test' > >Signed-off-by: Magnus Enger <magnus@libriotech.no> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > .../bug_21633_remove_finesMode_test.perl | 14 ++++++++++++++ > installer/data/mysql/sysprefs.sql | 2 +- > .../en/modules/admin/preferences/circulation.pref | 1 - > misc/cronjobs/fines.pl | 2 +- > misc/cronjobs/staticfines.pl | 1 - > 5 files changed, 16 insertions(+), 4 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl > >diff --git a/installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl b/installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl >new file mode 100644 >index 0000000000..7075820e17 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl >@@ -0,0 +1,14 @@ >+$DBversion = 'XXX'; >+if( CheckVersion( $DBversion ) ) { >+ $dbh->do(q{ >+ UPDATE systempreferences SET value = 'off' >+ WHERE variable = 'finesMode' and value = 'test' >+ }); >+ $dbh->do(q{ >+ UPDATE systempreferences SET options = 'off|production', >+ explanation = "Choose the fines mode, 'off' (do not accrue fines) or 'production' (accrue overdue fines). Requires accruefines cronjob or CalculateFinesOnReturn system preference." >+ WHERE variable = 'finesMode' >+ }); >+ SetVersion( $DBversion ); >+ print "Upgrade to $DBversion done (Bug 21633 - Remove finesMode 'test')\n"; >+} >diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql >index cfa295e197..54d5305b14 100644 >--- a/installer/data/mysql/sysprefs.sql >+++ b/installer/data/mysql/sysprefs.sql >@@ -195,7 +195,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` > ('finesCalendar','noFinesWhenClosed','ignoreCalendar|noFinesWhenClosed','Specify whether to use the Calendar in calculating duedates and fines','Choice'), > ('FinesIncludeGracePeriod','1',NULL,'If enabled, fines calculations will include the grace period.','YesNo'), > ('FinesLog','1',NULL,'If ON, log fines','YesNo'), >-('finesMode','test','off|test|production','Choose the fines mode, \'off\', \'test\' (emails admin report) or \'production\' (accrue overdue fines). Requires accruefines cronjob.','Choice'), >+('finesMode','off','off|production','Choose the fines mode, \'off\' (no charges), \'production\' (accrue overdue fines). Requires accruefines cronjob.','Choice'), > ('FRBRizeEditions','0','','If ON, Koha will query one or more ISBN web services for associated ISBNs and display an Editions tab on the details pages','YesNo'), > ('GDPR_Policy','','Enforced|Permissive|Disabled','General Data Protection Regulation - policy', 'Choice'), > ('gist','0','','Default Goods and Services tax rate NOT in %, but in numeric form (0.12 for 12%), set to 0 to disable GST','Integer'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >index 58d7b3b66a..b954172ba2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref >@@ -861,7 +861,6 @@ Circulation: > type: choice > choices: > off: "Don't calculate" >- test: Calculate (but only for mailing to the admin) > production: Calculate and charge > - fines (when <code>misc/cronjobs/fines.pl</code> is being run). > - "<br><strong>NOTE:</strong> Fines can also be charged by the CalculateFinesOnReturn system preference." >diff --git a/misc/cronjobs/fines.pl b/misc/cronjobs/fines.pl >index df85affd8d..aa9738a01d 100755 >--- a/misc/cronjobs/fines.pl >+++ b/misc/cronjobs/fines.pl >@@ -59,7 +59,7 @@ my $usage = << 'ENDUSAGE'; > This script calculates and charges overdue fines > to patron accounts. The Koha system preference 'finesMode' controls > whether the fines are calculated and charged to the patron accounts ("Calculate and charge"); >-calculated and emailed to the admin but not applied ("Calculate (but only for mailing to the admin)"); or not calculated ("Don't calculate"). >+or not calculated ("Don't calculate"). > > This script has the following parameters : > -h --help: this message >diff --git a/misc/cronjobs/staticfines.pl b/misc/cronjobs/staticfines.pl >index 40407c686b..dac2f33de6 100755 >--- a/misc/cronjobs/staticfines.pl >+++ b/misc/cronjobs/staticfines.pl >@@ -76,7 +76,6 @@ my $usage = << 'ENDUSAGE'; > This script calculates and charges overdue fines to patron accounts. > > If the Koha System Preference 'finesMode' is set to 'production', the fines are charged to the patron accounts. >-If set to 'test', the fines are calculated but not applied. > > Please note that the fines won't be applied on a holiday. > >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21633
:
96794
|
96835
|
97809
|
97810
| 99225 |
99226