my $date;
my $date2;
if ($time eq 'yesterday'){
- $date=ParseDate('yesterday');
- $date2=ParseDate('today');
+ $date=ParseDate('yesterday');
+ $date2=ParseDate('today');
}
if ($time eq 'today'){
- $date=ParseDate('today');
- $date2=ParseDate('tomorrow');
+ $date=ParseDate('today');
+ $date2=ParseDate('tomorrow');
}
if ($time eq 'daybefore'){
- $date=ParseDate('2 days ago');
- $date2=ParseDate('yesterday');
+ $date=ParseDate('2 days ago');
+ $date2=ParseDate('yesterday');
+}
+if ($time eq 'month') {
+ $date = ParseDate('1 month ago');
+ $date2 = ParseDate('today');
+ warn "d : $date // d2 : $date2";
}
if ($time=~ /\//){
- $date=ParseDate($time);
- $date2=ParseDateDelta('+ 1 day');
- $date2=DateCalc($date,$date2);
+ $date=ParseDate($time);
+ $date2=ParseDateDelta('+ 1 day');
+ $date2=DateCalc($date,$date2);
}
$date=UnixDate($date,'%Y-%m-%d');
$date2=UnixDate($date2,'%Y-%m-%d');
-my @payments=TotalPaid($date);
+ warn "d : $date // d2 : $date2";
+my @payments=TotalPaid($date,$date2);
my $count=@payments;
my $total=0;
-my %levin;
-my %foxton;
-my %shannon;
my $oldtime;
my $totalw=0;
my @loop;
my %row;
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;
- my $temptotalf=0;
- my $temptotalr=0;
- my $temptotalres=0;
- my $temptotalren=0;
- my $temptotalw=0;
- for (my $i2=0;$i2<$count;$i2++){
- $charge+=$charges[$i2]->{'amount'};
- %row = ( name => $charges[$i2]->{'description'},
- type => $charges[$i2]->{'accounttype'},
- time => $charges[$i2]->{'timestamp'},
- amount => $charges[$i2]->{'amount'},
- branch => $charges[$i2]->{'amountoutstanding'} );
- push(@loop, \%row);
- 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'};
- }
- if ($charges[$i2]->{'accounttype'} eq 'Res'){
- $temptotalres+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
- }
- if ($charges[$i2]->{'accounttype'} eq 'R'){
- $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
- }
- }
- }
-
- 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'};
- }
-
- }
-
- %row = ( name => $payments[$i]{'firstname'} . " <b>" . $payments[$i]{'surname'} . "</b>",
- type => $payments[$i]{'accounttype'},
- time => $payments[$i]{'date'},
- amount => $payments[$i]{'amount'},
- branch => $branch );
-
- push(@loop, \%row);
-
- $oldtype=$payments[$i]{'accounttype'};
- $oldtime=$payments[$i]{'timestamp'};
- $bornum=$payments[$i]{'borrowernumber'};
- $i++;
-
- }
+ warn " pay : ".$payments[$i]{'timestamp'};
+ 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;
+ my $temptotalf=0;
+ my $temptotalr=0;
+ my $temptotalres=0;
+ my $temptotalren=0;
+ my $temptotalw=0;
+ for (my $i2=0;$i2<$count;$i2++){
+ $charge+=$charges[$i2]->{'amount'};
+ %row = ( name => $charges[$i2]->{'description'},
+ type => $charges[$i2]->{'accounttype'},
+ time => $charges[$i2]->{'timestamp'},
+ amount => $charges[$i2]->{'amount'},
+ branch => $charges[$i2]->{'amountoutstanding'} );
+ push(@loop, \%row);
+ 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'};
+ }
+ if ($charges[$i2]->{'accounttype'} eq 'Res'){
+ $temptotalres+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
+ }
+ if ($charges[$i2]->{'accounttype'} eq 'R'){
+ $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'};
+ }
+ }
+ }
+ 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'});
+ 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'};
+ }
+
+ %row = ( name => "<b>".$payments[$i]{'firstname'}.$payments[$i]{'surname'} . "</b>",
+ type => $payments[$i]{'accounttype'}, time => $payments[$i]{'date'},
+ amount => $payments[$i]{'amount'}, branch => $branch );
+ push(@loop, \%row);
+ $oldtype=$payments[$i]{'accounttype'};
+ $oldtime=$payments[$i]{'timestamp'};
+ $bornum=$payments[$i]{'borrowernumber'};
+ $i++;
+ }
}
-$template->param( loop => \@loop,
+$template->param( loop1 => \@loop,
totalw => $totalw,
total => $total );
projects / koha_fer / blobdiff