&CanBookBeRenewed
&AddIssue
&AddRenewal
+ &GetRenewCount
&GetItemIssue
&GetItemIssues
&GetBorrowerIssues
my $branch_issuer = C4::Context->userenv->{'branchcode'};
#TODO : specify issuer or borrower for circrule.
my $type = (C4::Context->preference('item-level_itypes'))
- ? $item->{'ccode'} # item-level
+ ? $item->{'itype'} # item-level
: $item->{'itemtype'}; # biblio-level
my $sth =
AND i.itemnumber = s2.itemnumber
AND s1.biblioitemnumber = s2.biblioitemnumber"
. (C4::Context->preference('item-level_itypes'))
- ? " AND s2.ccode=? "
+ ? " AND s2.itype=? "
: " AND s1.itemtype= ? ";
my $sth2= $dbh->prepare($query2);
my $sth3 =
=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 $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) =
- 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 ) {
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} );
}
}
}
# 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" )
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'}
+ );
- #
- # 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
# 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'} ) {
(borrowernumber, itemnumber,issuedate, date_due, branchcode)
VALUES (?,?,?,?,?)"
);
- my $itype=(C4::Context->preference('item-level_itypes')) ? $biblio->{'itemtype'} : $biblio->{'ccode'};
- my $loanlength = GetLoanLength(
- $borrower->{'categorycode'},
- $itype,
- $borrower->{'branchcode'}
- );
- my $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 gt $borrower->{dateexpiry} ) {
+ $dateduef = $borrower->{dateexpiry};
+ }
+ };
+ $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'},
&logaction(C4::Context->userenv->{'number'},"CIRCULATION","ISSUE",$borrower->{'borrowernumber'},$biblio->{'biblionumber'})
if C4::Context->preference("IssueLog");
+ return ($datedue);
}
}
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';
# 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'} );
+ if ($iteminformation->{borrowernumber}){
+ my $sth = $dbh->prepare("UPDATE items SET onloan = NULL where itemnumber = ?");
+ $sth->execute($iteminformation->{'itemnumber'});
+ $sth->finish();
+ my $record = GetMarcItem( $iteminformation->{'biblionumber'}, $iteminformation->{'itemnumber'} );
+ my $frameworkcode = GetFrameworkCode( $iteminformation->{'biblionumber'} );
+ ModItemInMarc( $record, $iteminformation->{'biblionumber'}, $iteminformation->{'itemnumber'}, $frameworkcode );
+ }
($borrower) = C4::Members::GetMemberDetails( $iteminformation->{borrowernumber}, 0 );
# fix up the accounts.....
# 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 $loanlength = GetLoanLength(
+ my $borrower = C4::Members::GetMemberDetails( $borrowernumber, 0 );
+ my $loanlength = GetLoanLength(
$borrower->{'categorycode'},
- (C4::Context->preference('item-level_itypes')) ? $biblio->{'ccode'} : $biblio->{'itemtype'} ,
+ (C4::Context->preference('item-level_itypes')) ? $biblio->{'itype'} : $biblio->{'itemtype'} ,
$borrower->{'branchcode'}
);
#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 = C4::Dates->new( "$due_year-$due_month-$due_day",'iso');
$datedue=CheckValidDatedue($datedue,$itemnumber,$branch);
}
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 );
# Charge a new rental fee, if applicable?
my ( $charge, $type ) = GetIssuingCharges( $itemnumber, $borrowernumber );
'Rent', $charge, $itemnumber );
$sth->finish;
}
+ UpdateStats( C4::Context->userenv->{'branchcode'}, '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);
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.ccode = itemtypes.itemtype "
+ ? " LEFT JOIN itemtypes ON items.itype = itemtypes.itemtype "
: " LEFT JOIN itemtypes ON biblioitems.itemtype = itemtypes.itemtype ";
$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];
(($years,$month,$day) = Add_Delta_Days($years,$month,$day, 1))if ($i ne '1');
}
}
-my $newdatedue=$years."-".$month."-".$day;
+my $newdatedue=C4::Dates->new( $years."-".$month."-".$day,'iso');
return $newdatedue;
}
=head2 CheckRepeatableHolidays
projects / koha.git / blobdiff