@@ -, +, @@ --- C4/Overdues.pm | 19 +- .../prog/en/modules/tools/overduerules.tt | 379 +++++++++++-------- tools/overduerules.pl | 393 +++++++------------- 3 files changed, 362 insertions(+), 429 deletions(-) --- a/C4/Overdues.pm +++ a/C4/Overdues.pm @@ -766,9 +766,9 @@ returns a list of branch codes for branches with overdue rules defined. sub GetBranchcodesWithOverdueRules { my $dbh = C4::Context->dbh; my $branchcodes = $dbh->selectcol_arrayref(q| - SELECT DISTINCT(branchcode) - FROM overduerules - WHERE delay1 IS NOT NULL + SELECT DISTINCT b.branchcode + FROM branches b, overduerules r + WHERE b.branchcode = r.branchcode or r.branchcode = '' ORDER BY branchcode |); if ( $branchcodes->[0] eq '' ) { @@ -935,17 +935,14 @@ sub RemoveNotifyLine { =cut sub GetOverdueMessageTransportTypes { - my ( $branchcode, $categorycode, $letternumber ) = @_; - return unless $categorycode and $letternumber; + my ( $overduerules_id ) = @_; + return unless $overduerules_id; my $dbh = C4::Context->dbh; my $sth = $dbh->prepare(" - SELECT message_transport_type - FROM overduerules odr LEFT JOIN overduerules_transport_types ott USING (overduerules_id) - WHERE branchcode = ? - AND categorycode = ? - AND letternumber = ? + SELECT message_transport_type FROM overduerules_transport_types + WHERE overduerules_id = ? "); - $sth->execute( $branchcode, $categorycode, $letternumber ); + $sth->execute( $overduerules_id ); my @mtts; while ( my $mtt = $sth->fetchrow ) { push @mtts, $mtt; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/overduerules.tt @@ -2,177 +2,250 @@ [% INCLUDE 'doc-head-open.inc' %]
Delay is the number of days after an checkout is due before an action is triggered.
-If you want Koha to trigger an action (send a letter or restrict a member), a delay value is required.
-Columns must be filled left to right: if the first column is blank, other columns will be ignored.
-The following errors were found. Please correct them and submit again:
-