Attachment 61744 Details for Bug 17560 – Bug 17560: Add a third option to HoldFeeMode

[patch] Bug 17560: Add a third option to HoldFeeMode

Bug-17560-Add-a-third-option-to-HoldFeeMode.patch (text/plain), 3.64 KB, created by Marcel de Rooy on 2017-03-31 06:54:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2017-03-31 06:54:40 UTC

Size: 3.64 KB

patch

obsolete

>From 50708825aaf2d89726e1665a9cb58adcbf13dfd6 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 3 Nov 2016 08:16:26 +0000
>Subject: [PATCH] Bug 17560: Add a third option to HoldFeeMode
>Content-Type: text/plain; charset=utf-8
>
>This patch adds a new 'any_time_is_collected' option to the HoldFeeMode
>syspref.
>The existing 'always' option is renamed with 'any_time_is_placed''
>
>Sponsored-by: Cheshire Libraries
>
>Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> installer/data/mysql/atomicupdate/bug_XXXXX.sql                        | 1 +
> installer/data/mysql/sysprefs.sql                                      | 2 +-
> .../intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref   | 3 ++-
> 3 files changed, 4 insertions(+), 2 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_XXXXX.sql
>
>diff --git a/installer/data/mysql/atomicupdate/bug_XXXXX.sql b/installer/data/mysql/atomicupdate/bug_XXXXX.sql
>new file mode 100644
>index 0000000..f7526e1
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_XXXXX.sql
>@@ -0,0 +1 @@
>+UPDATE systempreferences SET options="any_time_is_placed|not_always|any_time_is_collected" WHERE value="HoldFeeMode";
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index eaf856a..60197f2 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -176,7 +176,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('hide_marc','0',NULL,'If ON, disables display of MARC fields, subfield codes & indicators (still shows data)','YesNo'),
> ('HighlightOwnItemsOnOPAC','0','','If on, and a patron is logged into the OPAC, items from his or her home library will be emphasized and shown first in search results and item details.','YesNo'),
> ('HighlightOwnItemsOnOPACWhich','PatronBranch','PatronBranch|OpacURLBranch','Decides which branch\'s items to emphasize. If PatronBranch, emphasize the logged in user\'s library\'s items. If OpacURLBranch, highlight the items of the Apache var BRANCHCODE defined in Koha\'s Apache configuration file.','Choice'),
>-('HoldFeeMode','not_always','always|not_always','Set the hold fee mode','Choice'),
>+('HoldFeeMode','not_always','any_time_is_placed|not_always|any_time_is_collected','Set the hold fee mode','Choice'),
> ('HoldsLog','0',NULL,'If ON, log create/cancel/suspend/resume actions on holds.','YesNo'),
> ('HoldsQueueSkipClosed', '0', NULL, 'If enabled, any libraries that are closed when the holds queue is built will be ignored for the purpose of filling holds.', 'YesNo'),
> ('HoldsToPullStartDate','2',NULL,'Set the default start date for the Holds to pull list to this many days ago','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 81b671c..b106f83 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
>@@ -710,8 +710,9 @@ Circulation:
>             - Charge a hold fee
>             - pref: HoldFeeMode
>               choices:
>-                  always: "any time a hold is placed."
>+                  any_time_is_placed: "any time a hold is placed."
>                   not_always: "only if all items are checked out and the record has at least one hold already."
>+                  any_time_is_collected: "any time a hold is collected."
>     Self Checkout:
>         -
>             - "Include the following JavaScript on all pages in the web-based self checkout:"
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 17560: 57233 | 57234 | 57235 | 57236 | 57237 | 57241 | 57242 | 57243 | 57244 | 57245 | 60993 | 61301 | 61669 | 61691 | 61744 | 61745 | 61746 | 61747 | 61748 | 61749 | 61750