From 6e6256971784c4816c205a784ff11973586f3b1a Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 10 Jul 2019 14:34:47 +0100 Subject: [PATCH] Bug 23293: Add system preference --- installer/data/mysql/atomicupdate/bug_23293.perl | 11 +++++++++++ installer/data/mysql/sysprefs.sql | 1 + .../prog/en/modules/admin/preferences/opac.pref | 6 ++++++ 3 files changed, 18 insertions(+) create mode 100644 installer/data/mysql/atomicupdate/bug_23293.perl diff --git a/installer/data/mysql/atomicupdate/bug_23293.perl b/installer/data/mysql/atomicupdate/bug_23293.perl new file mode 100644 index 0000000000..092985087e --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_23293.perl @@ -0,0 +1,11 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do( q{ + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES + ('OPACFineNoRenewalsIncludeCredits','1',NULL,'If enabled the value specified in OPACFineNoRenewals should include any unapplied account credits in the calculation','YesNo') + }); + + # Always end with this (adjust the bug info) + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 23293 - Add 'OPACFineNoRenewalsIncludeCredits' system preference)\n"; +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 5b916426bf..d570648ed9 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -448,6 +448,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OpenURLResolverURL', '', NULL, 'URL of OpenURL Resolver', 'Free'), ('OpenURLText', '', NULL, 'Text of OpenURL links (or image title if OpenURLImageLocation is defined)', 'Free'), ('OpenURLImageLocation', '', NULL, 'Location of image for OpenURL links', 'Free'), +('OPACFineNoRenewalsIncludeCredits','1',NULL,'If enabled the value specified in OPACFineNoRenewals should include any unapplied account credits in the calculation','YesNo'), ('OPACShowOpenURL', '', NULL, 'Enable display of OpenURL links in OPAC search results and detail page', 'YesNo'), ('OPACOpenURLItemTypes', '', NULL, 'Show the OpenURL link only for these item types', 'Free'), ('OrderPdfFormat','pdfformat::layout3pages','Controls what script is used for printing (basketgroups)','','free'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index a078939dfc..a31d34b3cc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -602,6 +602,12 @@ OPAC: - pref: OPACFineNoRenewals class: currency - '[% local_currency %] in fines (leave blank to disable).' + - + - pref: OPACFineNoRenewalsIncludeCredits + choices: + yes: Include + no: "Don't include" + - outstanding/unapplied credits when applying the OPACFineNoRenewals rule to users - - pref: OPACViewOthersSuggestions choices: -- 2.20.1