From ce174b4977c68cb1462427ce8768b6132a3b10e6 Mon Sep 17 00:00:00 2001
From: Agustin Moyano <agustinmoyano@theke.io>
Date: Mon, 25 Mar 2019 00:43:05 -0300
Subject: [PATCH] Bug 22284: New hold group options in smart-rules

This patch adds new options for 'Default checkout, hold and return policy'
and 'Default holds policy by item type', both in 'Hold policy' and 'Hold
pickup library match' columns

To test:
1) Go to 'Circulation and fines rules' in admin
2) Check that there are no options for hold group in 'Hold policy' and 'Hold
pickup library match' columns
3) Apply this patch
SUCCESS => in 'Hold policy' you should see 'From local hold group' option, and in
'Hold pickup library match' you should see "Item's hold group"
4) Select any of those options and save
SUCCESS => options should be selected when page reloads
5) Sign off

Sponsored-by: VOKAL
---
 admin/smart-rules.pl                               |  2 ++
 .../prog/en/modules/admin/smart-rules.tt           | 39 ++++++++++++++++++----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 927533d14d..6af813c2fd 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -590,6 +590,7 @@ my @sorted_branch_item_rules = sort { lc $a->{translated_description} cmp lc $b-
 foreach my $entry (@sorted_branch_item_rules) {
     $entry->{holdallowed_any}  = 1 if ( $entry->{holdallowed} == 2 );
     $entry->{holdallowed_same} = 1 if ( $entry->{holdallowed} == 1 );
+    $entry->{holdallowed_group} = 1 if ( $entry->{holdallowed} == 3 );
 }
 
 $template->param(show_branch_cat_rule_form => 1);
@@ -617,6 +618,7 @@ if ($defaults) {
     $template->param( default_holdallowed_none => 1 ) if ( $defaults->{holdallowed} == 0 );
     $template->param( default_holdallowed_same => 1 ) if ( $defaults->{holdallowed} == 1 );
     $template->param( default_holdallowed_any  => 1 ) if ( $defaults->{holdallowed} == 2 );
+    $template->param( default_holdallowed_group  => 1 ) if ( $defaults->{holdallowed} == 3 );
     $template->param( default_hold_fulfillment_policy => $defaults->{hold_fulfillment_policy} );
     $template->param( default_maxissueqty      => $defaults->{maxissueqty} );
     $template->param( default_maxonsiteissueqty => $defaults->{maxonsiteissueqty} );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index bca8b25940..5edb6cc416 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -431,6 +431,13 @@
                             [% END %]
                                 From any library
                             </option>
+                            [% IF ( default_holdallowed_group ) %]
+                            <option value="3" selected="selected">
+                            [% ELSE %]
+                            <option value="3">
+                            [% END %]
+                                From local hold group
+                            </option>
                             [% IF ( default_holdallowed_same ) %]
                             <option value="1" selected="selected">
                             [% ELSE %]
@@ -459,6 +466,16 @@
                                 </option>
                             [% END %]
 
+                            [% IF default_hold_fulfillment_policy == 'holdgroup' %]
+                                <option value="holdgroup" selected="selected">
+                                    item's hold group
+                                </option>
+                            [% ELSE %]
+                                <option value="holdgroup">
+                                    item's hold group
+                                </option>
+                            [% END %]
+
                             [% IF default_hold_fulfillment_policy == 'homebranch' %]
                                 <option value="homebranch" selected="selected">
                                     item's home library
@@ -515,7 +532,7 @@
     </div>
     [% IF ( show_branch_cat_rule_form ) %]
     <div id="holds-policy-by-patron-category" class="container">
-    <h3>[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]</h3>
+        <h3>[% IF humanbranch %]Checkout, hold policy by patron category for [% Branches.GetName( humanbranch ) | html %][% ELSE %]Default checkout, hold policy by patron category[% END %]</h3>
         <p>For this library, you can specify the maximum number of loans that
             a patron of a given category can make, regardless of the item type.
         </p>
@@ -594,11 +611,11 @@
     [% END %]
 
     <div id="refund-lost-item-fee-on-return" class="container">
-  [% IF current_branch == '*' %]
-    <h3>Default lost item fee refund on return policy</h3>
-  [% ELSE %]
-    <h3>Lost item fee refund on return policy for [% Branches.GetName(current_branch) | html %]</h3>
-  [% END %]
+        [% IF current_branch == '*' %]
+            <h3>Default lost item fee refund on return policy</h3>
+        [% ELSE %]
+            <h3>Lost item fee refund on return policy for [% Branches.GetName(current_branch) | html %]</h3>
+        [% END %]
         <p>Specify the default policy for lost item fees on return.
         </p>
         <form method="post" action="/cgi-bin/koha/admin/smart-rules.pl">
@@ -684,6 +701,7 @@
         </p>
         <ul>
             <li><strong>From any library:</strong> Patrons from any library may put this item on hold. <cite>(default if none is defined)</cite></li>
+            <li><strong>From local hold group:</strong> Only patrons from libraries in the same item's home library hold groups may put this book on hold.</li>
             <li><strong>From home library:</strong> Only patrons from the item's home library may put this book on hold.</li>
             <li><strong>No holds allowed:</strong> No patron may put this book on hold.</li>
         </ul>
@@ -716,6 +734,8 @@
                         </td>
                         <td>[% IF ( branch_item_rule_loo.holdallowed_any ) %]
                                 <span>From any library</span>
+                            [% ELSIF ( branch_item_rule_loo.holdallowed_group ) %]
+                                <span>From local hold group</span>
                             [% ELSIF ( branch_item_rule_loo.holdallowed_same ) %]
                                 <span>From home library</span>
                             [% ELSE %]
@@ -724,6 +744,8 @@
                         </td>
                         <td>[% IF ( branch_item_rule_loo.hold_fulfillment_policy == 'any' ) %]
                                 <span>any library</span>
+                            [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'holdgroup' ) %]
+                                <span>item's hold group</span>
                             [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'homebranch' ) %]
                                 <span>item's home library</span>
                             [% ELSIF ( branch_item_rule_loo.hold_fulfillment_policy == 'holdingbranch' ) %]
@@ -756,6 +778,7 @@
                     <td>
                         <select name="holdallowed">
                             <option value="2">From any library</option>
+                            <option value="3">From local hold group</option>
                             <option value="1">From home library</option>
                             <option value="0">No holds allowed</option>
                         </select>
@@ -766,6 +789,10 @@
                                 any library
                             </option>
 
+                            <option value="holdgroup">
+                                item's hold group
+                            </option>
+
                             <option value="homebranch">
                                 item's home library
                             </option>
-- 
2.11.0