Bug 19804: Add the new column to the circ rules interface

Signed-off-by: Hugo Agud <hagud@orex.es>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index 718b682..fe0c9c2 100755 (executable)
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -125,6 +125,7 @@ elsif ($op eq 'add') {
     my $finedays     = $input->param('finedays');
     my $maxsuspensiondays = $input->param('maxsuspensiondays');
     $maxsuspensiondays = undef if $maxsuspensiondays eq q||;
+    my $suspension_chargeperiod = $input->param('suspension_chargeperiod') || 1;
     my $firstremind  = $input->param('firstremind');
     my $chargeperiod = $input->param('chargeperiod');
     my $chargeperiod_charge_at = $input->param('chargeperiod_charge_at');
@@ -168,6 +169,7 @@ elsif ($op eq 'add') {
         fine                          => $fine,
         finedays                      => $finedays,
         maxsuspensiondays             => $maxsuspensiondays,
+        suspension_chargeperiod       => $suspension_chargeperiod,
         firstremind                   => $firstremind,
         chargeperiod                  => $chargeperiod,
         chargeperiod_charge_at        => $chargeperiod_charge_at,

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 ffa8776..03a8bdc 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -78,6 +78,7 @@
                 <th>Cap fine at replacement price</th>
                 <th>Suspension in days (day)</th>
                 <th>Max. suspension duration (day)</th>
+                <th>Fine day charging interval</th>
                 <th>Renewals allowed (count)</th>
                 <th>Renewal period</th>
                 <th>No renewal before</th>
@@ -165,6 +166,7 @@
                             </td>
                                                        <td>[% rule.finedays %]</td>
                             <td>[% rule.maxsuspensiondays %]</td>
+                            <td>[% rule.suspension_chargeperiod %]</td>
                                                        <td>[% rule.renewalsallowed %]</td>
                             <td>[% rule.renewalperiod %]</td>
                             <td>[% rule.norenewalbefore %]</td>
@@ -269,6 +271,7 @@
                     <td><input type="checkbox" name="cap_fine_to_replacement_price" id="cap_fine_to_replacement_price" /></td>
                     <td><input type="text" name="finedays" id="fined" size="3" /> </td>
                     <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="renewalperiod" id="renewalperiod" size="3" /></td>
                     <td><input type="text" name="norenewalbefore" id="norenewalbefore" size="3" /></td>
@@ -331,6 +334,7 @@
                       <th>Overdue fines cap (amount)</th>
                       <th>Cap fine at replacement price</th>
                       <th>Suspension in days (day)</th>
+                      <th>Fine day charging interval</th>
                       <th>Max. suspension duration (day)</th>
                       <th>Renewals allowed (count)</th>
                       <th>Renewal period</th>