From rangi@users.sourceforge.net Wed Feb 21 14:32:47 2001
From: Chris Cornack <rangi@users.sourceforge.net>
To: koha-devel@lists.koha-community.org
Subject: [Koha-devel] CVS: koha/circ circulation.pl,1.13,1.14
Date: Wed, 21 Feb 2001 14:33:50 -0800
Message-ID: <E14VhpW-00013h-00@usw-pr-cvs1.sourceforge.net>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7796186499669928874=="

--===============7796186499669928874==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv3991/circ

Modified Files:
	circulation.pl=20
Log Message:
Rejigged printing issues, to print out everything on issue to the borrower


Index: circulation.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** circulation.pl	2001/02/14 02:41:43	1.13
--- circulation.pl	2001/02/21 22:33:48	1.14
***************
*** 31,35 ****
  $env{'branchcode'}=3D$branch;
  $env{'printer'}=3D$printer;
! #$env{'queue'}=3D$printer;
  my $branchcount=3D0;
  my $printercount=3D0;
--- 31,35 ----
  $env{'branchcode'}=3D$branch;
  $env{'printer'}=3D$printer;
! $env{'queue'}=3D$printer;
  my $branchcount=3D0;
  my $printercount=3D0;
***************
*** 330,334 ****
  	<table border=3D0 cellpadding=3D5 cellspacing=3D0 bgcolor=3D#dddddd>
  	<tr><th colspan=3D6 bgcolor=3D$headerbackgroundcolor background=3D$backgro=
undimage><font color=3Dblack>Returned Items</font></th></tr>
! 	<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Cla=
ss</th><th>Borrower</th></tr>
  EOF
  	my $color=3D'';
--- 330,334 ----
  	<table border=3D0 cellpadding=3D5 cellspacing=3D0 bgcolor=3D#dddddd>
  	<tr><th colspan=3D6 bgcolor=3D$headerbackgroundcolor background=3D$backgro=
undimage><font color=3Dblack>Returned Items</font></th></tr>
! 	<tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Typ=
e</th><th>Borrower</th></tr>
  EOF
  	my $color=3D'';
***************
*** 345,349 ****
  	    my ($borrower) =3D getpatroninformation(\%env,$borrowernumber,0);
  	    my ($iteminformation) =3D getiteminformation(\%env, 0, $barcode);
! 	    print "<tr><td bgcolor=3D$color>$overduetext</td><td bgcolor=3D$color =
align=3Dcenter><a href=3D/cgi-bin/koha/detail.pl?bib=3D$iteminformation->{'bi=
blionumber'}&type=3Dintra onClick=3D\"openWindow(this, 'Item', 480, 640)\">$b=
arcode</a></td><td bgcolor=3D$color>$iteminformation->{'title'}</td><td bgcol=
or=3D$color>$iteminformation->{'author'}</td><td bgcolor=3D$color align=3Dcen=
ter>$iteminformation->{'dewey'} $iteminformation->{'subclass'}</td><td bgcolo=
r=3D$color><img src=3D/images/blackdot.gif><a href=3D/cgi-bin/koha/moremember=
.pl?bornum=3D$borrower->{'borrowernumber'} onClick=3D\"openWindow(this,'Membe=
r', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borro=
wer->{'surname'}</td></tr>\n";
  	}
  	print "</table>\n";
--- 345,349 ----
  	    my ($borrower) =3D getpatroninformation(\%env,$borrowernumber,0);
  	    my ($iteminformation) =3D getiteminformation(\%env, 0, $barcode);
! 	    print "<tr><td bgcolor=3D$color>$overduetext</td><td bgcolor=3D$color =
align=3Dcenter><a href=3D/cgi-bin/koha/detail.pl?bib=3D$iteminformation->{'bi=
blionumber'}&type=3Dintra onClick=3D\"openWindow(this, 'Item', 480, 640)\">$b=
arcode</a></td><td bgcolor=3D$color>$iteminformation->{'title'}</td><td bgcol=
or=3D$color>$iteminformation->{'author'}</td><td bgcolor=3D$color align=3Dcen=
ter>$iteminformation->{'itemtype'}</td><td bgcolor=3D$color><img src=3D/image=
s/blackdot.gif><a href=3D/cgi-bin/koha/moremember.pl?bornum=3D$borrower->{'bo=
rrowernumber'} onClick=3D\"openWindow(this,'Member', 480, 640)\">$borrower->{=
'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>\n=
";
  	}
  	print "</table>\n";
***************
*** 360,369 ****
      my $borrowernumber=3D$query->param('borrnumber');   =20
      my $barcode=3D$query->param('barcode');
- #    if (!$barcode){
- #      $barcode=3D' ';
- #    }
      if ($barcode eq ''){
!       $print=3D'yes';
!     =20
      } elsif ($barcode eq ' '){
        $query->param('barcode','');
--- 360,365 ----
      my $borrowernumber=3D$query->param('borrnumber');   =20
      my $barcode=3D$query->param('barcode');
      if ($barcode eq ''){
!       $print=3D'yes';    =20
      } elsif ($barcode eq ' '){
        $query->param('barcode','');
***************
*** 374,390 ****
        $env{'todaysissues'}=3D1;
        my ($borrowerissues) =3D currentissues(\%env, $borrower);
        my $i=3D0;
        my @issues;
        foreach (sort keys %$borrowerissues) {
          $issues[$i]=3D$borrowerissues->{$_};
- 	#print $issues[$i]->{'date_due'};
  	$i++;
!=20
! 	#print $i;
        }
- #      print $i;
        remoteprint(\%env,\@issues,$borrower);
        $query->param('borrnumber','')
- #       $borrowernumber=3D'';
      }
      unless ($noheader) {
--- 370,389 ----
        $env{'todaysissues'}=3D1;
        my ($borrowerissues) =3D currentissues(\%env, $borrower);
+       $env{'nottodaysissues'}=3D1;
+       $env{'todaysissues'}=3D0;
+       my ($borroweriss2)=3Dcurrentissues(\%env, $borrower);
+       $env{'nottodaysissues'}=3D0;
        my $i=3D0;
        my @issues;
        foreach (sort keys %$borrowerissues) {
          $issues[$i]=3D$borrowerissues->{$_};
  	$i++;
!       }
!       foreach (sort keys %$borroweriss2) {
!         $issues[$i]=3D$borroweriss2->{$_};
! 	$i++;
        }
        remoteprint(\%env,\@issues,$borrower);
        $query->param('borrnumber','')
      }
      unless ($noheader) {



--===============7796186499669928874==--