use C4::Koha;
use C4::Biblio;
use C4::Members;
-use C4::Date;
+use C4::Dates;
use Date::Calc qw(
Today
Today_and_Now
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
&CanBookBeRenewed
&AddIssue
&AddRenewal
+ &GetRenewCount
&GetItemIssue
&GetItemIssues
&GetBorrowerIssues
my $branch_borrower = $borrower->{'branchcode'};
my $dbh = C4::Context->dbh;
- my $branch_issuer = C4::Context->userenv->{'branchcode'};
-#TODO : specify issuer or borrower for circrule.
- my $type = (C4::Context->preference('item-level_itypes'))
+ 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 =
+ my $sth =
$dbh->prepare(
'SELECT * FROM issuingrules
WHERE categorycode = ?
- AND branchcode = ?
- AND itemtype = ? '
+ AND itemtype = ?
+ AND branchcode = ?'
);
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= ? ";
+ 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(
=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
# DEBTS
my ($amount) =
- C4::Members::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 ) {
#
# JB34 CHECKS IF BORROWERS DONT HAVE ISSUE TOO MANY BOOKS
#
-
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} );
}
}
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);
-
- my $datedue;
-
- # 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
(borrowernumber, itemnumber,issuedate, date_due, branchcode)
VALUES (?,?,?,?,?)"
);
- my $itype=(C4::Context->preference('item-level_itypes')) ? $biblio->{'itemtype'} : $biblio->{'itype'};
- my $loanlength = GetLoanLength(
- $borrower->{'categorycode'},
- $itype,
- $borrower->{'branchcode'}
- );
- $datedue = time + ($loanlength) * 86400;
- my @datearr = localtime($datedue);
- my $dateduef =
- sprintf("%04d-%02d-%02d", 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'},
$dbh->prepare(
"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 );
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';
=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:
=cut
sub AddReturn {
- my ( $barcode, $branch ) = @_;
+ my ( $barcode, $branch, $exemptfine ) = @_;
my $dbh = C4::Context->dbh;
my $messages;
my $doreturn = 1;
# get information on item
my $iteminformation = GetItemIssue( GetItemnumberFromBarcode($barcode));
+ my $biblio = GetBiblioFromItemNumber($iteminformation->{'itemnumber'});
unless ($iteminformation->{'itemnumber'} ) {
$messages->{'BadBarcode'} = $barcode;
$doreturn = 0;
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;
# 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;
}
# 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
#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 );
=head2 FixOverduesOnReturn
- &FixOverduesOnReturn($brn,$itm);
+ &FixOverduesOnReturn($brn,$itm, $exemptfine);
C<$brn> borrowernumber
=cut
sub FixOverduesOnReturn {
- my ( $borrowernumber, $item ) = @_;
+ my ( $borrowernumber, $item, $exemptfine ) = @_;
my $dbh = C4::Context->dbh;
# check for overdue fine
$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;
}
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',?)");
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 = C4::Members::GetMemberDetails( $borrowernumber, 0 );
my $loanlength = GetLoanLength(
$borrower->{'categorycode'},
);
#FIXME -- choose issuer or borrower branch.
#FIXME -- where's the calendar ?
- 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 -- $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 );
'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);
$qcharge .= "WHERE items.itemnumber =?";
-warn $qcharge;
my $sth1 = $dbh->prepare($qcharge);
$sth1->execute($itemnumber);
if ( my $data1 = $sth1->fetchrow_hashref ) {
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);
(($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
projects / koha.git / blobdiff