X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FCirculation.pm;h=1694444781372676cc2f81289ea2e040f04af65e;hb=87327eae60a9e65bbde067c1e09c73e4955aa749;hp=4a6f80fdeb028b0a8f3ab331207750b3e6f13456;hpb=2e4a11773c0a4aa172b5debdee4db831a13adf26;p=koha.git diff --git a/C4/Circulation.pm b/C4/Circulation.pm old mode 100755 new mode 100644 index 4a6f80fdeb..1694444781 --- a/C4/Circulation.pm +++ b/C4/Circulation.pm @@ -17,7 +17,6 @@ package C4::Circulation; # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA -# $Id$ use strict; require Exporter; @@ -26,9 +25,8 @@ use C4::Stats; use C4::Reserves; use C4::Koha; use C4::Biblio; -use C4::Reserves; use C4::Members; -use C4::Date; +use C4::Dates; use Date::Calc qw( Today Today_and_Now @@ -42,10 +40,12 @@ use POSIX qw(strftime); use C4::Branch; # GetBranches use C4::Log; # logaction +use Data::Dumper; + our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,%EXPORT_TAGS); # set the version for version checking -$VERSION = do { my @v = '$Revision$' =~ /\d+/g; shift(@v).".".join( "_", map { sprintf "%03d", $_ } @v ); }; +$VERSION = 3.00; =head1 NAME @@ -79,6 +79,7 @@ push @EXPORT, qw( &CanBookBeRenewed &AddIssue &AddRenewal + &GetRenewCount &GetItemIssue &GetItemIssues &GetBorrowerIssues @@ -367,150 +368,142 @@ if the borrower borrows to much things =cut # check if a book can be issued. -# returns an array with errors if any -sub TooMany ($$) { + +sub TooMany { my $borrower = shift; my $biblionumber = shift; + my $item = shift; my $cat_borrower = $borrower->{'categorycode'}; my $branch_borrower = $borrower->{'branchcode'}; my $dbh = C4::Context->dbh; - my $sth = - $dbh->prepare('select itemtype from biblioitems where biblionumber = ?'); - $sth->execute($biblionumber); - my $type = $sth->fetchrow; - $sth = + my $branch_issuer = C4::Context->userenv->{'branchcode'}; + # TODO : specify issuer or borrower for circrule. + my $type = (C4::Context->preference('item-level_itypes')) + ? $item->{'itype'} # item-level + : $item->{'itemtype'}; # biblio-level + + my $sth = $dbh->prepare( -'select * from issuingrules where categorycode = ? and itemtype = ? and branchcode = ?' + 'SELECT * FROM issuingrules + WHERE categorycode = ? + AND itemtype = ? + AND branchcode = ?' ); -# my $sth2 = $dbh->prepare("select COUNT(*) from issues i, biblioitems s where i.borrowernumber = ? and i.returndate is null and i.itemnumber = s.biblioitemnumber and s.itemtype like ?"); - my $sth2 = - $dbh->prepare( -"select COUNT(*) from issues i, biblioitems s1, items s2 where i.borrowernumber = ? and i.returndate is null and i.itemnumber = s2.itemnumber and s1.itemtype like ? and s1.biblioitemnumber = s2.biblioitemnumber" - ); + my $query2 = "SELECT COUNT(*) FROM issues i, biblioitems s1, items s2 + WHERE i.borrowernumber = ? + AND i.returndate IS NULL + AND i.itemnumber = s2.itemnumber + AND s1.biblioitemnumber = s2.biblioitemnumber"; + (C4::Context->preference('item-level_itypes')) ? $query2.=" AND s2.itype=? " : $query2.=" AND s1.itemtype= ? "; + my $sth2= $dbh->prepare($query2); my $sth3 = $dbh->prepare( -'select COUNT(*) from issues where borrowernumber = ? and returndate is null' - ); + 'SELECT COUNT(*) FROM issues + WHERE borrowernumber = ? + AND returndate IS NULL' + ); my $alreadyissued; - # check the 3 parameters + # check the 3 parameters (branch / itemtype / category code $sth->execute( $cat_borrower, $type, $branch_borrower ); my $result = $sth->fetchrow_hashref; +# warn "$cat_borrower, $type, $branch_borrower = ".Data::Dumper::Dumper($result); - # warn "==>".$result->{maxissueqty}; - -# Currently, using defined($result) ie on an entire hash reports whether memory -# for that aggregate has ever been allocated. As $result is used all over the place -# it would rarely return as undefined. - if ( defined( $result->{maxissueqty} ) ) { - $sth2->execute( $borrower->{'borrowernumber'}, "%$type%" ); - my $alreadyissued = $sth2->fetchrow; - if ( $result->{'maxissueqty'} <= $alreadyissued ) { - return ( "a $alreadyissued / ".( $result->{maxissueqty} + 0 ) ); - } - else { - return; - } - } - - # check for branch=* - $sth->execute( $cat_borrower, $type, "" ); - $result = $sth->fetchrow_hashref; - if ( defined( $result->{maxissueqty} ) ) { - $sth2->execute( $borrower->{'borrowernumber'}, "%$type%" ); + if ( $result->{maxissueqty} ne '' ) { +# warn "checking on everything set"; + $sth2->execute( $borrower->{'borrowernumber'}, $type ); my $alreadyissued = $sth2->fetchrow; if ( $result->{'maxissueqty'} <= $alreadyissued ) { - return ( "b $alreadyissued / ".( $result->{maxissueqty} + 0 ) ); + return ( "$alreadyissued / ".( $result->{maxissueqty} + 0 )." (rule on branch/category/itemtype failed)" ); } - else { - return; + # now checking for total + $sth->execute( $cat_borrower, '', $branch_borrower ); + my $result = $sth->fetchrow_hashref; + if ( $result->{maxissueqty} ne '*' ) { + $sth2->execute( $borrower->{'borrowernumber'}, $type ); + my $alreadyissued = $sth2->fetchrow; + if ( $result->{'maxissueqty'} <= $alreadyissued ) { + return ( "$alreadyissued / ".( $result->{maxissueqty} + 0 )." (rule on branch/category/total failed)" ); + } } } - # check for itemtype=* - $sth->execute( $cat_borrower, "*", $branch_borrower ); - $result = $sth->fetchrow_hashref; - if ( defined( $result->{maxissueqty} ) ) { - $sth3->execute( $borrower->{'borrowernumber'} ); - my ($alreadyissued) = $sth3->fetchrow; - if ( $result->{'maxissueqty'} <= $alreadyissued ) { - -# warn "HERE : $alreadyissued / ($result->{maxissueqty} for $borrower->{'borrowernumber'}"; - return ( "c $alreadyissued / " . ( $result->{maxissueqty} + 0 ) ); - } - else { - return; - } - } + # check the 2 parameters (branch / itemtype / default categorycode + $sth->execute( '*', $type, $branch_borrower ); + my $result = $sth->fetchrow_hashref; +# warn "*, $type, $branch_borrower = ".Data::Dumper::Dumper($result); - # check for borrowertype=* - $sth->execute( "*", $type, $branch_borrower ); - $result = $sth->fetchrow_hashref; - if ( defined( $result->{maxissueqty} ) ) { - $sth2->execute( $borrower->{'borrowernumber'}, "%$type%" ); + if ( $result->{maxissueqty} ne '' ) { +# warn "checking on 2 parameters (default categorycode)"; + $sth2->execute( $borrower->{'borrowernumber'}, $type ); my $alreadyissued = $sth2->fetchrow; if ( $result->{'maxissueqty'} <= $alreadyissued ) { - return ( "d $alreadyissued / " . ( $result->{maxissueqty} + 0 ) ); + return ( "$alreadyissued / ".( $result->{maxissueqty} + 0 )." (rule on branch / default category / itemtype failed)" ); } - else { - return; - } - } - - $sth->execute( "*", "*", $branch_borrower ); - $result = $sth->fetchrow_hashref; - if ( defined( $result->{maxissueqty} ) ) { - $sth3->execute( $borrower->{'borrowernumber'} ); - my $alreadyissued = $sth3->fetchrow; - if ( $result->{'maxissueqty'} <= $alreadyissued ) { - return ( "e $alreadyissued / " . ( $result->{maxissueqty} + 0 ) ); - } - else { - return; + # now checking for total + $sth->execute( '*', '*', $branch_borrower ); + my $result = $sth->fetchrow_hashref; + if ( $result->{maxissueqty} ne '' ) { + $sth2->execute( $borrower->{'borrowernumber'}, $type ); + my $alreadyissued = $sth2->fetchrow; + if ( $result->{'maxissueqty'} <= $alreadyissued ) { + return ( "$alreadyissued / ".( $result->{maxissueqty} + 0 )." (rule on branch / default category / total failed)" ); + } } } - - $sth->execute( "*", $type, "" ); - $result = $sth->fetchrow_hashref; - if ( defined( $result->{maxissueqty} ) && $result->{maxissueqty} >= 0 ) { - $sth2->execute( $borrower->{'borrowernumber'}, "%$type%" ); + + # check the 1 parameters (default branch / itemtype / categorycode + $sth->execute( $cat_borrower, $type, '*' ); + my $result = $sth->fetchrow_hashref; +# warn "$cat_borrower, $type, * = ".Data::Dumper::Dumper($result); + + if ( $result->{maxissueqty} ne '' ) { +# warn "checking on 1 parameter (default branch + categorycode)"; + $sth2->execute( $borrower->{'borrowernumber'}, $type ); my $alreadyissued = $sth2->fetchrow; if ( $result->{'maxissueqty'} <= $alreadyissued ) { - return ( "f $alreadyissued / " . ( $result->{maxissueqty} + 0 ) ); + return ( "$alreadyissued / ".( $result->{maxissueqty} + 0 )." (rule on default branch/category/itemtype failed)" ); } - else { - return; + # now checking for total + $sth->execute( $cat_borrower, '*', '*' ); + my $result = $sth->fetchrow_hashref; + if ( $result->{maxissueqty} ne '' ) { + $sth2->execute( $borrower->{'borrowernumber'}, $type ); + my $alreadyissued = $sth2->fetchrow; + if ( $result->{'maxissueqty'} <= $alreadyissued ) { + return ( "$alreadyissued / ".( $result->{maxissueqty} + 0 )." (rule on default branch / category / total failed)" ); + } } } - $sth->execute( $cat_borrower, "*", "" ); - $result = $sth->fetchrow_hashref; - if ( defined( $result->{maxissueqty} ) ) { - $sth2->execute( $borrower->{'borrowernumber'}, "%$type%" ); + # check the 0 parameters (default branch / itemtype / default categorycode + $sth->execute( '*', $type, '*' ); + my $result = $sth->fetchrow_hashref; +# warn "*, $type, * = ".Data::Dumper::Dumper($result); + + if ( $result->{maxissueqty} ne '' ) { +# warn "checking on default branch and default categorycode"; + $sth2->execute( $borrower->{'borrowernumber'}, $type ); my $alreadyissued = $sth2->fetchrow; if ( $result->{'maxissueqty'} <= $alreadyissued ) { - return ( "g $alreadyissued / " . ( $result->{maxissueqty} + 0 ) ); + return ( "$alreadyissued / ".( $result->{maxissueqty} + 0 )." (rule on default branch / default category / itemtype failed)" ); } - else { - return; + # now checking for total + $sth->execute( '*', '*', '*' ); + my $result = $sth->fetchrow_hashref; + if ( $result->{maxissueqty} ne '' ) { + $sth2->execute( $borrower->{'borrowernumber'}, $type ); + my $alreadyissued = $sth2->fetchrow; + if ( $result->{'maxissueqty'} <= $alreadyissued ) { + return ( "$alreadyissued / ".( $result->{maxissueqty} + 0 )." (rule on default branch / default category / total failed)" ); + } } } - $sth->execute( "*", "*", "" ); - $result = $sth->fetchrow_hashref; - if ( defined( $result->{maxissueqty} ) ) { - $sth3->execute( $borrower->{'borrowernumber'} ); - my $alreadyissued = $sth3->fetchrow; - if ( $result->{'maxissueqty'} <= $alreadyissued ) { - return ( "h $alreadyissued / " . ( $result->{maxissueqty} + 0 ) ); - } - else { - return; - } - } + #OK, the patron can issue !!! return; } @@ -612,22 +605,13 @@ sub itemissues { # Find the last 3 people who borrowed this item. $sth2 = $dbh->prepare( - "SELECT * FROM issues, borrowers + "SELECT * FROM issues LEFT JOIN borrowers ON issues.borrowernumber = borrowers.borrowernumber WHERE itemnumber = ? AND returndate IS NOT NULL ORDER BY returndate DESC,timestamp DESC" ); -# $sth2 = $dbh->prepare(" -# SELECT * -# FROM issues -# LEFT JOIN borrowers ON issues.borrowernumber = borrowers.borrowernumber -# WHERE itemnumber = ? -# AND returndate is not NULL -# ORDER BY returndate DESC,timestamp DESC -# "); - $sth2->execute( $data->{'itemnumber'} ); for ( my $i2 = 0 ; $i2 < 2 ; $i2++ ) { # FIXME : error if there is less than 3 pple borrowing this item @@ -650,25 +634,26 @@ sub itemissues { =head2 CanBookBeIssued $issuingimpossible, $needsconfirmation = - CanBookBeIssued( $borrower, $barcode, $year, $month, $day, $inprocess ); - + CanBookBeIssued( $borrower, $barcode, $duedatespec, $inprocess ); +C<$duedatespec> is a C4::Dates object. C<$issuingimpossible> and C<$needsconfirmation> are some hashref. =cut sub CanBookBeIssued { - my ( $borrower, $barcode, $year, $month, $day, $inprocess ) = @_; + my ( $borrower, $barcode, $duedate, $inprocess ) = @_; my %needsconfirmation; # filled with problems that needs confirmations my %issuingimpossible; # filled with problems that causes the issue to be IMPOSSIBLE my $item = GetItem(GetItemnumberFromBarcode( $barcode )); my $issue = GetItemIssue($item->{itemnumber}); + my $biblioitem = GetBiblioItemData($item->{biblioitemnumber}); + $item->{'itemtype'}=$biblioitem->{'itemtype'}; my $dbh = C4::Context->dbh; # - # DUE DATE is OK ? + # DUE DATE is OK ? -- should already have checked. # - my ( $duedate, $invalidduedate ) = fixdate( $year, $month, $day ); - $issuingimpossible{INVALID_DATE} = 1 if ($invalidduedate); + #$issuingimpossible{INVALID_DATE} = 1 unless ($duedate); # # BORROWER STATUS @@ -682,22 +667,22 @@ sub CanBookBeIssued { if ( $borrower->{flags}->{'DBARRED'} ) { $issuingimpossible{DEBARRED} = 1; } - if ( Date_to_Days(Today) > - Date_to_Days( split "-", $borrower->{'dateexpiry'} ) ) - { - - # - #if (&Date_Cmp(&ParseDate($borrower->{expiry}),&ParseDate("today"))<0) { + if ( $borrower->{'dateexpiry'} eq '0000-00-00') { $issuingimpossible{EXPIRED} = 1; + } else { + my @expirydate= split /-/,$borrower->{'dateexpiry'}; + if($expirydate[0]==0 || $expirydate[1]==0|| $expirydate[2]==0 || + Date_to_Days(Today) > Date_to_Days( @expirydate )) { + $issuingimpossible{EXPIRED} = 1; + } } - # # BORROWER STATUS # # DEBTS my ($amount) = - GetMemberAccountRecords( $borrower->{'borrowernumber'}, $duedate ); + C4::Members::GetMemberAccountRecords( $borrower->{'borrowernumber'}, '' && $duedate->output('iso') ); if ( C4::Context->preference("IssuingInProcess") ) { my $amountlimit = C4::Context->preference("noissuescharge"); if ( $amount > $amountlimit && !$inprocess ) { @@ -716,7 +701,7 @@ sub CanBookBeIssued { # # JB34 CHECKS IF BORROWERS DONT HAVE ISSUE TOO MANY BOOKS # - my $toomany = TooMany( $borrower, $item->{biblionumber} ); + my $toomany = TooMany( $borrower, $item->{biblionumber}, $item ); $needsconfirmation{TOO_MANY} = $toomany if $toomany; # @@ -743,7 +728,7 @@ sub CanBookBeIssued { my $userenv = C4::Context->userenv; if ( ($userenv) && ( $userenv->{flags} != 1 ) ) { $issuingimpossible{NOTSAMEBRANCH} = 1 - if ( $item->{'holdingbranch'} ne $userenv->{branch} ); + if ( $item->{C4::Context->preference("HomeOrHoldingbranch")} ne $userenv->{branch} ); } } @@ -763,8 +748,7 @@ sub CanBookBeIssued { $issuingimpossible{NO_MORE_RENEWALS} = 1; } else { - - # $needsconfirmation{RENEW_ISSUE} = 1; + $needsconfirmation{RENEW_ISSUE} = 1; } } elsif ($issue->{borrowernumber}) { @@ -778,7 +762,7 @@ sub CanBookBeIssued { } # See if the item is on reserve. - my ( $restype, $res ) = CheckReserves( $item->{'itemnumber'} ); + my ( $restype, $res ) = C4::Reserves::CheckReserves( $item->{'itemnumber'} ); if ($restype) { my $resbor = $res->{'borrowernumber'}; if ( $resbor ne $borrower->{'borrowernumber'} && $restype eq "Waiting" ) @@ -808,17 +792,14 @@ sub CanBookBeIssued { "$res->{'reservedate'} : $resborrower->{'firstname'} $resborrower->{'surname'} ($resborrower->{'cardnumber'})"; } } - if ( C4::Context->preference("LibraryName") eq "Horowhenua Library Trust" ) - { + if ( C4::Context->preference("LibraryName") eq "Horowhenua Library Trust" ) { if ( $borrower->{'categorycode'} eq 'W' ) { my %issuingimpossible; return ( \%issuingimpossible, \%needsconfirmation ); - } - else { + } else { return ( \%issuingimpossible, \%needsconfirmation ); } - } - else { + } else { return ( \%issuingimpossible, \%needsconfirmation ); } } @@ -856,48 +837,34 @@ AddIssue does the following things : sub AddIssue { my ( $borrower, $barcode, $date, $cancelreserve ) = @_; - my $dbh = C4::Context->dbh; -my $barcodecheck=CheckValidBarcode($barcode); -if ($borrower and $barcode and $barcodecheck ne '0'){ + my $barcodecheck=CheckValidBarcode($barcode); + if ($borrower and $barcode and $barcodecheck ne '0'){ # my ($borrower, $flags) = &GetMemberDetails($borrowernumber, 0); - # find which item we issue - my $item = GetItem('', $barcode); - - # get actual issuing if there is one - my $actualissue = GetItemIssue( $item->{itemnumber}); - - # get biblioinformation for this item - my $biblio = GetBiblioFromItemNumber($item->{itemnumber}); + # find which item we issue + my $item = GetItem('', $barcode); + my $datedue; + + # get actual issuing if there is one + my $actualissue = GetItemIssue( $item->{itemnumber}); + + # get biblioinformation for this item + my $biblio = GetBiblioFromItemNumber($item->{itemnumber}); + + # + # check if we just renew the issue. + # + if ( $actualissue->{borrowernumber} eq $borrower->{'borrowernumber'} ) { + AddRenewal( + $borrower->{'borrowernumber'}, + $item->{'itemnumber'}, + C4::Context->userenv->{'branch'}, + $date + ); - # - # check if we just renew the issue. - # - if ( $actualissue->{borrowernumber} eq $borrower->{'borrowernumber'} ) { - # we renew, do we need to add some charge ? - my ( $charge, $itemtype ) = GetIssuingCharges( - $item->{'itemnumber'}, - $borrower->{'borrowernumber'} - ); - if ( $charge > 0 ) { - AddIssuingCharge( - $item->{'itemnumber'}, - $borrower->{'borrowernumber'}, $charge - ); - $item->{'charge'} = $charge; - } - &UpdateStats( - C4::Context->userenv->{'branch'}, - 'renew', $charge, - '', $item->{'itemnumber'}, - $biblio->{'itemtype'}, $borrower->{'borrowernumber'} - ); - AddRenewal( - $borrower->{'borrowernumber'}, - $item->{'itemnumber'} - ); - } - else {# it's NOT a renewal + } + else { + # it's NOT a renewal if ( $actualissue->{borrowernumber}) { # This book is currently on loan, but not to the person # who wants to borrow it now. mark it returned before issuing to the new borrower @@ -909,7 +876,7 @@ if ($borrower and $barcode and $barcodecheck ne '0'){ # See if the item is on reserve. my ( $restype, $res ) = - CheckReserves( $item->{'itemnumber'} ); + C4::Reserves::CheckReserves( $item->{'itemnumber'} ); if ($restype) { my $resbor = $res->{'borrowernumber'}; if ( $resbor eq $borrower->{'borrowernumber'} ) { @@ -926,20 +893,6 @@ if ($borrower and $barcode and $barcodecheck ne '0'){ my $branches = GetBranches(); my $branchname = $branches->{ $res->{'branchcode'} }->{'branchname'}; - if ($cancelreserve) { - CancelReserve( 0, $res->{'itemnumber'}, - $res->{'borrowernumber'} ); - } - else { - - # set waiting reserve to first in reserve queue as book isn't waiting now - ModReserve( - 1, - $res->{'biblionumber'}, - $res->{'borrowernumber'}, - $res->{'branchcode'} - ); - } } elsif ( $restype eq "Reserved" ) { @@ -955,6 +908,19 @@ if ($borrower and $barcode and $barcodecheck ne '0'){ $res->{'borrowernumber'} ); } } + if ($cancelreserve) { + CancelReserve( $res->{'biblionumber'}, 0, + $res->{'borrowernumber'} ); + } + else { + # set waiting reserve to first in reserve queue as book isn't waiting now + ModReserve( + 1, + $res->{'biblionumber'}, + $res->{'borrowernumber'}, + $res->{'branchcode'} + ); + } } # Starting process for transfer job (checking transfert and validate it if we have one) @@ -980,44 +946,47 @@ if ($borrower and $barcode and $barcodecheck ne '0'){ (borrowernumber, itemnumber,issuedate, date_due, branchcode) VALUES (?,?,?,?,?)" ); - my $loanlength = GetLoanLength( - $borrower->{'categorycode'}, - $biblio->{'itemtype'}, - $borrower->{'branchcode'} - ); - my $datedue = time + ($loanlength) * 86400; - my @datearr = localtime($datedue); - my $dateduef = - ( 1900 + $datearr[5] ) . "-" - . ( $datearr[4] + 1 ) . "-" - . $datearr[3]; + my $dateduef; if ($date) { $dateduef = $date; - } - $dateduef=CheckValidDatedue($dateduef,$item->{'itemnumber'},C4::Context->userenv->{'branch'}); - # if ReturnBeforeExpiry ON the datedue can't be after borrower expirydate - if ( C4::Context->preference('ReturnBeforeExpiry') - && $dateduef gt $borrower->{dateexpiry} ) - { - $dateduef = $borrower->{dateexpiry}; - } - $sth->execute( + } else { + my $itype=(C4::Context->preference('item-level_itypes')) ? $biblio->{'itype'} : $biblio->{'itemtype'} ; + my $loanlength = GetLoanLength( + $borrower->{'categorycode'}, + $itype, + $borrower->{'branchcode'} + ); + $datedue = time + ($loanlength) * 86400; + my @datearr = localtime($datedue); + $dateduef = C4::Dates->new( sprintf("%04d-%02d-%02d", 1900 + $datearr[5], $datearr[4] + 1, $datearr[3]), 'iso'); + $dateduef=CheckValidDatedue($dateduef,$item->{'itemnumber'},C4::Context->userenv->{'branch'}); + + # if ReturnBeforeExpiry ON the datedue can't be after borrower expirydate + if ( C4::Context->preference('ReturnBeforeExpiry') && $dateduef->output('iso') gt $borrower->{dateexpiry} ) { + $dateduef = C4::Dates->new($borrower->{dateexpiry},'iso'); + } + }; + $sth->execute( $borrower->{'borrowernumber'}, $item->{'itemnumber'}, - strftime( "%Y-%m-%d", localtime ),$dateduef, C4::Context->userenv->{'branch'} + strftime( "%Y-%m-%d", localtime ),$dateduef->output('iso'), C4::Context->userenv->{'branch'} ); $sth->finish; $item->{'issues'}++; $sth = $dbh->prepare( - "UPDATE items SET issues=?, holdingbranch=?, itemlost=0, datelastborrowed = now() WHERE itemnumber=?"); + "UPDATE items SET issues=?, holdingbranch=?, itemlost=0, datelastborrowed = now(), onloan = ? WHERE itemnumber=?"); $sth->execute( $item->{'issues'}, C4::Context->userenv->{'branch'}, + $dateduef->output('iso'), $item->{'itemnumber'} ); $sth->finish; &ModDateLastSeen( $item->{'itemnumber'} ); + my $record = GetMarcItem( $item->{'biblionumber'}, $item->{'itemnumber'} ); + my $frameworkcode = GetFrameworkCode( $item->{'biblionumber'} ); + ModItemInMarc( $record, $item->{'biblionumber'}, $item->{'itemnumber'}, $frameworkcode ); # If it costs to borrow this book, charge it to the patron's account. my ( $charge, $itemtype ) = GetIssuingCharges( $item->{'itemnumber'}, @@ -1042,6 +1011,7 @@ if ($borrower and $barcode and $barcodecheck ne '0'){ &logaction(C4::Context->userenv->{'number'},"CIRCULATION","ISSUE",$borrower->{'borrowernumber'},$biblio->{'biblionumber'}) if C4::Context->preference("IssueLog"); + return ($datedue); } } @@ -1058,9 +1028,9 @@ sub GetLoanLength { my $dbh = C4::Context->dbh; my $sth = $dbh->prepare( -"select issuelength from issuingrules where categorycode=? and itemtype=? and branchcode=?" +"select issuelength from issuingrules where categorycode=? and itemtype=? and branchcode=? and issuelength is not null" ); - +# warn "in get loan lenght $borrowertype $itemtype $branchcode "; # try to find issuelength & return the 1st available. # check with borrowertype, itemtype and branchcode, then without one of those parameters $sth->execute( $borrowertype, $itemtype, $branchcode ); @@ -1068,7 +1038,7 @@ sub GetLoanLength { return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL'; - $sth->execute( $borrowertype, $itemtype, "" ); + $sth->execute( $borrowertype, $itemtype, "*" ); $loanlength = $sth->fetchrow_hashref; return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL'; @@ -1083,7 +1053,7 @@ sub GetLoanLength { return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL'; - $sth->execute( $borrowertype, "*", "" ); + $sth->execute( $borrowertype, "*", "*" ); $loanlength = $sth->fetchrow_hashref; return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL'; @@ -1093,12 +1063,12 @@ sub GetLoanLength { return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL'; - $sth->execute( "*", $itemtype, "" ); + $sth->execute( "*", $itemtype, "*" ); $loanlength = $sth->fetchrow_hashref; return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL'; - $sth->execute( "*", "*", "" ); + $sth->execute( "*", "*", "*" ); $loanlength = $sth->fetchrow_hashref; return $loanlength->{issuelength} if defined($loanlength) && $loanlength->{issuelength} ne 'NULL'; @@ -1110,12 +1080,13 @@ sub GetLoanLength { =head2 AddReturn ($doreturn, $messages, $iteminformation, $borrower) = - &AddReturn($barcode, $branch); + &AddReturn($barcode, $branch, $exemptfine); Returns a book. C<$barcode> is the bar code of the book being returned. C<$branch> is -the code of the branch where the book is being returned. +the code of the branch where the book is being returned. C<$exemptfine> +indicates that overdue charges for the item will not be applied. C<&AddReturn> returns a list of four items: @@ -1158,7 +1129,7 @@ patron who last borrowed the book. =cut sub AddReturn { - my ( $barcode, $branch ) = @_; + my ( $barcode, $branch, $exemptfine ) = @_; my $dbh = C4::Context->dbh; my $messages; my $doreturn = 1; @@ -1168,6 +1139,7 @@ sub AddReturn { # get information on item my $iteminformation = GetItemIssue( GetItemnumberFromBarcode($barcode)); + my $biblio = GetBiblioFromItemNumber($iteminformation->{'itemnumber'}); unless ($iteminformation->{'itemnumber'} ) { $messages->{'BadBarcode'} = $barcode; $doreturn = 0; @@ -1184,7 +1156,13 @@ sub AddReturn { if ( $hbr && $branches->{$hbr}->{'PE'} ) { $messages->{'IsPermanent'} = $hbr; } - + + # if independent branches are on and returning to different branch, refuse the return + if ($hbr ne C4::Context->userenv->{'branch'} && C4::Context->preference("IndependantBranches")){ + $messages->{'Wrongbranch'} = 1; + $doreturn=0; + } + # check that the book has been cancelled if ( $iteminformation->{'wthdrawn'} ) { $messages->{'wthdrawn'} = 1; @@ -1211,15 +1189,22 @@ sub AddReturn { # continue to deal with returns cases, but not only if we have an issue # the holdingbranch is updated if the document is returned in an other location . - if ( $iteminformation->{'holdingbranch'} ne C4::Context->userenv->{'branch'} ) - { - UpdateHoldingbranch(C4::Context->userenv->{'branch'},$iteminformation->{'itemnumber'}); - # reload iteminformation holdingbranch with the userenv value - $iteminformation->{'holdingbranch'} = C4::Context->userenv->{'branch'}; - } + if ( $iteminformation->{'holdingbranch'} ne C4::Context->userenv->{'branch'} ) { + UpdateHoldingbranch(C4::Context->userenv->{'branch'},$iteminformation->{'itemnumber'}); + # reload iteminformation holdingbranch with the userenv value + $iteminformation->{'holdingbranch'} = C4::Context->userenv->{'branch'}; + } ModDateLastSeen( $iteminformation->{'itemnumber'} ); - ($borrower) = C4::Members::GetMemberDetails( $iteminformation->{borrowernumber}, 0 ); - + my $sth = $dbh->prepare("UPDATE items SET onloan = NULL where itemnumber = ?"); + $sth->execute($iteminformation->{'itemnumber'}); + $sth->finish(); + my $record = GetMarcItem( $biblio->{'biblionumber'}, $iteminformation->{'itemnumber'} ); + my $frameworkcode = GetFrameworkCode( $biblio->{'biblionumber'} ); + ModItemInMarc( $record, $biblio->{'biblionumber'}, $iteminformation->{'itemnumber'}, $frameworkcode ); + + if ($iteminformation->{borrowernumber}){ + ($borrower) = C4::Members::GetMemberDetails( $iteminformation->{borrowernumber}, 0 ); + } # fix up the accounts..... if ( $iteminformation->{'itemlost'} ) { $messages->{'WasLost'} = 1; @@ -1239,7 +1224,7 @@ sub AddReturn { $sth->execute( $iteminformation->{'itemnumber'} ); $sth->finish; # now we check if there is a reservation with the validate of transfer if we have one, we can set it with the status 'W' - ModReserveStatus( $iteminformation->{'itemnumber'},'W' ); + C4::Reserves::ModReserveStatus( $iteminformation->{'itemnumber'},'W' ); } else { $messages->{'WrongTransfer'} = $tobranch; @@ -1256,7 +1241,7 @@ sub AddReturn { } # fix up the overdues in accounts... FixOverduesOnReturn( $borrower->{'borrowernumber'}, - $iteminformation->{'itemnumber'} ); + $iteminformation->{'itemnumber'}, $exemptfine ); # find reserves..... # if we don't have a reserve with the status W, we launch the Checkreserves routine @@ -1284,11 +1269,13 @@ sub AddReturn { #we check, if we don't have reserv or transfert for this document, if not, return it to homebranch . if ( ($iteminformation->{'holdingbranch'} ne $iteminformation->{'homebranch'}) and not $messages->{'WrongTransfer'} and ($validTransfert ne 1) and ($reserveDone ne 1) ){ - if (C4::Context->preference("AutomaticItemReturn") == 1) { - ModItemTransfer($iteminformation->{'itemnumber'}, C4::Context->userenv->{'branch'}, $iteminformation->{'homebranch'}); - $messages->{'WasTransfered'} = 1; - warn "was transfered"; - } + if (C4::Context->preference("AutomaticItemReturn") == 1) { + ModItemTransfer($iteminformation->{'itemnumber'}, C4::Context->userenv->{'branch'}, $iteminformation->{'homebranch'}); + $messages->{'WasTransfered'} = 1; + } + else { + $messages->{'NeedsTransfer'} = 1; + } } } return ( $doreturn, $messages, $iteminformation, $borrower ); @@ -1296,7 +1283,7 @@ sub AddReturn { =head2 FixOverduesOnReturn - &FixOverduesOnReturn($brn,$itm); + &FixOverduesOnReturn($brn,$itm, $exemptfine); C<$brn> borrowernumber @@ -1307,7 +1294,7 @@ internal function, called only by AddReturn =cut sub FixOverduesOnReturn { - my ( $borrowernumber, $item ) = @_; + my ( $borrowernumber, $item, $exemptfine ) = @_; my $dbh = C4::Context->dbh; # check for overdue fine @@ -1318,14 +1305,15 @@ sub FixOverduesOnReturn { $sth->execute( $borrowernumber, $item ); # alter fine to show that the book has been returned - if ( my $data = $sth->fetchrow_hashref ) { - my $usth = - $dbh->prepare( -"UPDATE accountlines SET accounttype='F' WHERE (borrowernumber = ?) AND (itemnumber = ?) AND (accountno = ?)" - ); - $usth->execute( $borrowernumber, $item, $data->{'accountno'} ); + my $data; + if ($data = $sth->fetchrow_hashref) { + my $uquery =($exemptfine)? "update accountlines set accounttype='FFOR', amountoutstanding=0":"update accountlines set accounttype='F' "; + $uquery .= " where (borrowernumber = ?) and (itemnumber = ?) and (accountno = ?)"; + my $usth = $dbh->prepare($uquery); + $usth->execute($borrowernumber,$item ,$data->{'accountno'}); $usth->finish(); } + $sth->finish(); return; } @@ -1408,7 +1396,7 @@ sub FixAccountForLostAndReturned { if ($amountleft > 0){ $amountleft*=-1; } - my $desc="Book Returned ".$iteminfo->{'barcode'}; + my $desc="Item Returned ".$iteminfo->{'barcode'}; $usth = $dbh->prepare("INSERT INTO accountlines (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding) VALUES (?,?,now(),?,?,'CR',?)"); @@ -1486,8 +1474,10 @@ sub GetItemIssues { my $sth = $dbh->prepare( "SELECT * FROM issues + LEFT JOIN borrowers ON borrowers.borrowernumber + LEFT JOIN items ON items.itemnumber=issues.itemnumber WHERE - itemnumber=?".($history?"":" AND returndate IS NULL "). + issues.itemnumber=?".($history?"":" AND returndate IS NULL "). "ORDER BY issues.date_due DESC" ); $sth->execute($itemnumber); @@ -1498,7 +1488,6 @@ sub GetItemIssues { $data->{'overdue'} = 1; } my $itemnumber = $data->{'itemnumber'}; - push @GetItemIssues, $data; } $sth->finish; @@ -1522,7 +1511,7 @@ sub GetBiblioIssues { return undef unless $biblionumber; my $dbh = C4::Context->dbh; my $query = " - SELECT issues.*,biblio.biblionumber,biblio.title, biblio.author,borrowers.cardnumber,borrowers.surname,borrowers.firstname + SELECT issues.*,items.barcode,biblio.biblionumber,biblio.title, biblio.author,borrowers.cardnumber,borrowers.surname,borrowers.firstname FROM issues LEFT JOIN borrowers ON borrowers.borrowernumber = issues.borrowernumber LEFT JOIN items ON issues.itemnumber = items.itemnumber @@ -1635,22 +1624,28 @@ sub AddRenewal { my ( $borrowernumber, $itemnumber, $branch ,$datedue ) = @_; my $dbh = C4::Context->dbh; - + + my $biblio = GetBiblioFromItemNumber($itemnumber); # If the due date wasn't specified, calculate it by adding the # book's loan length to today's date. - if ( $datedue eq "" ) { + unless ( $datedue ) { - my $biblio = GetBiblioFromItemNumber($itemnumber); - my $borrower = GetMemberDetails( $borrowernumber, 0 ); + + my $borrower = C4::Members::GetMemberDetails( $borrowernumber, 0 ); my $loanlength = GetLoanLength( $borrower->{'categorycode'}, - $biblio->{'itemtype'}, - $borrower->{'branchcode'} + (C4::Context->preference('item-level_itypes')) ? $biblio->{'itype'} : $biblio->{'itemtype'} , + $borrower->{'branchcode'} ); - my ( $due_year, $due_month, $due_day ) = - Add_Delta_DHMS( Today_and_Now(), $loanlength, 0, 0, 0 ); - $datedue = "$due_year-$due_month-$due_day"; - $datedue=CheckValidDatedue($datedue,$itemnumber,$branch); + #FIXME -- choose issuer or borrower branch. + #FIXME -- where's the calendar ? + #FIXME -- $debug-ify the (0) + my @darray = Add_Delta_DHMS( Today_and_Now(), $loanlength, 0, 0, 0 ); + $datedue = C4::Dates->new( sprintf("%04d-%02d-%02d",@darray[0..2]), 'iso'); + (0) and print STDERR "C4::Dates->new->output = " . C4::Dates->new()->output() + . "\ndatedue->output = " . $datedue->output() + . "\n(Y,M,D) = " . join ',', @darray; + $datedue=CheckValidDatedue($datedue,$itemnumber,$branch); } # Find the issues record for this book @@ -1672,11 +1667,17 @@ sub AddRenewal { AND itemnumber=? AND returndate IS NULL" ); - $sth->execute( $datedue, $renews, $borrowernumber, $itemnumber ); + $sth->execute( $datedue->output('iso'), $renews, $borrowernumber, $itemnumber ); $sth->finish; - # Log the renewal - UpdateStats( C4::Context->userenv->{'branchcode'}, 'renew', '', '', $itemnumber ); + # Update the renewal count on the item, and tell zebra to reindex + $renews = $biblio->{'renewals'} + 1; + $sth = $dbh->prepare("UPDATE items SET renewals = ? WHERE itemnumber = ?"); + $sth->execute($renews,$itemnumber); + $sth->finish(); + my $record = GetMarcItem( $biblio->{'biblionumber'}, $itemnumber ); + my $frameworkcode = GetFrameworkCode( $biblio->{'biblionumber'} ); + ModItemInMarc( $record, $biblio->{'biblionumber'}, $itemnumber, $frameworkcode ); # Charge a new rental fee, if applicable? my ( $charge, $type ) = GetIssuingCharges( $itemnumber, $borrowernumber ); @@ -1695,8 +1696,39 @@ sub AddRenewal { 'Rent', $charge, $itemnumber ); $sth->finish; } + # Log the renewal + UpdateStats( $branch, 'renew', $charge, '', $itemnumber ); } +sub GetRenewCount { + # check renewal status + my ($bornum,$itemno)=@_; + my $dbh = C4::Context->dbh; + my $renewcount = 0; + my $renewsallowed = 0; + my $renewsleft = 0; + # Look in the issues table for this item, lent to this borrower, + # and not yet returned. + + # FIXME - I think this function could be redone to use only one SQL call. + my $sth = $dbh->prepare("select * from issues + where (borrowernumber = ?) + and (itemnumber = ?) + and returndate is null"); + $sth->execute($bornum,$itemno); + my $data = $sth->fetchrow_hashref; + $renewcount = $data->{'renewals'} if $data->{'renewals'}; + my $sth2 = $dbh->prepare("select renewalsallowed from items,biblioitems,itemtypes + where (items.itemnumber = ?) + and (items.biblioitemnumber = biblioitems.biblioitemnumber) + and (biblioitems.itemtype = itemtypes.itemtype)"); + $sth2->execute($itemno); + my $data2 = $sth2->fetchrow_hashref(); + $renewsallowed = $data2->{'renewalsallowed'}; + $renewsleft = $renewsallowed - $renewcount; + warn "Renewcount:$renewcount RenewsAll:$renewsallowed RenewLeft:$renewsleft"; + return ($renewcount,$renewsallowed,$renewsleft); +} =head2 GetIssuingCharges ($charge, $item_type) = &GetIssuingCharges($itemnumber, $borrowernumber); @@ -1723,13 +1755,15 @@ sub GetIssuingCharges { my $item_type; # Get the book's item type and rental charge (via its biblioitem). - my $sth1 = $dbh->prepare( - "SELECT itemtypes.itemtype,rentalcharge FROM items - LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber - LEFT JOIN itemtypes ON biblioitems.itemtype = itemtypes.itemtype - WHERE items.itemnumber =? - " - ); + my $qcharge = "SELECT itemtypes.itemtype,rentalcharge FROM items + LEFT JOIN biblioitems ON biblioitems.biblioitemnumber = items.biblioitemnumber"; + $qcharge .= (C4::Context->preference('item-level_itypes')) + ? " LEFT JOIN itemtypes ON items.itype = itemtypes.itemtype " + : " LEFT JOIN itemtypes ON biblioitems.itemtype = itemtypes.itemtype "; + + $qcharge .= "WHERE items.itemnumber =?"; + + my $sth1 = $dbh->prepare($qcharge); $sth1->execute($itemnumber); if ( my $data1 = $sth1->fetchrow_hashref ) { $item_type = $data1->{'itemtype'}; @@ -1930,12 +1964,15 @@ C<$date_due> = returndate calculate with no day check C<$itemnumber> = itemnumber C<$branchcode> = localisation of issue =cut -sub CheckValidDatedue{ +# Why not create calendar object? - +# TODO add 'duedate' option to useDaysMode . +sub CheckValidDatedue { my ($date_due,$itemnumber,$branchcode)=@_; -my @datedue=split('-',$date_due); +my @datedue=split('-',$date_due->output('iso')); my $years=$datedue[0]; my $month=$datedue[1]; my $day=$datedue[2]; +# die "Item# $itemnumber ($branchcode) due: " . ${date_due}->output() . "\n(Y,M,D) = ($years,$month,$day)": my $dow; for (my $i=0;$i<2;$i++){ $dow=Day_of_Week($years,$month,$day); @@ -1948,7 +1985,7 @@ for (my $i=0;$i<2;$i++){ (($years,$month,$day) = Add_Delta_Days($years,$month,$day, 1))if ($i ne '1'); } } -my $newdatedue=$years."-".$month."-".$day; + my $newdatedue=C4::Dates->new(sprintf("%04d-%02d-%02d",$years,$month,$day),'iso'); return $newdatedue; } =head2 CheckRepeatableHolidays