X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FOverdues.pm;h=660e10b830b055a4202207b54e3141db20f29e59;hb=d7fe2f24dbccce034d52b630c225c2f342860fa2;hp=7ea969c860bef83d042ca9443a666d22e5840559;hpb=6241d54c52b9ad1e8f1117b260cbbc86c4d37faa;p=koha_gimpoz diff --git a/C4/Overdues.pm b/C4/Overdues.pm index 7ea969c860..660e10b830 100644 --- a/C4/Overdues.pm +++ b/C4/Overdues.pm @@ -2,6 +2,7 @@ package C4::Overdues; # Copyright 2000-2002 Katipo Communications +# copyright 2010 BibLibre # # This file is part of Koha. # @@ -78,7 +79,6 @@ BEGIN { # subs to move to Members.pm push @EXPORT, qw( &CheckBorrowerDebarred - &UpdateBorrowerDebarred ); # subs to move to Biblio.pm push @EXPORT, qw( @@ -156,7 +156,7 @@ LEFT JOIN biblioitems USING (biblioitemnumber) =head2 checkoverdues -($count, $overdueitems) = checkoverdues($borrowernumber); + ($count, $overdueitems) = checkoverdues($borrowernumber); Returns a count and a list of overdueitems for a given borrowernumber @@ -164,8 +164,37 @@ Returns a count and a list of overdueitems for a given borrowernumber sub checkoverdues { my $borrowernumber = shift or return; + # don't select biblioitems.marc or biblioitems.marcxml... too slow on large systems my $sth = C4::Context->dbh->prepare( - "SELECT * FROM issues + "SELECT biblio.*, items.*, issues.*, + biblioitems.volume, + biblioitems.number, + biblioitems.itemtype, + biblioitems.isbn, + biblioitems.issn, + biblioitems.publicationyear, + biblioitems.publishercode, + biblioitems.volumedate, + biblioitems.volumedesc, + biblioitems.collectiontitle, + biblioitems.collectionissn, + biblioitems.collectionvolume, + biblioitems.editionstatement, + biblioitems.editionresponsibility, + biblioitems.illus, + biblioitems.pages, + biblioitems.notes, + biblioitems.size, + biblioitems.place, + biblioitems.lccn, + biblioitems.url, + biblioitems.cn_source, + biblioitems.cn_class, + biblioitems.cn_item, + biblioitems.cn_suffix, + biblioitems.cn_sort, + biblioitems.totalissues + 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 @@ -180,8 +209,9 @@ sub checkoverdues { =head2 CalcFine - ($amount, $chargename, $daycount, $daycounttotal) = - &CalcFine($item, $categorycode, $branch, $days_overdue, $description, $start_date, $end_date ); + ($amount, $chargename, $daycount, $daycounttotal) = &CalcFine($item, + $categorycode, $branch, $days_overdue, + $description, $start_date, $end_date ); Calculates the fine for a book. @@ -277,7 +307,7 @@ sub CalcFine { =head2 GetSpecialHolidays -&GetSpecialHolidays($date_dues,$itemnumber); + &GetSpecialHolidays($date_dues,$itemnumber); return number of special days between date of the day and date due @@ -335,7 +365,7 @@ AND branchcode=? =head2 GetRepeatableHolidays -&GetRepeatableHolidays($date_dues, $itemnumber, $difference,); + &GetRepeatableHolidays($date_dues, $itemnumber, $difference,); return number of day closed between date of the day and date due @@ -373,7 +403,7 @@ sub GetRepeatableHolidays { =head2 GetWayFromItemnumber -&Getwdayfromitemnumber($itemnumber); + &Getwdayfromitemnumber($itemnumber); return the different week day from repeatable_holidays table @@ -401,7 +431,7 @@ sub GetWdayFromItemnumber { =head2 GetIssuesIteminfo -&GetIssuesIteminfo($itemnumber); + &GetIssuesIteminfo($itemnumber); return all data from issues about item @@ -425,7 +455,7 @@ sub GetIssuesIteminfo { =head2 UpdateFine - &UpdateFine($itemnumber, $borrowernumber, $amount, $type, $description); + &UpdateFine($itemnumber, $borrowernumber, $amount, $type, $description); (Note: the following is mostly conjecture and guesswork.) @@ -487,12 +517,12 @@ sub UpdateFine { if ( my $data = $sth->fetchrow_hashref ) { - # we're updating an existing fine. Only modify if we're adding to the charge. + # we're updating an existing fine. Only modify if amount changed # Note that in the current implementation, you cannot pay against an accruing fine # (i.e. , of accounttype 'FU'). Doing so will break accrual. if ( $data->{'amount'} != $amount ) { my $diff = $amount - $data->{'amount'}; - $diff = 0 if ( $data->{amount} > $amount); + #3341: diff could be positive or negative! my $out = $data->{'amountoutstanding'} + $diff; my $query = " UPDATE accountlines @@ -552,7 +582,7 @@ sub UpdateFine { =head2 BorType - $borrower = &BorType($borrowernumber); + $borrower = &BorType($borrowernumber); Looks up a patron by borrower number. @@ -578,7 +608,7 @@ sub BorType { =head2 ReplacementCost - $cost = &ReplacementCost($itemnumber); + $cost = &ReplacementCost($itemnumber); Returns the replacement cost of the item with the given item number. @@ -599,7 +629,7 @@ sub ReplacementCost { =head2 GetFine -$data->{'sum(amountoutstanding)'} = &GetFine($itemnum,$borrowernumber); + $data->{'sum(amountoutstanding)'} = &GetFine($itemnum,$borrowernumber); return the total of fine @@ -613,13 +643,16 @@ C<$borrowernumber> is the borrowernumber sub GetFine { my ( $itemnum, $borrowernumber ) = @_; my $dbh = C4::Context->dbh(); - my $query = "SELECT sum(amountoutstanding) FROM accountlines - where accounttype like 'F%' - AND amountoutstanding > 0 AND itemnumber = ? AND borrowernumber=?"; + my $query = q|SELECT sum(amountoutstanding) as fineamount FROM accountlines + where accounttype like 'F%' + AND amountoutstanding > 0 AND itemnumber = ? AND borrowernumber=?|; my $sth = $dbh->prepare($query); $sth->execute( $itemnum, $borrowernumber ); - my $data = $sth->fetchrow_hashref(); - return ( $data->{'sum(amountoutstanding)'} ); + my $fine = $sth->fetchrow_hashref(); + if ($fine->{fineamount}) { + return $fine->{fineamount}; + } + return 0; } @@ -628,7 +661,7 @@ sub GetFine { FIXME - This sub should be deprecated and removed. It ignores branch and defaults. -$data = &GetIssuingRules($itemtype,$categorycode); + $data = &GetIssuingRules($itemtype,$categorycode); Looks up for all issuingrules an item info @@ -675,7 +708,7 @@ sub ReplacementCost2 { =head2 GetNextIdNotify -($result) = &GetNextIdNotify($reference); + ($result) = &GetNextIdNotify($reference); Returns the new file number @@ -714,7 +747,7 @@ sub GetNextIdNotify { =head2 NumberNotifyId -(@notify) = &NumberNotifyId($borrowernumber); + (@notify) = &NumberNotifyId($borrowernumber); Returns amount for all file per borrowers C<@notify> array contains all file per borrowers @@ -740,7 +773,7 @@ sub NumberNotifyId{ =head2 AmountNotify -($totalnotify) = &AmountNotify($notifyid); + ($totalnotify) = &AmountNotify($notifyid); Returns amount for all file per borrowers C<$notifyid> is the file number @@ -767,7 +800,7 @@ sub AmountNotify{ =head2 GetNotifyId -($notify_id) = &GetNotifyId($borrowernumber,$itemnumber); + ($notify_id) = &GetNotifyId($borrowernumber,$itemnumber); Returns the file number per borrower and itemnumber @@ -797,7 +830,9 @@ sub GetNotifyId { =head2 CreateItemAccountLine -() = &CreateItemAccountLine($borrowernumber,$itemnumber,$date,$amount,$description,$accounttype,$amountoutstanding,$timestamp,$notify_id,$level); + () = &CreateItemAccountLine($borrowernumber, $itemnumber, $date, $amount, + $description, $accounttype, $amountoutstanding, + $timestamp, $notify_id, $level); update the account lines with file number or with file level @@ -850,7 +885,7 @@ sub CreateItemAccountLine { =head2 UpdateAccountLines -() = &UpdateAccountLines($notify_id,$notify_level,$borrowernumber,$itemnumber); + () = &UpdateAccountLines($notify_id,$notify_level,$borrowernumber,$itemnumber); update the account lines with file number or with file level @@ -893,7 +928,7 @@ sub UpdateAccountLines { =head2 GetItems -($items) = &GetItems($itemnumber); + ($items) = &GetItems($itemnumber); Returns the list of all delays from overduerules. @@ -922,7 +957,7 @@ sub GetItems { =head2 GetOverdueDelays -(@delays) = &GetOverdueDelays($categorycode); + (@delays) = &GetOverdueDelays($categorycode); Returns the list of all delays from overduerules. @@ -945,27 +980,27 @@ sub GetOverdueDelays { =head2 GetBranchcodesWithOverdueRules -=over 4 - -my @branchcodes = C4::Overdues::GetBranchcodesWithOverdueRules() + my @branchcodes = C4::Overdues::GetBranchcodesWithOverdueRules() returns a list of branch codes for branches with overdue rules defined. -=back - =cut sub GetBranchcodesWithOverdueRules { my $dbh = C4::Context->dbh; - my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL AND branchcode <> ''"); + my $rqoverduebranches = $dbh->prepare("SELECT DISTINCT branchcode FROM overduerules WHERE delay1 IS NOT NULL AND branchcode <> '' ORDER BY branchcode"); $rqoverduebranches->execute; my @branches = map { shift @$_ } @{ $rqoverduebranches->fetchall_arrayref }; + if (!$branches[0]) { + my $availbranches = C4::Branch::GetBranches(); + @branches = keys %$availbranches; + } return @branches; } =head2 CheckAccountLineLevelInfo -($exist) = &CheckAccountLineLevelInfo($borrowernumber,$itemnumber,$accounttype,notify_level); + ($exist) = &CheckAccountLineLevelInfo($borrowernumber,$itemnumber,$accounttype,notify_level); Check and Returns the list of all overdue books. @@ -999,7 +1034,7 @@ sub CheckAccountLineLevelInfo { =head2 GetOverduerules -($overduerules) = &GetOverduerules($categorycode); + ($overduerules) = &GetOverduerules($categorycode); Returns the value of borrowers (debarred or not) with notify level @@ -1026,7 +1061,7 @@ sub GetOverduerules { =head2 CheckBorrowerDebarred -($debarredstatus) = &CheckBorrowerDebarred($borrowernumber); + ($debarredstatus) = &CheckBorrowerDebarred($borrowernumber); Check if the borrowers is already debarred @@ -1044,39 +1079,18 @@ sub CheckBorrowerDebarred { SELECT debarred FROM borrowers WHERE borrowernumber=? + AND debarred > NOW() |; my $sth = $dbh->prepare($query); $sth->execute($borrowernumber); - my ($debarredstatus) = $sth->fetchrow; - return ( $debarredstatus eq '1' ? 1 : 0 ); + my $debarredstatus = $sth->fetchrow; + return $debarredstatus; } -=head2 UpdateBorrowerDebarred - -($borrowerstatut) = &UpdateBorrowerDebarred($borrowernumber); - -update status of borrowers in borrowers table (field debarred) - -C<$borrowernumber> borrower number - -=cut - -sub UpdateBorrowerDebarred{ - my($borrowernumber) = @_; - my $dbh = C4::Context->dbh; - my $query=qq|UPDATE borrowers - SET debarred='1' - WHERE borrowernumber=? - |; - my $sth=$dbh->prepare($query); - $sth->execute($borrowernumber); - $sth->finish; - return 1; -} =head2 CheckExistantNotifyid - ($exist) = &CheckExistantNotifyid($borrowernumber,$itemnumber,$accounttype,$notify_id); + ($exist) = &CheckExistantNotifyid($borrowernumber,$itemnumber,$accounttype,$notify_id); Check and Returns the notify id if exist else return 0. @@ -1103,7 +1117,7 @@ sub CheckExistantNotifyid { =head2 CheckAccountLineItemInfo - ($exist) = &CheckAccountLineItemInfo($borrowernumber,$itemnumber,$accounttype,$notify_id); + ($exist) = &CheckAccountLineItemInfo($borrowernumber,$itemnumber,$accounttype,$notify_id); Check and Returns the list of all overdue items from the same file number(notify_id). @@ -1177,12 +1191,14 @@ sub GetOverduesForBranch { borrowers.phone, borrowers.email, biblio.title, + biblio.author, biblio.biblionumber, issues.date_due, issues.returndate, issues.branchcode, branches.branchname, items.barcode, + items.homebranch, items.itemcallnumber, items.location, items.itemnumber, @@ -1228,9 +1244,9 @@ sub GetOverduesForBranch { =head2 AddNotifyLine -&AddNotifyLine($borrowernumber, $itemnumber, $overduelevel, $method, $notifyId) + &AddNotifyLine($borrowernumber, $itemnumber, $overduelevel, $method, $notifyId) -Creat a line into notify, if the method is phone, the notification_send_date is implemented to +Create a line into notify, if the method is phone, the notification_send_date is implemented to =cut @@ -1258,7 +1274,7 @@ sub AddNotifyLine { =head2 RemoveNotifyLine -&RemoveNotifyLine( $borrowernumber, $itemnumber, $notify_date ); + &RemoveNotifyLine( $borrowernumber, $itemnumber, $notify_date ); Cancel a notification @@ -1283,6 +1299,6 @@ __END__ =head1 AUTHOR -Koha Development Team +Koha Development Team =cut