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