Attachment 98766 Details for Bug 24083 – Bug 24083: Add circ rules management

[patch] Bug 24083: Add circ rules management

Bug-24083-Add-circ-rules-management.patch (text/plain), 6.63 KB, created by Andrew Isherwood on 2020-02-12 17:02:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2020-02-12 17:02:39 UTC

Size: 6.63 KB

patch

obsolete

>From 7f3e838936c04e004d7a2eba351ae0c20c7aeb1c Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Thu, 21 Nov 2019 14:37:05 +0000
>Subject: [PATCH] Bug 24083: Add circ rules management
>
>This patch adds the ability to set the "Unseen renewals allowed" value
>in the circulation rules
>---
> admin/smart-rules.pl                                        |  2 ++
> .../intranet-tmpl/prog/en/modules/admin/smart-rules.tt      | 13 ++++++++++++-
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
>diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
>index 75ed5164ca..005e26d8b9 100755
>--- a/admin/smart-rules.pl
>+++ b/admin/smart-rules.pl
>@@ -264,6 +264,7 @@ elsif ($op eq 'add') {
>     my $maxissueqty  = $input->param('maxissueqty');
>     my $maxonsiteissueqty  = $input->param('maxonsiteissueqty');
>     my $renewalsallowed  = $input->param('renewalsallowed');
>+    my $unseen_renewals_allowed  = $input->param('unseen_renewals_allowed');
>     my $renewalperiod    = $input->param('renewalperiod');
>     my $norenewalbefore  = $input->param('norenewalbefore');
>     $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
>@@ -314,6 +315,7 @@ elsif ($op eq 'add') {
>         hardduedate                   => $hardduedate,
>         hardduedatecompare            => $hardduedatecompare,
>         renewalsallowed               => $renewalsallowed,
>+        unseen_renewals_allowed       => $unseen_renewals_allowed,
>         renewalperiod                 => $renewalperiod,
>         norenewalbefore               => $norenewalbefore,
>         auto_renew                    => $auto_renew,
>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 ed737af2cd..742bf48817 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
>@@ -105,6 +105,9 @@
>                 <th>Max. suspension duration (day)</th>
>                 <th>Suspension charging interval</th>
>                 <th>Renewals allowed (count)</th>
>+                [% IF Koha.Preference('UnseenRenewals') %]
>+                <th>Unseen renewals allowed (count)</th>
>+                [% END %]
>                 <th>Renewal period</th>
>                 <th>No renewal before</th>
>                 <th>Automatic renewal</th>
>@@ -141,6 +144,7 @@
>                         [% SET maxsuspensiondays = CirculationRules.Search( branchcode, c, i, 'maxsuspensiondays' ) %]
>                         [% SET suspension_chargeperiod = CirculationRules.Search( branchcode, c, i, 'suspension_chargeperiod' ) %]
>                         [% SET renewalsallowed = CirculationRules.Search( branchcode, c, i, 'renewalsallowed' ) %]
>+                        [% SET unseenrenewalsallowed = CirculationRules.Search( branchcode, c, i, 'unseen_renewals_allowed' ) %]
>                         [% SET renewalperiod = CirculationRules.Search( branchcode, c, i, 'renewalperiod' ) %]
>                         [% SET norenewalbefore = CirculationRules.Search( branchcode, c, i, 'norenewalbefore' ) %]
>                         [% SET auto_renew = CirculationRules.Search( branchcode, c, i, 'auto_renew' ) %]
>@@ -154,7 +158,7 @@
>                         [% SET article_requests = CirculationRules.Search( branchcode, c, i, 'article_requests' ) %]
>                         [% SET rentaldiscount = CirculationRules.Search( branchcode, c, i, 'rentaldiscount' ) %]
> 
>-                        [% SET show_rule = maxissueqty || maxonsiteissueqty || issuelength || lengthunit || hardduedate || hardduedatebefore || hardduedateexact || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalsallowed || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || article_requests %]
>+                        [% SET show_rule = maxissueqty || maxonsiteissueqty || issuelength || lengthunit || hardduedate || hardduedatebefore || hardduedateexact || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || unseenrenewalsallowed || renewalsallowed || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || article_requests %]
>                         [% IF show_rule %]
>                             [% SET row_count = row_count + 1 %]
>                             <tr row_countd="row_[% row_count | html %]">
>@@ -237,6 +241,9 @@
>                                     <td>[% maxsuspensiondays | html %]</td>
>                                     <td>[% suspension_chargeperiod | html %]</td>
>                                     <td>[% renewalsallowed | html %]</td>
>+                                    [% IF Koha.Preference('UnseenRenewals') %]
>+                                        <td>[% unseenrenewalsallowed | html %]</td>
>+                                    [% END %]
>                                     <td>[% renewalperiod | html %]</td>
>                                     <td>[% norenewalbefore | html %]</td>
>                                     <td>
>@@ -357,6 +364,7 @@
>                     <td><input type="text" name="maxsuspensiondays" id="maxsuspensiondays" size="3" /> </td>
>                     <td><input type="text" name="suspension_chargeperiod" id="suspension_chargeperiod" size="3" /> </td>
>                     <td><input type="text" name="renewalsallowed" id="renewalsallowed" size="2" /></td>
>+                    <td><input type="text" name="unseen_renewals_allowed" id="unseen_renewals_allowed" size="2" /></td>
>                     <td><input type="text" name="renewalperiod" id="renewalperiod" size="3" /></td>
>                     <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
>                     <td>
>@@ -423,6 +431,9 @@
>                       <th>Max. suspension duration (day)</th>
>                       <th>Suspension charging interval</th>
>                       <th>Renewals allowed (count)</th>
>+                      [% IF Koha.Preference('UnseenRenewals') %]
>+                      <th>Unseen renewals allowed (count)</th>
>+                      [% END %]
>                       <th>Renewal period</th>
>                       <th>No renewal before</th>
>                       <th>Automatic renewal</th>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 24083: 95861 | 95862 | 95863 | 95864 | 95865 | 95866 | 95867 | 95868 | 98749 | 98750 | 98751 | 98752 | 98765 | 98766 | 98767 | 98768 | 100244 | 100245 | 100246 | 100247 | 100380 | 100381 | 100382 | 100383 | 100392 | 110607 | 110608 | 110609 | 110610 | 110611 | 111147 | 111148 | 111149 | 111150 | 111151 | 111152 | 111283 | 111284 | 111285 | 111286 | 111287 | 111288 | 111289 | 111290 | 111291 | 111292 | 111293 | 111849 | 111850 | 111851 | 111852 | 111853 | 111854 | 111855 | 111856 | 111857 | 111858 | 111859 | 111860 | 112230 | 112231 | 112232 | 112233 | 112234 | 112235 | 112236 | 112237 | 112238 | 112239 | 112240 | 112241 | 112242 | 112243 | 112410 | 112411 | 112412 | 112413 | 112414 | 112415 | 112416 | 112417 | 112418 | 112419 | 112420 | 112421 | 112422 | 112423 | 113073 | 113074 | 113075 | 113076 | 113077 | 113078 | 113079 | 113080 | 113314 | 113315 | 113484 | 113485 | 113486 | 113487 | 113488 | 113489 | 113490 | 113491 | 113492 | 113493 | 113494 | 113546 | 113556 | 113557 | 113814