Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv3991/circ Modified Files: circulation.pl Log Message: Rejigged printing issues, to print out everything on issue to the borrower Index: circulation.pl =================================================================== 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'}=$branch; $env{'printer'}=$printer; ! #$env{'queue'}=$printer; my $branchcount=0; my $printercount=0; --- 31,35 ---- $env{'branchcode'}=$branch; $env{'printer'}=$printer; ! $env{'queue'}=$printer; my $branchcount=0; my $printercount=0; *************** *** 330,334 **** <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Returned Items</font></th></tr> ! <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th><th>Borrower</th></tr> EOF my $color=''; --- 330,334 ---- <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Returned Items</font></th></tr> ! <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</th></tr> EOF my $color=''; *************** *** 345,349 **** my ($borrower) = getpatroninformation(\%env,$borrowernumber,0); my ($iteminformation) = getiteminformation(\%env, 0, $barcode); ! print "<tr><td bgcolor=$color>$overduetext</td><td bgcolor=$color align=center><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td><td bgcolor=$color>$iteminformation->{'title'}</td><td bgcolor=$color>$iteminformation->{'author'}</td><td bgcolor=$color align=center>$iteminformation->{'dewey'} $iteminformation->{'subclass'}</td><td bgcolor=$color><img src=/images/blackdot.gif><a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>\n"; } print "</table>\n"; --- 345,349 ---- my ($borrower) = getpatroninformation(\%env,$borrowernumber,0); my ($iteminformation) = getiteminformation(\%env, 0, $barcode); ! print "<tr><td bgcolor=$color>$overduetext</td><td bgcolor=$color align=center><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td><td bgcolor=$color>$iteminformation->{'title'}</td><td bgcolor=$color>$iteminformation->{'author'}</td><td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td><td bgcolor=$color><img src=/images/blackdot.gif><a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>\n"; } print "</table>\n"; *************** *** 360,369 **** my $borrowernumber=$query->param('borrnumber'); my $barcode=$query->param('barcode'); - # if (!$barcode){ - # $barcode=' '; - # } if ($barcode eq ''){ ! $print='yes'; ! } elsif ($barcode eq ' '){ $query->param('barcode',''); --- 360,365 ---- my $borrowernumber=$query->param('borrnumber'); my $barcode=$query->param('barcode'); if ($barcode eq ''){ ! $print='yes'; } elsif ($barcode eq ' '){ $query->param('barcode',''); *************** *** 374,390 **** $env{'todaysissues'}=1; my ($borrowerissues) = currentissues(\%env, $borrower); my $i=0; my @issues; foreach (sort keys %$borrowerissues) { $issues[$i]=$borrowerissues->{$_}; - #print $issues[$i]->{'date_due'}; $i++; ! ! #print $i; } - # print $i; remoteprint(\%env,\@issues,$borrower); $query->param('borrnumber','') - # $borrowernumber=''; } unless ($noheader) { --- 370,389 ---- $env{'todaysissues'}=1; my ($borrowerissues) = currentissues(\%env, $borrower); + $env{'nottodaysissues'}=1; + $env{'todaysissues'}=0; + my ($borroweriss2)=currentissues(\%env, $borrower); + $env{'nottodaysissues'}=0; my $i=0; my @issues; foreach (sort keys %$borrowerissues) { $issues[$i]=$borrowerissues->{$_}; $i++; ! } ! foreach (sort keys %$borroweriss2) { ! $issues[$i]=$borroweriss2->{$_}; ! $i++; } remoteprint(\%env,\@issues,$borrower); $query->param('borrnumber','') } unless ($noheader) {