[Koha-cvs] koha C4/Circulation.pm C4/Members.pm circ/circu...

[Henri-Damien LAURENT]

CVSROOT:        /cvsroot/koha
Module name:    koha
Changes by:     Henri-Damien LAURENT <hdl>      07/04/25 14:07:34

Modified files:
        C4             : Circulation.pm Members.pm 
        circ           : circulation.pl 
        members        : deletemem.pl 
        opac           : opac-user.pl 

Log message:
        GetBorrowerIssues is deleted from C4::Circulation
        Use GetPendingIssues from C4::Members instead.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation.pm?cvsroot=koha&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.50&r2=1.51
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-user.pl?cvsroot=koha&r1=1.31&r2=1.32

Patches:
Index: C4/Circulation.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- C4/Circulation.pm   24 Apr 2007 16:10:36 -0000      1.20
+++ C4/Circulation.pm   25 Apr 2007 14:07:34 -0000      1.21
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Circulation.pm,v 1.20 2007/04/24 16:10:36 tipaul Exp $
+# $Id: Circulation.pm,v 1.21 2007/04/25 14:07:34 hdl Exp $
 
 use strict;
 require Exporter;
@@ -43,7 +43,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.20 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.21 $' =~ /\d+/g; shift(@v).".".join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -694,7 +694,7 @@
 
     # DEBTS
     my ($amount) =
-      GetBorrowerAcctRecord( $borrower->{'borrowernumber'}, $duedate );
+      GetMemberAccountRecords( $borrower->{'borrowernumber'}, $duedate );
     if ( C4::Context->preference("IssuingInProcess") ) {
         my $amountlimit = C4::Context->preference("noissuescharge");
         if ( $amount > $amountlimit && !$inprocess ) {
@@ -1425,7 +1425,7 @@
 
 =head2 GetItemIssue
 
-$issues = &GetBorrowerIssue($itemnumber);
+$issues = &GetItemIssue($itemnumber);
 
 Returns patrons currently having a book. nothing if item is not issued atm
 
@@ -1462,7 +1462,7 @@
 
 =head2 GetItemIssues
 
-$issues = &GetBorrowerIssues($itemnumber, $history);
+$issues = &GetItemIssues($itemnumber, $history);
 
 Returns patrons that have issued a book
 
@@ -1542,8 +1542,6 @@
         if ( $datedue < $today ) {
             $data->{'overdue'} = 1;
         }
-        my $itemnumber = $data->{'itemnumber'};
-
         push @GetBorrowerIssues, $data;
     }
     $sth->finish;

Index: C4/Members.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Members.pm,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- C4/Members.pm       25 Apr 2007 13:38:00 -0000      1.50
+++ C4/Members.pm       25 Apr 2007 14:07:34 -0000      1.51
@@ -17,7 +17,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Members.pm,v 1.50 2007/04/25 13:38:00 hdl Exp $
+# $Id: Members.pm,v 1.51 2007/04/25 14:07:34 hdl Exp $
 
 use strict;
 require Exporter;
@@ -31,7 +31,7 @@
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision: 1.50 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.51 $' =~ /\d+/g; shift(@v) . "." . join( 
"_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -86,7 +86,6 @@
   &GetBorrowersWhoHaveNotBorrowedSince
   &GetBorrowersWhoHaveNeverBorrowed
   &GetBorrowersWithIssuesHistoryOlderThan
-  &GetMembersFromSurname 
   
   &GetExpiryDate
 );
@@ -994,14 +993,28 @@
 sub GetPendingIssues {
     my ($borrowernumber) = @_;
     my $dbh              = C4::Context->dbh;
+
     my $sth              = $dbh->prepare(
-        "Select * from issues,biblio,items where borrowernumber=?
-        and items.itemnumber=issues.itemnumber
-       and items.biblionumber=biblio.biblionumber
-       and issues.returndate is NULL order by date_due"
+   "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($borrowernumber);
     my $data = $sth->fetchall_arrayref({});
+    my $today = POSIX::strftime("%Y%m%d", localtime);
+    foreach( @$data ) {
+        my $datedue = $_->{'date_due'};
+        $datedue =~ s/-//g;
+        if ( $datedue < $today ) {
+            $_->{'overdue'} = 1;
+        }
+    }
+    $sth->finish;
     return ( scalar(@$data), $data );
 }
 
@@ -1484,8 +1497,6 @@
 
 }    # sub add_member_orgs
 
-=head2 GetMembersFromSurname
-
 =head2 GetCities (OUEST-PROVENCE)
 
   ($id_cityarrayref, $city_hashref) = &GetCities();

Index: circ/circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- circ/circulation.pl 24 Apr 2007 16:10:36 -0000      1.111
+++ circ/circulation.pl 25 Apr 2007 14:07:34 -0000      1.112
@@ -368,7 +368,7 @@
 # get each issue of the borrower & separate them in todayissues & previous 
issues
     my @todaysissues;
     my @previousissues;
-    my $issueslist = GetBorrowerIssues($borrower);
+    my ($countissues,$issueslist) = 
GetPendingIssues($borrower->{'borrowernumber'});
 
     # split in 2 arrays for today & previous
     my $dbh = C4::Context->dbh;

Index: members/deletemem.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/deletemem.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- members/deletemem.pl        24 Apr 2007 13:54:29 -0000      1.14
+++ members/deletemem.pl        25 Apr 2007 14:07:34 -0000      1.15
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: deletemem.pl,v 1.14 2007/04/24 13:54:29 hdl Exp $
+# $Id: deletemem.pl,v 1.15 2007/04/25 14:07:34 hdl Exp $
 
 #script to delete items
 #written 2/5/00
@@ -29,7 +29,6 @@
 use CGI;
 use C4::Context;
 use C4::Output;
-use C4::Circulation;
 use C4::Auth;
 use C4::Members;
 
@@ -46,7 +45,7 @@
 my $member=$input->param('member');
 my %member2;
 $member2{'borrowernumber'}=$member;
-my $issues=GetBorrowerIssues(\%member2);
+my ($countissues,$issues)=GetPendingIssues($member);
 my $i=0;
 foreach (sort keys %$issues) {
        $i++;

Index: opac/opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- opac/opac-user.pl   24 Apr 2007 16:10:36 -0000      1.31
+++ opac/opac-user.pl   25 Apr 2007 14:07:34 -0000      1.32
@@ -15,7 +15,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: opac-user.pl,v 1.31 2007/04/24 16:10:36 tipaul Exp $
+# $Id: opac-user.pl,v 1.32 2007/04/25 14:07:34 hdl Exp $
 
 use strict;
 require Exporter;
@@ -76,7 +76,7 @@
 $template->param( borrowernumber => $borrowernumber );
 
 #get issued items ....
-my $issues = GetBorrowerIssues($borr);
+my ($countissues,$issues) = GetPendingIssues($borrowernumber);
 
 my $count          = 0;
 my $overdues_count = 0;