From bd2367f6117a1bb6566c4cb2c04b2ce12b6c6d38 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 10 May 2017 12:54:30 -0400 Subject: [PATCH] Bug 15561 [QA Followup] - Add atomic update, fix other issues --- installer/data/mysql/atomicupdate/bug_15561.perl | 9 +++++++++ installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/circulation.pref | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 installer/data/mysql/atomicupdate/bug_15561.perl diff --git a/installer/data/mysql/atomicupdate/bug_15561.perl b/installer/data/mysql/atomicupdate/bug_15561.perl new file mode 100644 index 0000000..96e3f45 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_15561.perl @@ -0,0 +1,9 @@ +$DBversion = 'XXX'; # will be replaced by the RM +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + UPDATE systempreferences SET variable = 'WaitingHoldCancelationFee' WHERE variable = 'ExpireReservesMaxPickUpDelayCharge'; + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 14137 - Allow ExpireReservesMaxPickUpDelayCharge to be used without ExpireReservesMaxPickUpDelay)\n"; +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 51419e9..7afa29a 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -153,7 +153,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('EnhancedMessagingPreferencesOPAC', '1', NULL, 'If ON, show patrons messaging setting on the OPAC.', 'YesNo'), ('expandedSearchOption','0',NULL,'If ON, set advanced search to be expanded by default','YesNo'), ('ExpireReservesMaxPickUpDelay','0','','Enabling this allows holds to expire automatically if they have not been picked by within the time period specified in ReservesMaxPickUpDelay','YesNo'), -('WaitingHoldCancelationFee','0',NULL,'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, than a borrower whose waiting hold has expired will be charged this amount.','free'), ('ExpireReservesOnHolidays', '1', NULL, 'If false, reserves at a library will not be canceled on days the library is not open.', 'YesNo'), ('ExcludeHolidaysFromMaxPickUpDelay', '0', NULL, 'If ON, reserves max pickup delay takes into accountthe closed days.', 'YesNo'), ('ExportCircHistory', 0, NULL, "Display the export circulation options", 'YesNo' ), @@ -570,6 +569,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('viewLabeledMARC','0','','Allow display of labeled MARC view of bibiographic records','YesNo'), ('viewMARC','1','','Allow display of MARC view of bibiographic records','YesNo'), ('virtualshelves','1','','If ON, enables Lists management','YesNo'), +('WaitingHoldCancelationFee','0',NULL,'If ExpireReservesMaxPickUpDelay is enabled, and this field has a non-zero value, then a borrower whose waiting hold has expired will be charged this amount.','free'), ('WaitingNotifyAtCheckin','0',NULL,'If ON, notify librarians of waiting holds for the patron whose items they are checking in.','YesNo'), ('WebBasedSelfCheck','0',NULL,'If ON, enables the web-based self-check system','YesNo'), ('WhenLostChargeReplacementFee','1',NULL,'If ON, Charge the replacement price when a patron loses an item.','YesNo'), 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 f0fbd7b..f839cdb 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 @@ -543,7 +543,7 @@ Circulation: - Charge an amount of - pref: WaitingHoldCancelationFee class: currency - - if a waiting hold cancellation fee is to be charged, based on if the hold has been waiting more days than defined by ReservesMaxPickUpDelay. + - if a waiting hold cancelation fee is to be charged, based on if the hold has been waiting more days than defined by ReservesMaxPickUpDelay. - - Satisfy holds using items from the libraries - pref: StaticHoldsQueueWeight -- 2.10.2