Attachment 81656 Details for Bug 19532 – Bug 19532: Circulation rules

[patch] Bug 19532: Circulation rules

Bug-19532-Circulation-rules.patch (text/plain), 7.73 KB, created by Martin Renvoize (ashimema) on 2018-10-31 07:21:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-10-31 07:21:21 UTC

Size: 7.73 KB

patch

obsolete

>From 19f60d8a5c0749f5c384ab30607604952fcc3f6e Mon Sep 17 00:00:00 2001
>From: Aleisha Amohia <aleishaamohia@hotmail.com>
>Date: Fri, 27 Oct 2017 03:04:58 +0000
>Subject: [PATCH] Bug 19532: Circulation rules
>
>Adding 3 new rules and columns to issuingrules
>- recall_due_date_interval
>- recall_overdue_fine
>- recall_shelf_time
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> Koha/Schema/Result/Issuingrule.pm             | 22 +++++++++++++++++++
> admin/smart-rules.pl                          |  8 ++++++-
> ...bug_19532_-_adding_recalls_circ_rules.perl | 15 +++++++++++++
> .../prog/en/modules/admin/smart-rules.tt      | 13 +++++++++++
> 4 files changed, 57 insertions(+), 1 deletion(-)
> create mode 100644 installer/data/mysql/atomicupdate/bug_19532_-_adding_recalls_circ_rules.perl
>
>diff --git a/Koha/Schema/Result/Issuingrule.pm b/Koha/Schema/Result/Issuingrule.pm
>index f1470b9899..a1800570a1 100644
>--- a/Koha/Schema/Result/Issuingrule.pm
>+++ b/Koha/Schema/Result/Issuingrule.pm
>@@ -226,6 +226,22 @@ __PACKAGE__->table("issuingrules");
>   extra: {list => ["no","yes","bib_only","item_only"]}
>   is_nullable: 0
> 
>+=head2 recall_due_date_interval
>+
>+  data_type: 'integer'
>+  is_nullable: 1
>+
>+=head2 recall_overdue_fine
>+
>+  data_type: 'decimal'
>+  is_nullable: 1
>+  size: [28,6]
>+
>+=head2 recall_shelf_time
>+
>+  data_type: 'integer'
>+  is_nullable: 1
>+
> =cut
> 
> __PACKAGE__->add_columns(
>@@ -309,6 +325,12 @@ __PACKAGE__->add_columns(
>     extra => { list => ["no", "yes", "bib_only", "item_only"] },
>     is_nullable => 0,
>   },
>+  "recall_due_date_interval",
>+  { data_type => "integer", is_nullable => 1 },
>+  "recall_overdue_fine",
>+  { data_type => "decimal", is_nullable => 1, size => [28, 6] },
>+  "recall_shelf_time",
>+  { data_type => "integer", is_nullable => 1 },
> );
> 
> =head1 PRIMARY KEY
>diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
>index 4975254045..eb698dd4af 100755
>--- a/admin/smart-rules.pl
>+++ b/admin/smart-rules.pl
>@@ -177,7 +177,7 @@ elsif ($op eq 'add') {
>     $issuelength = $issuelength eq q{} ? undef : $issuelength;
>     my $lengthunit  = $input->param('lengthunit');
>     my $hardduedate = $input->param('hardduedate') || undef;
>-    $hardduedate = eval { dt_from_string( $input->param('hardduedate') ) } if ( $hardduedate );
>+    $hardduedate = eval { dt_from_string( scalar $input->param('hardduedate') ) } if ( $hardduedate );
>     $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
>     my $hardduedatecompare = $input->param('hardduedatecompare');
>     my $rentaldiscount = $input->param('rentaldiscount');
>@@ -185,6 +185,9 @@ 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 $recall_due_date_interval = $input->param('recall_due_date_interval');
>+    my $recall_overdue_fine = $input->param('recall_overdue_fine');
>+    my $recall_shelf_time = $input->param('recall_shelf_time');
>     $debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty, $maxonsiteissueqty, $cap_fine_to_replacement_price";
> 
>     my $params = {
>@@ -219,6 +222,9 @@ elsif ($op eq 'add') {
>         overduefinescap               => $overduefinescap,
>         cap_fine_to_replacement_price => $cap_fine_to_replacement_price,
>         article_requests              => $article_requests,
>+        recall_due_date_interval      => $recall_due_date_interval,
>+        recall_overdue_fine           => $recall_overdue_fine,
>+        recall_shelf_time             => $recall_shelf_time,
>     };
> 
>     my $issuingrule = Koha::IssuingRules->find({categorycode => $bor, itemtype => $itemtype, branchcode => $br});
>diff --git a/installer/data/mysql/atomicupdate/bug_19532_-_adding_recalls_circ_rules.perl b/installer/data/mysql/atomicupdate/bug_19532_-_adding_recalls_circ_rules.perl
>new file mode 100644
>index 0000000000..3cf6a20066
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/bug_19532_-_adding_recalls_circ_rules.perl
>@@ -0,0 +1,15 @@
>+$DBversion = 'XXX';
>+if( CheckVersion( $DBversion ) ) {
>+    unless( column_exists( 'issuingrules', 'recall_due_date_interval' ) ) {
>+        $dbh->do(q|ALTER TABLE issuingrules ADD recall_due_date_interval int(11) default NULL AFTER note|);
>+    }
>+    unless( column_exists( 'issuingrules', 'recall_overdue_fine' ) ) {
>+        $dbh->do(q|ALTER TABLE issuingrules ADD recall_overdue_fine decimal(28,6) default NULL AFTER recall_due_date_interval|);
>+    }
>+    unless( column_exists( 'issuingrules', 'recall_shelf_time' ) ) {
>+        $dbh->do(q|ALTER TABLE issuingrules ADD recall_shelf_time int(11) default NULL AFTER recall_overdue_fine|);
>+    }
>+
>+    SetVersion( $DBversion );
>+    print "Upgrade to $DBversion done (Bug 19532: Add columns issuingrules.recall_due_date_interval, issuingrules.recall_overdue_fine and issuingrules.recall_shelf_time)\n";
>+}
>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 672a55f7b3..1426474f1d 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
>@@ -95,6 +95,9 @@
>                 <th>Holds per record (count)</th>
>                 <th>On shelf holds allowed</th>
>                 <th>Item level holds</th>
>+                <th>Recall due date interval (days)</th>
>+                <th>Recall overdue fine amount</th>
>+                <th>Recall pickup period (days)</th>
>                 <th>Article requests</th>
>                 <th>Rental discount (%)</th>
>                 <th>Actions</th>
>@@ -211,6 +214,10 @@
>                                                                 <span>Don't allow</span>
>                                                             [% END %]
>                                                         </td>
>+                                                        <td>[% IF rule.opacitemholds == 'F'%]Force[% ELSIF rule.opacitemholds == 'Y'%]Allow[% ELSE %]Don't allow[% END %]</td>
>+                                                        <td>[% rule.recall_due_date_interval %]</td>
>+                                                        <td>[% rule.recall_overdue_fine FILTER format("%.2f") %]</td>
>+                                                        <td>[% rule.recall_shelf_time %]</td>
>                                                         <td>
>                                                             [% IF rule.article_requests == 'no' %]
>                                                                 <span>No</span>
>@@ -315,6 +322,9 @@
>                             <option value="F">Force</option>
>                         </select>
>                     </td>
>+                    <td><input type="text" name="recall_due_date_interval" id="recall_due_date_interval" size="3"></td>
>+                    <td><input type="text" name="recall_overdue_fine" id="recall_overdue_fine" size="6"></td>
>+                    <td><input type="text" name="recall_shelf_time" id="recall_shelf_time" size="3"></td>
>                     <td>
>                         <select id="article_requests" name="article_requests">
>                             <option value="no">No</option>
>@@ -360,6 +370,9 @@
>                       <th>Holds per record (count)</th>
>                       <th>On shelf holds allowed</th>
>                       <th>Item level holds</th>
>+                      <th>Recall due date interval (days)</th>
>+                      <th>Recall overdue fine amount</th>
>+                      <th>Recall pickup period (days)</th>
>                       <th>Article requests</th>
>                       <th>Rental discount (%)</th>
>                       <th>&nbsp;</th>
>-- 
>2.19.1

Actions: View | Diff | Splinter Review

Attachments on bug 19532: 68569 | 68570 | 68571 | 68572 | 68642 | 68643 | 68644 | 68645 | 68653 | 69100 | 69102 | 69147 | 69148 | 69149 | 69170 | 69172 | 69221 | 69222 | 69223 | 69322 | 69353 | 69354 | 69405 | 69409 | 69410 | 69411 | 69841 | 69872 | 69873 | 69874 | 69875 | 69876 | 69877 | 69878 | 69879 | 69880 | 69881 | 69882 | 69883 | 69884 | 69885 | 69886 | 69887 | 69888 | 69889 | 69890 | 69986 | 70093 | 71409 | 71574 | 71575 | 71576 | 71577 | 71578 | 71579 | 71580 | 71581 | 71582 | 71583 | 71584 | 71585 | 71586 | 71587 | 71588 | 71589 | 71590 | 71591 | 71592 | 72244 | 72311 | 72312 | 72313 | 72314 | 72315 | 72316 | 72317 | 72318 | 72319 | 72320 | 72321 | 72322 | 72323 | 72324 | 72325 | 72326 | 72327 | 72328 | 72329 | 72330 | 72331 | 72332 | 72333 | 72334 | 72335 | 72336 | 72337 | 72338 | 72527 | 76817 | 76818 | 76819 | 76820 | 76821 | 76822 | 76823 | 76824 | 76825 | 76826 | 76827 | 76828 | 76829 | 76830 | 76831 | 76832 | 76833 | 76834 | 76835 | 76836 | 76837 | 76838 | 76839 | 76840 | 76841 | 76842 | 76843 | 76844 | 76845 | 76846 | 76847 | 77177 | 77178 | 77179 | 78755 | 78757 | 78759 | 78761 | 78763 | 78765 | 78766 | 78768 | 78770 | 78772 | 78773 | 78774 | 78775 | 78776 | 78777 | 78778 | 78780 | 78782 | 78785 | 78787 | 78789 | 78790 | 78792 | 78794 | 78797 | 78800 | 78801 | 78802 | 78803 | 78804 | 78805 | 78806 | 78807 | 78808 | 80763 | 80764 | 80765 | 80766 | 80767 | 80768 | 80769 | 80770 | 80771 | 80772 | 80773 | 80774 | 80775 | 80776 | 80777 | 80778 | 80779 | 80780 | 80781 | 80782 | 80783 | 80784 | 80785 | 80786 | 80787 | 80788 | 80789 | 80793 | 80878 | 81204 | 81205 | 81206 | 81207 | 81208 | 81209 | 81210 | 81211 | 81212 | 81213 | 81214 | 81215 | 81216 | 81217 | 81218 | 81219 | 81220 | 81221 | 81222 | 81223 | 81224 | 81225 | 81226 | 81227 | 81228 | 81229 | 81230 | 81231 | 81232 | 81233 | 81234 | 81235 | 81236 | 81237 | 81238 | 81239 | 81240 | 81241 | 81242 | 81243 | 81244 | 81245 | 81246 | 81247 | 81547 | 81548 | 81549 | 81550 | 81551 | 81552 | 81553 | 81554 | 81555 | 81556 | 81557 | 81558 | 81559 | 81560 | 81561 | 81562 | 81563 | 81564 | 81565 | 81566 | 81567 | 81568 | 81569 | 81583 | 81584 | 81585 | 81586 | 81587 | 81588 | 81595 | 81618 | 81652 | 81653 | 81654 | 81655 | 81656 | 81657 | 81658 | 81659 | 81660 | 81661 | 81662 | 81663 | 81664 | 81665 | 81666 | 81667 | 81668 | 81669 | 81670 | 81671 | 81672 | 81673 | 81674 | 81675 | 81676 | 81677 | 81678 | 81679 | 81680 | 81681 | 81682 | 81683 | 103887 | 103888 | 103890 | 103899 | 103900 | 103901 | 103999 | 104000 | 104001 | 104002 | 104005 | 104006 | 104007 | 104066 | 104067 | 104068 | 104069 | 104070 | 104071 | 104246 | 104247 | 104248 | 104249 | 104250 | 104322 | 104323 | 104324 | 104325 | 104326 | 104327 | 104328 | 104329 | 104330 | 104331 | 104332 | 104333 | 104334 | 104335 | 104336 | 104391 | 104392 | 104393 | 104394 | 104395 | 104396 | 104397 | 104398 | 104474 | 104475 | 104476 | 104477 | 104478 | 104479 | 104480 | 104481 | 104545 | 104546 | 104547 | 104548 | 104549 | 104550 | 104551 | 104552 | 104646 | 104647 | 104648 | 104649 | 104650 | 104651 | 104652 | 104653 | 104722 | 104723 | 104724 | 104725 | 104726 | 104727 | 104728 | 104729 | 104806 | 104807 | 104808 | 104809 | 104810 | 104811 | 104812 | 104813 | 104814 | 104815 | 104816 | 104817 | 104818 | 104819 | 104820 | 104821 | 104863 | 104864 | 104865 | 104866 | 104867 | 104868 | 104869 | 104870 | 104902 | 104903 | 104904 | 104905 | 104906 | 104907 | 104908 | 104909 | 104910 | 104913 | 104914 | 104915 | 104916 | 104917 | 104918 | 104919 | 104920 | 104988 | 104989 | 104990 | 104991 | 104992 | 106268 | 106269 | 106371 | 106372 | 106373 | 106374 | 106375 | 106376 | 106377 | 106378 | 106810 | 106811 | 106812 | 106813 | 106814 | 106815 | 106816 | 106817 | 106857 | 107198 | 107199 | 107200 | 107201 | 107202 | 107203 | 107204 | 107205 | 107807 | 107808 | 107809 | 107810 | 107811 | 107812 | 107813 | 107814 | 107918 | 107919 | 107920 | 107921 | 107922 | 107923 | 107924 | 107925 | 108222 | 108223 | 108224 | 108225 | 108226 | 108227 | 108228 | 108229 | 108980 | 108981 | 108982 | 109306 | 109307 | 109308 | 109309 | 109310 | 109311 | 109312 | 109313 | 109314 | 109315 | 109316 | 109317 | 109318 | 109463 | 109464 | 109465 | 109466 | 109467 | 109468 | 109469 | 109775 | 109776 | 109777 | 109778 | 109779 | 109780 | 109781 | 109782 | 109783 | 109784 | 109785 | 111199 | 111200 | 111201 | 111202 | 111203 | 111204 | 111205 | 111206 | 112316 | 112317 | 112321 | 112322 | 112323 | 112324 | 112325 | 112326 | 112346 | 112472 | 112491 | 112540 | 112612 | 112613 | 112614 | 112615 | 112616 | 112617 | 112618 | 112619 | 112620 | 112621 | 112622 | 113195 | 113196 | 113197 | 113198 | 113199 | 113200 | 113201 | 113202 | 113203 | 113204 | 113205 | 113286 | 113287 | 113288 | 113289 | 113290 | 113291 | 113292 | 113293 | 113294 | 113295 | 113296 | 113297 | 113298 | 113335 | 113351 | 113352 | 113353 | 113354 | 113355 | 113356 | 113357 | 113358 | 113359 | 113361 | 113362 | 113363 | 113364 | 113365 | 113430 | 113431 | 113432 | 113433 | 113434 | 113435 | 113436 | 113437 | 113438 | 113439 | 113440 | 113441 | 113442 | 113443 | 113444 | 113445 | 116121 | 116122 | 116123 | 116124 | 116125 | 116126 | 116127 | 116128 | 116129 | 116130 | 116131 | 116132 | 116133 | 116134 | 118267 | 118268 | 118269 | 118270 | 118271 | 118272 | 118273 | 118274 | 118275 | 118276 | 118277 | 118278 | 118279 | 118280 | 122993 | 122994 | 122995 | 122996 | 122997 | 122998 | 122999 | 123000 | 123001 | 123002 | 123003 | 123004 | 123005 | 126244 | 126245 | 126246 | 126247 | 126248 | 126249 | 126250 | 126251 | 126252 | 126253 | 126254 | 126255 | 126256 | 126257 | 126453 | 126454 | 126455 | 126456 | 126457 | 126458 | 126459 | 126460 | 126469 | 126470 | 126565 | 126566 | 126568 | 126569 | 126570 | 126571 | 126572 | 126573 | 126574 | 126575 | 126576 | 126577 | 126578 | 126579 | 126580 | 129305 | 129306 | 129307 | 129308 | 129309 | 129310 | 129311 | 129312 | 129313 | 129314 | 129315 | 129316 | 129317 | 129318 | 129319 | 130641 | 130642 | 130643 | 130644 | 130645 | 130646 | 130647 | 130648 | 130649 | 130650 | 130651 | 130652 | 130653 | 130654 | 130655 | 130656 | 131108 | 131156 | 131157 | 131158 | 131159 | 131160 | 131193 | 131213 | 131257 | 131260 | 131261 | 131262 | 131263 | 131264 | 131265 | 131266 | 131267 | 131268 | 131269 | 131270 | 131271 | 131272 | 131273 | 131274 | 131275 | 131276 | 131277 | 131278 | 131279 | 131280 | 131281 | 131282 | 131330 | 131629 | 131630 | 131631 | 131664 | 131665 | 131666 | 131701 | 132332