From 9193a71f164e44bfc9076dd137db6f6fa3e934cf Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Mon, 19 Jun 2017 19:47:52 +0000
Subject: [PATCH] Bug 12365 - Notes for rules

Lee Jamison <ldjamison@marywood.edu> rescued this patch.
It is a clean re-build of attachments 61865 and 63902
to fix the merge conflict introduced during application of both
attachments.

To test:
Follow test plan in Comment 2

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>

Signed-off-by: macon  lauren KohaCon17 <caballeromaricon@gmail.com>
---
 Koha/Schema/Result/Issuingrule.pm                                | 8 ++++++++
 admin/smart-rules.pl                                             | 2 ++
 .../bug_12365_-_add_note_column_to_issuingrules.perl             | 9 +++++++++
 installer/data/mysql/kohastructure.sql                           | 1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt     | 4 ++++
 5 files changed, 24 insertions(+)
 create mode 100644 installer/data/mysql/atomicupdate/bug_12365_-_add_note_column_to_issuingrules.perl

diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm
index 0ea74ca..924835a 100644
--- a/Koha/Schema/Result/Issuingrule.pm
+++ b/Koha/Schema/Result/Issuingrule.pm
@@ -215,6 +215,12 @@ __PACKAGE__->table("issuingrules");
   extra: {list => ["no","yes","bib_only","item_only"]}
   is_nullable: 0
 
+=head2 note
+
+  data_type: 'varchar'
+  is_nullable: 1
+  size: 100
+
 =cut
 
 __PACKAGE__->add_columns(
@@ -294,6 +300,8 @@ __PACKAGE__->add_columns(
     extra => { list => ["no", "yes", "bib_only", "item_only"] },
     is_nullable => 0,
   },
+  "note",
+  { data_type => "varchar", is_nullable => 1, size => 100 },
 );
 
 =head1 PRIMARY KEY
diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 6a55b7b..aa9e327 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -160,6 +160,7 @@ elsif ($op eq 'add') {
     my $article_requests = $input->param('article_requests') || 'no';
     my $overduefinescap = $input->param('overduefinescap') || undef;
     my $cap_fine_to_replacement_price = $input->param('cap_fine_to_replacement_price') eq 'on';
+    my $note = $input->param('note');
     $debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty, $maxonsiteissueqty, $cap_fine_to_replacement_price";
 
     my $params = {
@@ -192,6 +193,7 @@ elsif ($op eq 'add') {
         overduefinescap               => $overduefinescap,
         cap_fine_to_replacement_price => $cap_fine_to_replacement_price,
         article_requests              => $article_requests,
+        note                          => $note,
     };
 
     my $issuingrule = Koha::IssuingRules->find({categorycode => $bor, itemtype => $itemtype, branchcode => $br});
diff --git a/installer/data/mysql/atomicupdate/bug_12365_-_add_note_column_to_issuingrules.perl b/installer/data/mysql/atomicupdate/bug_12365_-_add_note_column_to_issuingrules.perl
new file mode 100644
index 0000000..6b4d671
--- /dev/null
+++ b/installer/data/mysql/atomicupdate/bug_12365_-_add_note_column_to_issuingrules.perl
@@ -0,0 +1,9 @@
+$DBversion = 'XXX';
+if( CheckVersion( $DBversion ) ) {
+    unless( column_exists( 'issuingrules', 'note' ) ) {
+        $dbh->do(q|ALTER TABLE issuingrules ADD note varchar(100) default NULL AFTER article_requests|);
+    }
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 12365: Add column issuingrules.note)\n";
+}
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index e9c60aa..efa6cf4 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -886,6 +886,7 @@ CREATE TABLE `issuingrules` ( -- circulation and fine rules
   onshelfholds tinyint(1) NOT NULL default 0, -- allow holds for items that are on shelf
   opacitemholds char(1) NOT NULL default 'N', -- allow opac users to place specific items on hold
   article_requests enum('no','yes','bib_only','item_only') NOT NULL DEFAULT 'no', -- allow article requests to be placed,
+  `note` varchar(100) default NULL, -- description of rule, reason for setting rule
   PRIMARY KEY  (`branchcode`,`categorycode`,`itemtype`),
   KEY `categorycode` (`categorycode`),
   KEY `itemtype` (`itemtype`)
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 0283d80..ace2c94 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
@@ -193,6 +193,7 @@ $(document).ready(function() {
                 <th>Item level holds</th>
                 <th>Article requests</th>
                 <th>Rental discount (%)</th>
+                <th>Note</th>
                 <th>Actions</th>
             </tr>
             </thead>
@@ -292,6 +293,7 @@ $(document).ready(function() {
                                                             [% END %]
                                                         </td>
 							<td>[% rule.rentaldiscount %]</td>
+            <td>[% rule.note %]</td>
                                                         <td class="actions">
                                                           <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a>
                                                           <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% rule.itemtype %]&amp;categorycode=[% rule.categorycode %]&amp;branch=[% rule.current_branch %]"><i class="fa fa-trash"></i> Delete</a>
@@ -385,6 +387,7 @@ $(document).ready(function() {
                         </select>
                     </td>
                     <td><input type="text" name="rentaldiscount" id="rentaldiscount" size="2" /></td>
+                    <td><input type="text" name="note" id="note" size="15" value=""></td>
                     <td class="actions">
                         <input type="hidden" name="branch" value="[% current_branch %]"/>
                         <button type="submit" class="btn btn-default btn-xs"><i class="fa fa-save"></i> Save</button>
@@ -420,6 +423,7 @@ $(document).ready(function() {
                       <th>Item level holds</th>
                       <th>Article requests</th>
                       <th>Rental discount (%)</th>
+                      <th>Note</th>
                       <th colspan="2">&nbsp;</th>
                     </tr>
                   </tfoot>
-- 
2.7.4