1fe3514c3c
Some code coming from BibLibre has been lost in the process of inclusion in 3.4. The result is that fine in days does not work at all (you can setup rules, but it does nothing) Step to reproduce: - Koha > Admin > circ rules > set 1 day fine every day of overdue for default rule - Issue a book return date last week - check-in the book => no debarment is set The following patch will fix all of those problems by : * updating borrowers.debarred to a date field (instead of tinyint). It contains the limit of the debarment * changing API of DebarMember and UpdateBorrowerDebarred to pass a date * display debarrdate where applicable. Note that a debarrdate of 31/12/9999 is considered as unlimited and not displayed * added a debarrcomment, usefull to explain why a patron is debarred (this is independant from debarrdate changes and can be used when placing an unlimited debarment too) [2011-05-12] F. Demians. It works as described. And I can confirm this functionality is impatiently awaited by French libraries since one year. Thanks BibLibre for the good work and for contributing this code. Bug 6328 Followup--update DB structure Thanks Katrin. Bug 6328: make comment a textbox / fix debar by notice trigger Debarring by notice triggers was broken, because the new function expects a date as second parameter. The comment field in patron account details was a very long text field. Patch changes it to be a textbox instead. Bug 6328: Lift debarment leaves patron account 'Lift debarment' redirects to an empty circulation page. BZ6328 follow-up 3 Fixes comment 23 from Fernando L. Canizo : when the patron was debarred and debar removed he still could not check-out. The changes in the IsMemberBlocked (that were on biblibre/master) were lost somewhere The sub was still checking for old_issues instead of calling CheckBorrowerDebarred to get a debardate if applicable Note : this bug was appearing only is you had issuing rules defined for itemtype/categorycode/branch. Seemed to work if you had only default rules. That's probably why it hadn't been spotted before BZ6328 follow-up 4 Comments fron Zeno Tajoli: The patch is OK and I sign-off it. Two little changes done on installer/data/mysql/kohastructure.sql and installer/data/mysql/updatedatabase.pl Signed-off-by: koha <koha@kohabase.localdomain>
71 lines
2.2 KiB
Perl
Executable file
71 lines
2.2 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#script to set or lift debarred status
|
|
#written 2/8/04
|
|
#by oleonard@athenscounty.lib.oh.us
|
|
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
# Parts copyright 2010 BibLibre
|
|
#
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it under the
|
|
# terms of the GNU General Public License as published by the Free Software
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
|
# version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
|
|
# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
|
|
# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License along
|
|
# with Koha; if not, write to the Free Software Foundation, Inc.,
|
|
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
use strict;
|
|
use warnings;
|
|
|
|
use CGI;
|
|
use C4::Context;
|
|
use C4::Members;
|
|
use C4::Auth;
|
|
|
|
|
|
my $input = new CGI;
|
|
|
|
my $flagsrequired;
|
|
$flagsrequired->{borrowers}=1;
|
|
my ($loggedinuser, $cookie, $sessionID) = checkauth($input, 0, $flagsrequired);
|
|
|
|
my $destination = $input->param("destination") || '';
|
|
my $cardnumber = $input->param("cardnumber");
|
|
my $borrowernumber=$input->param('borrowernumber');
|
|
my $status = $input->param('status');
|
|
my $reregistration = $input->param('reregistration') || '';
|
|
|
|
my $dbh = C4::Context->dbh;
|
|
my $dateexpiry;
|
|
|
|
if ( $reregistration eq 'y' ) {
|
|
# re-reregistration function to automatic calcul of date expiry
|
|
$dateexpiry = ExtendMemberSubscriptionTo( $borrowernumber );
|
|
} else {
|
|
my $sth = $dbh->prepare("UPDATE borrowers SET debarred = ?, debarredcomment = '' WHERE borrowernumber = ?");
|
|
$sth->execute( $status, $borrowernumber );
|
|
$sth->finish;
|
|
}
|
|
|
|
if($destination eq "circ"){
|
|
if($dateexpiry){
|
|
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber&dateexpiry=$dateexpiry");
|
|
} else {
|
|
print $input->redirect("/cgi-bin/koha/circ/circulation.pl?findborrower=$cardnumber");
|
|
}
|
|
} else {
|
|
if($dateexpiry){
|
|
print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber&dateexpiry=$dateexpiry");
|
|
} else {
|
|
print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$borrowernumber");
|
|
}
|
|
}
|