- Koha-devel - lists.koha-community.org

CVS: koha/sec writeoff.pl,1.2,1.3
by Chris Cormack 03 Apr '01

03 Apr '01

Update of /cvsroot/koha/koha/sec In directory usw-pr-cvs1:/tmp/cvs-serv11400/sec Modified Files: writeoff.pl Log Message: Reworking statistics for payments and writeoffs Index: writeoff.pl =================================================================== RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** writeoff.pl 2001/03/27 21:45:50 1.2 --- writeoff.pl 2001/04/02 22:51:26 1.3 *************** *** 46,49 **** --- 46,52 ---- my ($bornum,$accountnum,$itemnum,$accounttype,$amount)=@_; my $user=$input->remote_user; + $user=~ s/Levin/C/; + $user=~ s/Foxton/F/; + $user=~ s/Shannon/S/; my $dbh=C4Connect; my $env;

1 0

CVS: koha/C4 Stats.pm,1.2,1.3 Accounts2.pm,1.2,1.3
by Chris Cormack 03 Apr '01

03 Apr '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv11400/C4 Modified Files: Stats.pm Accounts2.pm Log Message: Reworking statistics for payments and writeoffs Index: Stats.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Stats.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Stats.pm 2001/03/27 21:43:37 1.2 --- Stats.pm 2001/04/02 22:51:26 1.3 *************** *** 56,60 **** my ($env,$branch,$type,$amount,$other,$itemnum,$itemtype,$borrowernumber)=@_; my $dbh=C4Connect(); ! my $branch=$env->{'branchcode'}; my $user = $env->{'usercode'}; print $borrowernumber; --- 56,62 ---- my ($env,$branch,$type,$amount,$other,$itemnum,$itemtype,$borrowernumber)=@_; my $dbh=C4Connect(); ! if ($branch eq ''){ ! $branch=$env->{'branchcode'}; ! } my $user = $env->{'usercode'}; print $borrowernumber; *************** *** 148,161 **** my ($time)=@_; my $dbh=C4Connect; ! my $query="Select * from statistics,borrowers ! where statistics.borrowernumber= borrowers.borrowernumber ! and (statistics.type='payment' or statistics.type='writeoff')"; if ($time eq 'today'){ ! $query=$query." and datetime = now()"; } else { ! $query.=" and datetime > '$time'"; } ! # $query.=" order by timestamp"; ! print $query; my $sth=$dbh->prepare($query); $sth->execute; --- 150,171 ---- my ($time)=@_; my $dbh=C4Connect; ! my $query="Select * from accountlines,borrowers where (accounttype = 'Pay' ! or accounttype ='W') ! and accountlines.borrowernumber = borrowers.borrowernumber"; if ($time eq 'today'){ ! $query=$query." and date = now()"; } else { ! $query.=" and date='$time'"; } ! # my $query="Select * from statistics,borrowers ! # where statistics.borrowernumber= borrowers.borrowernumber ! # and (statistics.type='payment' or statistics.type='writeoff') "; ! # if ($time eq 'today'){ ! # $query=$query." and datetime = now()"; ! # } else { ! # $query.=" and datetime > '$time'"; ! # } ! $query.=" order by timestamp"; ! # print $query; my $sth=$dbh->prepare($query); $sth->execute; *************** *** 180,184 **** accounttype <> 'W'"; my $sth=$dbh->prepare($query); ! print $query,"<br>"; $sth->execute; my $i=0; --- 190,194 ---- accounttype <> 'W'"; my $sth=$dbh->prepare($query); ! # print $query,"<br>"; $sth->execute; my $i=0; *************** *** 195,201 **** sub Getpaidbranch{ ! my($date)=@_; my $dbh=C4Connect; ! my $query="select * from statistics where type='payment' and datetime='$date'"; my $sth=$dbh->prepare($query); $sth->execute; --- 205,212 ---- sub Getpaidbranch{ ! my($date,$borrno)=@_; my $dbh=C4Connect; ! my $query="select * from statistics where type='payment' and datetime ! >'$date' and borrowernumber='$borrno'"; my $sth=$dbh->prepare($query); $sth->execute; Index: Accounts2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** Accounts2.pm 2001/03/27 21:43:37 1.2 --- Accounts2.pm 2001/04/02 22:51:26 1.3 *************** *** 62,65 **** --- 62,66 ---- my $newamtos = 0; my $accdata = ""; + my $branch=$env->{'branchcode'}; my $amountleft = $data; # begin transaction *************** *** 101,105 **** $usth->execute; $usth->finish; ! UpdateStats($env,'branch','payment',$data,'','','',$bornumber); $sth->finish; $dbh->disconnect; --- 102,106 ---- $usth->execute; $usth->finish; ! UpdateStats($env,$branch,'payment',$data,'','','',$bornumber); $sth->finish; $dbh->disconnect;

1 0

CVS: koha stats.pl,1.3,1.4 pay.pl,1.1.1.1,1.2
by Chris Cormack 03 Apr '01

03 Apr '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv11400 Modified Files: stats.pl pay.pl Log Message: Reworking statistics for payments and writeoffs Index: stats.pl =================================================================== RCS file: /cvsroot/koha/koha/stats.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** stats.pl 2001/02/21 22:27:59 1.3 --- stats.pl 2001/04/02 22:51:26 1.4 *************** *** 50,63 **** print mktablehdr; print mktablerow(5,'#99cc33',bold('Name'),bold('Type'),bold('Date/time'),bold('Amount'), bold('Branch'),'/images/background-mem.gif'); ! for (my $i=0;$i<$count;$i++){ ! my $hour=substr($payments[$i]{'timestamp'},8,2); ! my $min=substr($payments[$i]{'timestamp'},10,2); ! my $sec=substr($payments[$i]{'timestamp'},12,2); ! my $time="$hour:$min:$sec"; ! if ($payments[$i]{'accounttype'} ne 'W'){ ! $payments[$i]{'amount'}*=-1; ! $total+=$payments[$i]{'amount'}; ! } ! my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'}); my $count=@charges; --- 50,60 ---- print mktablehdr; print mktablerow(5,'#99cc33',bold('Name'),bold('Type'),bold('Date/time'),bold('Amount'), bold('Branch'),'/images/background-mem.gif'); ! my $i=0; ! while ($i<$count){ ! my $time=$payments[$i]{'datetime'}; ! my $payments=$payments[$i]{'value'}; ! my $charge=0; ! my @temp=split(/ /,$payments[$i]{'datetime'}); ! my $date=$temp[0]; my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'}); my $count=@charges; *************** *** 66,82 **** my $temptotalres=0; my $temptotalren=0; ! my $temptotalw=0; ! ! ! for (my $i2=0;$i2<$count;$i2++){ ! if ($charges[$i2]->{'amountoutstanding'} != $oldtime){ ! print mktablerow(6,'red',$charges[$i2]->{'description'},$charges[$i2]->{'accounttype'},'', $charges[$i2]->{'amount'},$charges[$i2]->{'amountoutstanding'}); ! if ($payments[$i]{'accounttype'} ne 'W'){ ! # print $payments[$i]{'accounttype'}; if ($charges[$i2]->{'accounttype'} eq 'Rent'){ $temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } ! if ($charges[$i2]->{'accounttype'} eq 'F' || $charges[$i2]->{'accounttype'} eq 'FU'){ $temptotalf+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } --- 63,76 ---- my $temptotalres=0; my $temptotalren=0; ! my $temptotalw=0; ! for (my $i2=0;$i2<$count;$i2++){ ! $charge+=$charges[$i2]->{'amount'}; ! print mktablerow(6,'red',$charges[$i2]->{'description'},$charges[$i2]->{'accounttype'},$charges[$i2]->{'timestamp'}, $charges[$i2]->{'amount'},$charges[$i2]->{'amountoutstanding'}); ! if ($payments[$i]{'accountytpe'} ne 'W'){ if ($charges[$i2]->{'accounttype'} eq 'Rent'){ $temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } ! if ($charges[$i2]->{'accounttype'} eq 'F' || $charges[$i2]->{'accounttype'} eq 'FU' || $charges[$i2]->{'accounttype'} eq 'FN' ){ $temptotalf+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } *************** *** 87,124 **** $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } ! } ! } ! } ! if ($payments[$i]{'accounttype'} eq 'W'){ ! $totalw+=$payments[$i]{'amount'}; } ! my $time2="$payments[$i]{'date'} $time"; ! my $branch=Getpaidbranch($time2); ! $branch=~ s/Levi/C/; if ($branch eq 'C'){ - $levin{'total'}+=$payments[$i]{'amount'}; - $levin{'totalr'}+=$temptotalr; - $levin{'totalres'}+=$temptotalres; $levin{'totalf'}+=$temptotalf; $levin{'totalren'}+=$temptotalren; ! } ! if ($branch eq 'F'){ ! $foxton{'total'}+=$payments[$i]{'amount'}; ! $foxton{'totalr'}+=$temptotalr; ! $foxton{'totalres'}+=$temptotalres; $foxton{'totalf'}+=$temptotalf; $foxton{'totalren'}+=$temptotalren; ! } ! if ($branch eq 'S'){ ! $shannon{'total'}+=$payments[$i]{'amount'}; ! $shannon{'totalr'}+=$temptotalr; ! $shannon{'totalres'}+=$temptotalres; $shannon{'totalf'}+=$temptotalf; $shannon{'totalren'}+=$temptotalren; } ! print mktablerow(6,'white',"$payments[$i]{'firstname'} <b>$payments[$i]{'surname'}</b>" ! ,$payments[$i]{'accounttype'},"$payments[$i]{'date'} $time",$payments[$i]{'amount'} ! ,$branch); ! $oldtime=$payments[$i]{'timestamp'}; } print mktableft; --- 81,150 ---- $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } ! } } ! ! # my $branch= ! my $hour=substr($payments[$i]{'timestamp'},8,2); ! my $min=substr($payments[$i]{'timestamp'},10,2); ! my $sec=substr($payments[$i]{'timestamp'},12,2); ! my $time="$hour:$min:$sec"; ! my $time2="$payments[$i]{'date'}"; ! my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'}); if ($branch eq 'C'){ $levin{'totalf'}+=$temptotalf; + $levin{'totalres'}+=$temptotalres; $levin{'totalren'}+=$temptotalren; ! $levin{'totalr'}+=$temptotalr; ! } elsif ($branch eq 'F'){ $foxton{'totalf'}+=$temptotalf; + $foxton{'totalres'}+=$temptotalres; $foxton{'totalren'}+=$temptotalren; ! $foxton{'totalr'}+=$temptotalr; ! } elsif ($branch eq 'S'){ $shannon{'totalf'}+=$temptotalf; + $shannon{'totalres'}+=$temptotalres; $shannon{'totalren'}+=$temptotalren; + $shannon{'totalr'}+=$temptotalr; } ! my $bornum=$payments[$i]{'borrowernumber'}; ! my $oldtime=$payments[$i]{'timestamp'}; ! my $oldtype=$payments[$i]{'accounttype'}; ! while ($bornum eq $payments[$i]{'borrowernumber'} && $oldtype == $payments[$i]{'accounttype'} && $oldtime eq $payments[$i]{'timestamp'}){ ! my $hour=substr($payments[$i]{'timestamp'},8,2); ! my $min=substr($payments[$i]{'timestamp'},10,2); ! my $sec=substr($payments[$i]{'timestamp'},12,2); ! my $time="$hour:$min:$sec"; ! my $time2="$payments[$i]{'date'}"; ! my $branch=Getpaidbranch($time2,$payments[$i]{'borrowernumber'}); ! ! if ($payments[$i]{'accounttype'} eq 'W'){ ! $totalw+=$payments[$i]{'amount'}; ! } else { ! $payments[$i]{'amount'}=$payments[$i]{'amount'}*-1; ! $total+=$payments[$i]{'amount'}; ! if ($branch eq 'C'){ ! $levin{'total'}+=$payments[$i]{'amount'}; ! } ! if ($branch eq 'F'){ ! $foxton{'total'}+=$payments[$i]{'amount'}; ! } ! if ($branch eq 'S'){ ! $shannon{'total'}+=$payments[$i]{'amount'}; ! } ! ! } ! # my $time2="$payments[$i]{'date'} $time"; ! ! ! print mktablerow(6,'white',"$payments[$i]{'firstname'} <b>$payments[$i]{'surname'}</b>", ! ,$payments[$i]{'accounttype'},"$payments[$i]{'date'} $time",$payments[$i]{'amount'} ! ,$branch); ! $oldtype=$payments[$i]{'accounttype'}; ! $oldtime=$payments[$i]{'timestamp'}; ! $bornum=$payments[$i]{'borrowernumber'}; ! $i++; ! ! } ! print mktablerow('6','white','','','','','',''); } print mktableft; *************** *** 137,147 **** $foxton{'renewals'}=Count('renew','F',$date,$date2); $shannon{'renewals'}=Count('renew','S',$date,$date2); ! ! print mktablerow(9,'white',"<b>Levin</b>","Fines $levin{'totalf'}","Rental Charges $levin{'totalr'}", ! "Reserve Charges $levin{'totalres'}","Renewal Charges $levin{'totalren'}","<b>Total $levin{'total'}</b>", "Issues $levin{'issues'}","Renewals $levin{'renewals'}","Returns $levin{'returns'}"); ! print mktablerow(9,'white',"<b>foxton</b>","Fines $foxton{'totalf'}","Rental Charges $foxton{'totalr'}","Reserve Charges $foxton{'totalres'}","Renewal Charges $foxton{'totalren'}","<b>Total $foxton{'total'}</b>", "Issues $foxton{'issues'}","Renewals $foxton{'renewals'}","Returns $foxton{'returns'}"); ! print mktablerow(9,'white',"<b>shannon</b>","Fines $shannon{'totalf'}","Rental Charges $shannon{'totalr'}","Reserve Charges $shannon{'totalres'}","Renewal Charges $shannon{'totalren'}","<b>Total $shannon{'total'}</b>", "Issues $shannon{'issues'}","Renewals $shannon{'renewals'}","Returns $shannon{'returns'}"); print mktableft; --- 163,175 ---- $foxton{'renewals'}=Count('renew','F',$date,$date2); $shannon{'renewals'}=Count('renew','S',$date,$date2); ! $levin{'unknown'}=$levin{'total'}-($levin{'totalf'}+$levin{'totalr'}+$levin{'totalres'}+$levin{'totalren'}); ! $foxton{'unknown'}=$foxton{'total'}-($foxton{'totalf'}+$foxton{'totalr'}+$foxton{'totalres'}+$foxton{'totalren'}); ! $foxton{'unknown'}=$foxton{'total'}-($foxton{'totalf'}+$foxton{'totalr'}+$foxton{'totalres'}+$foxton{'totalren'}); ! print mktablerow(10,'white',"<b>Levin</b>","Fines $levin{'totalf'}","Rental Charges $levin{'totalr'}", ! "Reserve Charges $levin{'totalres'}","Renewal Charges $levin{'totalren'}","Unknown $levin{'unknown'}","<b>Total $levin{'total'}</b>", "Issues $levin{'issues'}","Renewals $levin{'renewals'}","Returns $levin{'returns'}"); ! print mktablerow(10,'white',"<b>foxton</b>","Fines $foxton{'totalf'}","Rental Charges $foxton{'totalr'}","Reserve Charges $foxton{'totalres'}","Renewal Charges $foxton{'totalren'}","Unknown $foxton{'unknown'}","<b>Total $foxton{'total'}</b>", "Issues $foxton{'issues'}","Renewals $foxton{'renewals'}","Returns $foxton{'returns'}"); ! print mktablerow(10,'white',"<b>shannon</b>","Fines $shannon{'totalf'}","Rental Charges $shannon{'totalr'}","Reserve Charges $shannon{'totalres'}","Renewal Charges $shannon{'totalren'}","Unknown $shannon{'unknown'}","<b>Total $shannon{'total'}</b>", "Issues $shannon{'issues'}","Renewals $shannon{'renewals'}","Returns $shannon{'returns'}"); print mktableft; Index: pay.pl =================================================================== RCS file: /cvsroot/koha/koha/pay.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** pay.pl 2000/12/19 23:45:52 1.1.1.1 --- pay.pl 2001/04/02 22:51:26 1.2 *************** *** 35,38 **** --- 35,41 ---- } if ($temp eq 'yes'){ + $user=~ s/Levin/C/i; + $user=~ s/Foxton/F/i; + $user=~ s/Shannon/S/i; my $amount=$input->param($names[$i+4]); my $bornum=$input->param($names[$i+5]); *************** *** 43,46 **** --- 46,54 ---- } my %env; + $user=~ s/Levin/C/i; + $user=~ s/Foxton/F/i; + $user=~ s/Shannon/S/i; + + $env{'branchcode'}=$user; my $total=$input->param('total'); if ($check ==0){

1 0

CVS: koha moremember.pl,1.4,1.5
by Chris Cormack 29 Mar '01

29 Mar '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv9121 Modified Files: moremember.pl Log Message: Commenting out the code that doesnt allow renewals if a renewal has already occured Index: moremember.pl =================================================================== RCS file: /cvsroot/koha/koha/moremember.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** moremember.pl 2001/03/07 21:02:48 1.4 --- moremember.pl 2001/03/29 02:11:36 1.5 *************** *** 206,211 **** if ($rescount >0){ print "<TD><a href=/cgi-bin/koha/request.pl?bib=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>"; ! } elsif ($issue->[$i]->{'renewals'} > 0) { ! print "<TD>Previously Renewed - no renewals</td></tr>"; } else { print "<TD>"; --- 206,211 ---- if ($rescount >0){ print "<TD><a href=/cgi-bin/koha/request.pl?bib=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>"; ! # } elsif ($issue->[$i]->{'renewals'} > 0) { ! # print "<TD>Previously Renewed - no renewals</td></tr>"; } else { print "<TD>";

1 0

CVS: koha/circ circulation.pl,1.16,1.17
by Chris Cormack 28 Mar '01

28 Mar '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv7477/circ Modified Files: circulation.pl Log Message: Adding in javscript code to open a new window for payments Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** circulation.pl 2001/03/28 02:23:03 1.16 --- circulation.pl 2001/03/28 03:00:56 1.17 *************** *** 76,80 **** ! if ($printer && $branch) { --- 76,88 ---- ! print <<EOF ! <script language="javascript" type="text/javascript"> !  ! </script> ! EOF if ($printer && $branch) {

1 0

CVS: koha/circ circulation.pl,1.15,1.16
by Chris Cormack 28 Mar '01

28 Mar '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv3526/circ Modified Files: circulation.pl Log Message: Reworked layout of issues section. Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** circulation.pl 2001/03/22 22:20:29 1.15 --- circulation.pl 2001/03/28 02:23:03 1.16 *************** *** 12,18 **** my $circbackgroundcolor='#ffffcc'; my $circbackgroundcolor='white'; ! my $linecolor1='#bbbbbb'; ! my $linecolor2='#dddddd'; ! my $backgroundimage="/koha/images/background-mem.gif"; my $query=new CGI; my $branches=getbranches(\%env); --- 12,18 ---- my $circbackgroundcolor='#ffffcc'; my $circbackgroundcolor='white'; ! my $linecolor1='#ffffcc'; ! my $linecolor2='white'; ! my $backgroundimage="/images/background-mem.gif"; my $query=new CGI; my $branches=getbranches(\%env); *************** *** 76,104 **** - print << "EOF"; - <center> - <p> - <table border=0 width=100% cellspacing=0 bgcolor=$headerbackgroundcolor background=$backgroundimage> - <tr> - <th width=5%></th> - <th width=30%><font color=black>$branchname</font></th> - <th width=10%> - <a href=circulation.pl?module=issues&branch=$branch&printer=$printer><font color=black><img src=/koha/images/issues.gif border=0 height=40></font></a> - </th> - <th width=10%> - <a href=circulation.pl?selectnewbranchprinter=1><font color=black>Branch/Printer</font></a> - </th> - <th width=10%> - <a href=circulation.pl?module=returns&branch=$branch&printer=$printer><font color=black><img src=/koha/images/returns.gif border=0 height=40></font></a> - </th> - <th width=30%><font color=black>$printername</font></th> - <th width=5%></th> - </tr> - </table> - - <br> - EOF - if ($printer && $branch) { --- 76,80 ---- *************** *** 113,116 **** --- 89,93 ---- if ($printercount>1) { $printerform=<<"EOF"; + <table border=0 cellspacing=0 cellpadding=5> <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Choose a Printer</font></td></tr> *************** *** 142,145 **** --- 119,123 ---- } print << "EOF"; + <center> Select a branch and a printer <form method=get> *************** *** 444,450 **** } unless ($noheader) { ! print << "EOF"; ! <table border=0 cellpadding=10 cellspacing=0><tr><th background=$backgroundimage><font color=black>Circulation - Issues ! </td></tr><tr><td bgcolor=$circbackgroundcolor align=center> EOF } --- 422,433 ---- } unless ($noheader) { ! print <<EOF ! <p align=right> ! <FONT SIZE=2 face="arial, helvetica"> ! <a href=circulation.pl?borrnumber=$borrowernumber&module=issues&branch=$branch&printer=$printer&print>Next Borrower</a> || ! <a href=circulation.pl?module=returns&branch=$branch&printer=$printer>Returns</a></font><p> ! ! ! </p> EOF } *************** *** 676,687 **** my ($patrontable, $flaginfotable) = patrontable($borrower); print << "EOF"; <form method=get> ! <table border=0 cellpadding=5> <tr> <td align=center valign=top> ! <table border=0 cellspacing=0 cellpadding=5 bgcolor=#dddddd width=100%> <tr><th align=center background=$backgroundimage><font color=black><b>Enter Book Barcode</b></font></th></tr> <tr><td align=center> ! <table border=0 bgcolor=#dddddd> <tr><td>Item Barcode:</td><td><input name=barcode size=10></td><td><input type=submit value=Issue></tr> <tr><td colspan=3 align=center> --- 659,675 ---- my ($patrontable, $flaginfotable) = patrontable($borrower); print << "EOF"; + $patrontable + $flaginfotable + <FONT SIZE=6><em>Issues</em></FONT>    <br> <a href=circulation.pl?selectnewbranchprinter=1><b>Branch:</b></a> $branch, + <a href=circulation.pl?selectnewbranchprinter=1><b>Printer:</b></a> $printer<P> + <p> <form method=get> ! <table border=1 cellpadding=5> <tr> <td align=center valign=top> ! <table border=0 cellspacing=0 cellpadding=5> <tr><th align=center background=$backgroundimage><font color=black><b>Enter Book Barcode</b></font></th></tr> <tr><td align=center> ! <table border=0> <tr><td>Item Barcode:</td><td><input name=barcode size=10></td><td><input type=submit value=Issue></tr> <tr><td colspan=3 align=center> *************** *** 695,705 **** </td></tr> </table> - <br> <input type=checkbox name=stickyduedate $selected> Sticky Due Date </td></tr> ! </table> ! </td></tr> ! </table> ! <input type=hidden name=module value=issues> <input type=hidden name=borrnumber value=$borrnumber> <input type=hidden name=branch value=$branch> --- 683,690 ---- </td></tr> </table> <input type=checkbox name=stickyduedate $selected> Sticky Due Date </td></tr> ! </table> ! <input type=hidden name=module value=issues> <input type=hidden name=borrnumber value=$borrnumber> <input type=hidden name=branch value=$branch> *************** *** 707,721 **** </form> </td> ! <td align=center valign=top> ! $patrontable ! <br> ! <a href=/cgi-bin/koha/circ/circulation.pl?borrnumber=$borrowernumber&module=issues&branch=$branch&printer=$printer&print=yes>Next borrower</a> ! <br> ! $flaginfotable ! </td> </tr> ! <tr> <td colspan=2 align=center> ! <table border=0 cellpadding=5 cellspacing=0 width=100% bgcolor=#dddddd> <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Issues Today</b></font></th></tr> <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr> --- 692,706 ---- </form> </td> ! ! </tr> ! </table> ! </table> ! ! <p clear=all> !  ! <table border=1 cellpadding=5 cellspacing=0 width=90%> <td colspan=2 align=center> ! <table border=0 cellpadding=5 cellspacing=0 width=100% > <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Issues Today</b></font></th></tr> <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr> *************** *** 724,730 **** </td> </tr> <tr> <td colspan=2 align=center> ! <table border=0 cellpadding=5 cellspacing=0 width=100% bgcolor=#dddddd> <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Previous Issues</b></font></th></tr> <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr> --- 709,716 ---- </td> </tr> + <tr> <td colspan=2 align=center> ! <table border=0 cellpadding=5 cellspacing=0 width=100%> <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Previous Issues</b></font></th></tr> <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr> *************** *** 806,816 **** if ($flags->{$flag}->{'noissues'}) { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td bgcolor=$color valign=top><font color=red>$flag</font></td><td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } else { ! $flaginfotext.="<tr><td bgcolor=$color valign=top><font color=red>$flag</font></td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n"; } } else { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td valign=top bgcolor=$color>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'} <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } elsif ($flag eq 'WAITING') { my $itemswaiting=''; --- 792,802 ---- if ($flags->{$flag}->{'noissues'}) { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td valign=top><font color=red>$flag</font></td><td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } else { ! $flaginfotext.="<tr><td valign=top><font color=red>$flag</font></td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n"; } } else { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td valign=top>$flag</td><td $flags->{$flag}->{'message'} <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } elsif ($flag eq 'WAITING') { my $itemswaiting=''; *************** *** 820,824 **** $itemswaiting.="<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a> $iteminformation->{'title'} ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>\n"; } ! $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}<br>$itemswaiting</td></tr>\n"; } elsif ($flag eq 'ODUES') { my $items=$flags->{$flag}->{'itemlist'}; --- 806,810 ---- $itemswaiting.="<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a> $iteminformation->{'title'} ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>\n"; } ! $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n"; } elsif ($flag eq 'ODUES') { my $items=$flags->{$flag}->{'itemlist'}; *************** *** 830,862 **** ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); my ($iteminformation) = getiteminformation($env, $item->{'itemnumber'}, 0); ! $itemswaiting.="<tr><td bgcolor=$color><font color=red>$iteminformation->{'date_due'}</font></td><td bgcolor=$color><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a></td><td bgcolor=$color>$iteminformation->{'title'}</td></tr>\n"; } } $itemswaiting.="</table>\n"; if ($query->param('module') ne 'returns'){ ! $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}<br>Overdue items can be seen in the Previous Issues table below</td></tr>\n"; } else { ! $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n"; } } else { ! $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n"; } } } ! ($flaginfotext) && ($flaginfotext="<table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd><tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><font color=black>Patron Flags</font></th></tr>$flaginfotext</table>\n"); my $patrontable= << "EOF"; ! <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> ! <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Patron Information</b></font></td></tr> ! <tr><td> <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a> $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br> EOF if ($query->param('module') ne 'returns'){ ! $patrontable.="$borrower->{'streetaddress'} $borrower->{'city'}<br> $borrower->{'categorycode'} "; } $patrontable.=<< "EOF"; ! $flagtext </td></tr> ! </table> EOF return($patrontable, $flaginfotext); --- 816,849 ---- ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); my ($iteminformation) = getiteminformation($env, $item->{'itemnumber'}, 0); ! $itemswaiting.="<tr><td><font color=red>$iteminformation->{'date_due'}</font></td><td bgcolor=$color><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a></td><td>$iteminformation->{'title'}</td></tr>\n"; } } $itemswaiting.="</table>\n"; if ($query->param('module') ne 'returns'){ ! $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}, See below</td></tr>\n"; } else { ! $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n"; } } else { ! $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n"; } } } ! ($flaginfotext) && ($flaginfotext="<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><b>Flags</b></td></tr>$flaginfotext</table>\n"); my $patrontable= << "EOF"; ! <table border=1 ! cellpadding=5 cellspacing=0 align=right> ! <tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><font color=black><b>Patron Information</b></font></td></tr> ! <tr><td colspan=2> <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a> $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br> EOF if ($query->param('module') ne 'returns'){ ! $patrontable.="$borrower->{'streetaddress'} $borrower->{'city'} Cat: $borrower->{'categorycode'} "; } $patrontable.=<< "EOF"; ! </td></tr> ! EOF return($patrontable, $flaginfotext);

1 0

CVS: koha/C4/Circulation Circ2.pm,1.13,1.14
by Chris Cormack 28 Mar '01

28 Mar '01

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);

1 0

CVS: koha/sec writeoff.pl,1.1.1.1,1.2
by Chris Cormack 27 Mar '01

27 Mar '01

Update of /cvsroot/koha/koha/sec In directory usw-pr-cvs1:/tmp/cvs-serv5450/sec Modified Files: writeoff.pl Log Message: Getting writeoff stats being stored as well Index: writeoff.pl =================================================================== RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** writeoff.pl 2000/12/19 23:45:57 1.1.1.1 --- writeoff.pl 2001/03/27 21:45:50 1.2 *************** *** 7,10 **** --- 7,11 ---- use CGI; use C4::Database; + use C4::Stats; my $input=new CGI; *************** *** 44,48 **** --- 45,51 ---- sub writeoff{ my ($bornum,$accountnum,$itemnum,$accounttype,$amount)=@_; + my $user=$input->remote_user; my $dbh=C4Connect; + my $env; my $query="Update accountlines set amountoutstanding=0 where "; if ($accounttype eq 'Res'){ *************** *** 68,70 **** --- 71,74 ---- # print $query; $dbh->disconnect; + UpdateStats($env,$user,'writeoff',$amount,'','','',$bornum); }

1 0

CVS: koha/C4 Stats.pm,1.1.1.1,1.2 Accounts2.pm,1.1.1.1,1.2
by Chris Cormack 27 Mar '01

27 Mar '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv4889/C4 Modified Files: Stats.pm Accounts2.pm Log Message: Modified the update stats routine to store borrowernumbers also Passing borrowernumbers to update stats from Account routines Index: Stats.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Stats.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Stats.pm 2000/12/19 23:45:55 1.1.1.1 --- Stats.pm 2001/03/27 21:43:37 1.2 *************** *** 54,65 **** sub UpdateStats { #module to insert stats data into stats table ! my ($env,$branch,$type,$amount,$other,$itemnum,$itemtype)=@_; my $dbh=C4Connect(); my $branch=$env->{'branchcode'}; my $user = $env->{'usercode'}; my $sth=$dbh->prepare("Insert into statistics ! (datetime,branch,type,usercode,value,other,itemnumber,itemtype) ! values (now(),'$branch', ! '$type','$user','$amount','$other','$itemnum','$itemtype')"); $sth->execute; $sth->finish; --- 54,67 ---- sub UpdateStats { #module to insert stats data into stats table ! my ($env,$branch,$type,$amount,$other,$itemnum,$itemtype,$borrowernumber)=@_; my $dbh=C4Connect(); my $branch=$env->{'branchcode'}; my $user = $env->{'usercode'}; + print $borrowernumber; my $sth=$dbh->prepare("Insert into statistics ! (datetime,branch,type,usercode,value, ! other,itemnumber,itemtype,borrowernumber) ! values (now(),'$branch','$type','$user','$amount', ! '$other','$itemnum','$itemtype','$borrowernumber')"); $sth->execute; $sth->finish; *************** *** 146,157 **** my ($time)=@_; my $dbh=C4Connect; ! my $query="Select * from accountlines,borrowers where accounttype = 'Pay' ! and accountlines.borrowernumber = borrowers.borrowernumber"; if ($time eq 'today'){ ! $query=$query." and date = now()"; } else { ! $query.=" and date='$time'"; } # $query.=" order by timestamp"; my $sth=$dbh->prepare($query); $sth->execute; --- 148,161 ---- my ($time)=@_; my $dbh=C4Connect; ! my $query="Select * from statistics,borrowers ! where statistics.borrowernumber= borrowers.borrowernumber ! and (statistics.type='payment' or statistics.type='writeoff')"; if ($time eq 'today'){ ! $query=$query." and datetime = now()"; } else { ! $query.=" and datetime > '$time'"; } # $query.=" order by timestamp"; + print $query; my $sth=$dbh->prepare($query); $sth->execute; *************** *** 173,188 **** my $timestamp2=$timestamp-1; my $query="Select * from accountlines where borrowernumber=$borrowerno ! and timestamp <= '$timestamp' and accounttype <> 'Pay' and accounttype <> 'W'"; my $sth=$dbh->prepare($query); ! # print $query,"<br>"; $sth->execute; my $i=0; my @results; while (my $data=$sth->fetchrow_hashref){ ! if ($data->{'timestamp'} == $timestamp){ $results[$i]=$data; $i++; ! } } $dbh->disconnect; --- 177,192 ---- my $timestamp2=$timestamp-1; my $query="Select * from accountlines where borrowernumber=$borrowerno ! and timestamp = '$timestamp' and accounttype <> 'Pay' and accounttype <> 'W'"; my $sth=$dbh->prepare($query); ! print $query,"<br>"; $sth->execute; my $i=0; my @results; while (my $data=$sth->fetchrow_hashref){ ! # if ($data->{'timestamp'} == $timestamp){ $results[$i]=$data; $i++; ! # } } $dbh->disconnect; Index: Accounts2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Accounts2.pm 2000/12/19 23:45:54 1.1.1.1 --- Accounts2.pm 2001/03/27 21:43:37 1.2 *************** *** 101,105 **** $usth->execute; $usth->finish; ! UpdateStats($env,'branch','payment',$data); $sth->finish; $dbh->disconnect; --- 101,105 ---- $usth->execute; $usth->finish; ! UpdateStats($env,'branch','payment',$data,'','','',$bornumber); $sth->finish; $dbh->disconnect; *************** *** 134,138 **** $usth->execute; $usth->finish; ! UpdateStats($env,$user,'payment',$amount); $sth->finish; $dbh->disconnect; --- 134,138 ---- $usth->execute; $usth->finish; ! UpdateStats($env,$user,'payment',$amount,'','','',$bornumber); $sth->finish; $dbh->disconnect;

1 0

CVS: koha/circ circulation.pl,1.14,1.15
by Chris Cormack 22 Mar '01

22 Mar '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv11487/circ Modified Files: circulation.pl Log Message: Changes made by Glen to allow the circulation module to work with a ASCII-wand, or CueCat (weird encoded) input equally well. Do not bother installing the CueCat driver or any other software - it's not needed. Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** circulation.pl 2001/02/21 22:33:48 1.14 --- circulation.pl 2001/03/22 22:20:29 1.15 *************** *** 14,18 **** my $linecolor1='#bbbbbb'; my $linecolor2='#dddddd'; ! my $backgroundimage="/images/background-mem.gif"; my $query=new CGI; my $branches=getbranches(\%env); --- 14,18 ---- my $linecolor1='#bbbbbb'; my $linecolor2='#dddddd'; ! my $backgroundimage="/koha/images/background-mem.gif"; my $query=new CGI; my $branches=getbranches(\%env); *************** *** 84,88 **** <th width=30%><font color=black>$branchname</font></th> <th width=10%> ! <a href=circulation.pl?module=issues&branch=$branch&printer=$printer><font color=black><img src=/images/issues.gif border=0 height=40></font></a> </th> <th width=10%> --- 84,88 ---- <th width=30%><font color=black>$branchname</font></th> <th width=10%> ! <a href=circulation.pl?module=issues&branch=$branch&printer=$printer><font color=black><img src=/koha/images/issues.gif border=0 height=40></font></a> </th> <th width=10%> *************** *** 90,94 **** </th> <th width=10%> ! <a href=circulation.pl?module=returns&branch=$branch&printer=$printer><font color=black><img src=/images/returns.gif border=0 height=40></font></a> </th> <th width=30%><font color=black>$printername</font></th> --- 90,94 ---- </th> <th width=10%> ! <a href=circulation.pl?module=returns&branch=$branch&printer=$printer><font color=black><img src=/koha/images/returns.gif border=0 height=40></font></a> </th> <th width=30%><font color=black>$printername</font></th> *************** *** 167,170 **** --- 167,198 ---- + sub decode { + ($encoded) = @_; + $seq = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-'; + @s = map { index($seq,$_); } split(//,$encoded); + $l = ($#s+1) % 4; + if ($l) + { + if ($l == 1) + { + print "Error!"; + return; + } + $l = 4-$l; + $#s += $l; + } + $r = ''; + while ($#s >= 0) + { + $n = (($s[0] << 6 | $s[1]) << 6 | $s[2]) << 6 | $s[3]; + $r .=chr(($n >> 16) ^ 67) . + chr(($n >> 8 & 255) ^ 67) . + chr(($n & 255) ^ 67); + @s = @s[4..$#s]; + } + $r = substr($r,0,length($r)-$l); + return $r; + } + sub returns { my %returneditems; *************** *** 177,180 **** --- 205,218 ---- (next) if ($counter>20); my $barcode=$query->param("ri-$counter"); + # I'm not POSITIVE this decode belongs here - can't tell what causes it to run. + # decode cuecat + chomp($barcode); + @fields = split(/\./,$barcode); + @results = map(decode($_), @fields[1..$#fields]); + if ($#results == 2) + { + $barcode=$results[2]; + } + # end decode my $duedate=$query->param("dd-$counter"); my $borrowernumber=$query->param("bn-$counter"); *************** *** 188,191 **** --- 226,238 ---- } if (my $barcode=$query->param('barcode')) { + # decode cuecat + chomp($barcode); + @fields = split(/\./,$barcode); + @results = map(decode($_), @fields[1..$#fields]); + if ($#results == 2) + { + $barcode=$results[2]; + } + # end decode $ritext.="<input type=hidden name=ri-0 value=$barcode>\n"; $returneditems{0}=$barcode; *************** *** 204,207 **** --- 251,263 ---- EOF if ((my $barcode=$query->param('barcode')) || (%returneditems)) { + # decode cuecat + chomp($barcode); + @fields = split(/\./,$barcode); + @results = map(decode($_), @fields[1..$#fields]); + if ($#results == 2) + { + $barcode=$results[2]; + } + # end decode my ($iteminformation, $borrower, $messages, $overduecharge) = returnbook(\%env, $barcode); *************** *** 341,349 **** my $overduetext="$duedate"; ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate); ! ($duedate) || ($overduetext="<img src=/images/blackdot.gif>"); my $borrowernumber=$riborrowernumber{$_}; 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"; --- 397,405 ---- my $overduetext="$duedate"; ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate); ! ($duedate) || ($overduetext="<img src=/koha/images/blackdot.gif>"); my $borrowernumber=$riborrowernumber{$_}; 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=/koha/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"; *************** *** 399,402 **** --- 455,467 ---- my $day=$query->param('day'); if (my $barcode=$query->param('barcode')) { + # decode cuecat + chomp($barcode); + @fields = split(/\./,$barcode); + @results = map(decode($_), @fields[1..$#fields]); + if ($#results == 2) + { + $barcode=$results[2]; + } + # end decode my $invalidduedate=0; $env{'datedue'}='';

1 0