# 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;
use C4::Context;
use C4::Stats;
-use C4::Reserves2;
+use C4::Reserves;
use C4::Koha;
use C4::Biblio;
-use C4::Accounts;
-use C4::Reserves2;
use C4::Members;
-use C4::Date;
+use C4::Dates;
use Date::Calc qw(
Today
Today_and_Now
Add_Delta_YM
Add_Delta_DHMS
Date_to_Days
+ Day_of_Week
+ Add_Delta_Days
);
use POSIX qw(strftime);
use C4::Branch; # GetBranches
use C4::Log; # logaction
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+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
-C4::Circulation::Circ2 - Koha circulation module
+C4::Circulation - Koha circulation module
=head1 SYNOPSIS
# FIXME subs that should probably be elsewhere
push @EXPORT, qw(
- &fixoverduesonreturn
+ &FixOverduesOnReturn
+ &cuecatbarcodedecode
);
# subs to deal with issuing a book
&CanBookBeRenewed
&AddIssue
&AddRenewal
+ &GetRenewCount
&GetItemIssue
&GetItemIssues
&GetBorrowerIssues
&DeleteTransfer
);
-# subs to remove
-push @EXPORT, qw(
- &decode
- &dotransfer
-);
+# FIXME - At least, I'm pretty sure this is for decoding CueCat stuff.
+# FIXME From Paul : i don't understand what this sub does & why it has to be called on every circ. Speak of this with chris maybe ?
=head2 decode
=cut
-# FIXME - At least, I'm pretty sure this is for decoding CueCat stuff.
+sub cuecatbarcodedecode {
+ my ($barcode) = @_;
+ chomp($barcode);
+ my @fields = split( /\./, $barcode );
+ my @results = map( decode($_), @fields[ 1 .. $#fields ] );
+ if ( $#results == 2 ) {
+ return $results[2];
+ }
+ else {
+ return $barcode;
+ }
+}
+
+=head2 decode
+
+=head3 $str = &decode($chunk);
+
+=over 4
+
+=item Decodes a segment of a string emitted by a CueCat barcode scanner and
+returns it.
+
+=back
+
+=cut
-# FIXME From Paul : i don't understand what this sub does & why it has to be called on every circ. Speak of this with chris maybe ?
sub decode {
my ($encoded) = @_;
my $seq =
=cut
-#'
-# FIXME - This function tries to do too much, and its API is clumsy.
-# If it didn't also return books, it could be used to change the home
-# branch of a book while the book is on loan.
-#
-# Is there any point in returning the item information? The caller can
-# look that up elsewhere if ve cares.
-#
-# This leaves the ($dotransfer, $messages) tuple. This seems clumsy.
-# If the transfer succeeds, that's all the caller should need to know.
-# Thus, this function could simply return 1 or 0 to indicate success
-# or failure, and set $C4::Circulation::Circ2::errmsg in case of
-# failure. Or this function could return undef if successful, and an
-# error message in case of failure (this would feel more like C than
-# Perl, though).
sub transferbook {
my ( $tbr, $barcode, $ignoreRs ) = @_;
my $messages;
- my %env;
my $dotransfer = 1;
my $branches = GetBranches();
- my $item = GetItemnumberFromBarcode( $barcode );
- my $issue = GetItemIssues($item->{itemnumber});
+ my $itemnumber = GetItemnumberFromBarcode( $barcode );
+ my $issue = GetItemIssue($itemnumber);
+ my $biblio = GetBiblioFromItemNumber($itemnumber);
# bad barcode..
- if ( not $item ) {
+ if ( not $itemnumber ) {
$messages->{'BadBarcode'} = $barcode;
$dotransfer = 0;
}
# get branches of book...
- my $hbr = $item->{'homebranch'};
- my $fbr = $item->{'holdingbranch'};
+ my $hbr = $biblio->{'homebranch'};
+ my $fbr = $biblio->{'holdingbranch'};
# if is permanent...
if ( $hbr && $branches->{$hbr}->{'PE'} ) {
}
# can't transfer book if is already there....
- # FIXME - Why not? Shouldn't it trivially succeed?
if ( $fbr eq $tbr ) {
$messages->{'DestinationEqualsHolding'} = 1;
$dotransfer = 0;
}
# find reserves.....
- # FIXME - Don't call &CheckReserves unless $ignoreRs is true.
# That'll save a database query.
my ( $resfound, $resrec ) =
- CheckReserves( $item->{'itemnumber'} );
+ CheckReserves( $itemnumber );
if ( $resfound and not $ignoreRs ) {
$resrec->{'ResFound'} = $resfound;
#actually do the transfer....
if ($dotransfer) {
- dotransfer( $item->{'itemnumber'}, $fbr, $tbr );
+ ModItemTransfer( $itemnumber, $fbr, $tbr );
# don't need to update MARC anymore, we do it in batch now
$messages->{'WasTransfered'} = 1;
+ ModDateLastSeen( $itemnumber );
}
- return ( $dotransfer, $messages, $item );
-}
-
-# Not exported
-# FIXME - This is only used in &transferbook. Why bother making it a
-# separate function?
-sub dotransfer {
- my ( $itm, $fbr, $tbr ) = @_;
-
- my $dbh = C4::Context->dbh;
- $itm = $dbh->quote($itm);
- $fbr = $dbh->quote($fbr);
- $tbr = $dbh->quote($tbr);
-
- #new entry in branchtransfers....
- $dbh->do(
-"INSERT INTO branchtransfers (itemnumber, frombranch, datesent, tobranch)
- VALUES ($itm, $fbr, now(), $tbr)"
- );
-
- #update holdingbranch in items .....
- $dbh->do(
- "UPDATE items set holdingbranch = $tbr WHERE items.itemnumber = $itm");
- &ModDateLastSeen($itm);
- &domarctransfer( $dbh, $itm );
- return;
-}
-
-##New sub to dotransfer in marc tables as well. Not exported -TG 10/04/2006
-sub domarctransfer {
- my ( $dbh, $itemnumber ) = @_;
- $itemnumber =~ s /\'//g; ##itemnumber seems to come with quotes-TG
- my $sth =
- $dbh->prepare(
- "select biblionumber,holdingbranch from items where itemnumber=$itemnumber"
- );
- $sth->execute();
- while ( my ( $biblionumber, $holdingbranch ) = $sth->fetchrow ) {
- &ModItemInMarconefield( $biblionumber, $itemnumber,
- 'items.holdingbranch', $holdingbranch );
- }
- return;
+ return ( $dotransfer, $messages, $biblio );
}
=head2 CanBookBeIssued
Check if a book can be issued.
-my ($issuingimpossible,$needsconfirmation) = CanBookBeIssued($env,$borrower,$barcode,$year,$month,$day);
+my ($issuingimpossible,$needsconfirmation) = CanBookBeIssued($borrower,$barcode,$year,$month,$day);
=over 4
-=item C<$env> Environment variable. Should be empty usually, but used by other subs. Next code cleaning could drop it.
-
=item C<$borrower> hash with borrower informations (from GetMemberDetails)
=item C<$barcode> is the bar code of the book being issued.
=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 branchcode = ?
+ AND itemtype = ? '
);
-# 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'))
+ ? " AND s2.itype=? "
+ : " 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;
}
# 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
=head2 CanBookBeIssued
$issuingimpossible, $needsconfirmation =
- CanBookBeIssued( $env, $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 ( $env, $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 $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
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 =
- checkaccount( $borrower->{'borrowernumber'}, $dbh, $duedate );
+ my ($amount) =
+ C4::Members::GetMemberAccountRecords( $borrower->{'borrowernumber'}, '' && $duedate->output('iso') );
if ( C4::Context->preference("IssuingInProcess") ) {
my $amountlimit = C4::Context->preference("noissuescharge");
if ( $amount > $amountlimit && !$inprocess ) {
#
# 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;
#
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} );
}
}
$issuingimpossible{NO_MORE_RENEWALS} = 1;
}
else {
-
- # $needsconfirmation{RENEW_ISSUE} = 1;
+ $needsconfirmation{RENEW_ISSUE} = 1;
}
}
elsif ($issue->{borrowernumber}) {
}
# 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" )
"$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 );
}
}
Issue a book. Does no check, they are done in CanBookBeIssued. If we reach this sub, it means the user confirmed if needed.
-&AddIssue($env,$borrower,$barcode,$date)
+&AddIssue($borrower,$barcode,$date)
=over 4
-=item C<$env> Environment variable. Should be empty usually, but used by other subs. Next code cleaning could drop it.
-
=item C<$borrower> hash with borrower informations (from GetMemberDetails)
=item C<$barcode> is the bar code of the book being issued.
=item C<$date> contains the max date of return. calculated if empty.
AddIssue does the following things :
-- step 0�: check that there is a borrowernumber & a barcode provided
+- step 01: check that there is a borrowernumber & a barcode provided
- check for RENEWAL (book issued & being issued to the same patron)
- renewal YES = Calculate Charge & renew
- renewal NO =
=cut
sub AddIssue {
- my ( $env, $borrower, $barcode, $date, $cancelreserve ) = @_;
-
+ my ( $borrower, $barcode, $date, $cancelreserve ) = @_;
my $dbh = C4::Context->dbh;
-if ($borrower and $barcode){
+ 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});
-
-#
-# 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(
- $env, $env->{'branchcode'},
- 'renew', $charge,
- '', $item->{'itemnumber'},
- $biblio->{'itemtype'}, $borrower->{'borrowernumber'}
- );
- AddRenewal(
- $borrower->{'borrowernumber'},
- $item->{'itemnumber'}
- );
- }
- else {# it's NOT a renewal
+ # 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
+ );
+
+ }
+ 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
# 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'} ) {
# The item is reserved by the current patron
- FillReserve($res);
+ ModReserveFill($res);
}
elsif ( $restype eq "Waiting" ) {
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
- UpdateReserve(
- 1,
- $res->{'biblionumber'},
- $res->{'borrowernumber'},
- $res->{'branchcode'}
- );
- }
}
elsif ( $restype eq "Reserved" ) {
$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)
(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;
- }
-
- # 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, $env->{'branchcode'}
+ 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'},
# Record the fact that this book was issued.
&UpdateStats(
- $env, $env->{'branchcode'},
+ C4::Context->userenv->{'branch'},
'issue', $charge,
'', $item->{'itemnumber'},
$item->{'itemtype'}, $borrower->{'borrowernumber'}
&logaction(C4::Context->userenv->{'number'},"CIRCULATION","ISSUE",$borrower->{'borrowernumber'},$biblio->{'biblionumber'})
if C4::Context->preference("IssueLog");
+ return ($datedue);
}
}
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"
);
# try to find issuelength & return the 1st available.
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';
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';
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';
=cut
-# FIXME - This API is bogus. There's no need to return $borrower and
-# $iteminformation; the caller can ask about those separately, if it
-# cares (it'd be inefficient to make two database calls instead of
-# one, but &GetMemberDetails and &getiteminformation can be
-# memoized if this is an issue).
-#
-# The ($doreturn, $messages) tuple is redundant: if the return
-# succeeded, that's all the caller needs to know. So &AddReturn can
-# return 1 and 0 on success and failure, and set
-# $C4::Circulation::Circ2::errmsg to indicate the error. Or it can
-# return undef for success, and an error message on error (though this
-# is more C-ish than Perl-ish).
-
sub AddReturn {
my ( $barcode, $branch ) = @_;
- my %env;
- my $messages;
my $dbh = C4::Context->dbh;
+ my $messages;
my $doreturn = 1;
+ my $borrower;
my $validTransfert = 0;
my $reserveDone = 0;
- die '$branch not defined' unless defined $branch; # just in case (bug 170)
# get information on item
my $iteminformation = GetItemIssue( GetItemnumberFromBarcode($barcode));
- if ( not $iteminformation ) {
+ my $biblio = GetBiblioFromItemNumber($iteminformation->{'itemnumber'});
+ unless ($iteminformation->{'itemnumber'} ) {
$messages->{'BadBarcode'} = $barcode;
$doreturn = 0;
- }
-
- # find the borrower
- if ( ( not $iteminformation->{borrowernumber} ) && $doreturn ) {
- $messages->{'NotIssued'} = $barcode;
- $doreturn = 0;
- }
-
- # check if the book is in a permanent collection....
- my $hbr = $iteminformation->{'homebranch'};
- my $branches = GetBranches();
- if ( $hbr && $branches->{$hbr}->{'PE'} ) {
- $messages->{'IsPermanent'} = $hbr;
- }
-
- # check that the book has been cancelled
- if ( $iteminformation->{'wthdrawn'} ) {
- $messages->{'wthdrawn'} = 1;
- $doreturn = 0;
- }
-
-# new op dev : if the book returned in an other branch update the holding branch
-
-# update issues, thereby returning book (should push this out into another subroutine
- my ($borrower) = GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
-
-# case of a return of document (deal with issues and holdingbranch)
-
- if ($doreturn) {
- my $sth =
- $dbh->prepare(
-"update issues set returndate = now() where (borrowernumber = ?) and (itemnumber = ?) and (returndate is null)"
- );
- $sth->execute( $borrower->{'borrowernumber'},
- $iteminformation->{'itemnumber'} );
- $messages->{'WasReturned'} = 1; # FIXME is the "= 1" right?
- }
-
-# 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'};
+ } else {
+ # find the borrower
+ if ( ( not $iteminformation->{borrowernumber} ) && $doreturn ) {
+ $messages->{'NotIssued'} = $barcode;
+ $doreturn = 0;
}
- ModDateLastSeen( $iteminformation->{'itemnumber'} );
- ($borrower) = GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
- # fix up the accounts.....
- if ( $iteminformation->{'itemlost'} ) {
- $messages->{'WasLost'} = 1;
- }
-
- # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
- # check if we have a transfer for this document
- my ($datesent,$frombranch,$tobranch) = GetTransfers( $iteminformation->{'itemnumber'} );
-
- # if we have a transfer to do, we update the line of transfers with the datearrived
- if ($datesent) {
- if ( $tobranch eq C4::Context->userenv->{'branch'} ) {
- my $sth =
- $dbh->prepare(
- "update branchtransfers set datearrived = now() where itemnumber= ? AND datearrived IS NULL"
- );
- $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'
- SetWaitingStatus( $iteminformation->{'itemnumber'} );
+ # check if the book is in a permanent collection....
+ my $hbr = $iteminformation->{'homebranch'};
+ my $branches = GetBranches();
+ if ( $hbr && $branches->{$hbr}->{'PE'} ) {
+ $messages->{'IsPermanent'} = $hbr;
}
- else {
- $messages->{'WrongTransfer'} = $tobranch;
- $messages->{'WrongTransferItem'} = $iteminformation->{'itemnumber'};
- }
- $validTransfert = 1;
- }
-
-# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
-# fix up the overdues in accounts...
- fixoverduesonreturn( $borrower->{'borrowernumber'},
- $iteminformation->{'itemnumber'} );
-
-# find reserves.....
-# if we don't have a reserve with the status W, we launch the Checkreserves routine
- my ( $resfound, $resrec ) =
- CheckReserves( $iteminformation->{'itemnumber'} );
- if ($resfound) {
- $resrec->{'ResFound'} = $resfound;
- $messages->{'ResFound'} = $resrec;
- $reserveDone = 1;
- }
-
- # update stats?
- # Record the fact that this book was returned.
- UpdateStats(
- \%env, $branch, 'return', '0', '',
- $iteminformation->{'itemnumber'},
- $iteminformation->{'itemtype'},
- $borrower->{'borrowernumber'}
- );
- &logaction(C4::Context->userenv->{'number'},"CIRCULATION","RETURN",$iteminformation->{borrowernumber},$iteminformation->{'biblionumber'})
- if C4::Context->preference("ReturnLog");
-
- #adding message if holdingbranch is non equal a userenv branch to return the document to homebranch
- #we check, if we don't have reserv or transfert for this document, if not, return it to homebranch .
+ # check that the book has been cancelled
+ if ( $iteminformation->{'wthdrawn'} ) {
+ $messages->{'wthdrawn'} = 1;
+ $doreturn = 0;
+ }
- if ( ($iteminformation->{'holdingbranch'} ne $iteminformation->{'homebranch'}) and not $messages->{'WrongTransfer'} and ($validTransfert ne 1) and ($reserveDone ne 1) ){
- if (C4::Context->preference("AutomaticItemReturn") == 1) {
- dotransfer($iteminformation->{'itemnumber'}, C4::Context->userenv->{'branch'}, $iteminformation->{'homebranch'});
- $messages->{'WasTransfered'} = 1;
- warn "was transfered";
- }
- }
+ # new op dev : if the book returned in an other branch update the holding branch
+
+ # update issues, thereby returning book (should push this out into another subroutine
+ $borrower = C4::Members::GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
+
+ # case of a return of document (deal with issues and holdingbranch)
+
+ if ($doreturn) {
+ my $sth =
+ $dbh->prepare(
+ "UPDATE issues SET returndate = now() WHERE (borrowernumber = ?) AND (itemnumber = ?) AND (returndate IS NULL)"
+ );
+ $sth->execute( $borrower->{'borrowernumber'},
+ $iteminformation->{'itemnumber'} );
+ $messages->{'WasReturned'} = 1; # FIXME is the "= 1" right?
+ }
+
+ # 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'};
+ }
+ ModDateLastSeen( $iteminformation->{'itemnumber'} );
+ 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;
+ }
+
+ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+ # check if we have a transfer for this document
+ my ($datesent,$frombranch,$tobranch) = GetTransfers( $iteminformation->{'itemnumber'} );
+
+ # if we have a transfer to do, we update the line of transfers with the datearrived
+ if ($datesent) {
+ if ( $tobranch eq C4::Context->userenv->{'branch'} ) {
+ my $sth =
+ $dbh->prepare(
+ "UPDATE branchtransfers SET datearrived = now() WHERE itemnumber= ? AND datearrived IS NULL"
+ );
+ $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'
+ C4::Reserves::ModReserveStatus( $iteminformation->{'itemnumber'},'W' );
+ }
+ else {
+ $messages->{'WrongTransfer'} = $tobranch;
+ $messages->{'WrongTransferItem'} = $iteminformation->{'itemnumber'};
+ }
+ $validTransfert = 1;
+ }
+
+ # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
+ # fix up the accounts.....
+ if ($iteminformation->{'itemlost'}) {
+ FixAccountForLostAndReturned($iteminformation, $borrower);
+ $messages->{'WasLost'} = 1;
+ }
+ # fix up the overdues in accounts...
+ FixOverduesOnReturn( $borrower->{'borrowernumber'},
+ $iteminformation->{'itemnumber'} );
+
+ # find reserves.....
+ # if we don't have a reserve with the status W, we launch the Checkreserves routine
+ my ( $resfound, $resrec ) =
+ C4::Reserves::CheckReserves( $iteminformation->{'itemnumber'} );
+ if ($resfound) {
+ $resrec->{'ResFound'} = $resfound;
+ $messages->{'ResFound'} = $resrec;
+ $reserveDone = 1;
+ }
+
+ # update stats?
+ # Record the fact that this book was returned.
+ UpdateStats(
+ $branch, 'return', '0', '',
+ $iteminformation->{'itemnumber'},
+ $iteminformation->{'itemtype'},
+ $borrower->{'borrowernumber'}
+ );
+
+ &logaction(C4::Context->userenv->{'number'},"CIRCULATION","RETURN",$iteminformation->{borrowernumber},$iteminformation->{'biblionumber'})
+ if C4::Context->preference("ReturnLog");
+ #adding message if holdingbranch is non equal a userenv branch to return the document to homebranch
+ #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";
+ }
+ }
+ }
return ( $doreturn, $messages, $iteminformation, $borrower );
}
-=head2 fixoverdueonreturn
+=head2 FixOverduesOnReturn
- &fixoverdueonreturn($brn,$itm);
+ &FixOverduesOnReturn($brn,$itm);
C<$brn> borrowernumber
C<$itm> itemnumber
+internal function, called only by AddReturn
+
=cut
-sub fixoverduesonreturn {
+sub FixOverduesOnReturn {
my ( $borrowernumber, $item ) = @_;
my $dbh = C4::Context->dbh;
return;
}
+=head2 FixAccountForLostAndReturned
+
+ &FixAccountForLostAndReturned($iteminfo,$borrower);
+
+Calculates the charge for a book lost and returned (Not exported & used only once)
+
+C<$iteminfo> is a hashref to iteminfo. Only {itemnumber} is used.
+
+C<$borrower> is a hashref to borrower. Only {borrowernumber is used.
+
+Internal function, called by AddReturn
+
+=cut
+
+sub FixAccountForLostAndReturned {
+ my ($iteminfo, $borrower) = @_;
+ my %env;
+ my $dbh = C4::Context->dbh;
+ my $itm = $iteminfo->{'itemnumber'};
+ # check for charge made for lost book
+ my $sth = $dbh->prepare("SELECT * FROM accountlines WHERE (itemnumber = ?) AND (accounttype='L' OR accounttype='Rep') ORDER BY date DESC");
+ $sth->execute($itm);
+ if (my $data = $sth->fetchrow_hashref) {
+ # writeoff this amount
+ my $offset;
+ my $amount = $data->{'amount'};
+ my $acctno = $data->{'accountno'};
+ my $amountleft;
+ if ($data->{'amountoutstanding'} == $amount) {
+ $offset = $data->{'amount'};
+ $amountleft = 0;
+ } else {
+ $offset = $amount - $data->{'amountoutstanding'};
+ $amountleft = $data->{'amountoutstanding'} - $amount;
+ }
+ my $usth = $dbh->prepare("UPDATE accountlines SET accounttype = 'LR',amountoutstanding='0'
+ WHERE (borrowernumber = ?)
+ AND (itemnumber = ?) AND (accountno = ?) ");
+ $usth->execute($data->{'borrowernumber'},$itm,$acctno);
+ $usth->finish;
+ #check if any credit is left if so writeoff other accounts
+ my $nextaccntno = getnextacctno(\%env,$data->{'borrowernumber'},$dbh);
+ if ($amountleft < 0){
+ $amountleft*=-1;
+ }
+ if ($amountleft > 0){
+ my $msth = $dbh->prepare("SELECT * FROM accountlines WHERE (borrowernumber = ?)
+ AND (amountoutstanding >0) ORDER BY date");
+ $msth->execute($data->{'borrowernumber'});
+ # offset transactions
+ my $newamtos;
+ my $accdata;
+ while (($accdata=$msth->fetchrow_hashref) and ($amountleft>0)){
+ if ($accdata->{'amountoutstanding'} < $amountleft) {
+ $newamtos = 0;
+ $amountleft -= $accdata->{'amountoutstanding'};
+ } else {
+ $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
+ $amountleft = 0;
+ }
+ my $thisacct = $accdata->{'accountno'};
+ my $usth = $dbh->prepare("UPDATE accountlines SET amountoutstanding= ?
+ WHERE (borrowernumber = ?)
+ AND (accountno=?)");
+ $usth->execute($newamtos,$data->{'borrowernumber'},'$thisacct');
+ $usth->finish;
+ $usth = $dbh->prepare("INSERT INTO accountoffsets
+ (borrowernumber, accountno, offsetaccount, offsetamount)
+ VALUES
+ (?,?,?,?)");
+ $usth->execute($data->{'borrowernumber'},$accdata->{'accountno'},$nextaccntno,$newamtos);
+ $usth->finish;
+ }
+ $msth->finish;
+ }
+ if ($amountleft > 0){
+ $amountleft*=-1;
+ }
+ my $desc="Item Returned ".$iteminfo->{'barcode'};
+ $usth = $dbh->prepare("INSERT INTO accountlines
+ (borrowernumber,accountno,date,amount,description,accounttype,amountoutstanding)
+ VALUES (?,?,now(),?,?,'CR',?)");
+ $usth->execute($data->{'borrowernumber'},$nextaccntno,0-$amount,$desc,$amountleft);
+ $usth->finish;
+ $usth = $dbh->prepare("INSERT INTO accountoffsets
+ (borrowernumber, accountno, offsetaccount, offsetamount)
+ VALUES (?,?,?,?)");
+ $usth->execute($borrower->{'borrowernumber'},$data->{'accountno'},$nextaccntno,$offset);
+ $usth->finish;
+ $usth = $dbh->prepare("UPDATE items SET paidfor='' WHERE itemnumber=?");
+ $usth->execute($itm);
+ $usth->finish;
+ }
+ $sth->finish;
+ return;
+}
+
=head2 GetItemIssue
-$issues = &GetBorrowerIssue($itemnumber);
+$issues = &GetItemIssue($itemnumber);
Returns patrons currently having a book. nothing if item is not issued atm
sub GetItemIssue {
my ( $itemnumber) = @_;
+ return unless $itemnumber;
my $dbh = C4::Context->dbh;
my @GetItemIssues;
=head2 GetItemIssues
-$issues = &GetBorrowerIssues($itemnumber, $history);
+$issues = &GetItemIssues($itemnumber, $history);
Returns patrons that have issued a book
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);
$data->{'overdue'} = 1;
}
my $itemnumber = $data->{'itemnumber'};
-
push @GetItemIssues, $data;
}
$sth->finish;
return ( \@GetItemIssues );
}
-=head2 GetBorrowerIssues
-
-$issues = &GetBorrowerIssues($borrower);
-
-Returns a list of books currently on loan to a patron.
-
-C<$borrower->{borrowernumber}> is the borrower number of the patron
-whose issues we want to list.
-
-C<&GetBorrowerIssues> returns a PHP-style array: C<$issues> is a
-reference-to-hash whose keys are integers in the range 1...I<n>, where
-I<n> is the number of items on issue (either today or before today).
-C<$issues-E<gt>{I<n>}> is a reference-to-hash whose keys are all of
-the fields of the biblio, biblioitems, items, and issues fields of the
-Koha database for that particular item.
-
-=cut
-
-sub GetBorrowerIssues {
- my ( $borrower ) = @_;
- my $dbh = C4::Context->dbh;
- my @GetBorrowerIssues;
- # get today date
- my $today = POSIX::strftime("%Y%m%d", localtime);
-
- my $sth = $dbh->prepare(
- "SELECT * FROM issues
- LEFT JOIN items ON issues.itemnumber=items.itemnumber
- LEFT JOIN biblio ON items.biblionumber=biblio.biblionumber
- LEFT JOIN biblioitems ON items.biblioitemnumber=biblioitems.biblioitemnumber
- WHERE
- borrowernumber=? AND returndate IS NULL
- ORDER BY issues.date_due"
- );
- $sth->execute($borrower->{'borrowernumber'});
- while ( my $data = $sth->fetchrow_hashref ) {
- my $datedue = $data->{'date_due'};
- $datedue =~ s/-//g;
- if ( $datedue < $today ) {
- $data->{'overdue'} = 1;
- }
- my $itemnumber = $data->{'itemnumber'};
-
- push @GetBorrowerIssues, $data;
- }
- $sth->finish;
- return ( \@GetBorrowerIssues );
-}
-
=head2 GetBiblioIssues
$issues = GetBiblioIssues($biblionumber);
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
Find out whether a borrowed item may be renewed.
-C<$env> is ignored.
-
C<$dbh> is a DBI handle to the Koha database.
C<$borrowernumber> is the borrower number of the patron who currently
if ( my $data2 = $sth2->fetchrow_hashref ) {
$renews = $data2->{'renewalsallowed'};
}
- if ( $renews && $renews > $data1->{'renewals'} ) {
+ if ( $renews && $renews >= $data1->{'renewals'} ) {
$renewokay = 1;
}
$sth2->finish;
- my ( $resfound, $resrec ) = C4::Reserves2::CheckReserves($itemnumber);
- if ($resfound) {
- $renewokay = 0;
- }
- ( $resfound, $resrec ) = C4::Reserves2::CheckReserves($itemnumber);
+ my ( $resfound, $resrec ) = C4::Reserves::CheckReserves($itemnumber);
if ($resfound) {
$renewokay = 0;
}
Renews a loan.
-C<$env-E<gt>{branchcode}> is the code of the branch where the
-renewal is taking place.
-
-C<$env-E<gt>{usercode}> is the value to log in C<statistics.usercode>
-in the Koha database.
-
C<$borrowernumber> is the borrower number of the patron who currently
has the item.
sub AddRenewal {
- my ( $borrowernumber, $itemnumber, $datedue ) = @_;
+ 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";
-
+ #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
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 );
if ( $charge > 0 ) {
my $accountno = getnextacctno( $borrowernumber );
- my $item = GetBiblioFromItemNumbe(r$itemnumber);
+ my $item = GetBiblioFromItemNumber($itemnumber);
$sth = $dbh->prepare(
"INSERT INTO accountlines
(borrowernumber,accountno,date,amount,
'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);
Calculate how much it would cost for a given patron to borrow a given
item, including any applicable discounts.
-C<$env> is ignored.
-
C<$itemnumber> is the item number of item the patron wishes to borrow.
C<$borrowernumber> is the patron's borrower number.
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'};
$sth->finish;
# second step create a new line of branchtransfer to the right location .
- dotransfer($itemNumber, $FromLibrary, $waitingAtLibrary);
+ ModItemTransfer($itemNumber, $FromLibrary, $waitingAtLibrary);
#third step changing holdingbranch of item
UpdateHoldingbranch($FromLibrary,$itemNumber);
$sth->finish;
+}
+=head2 CheckValidDatedue
+
+$newdatedue = CheckValidDatedue($date_due,$itemnumber,$branchcode);
+this function return a new date due after checked if it's a repeatable or special holiday
+C<$date_due> = returndate calculate with no day check
+C<$itemnumber> = itemnumber
+C<$branchcode> = localisation of issue
+=cut
+# Why not create calendar object? -
+# TODO add 'duedate' option to useDaysMode .
+sub CheckValidDatedue {
+my ($date_due,$itemnumber,$branchcode)=@_;
+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);
+ ($dow=0) if ($dow>6);
+ my $result=CheckRepeatableHolidays($itemnumber,$dow,$branchcode);
+ my $countspecial=CheckSpecialHolidays($years,$month,$day,$itemnumber,$branchcode);
+ my $countspecialrepeatable=CheckRepeatableSpecialHolidays($month,$day,$itemnumber,$branchcode);
+ if (($result ne '0') or ($countspecial ne '0') or ($countspecialrepeatable ne '0') ){
+ $i=0;
+ (($years,$month,$day) = Add_Delta_Days($years,$month,$day, 1))if ($i ne '1');
+ }
+ }
+ my $newdatedue=C4::Dates->new(sprintf("%04d-%02d-%02d",$years,$month,$day),'iso');
+return $newdatedue;
+}
+=head2 CheckRepeatableHolidays
+
+$countrepeatable = CheckRepeatableHoliday($itemnumber,$week_day,$branchcode);
+this function check if the date due is a repeatable holiday
+C<$date_due> = returndate calculate with no day check
+C<$itemnumber> = itemnumber
+C<$branchcode> = localisation of issue
+
+=cut
+
+sub CheckRepeatableHolidays{
+my($itemnumber,$week_day,$branchcode)=@_;
+my $dbh = C4::Context->dbh;
+my $query = qq|SELECT count(*)
+ FROM repeatable_holidays
+ WHERE branchcode=?
+ AND weekday=?|;
+my $sth = $dbh->prepare($query);
+$sth->execute($branchcode,$week_day);
+my $result=$sth->fetchrow;
+$sth->finish;
+return $result;
+}
+
+
+=head2 CheckSpecialHolidays
+
+$countspecial = CheckSpecialHolidays($years,$month,$day,$itemnumber,$branchcode);
+this function check if the date is a special holiday
+C<$years> = the years of datedue
+C<$month> = the month of datedue
+C<$day> = the day of datedue
+C<$itemnumber> = itemnumber
+C<$branchcode> = localisation of issue
+=cut
+sub CheckSpecialHolidays{
+my ($years,$month,$day,$itemnumber,$branchcode) = @_;
+my $dbh = C4::Context->dbh;
+my $query=qq|SELECT count(*)
+ FROM `special_holidays`
+ WHERE year=?
+ AND month=?
+ AND day=?
+ AND branchcode=?
+ |;
+my $sth = $dbh->prepare($query);
+$sth->execute($years,$month,$day,$branchcode);
+my $countspecial=$sth->fetchrow ;
+$sth->finish;
+return $countspecial;
+}
+
+=head2 CheckRepeatableSpecialHolidays
+
+$countspecial = CheckRepeatableSpecialHolidays($month,$day,$itemnumber,$branchcode);
+this function check if the date is a repeatble special holidays
+C<$month> = the month of datedue
+C<$day> = the day of datedue
+C<$itemnumber> = itemnumber
+C<$branchcode> = localisation of issue
+=cut
+sub CheckRepeatableSpecialHolidays{
+my ($month,$day,$itemnumber,$branchcode) = @_;
+my $dbh = C4::Context->dbh;
+my $query=qq|SELECT count(*)
+ FROM `repeatable_holidays`
+ WHERE month=?
+ AND day=?
+ AND branchcode=?
+ |;
+my $sth = $dbh->prepare($query);
+$sth->execute($month,$day,$branchcode);
+my $countspecial=$sth->fetchrow ;
+$sth->finish;
+return $countspecial;
+}
+
+
+
+sub CheckValidBarcode{
+my ($barcode) = @_;
+my $dbh = C4::Context->dbh;
+my $query=qq|SELECT count(*)
+ FROM items
+ WHERE barcode=?
+ |;
+my $sth = $dbh->prepare($query);
+$sth->execute($barcode);
+my $exist=$sth->fetchrow ;
+$sth->finish;
+return $exist;
}
1;
projects / koha.git / blobdiff