[Koha-devel] CVS: koha/C4/Circulation Circ2.pm,1.13,1.14

[Chris Cormack]

Update of /cvsroot/koha/koha/C4/Circulation
In directory usw-pr-cvs1:/tmp/cvs-serv3526/C4/Circulation

Modified Files:
        Circ2.pm 
Log Message:
Reworked layout of issues section. 


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** Circ2.pm    2001/02/18 22:13:26     1.13
--- Circ2.pm    2001/03/28 02:23:03     1.14
***************
*** 201,204 ****
--- 201,208 ----
            last SWITCH;
        }
+       if ($patroninformation->{'debarred'}) {
+           $rejected="Patron is Debarred";
+           last SWITCH;
+       }
        my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, 
$dbh);
        if ($amount>5) {
***************
*** 452,455 ****
--- 456,465 ----
        $flags{'LOST'}=\%flaginfo;
      }
+     if ($patroninformation->{'debarred'} == 1) {
+       my %flaginfo;
+       $flaginfo{'message'}='Borrower is Debarred.'; 
+       $flaginfo{'noissues'}=1;
+       $flags{'DBARRED'}=\%flaginfo;
+     }
      if ($patroninformation->{'borrowernotes'}) {
        my %flaginfo;
***************
*** 460,464 ****
      if ($odues > 0) {
        my %flaginfo;
!       $flaginfo{'message'}="Patron has overdue items";
        $flaginfo{'itemlist'}=$itemsoverdue;
        foreach (sort {$a->{'date_due'} cmp $b->{'date_due'}} @$itemsoverdue) {
--- 470,474 ----
      if ($odues > 0) {
        my %flaginfo;
!       $flaginfo{'message'}="Yes";
        $flaginfo{'itemlist'}=$itemsoverdue;
        foreach (sort {$a->{'date_due'} cmp $b->{'date_due'}} @$itemsoverdue) {
***************
*** 588,592 ****
        $crit=" and !(issues.timestamp like '$today%') ";
      }
!     my $select="select * from issues,items,biblioitems,biblio where 
borrowernumber=$borrowernumber and issues.itemnumber=items.itemnumber and 
items.biblionumber=biblio.biblionumber and 
items.biblioitemnumber=biblioitems.biblioitemnumber and returndate is null 
$crit order by date_due";
  #    print $select;
      my $sth=$dbh->prepare($select);
--- 598,606 ----
        $crit=" and !(issues.timestamp like '$today%') ";
      }
!     my $select="select * from issues,items,biblioitems,biblio where
!     borrowernumber=$borrowernumber and issues.itemnumber=items.itemnumber and
!     items.biblionumber=biblio.biblionumber and
!     items.biblioitemnumber=biblioitems.biblioitemnumber and returndate is null
!     $crit order by issues.timestamp desc";
  #    print $select;
      my $sth=$dbh->prepare($select);