X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fsearch%2Freport_prepaid_income.cgi;h=241e8a0089fc48057d78412e228ad609e1d047b8;hb=3ce7691203a7737406bf2d4442f7fd84b81f847e;hp=eb8bbb55eb903d2df14624311dea752c46fcf1f6;hpb=ff15db0f2fa18e67498d0097797b667a81b51f71;p=freeside.git

diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index eb8bbb55e..241e8a008 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -1,75 +1,87 @@
 <!-- mason kludge -->
-<%
-
-  #doesn't yet deal with daily/weekly packages
-
-  #needs to be re-written in sql for efficiency
-
-  my $now = $cgi->param('date') && str2time($cgi->param('date')) || time;
-  $now =~ /^(\d+)$/ or die "unparsable date?";
-  $now = $1;
-
-  my %prepaid;
-
-  my @cust_bill_pkg =
-    grep { $_->cust_pkg && $_->cust_pkg->part_pkg->freq !~ /^([01]|\d+[dw])$/ }
-      qsearch( 'cust_bill_pkg', {
-                                  'recur' => { op=>'!=', value=>0 },
-                                  'edate' => { op=>'>', value=>$now },
-                                }, );
-
-  foreach my $cust_bill_pkg ( @cust_bill_pkg ) {
-
-    #conceptual false laziness w/texas tax exempt_amount stuff in
-    #FS::cust_main::bill
-
-    my $freq = $cust_bill_pkg->cust_pkg->part_pkg->freq;
-    my $per_month = sprintf("%.2f", $cust_bill_pkg->recur / $freq);
-
-    my($mon, $year) = (localtime($cust_bill_pkg->sdate) )[4,5];
-    $mon+=2; $year+=1900;
-
-    foreach my $which_month ( 2 .. $freq ) {
-      until ( $mon < 13 ) { $mon -= 12; $year++; }
-      $prepaid{"$year-$mon"} += $per_month;
-      $mon++;
-    }
-
-  }
-
-  my @mon = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
-
-%>
-
-<%= header( 'Prepaid Income (Unearned Revenue) Report',
+%
+%
+%  #doesn't yet deal with daily/weekly packages
+%
+%  #needs to be re-written in sql for efficiency
+%
+%  my $time = time;
+%
+%  my $now = $cgi->param('date') && str2time($cgi->param('date')) || $time;
+%  $now =~ /^(\d+)$/ or die "unparsable date?";
+%  $now = $1;
+%
+%  my( $total, $total_legacy ) = ( 0, 0 );
+%
+%  my @cust_bill_pkg =
+%    grep { $_->cust_pkg && $_->cust_pkg->part_pkg->freq !~ /^([01]|\d+[dw])$/ }
+%      qsearch( 'cust_bill_pkg', {
+%                                  'recur' => { op=>'!=', value=>0 },
+%                                  'edate' => { op=>'>', value=>$now },
+%                                }, );
+%
+%  my @cust_pkg = 
+%    grep { $_->part_pkg->recur != 0
+%           && $_->part_pkg->freq !~ /^([01]|\d+[dw])$/
+%         }
+%      qsearch ( 'cust_pkg', {
+%                              'bill' => { op=>'>', value=>$now }
+%                            } );
+%
+%  foreach my $cust_bill_pkg ( @cust_bill_pkg) { 
+%    my $period = $cust_bill_pkg->edate - $cust_bill_pkg->sdate;
+%
+%    my $elapsed = $now - $cust_bill_pkg->sdate;
+%    $elapsed = 0 if $elapsed < 0;
+%
+%    my $remaining = 1 - $elapsed/$period;
+%
+%    my $unearned = $remaining * $cust_bill_pkg->recur;
+%    $total += $unearned;
+%
+%  }
+%
+%  foreach my $cust_pkg ( @cust_pkg ) {
+%    my $period = $cust_pkg->bill - $cust_pkg->last_bill;
+%
+%    my $elapsed = $now - $cust_pkg->last_bill;
+%    $elapsed = 0 if $elapsed < 0;
+%
+%    my $remaining = 1 - $elapsed/$period;
+%
+%    my $unearned = $remaining * $cust_pkg->part_pkg->recur; #!! only works for flat/legacy
+%    $total_legacy += $unearned;
+%
+%  }
+%
+%  $total = sprintf('%.2f', $total);
+%  $total_legacy = sprintf('%.2f', $total_legacy);
+%
+%
+
+
+<% include("/elements/header.html", 'Prepaid Income (Unearned Revenue) Report',
             menubar( 'Main Menu'=>$p, ) )               %>
-<%= table() %>
-<%
-
-  my $total = 0;
-
-  my ($now_mon, $now_year) = (localtime($now))[4,5];
-  $now_mon+=2; $now_year+=1900;
-  until ( $now_mon < 13 ) { $now_mon -= 12; $now_year++; }
-
-  my $subseq = 0;
-  for my $year ( $now_year .. 2037 ) {
-    for my $mon ( ( $subseq++ ? 1 : $now_mon ) .. 12 ) {
-      if ( $prepaid{"$year-$mon"} ) {
-        $total += $prepaid{"$year-$mon"};
-        %> <TR><TD ALIGN="right"><%= $mon[$mon-1]. ' '. $year %></TD>
-               <TD ALIGN="right">
-                 <%= sprintf("%.2f", $prepaid{"$year-$mon"} ) %>
-               </TD>
-           </TR>
-        <%
-      }
-    }
-
-  }
+<% table() %>
+  <TR>
+    <TH>Actual Unearned Revenue</TH>
+    <TH>Legacy Unearned Revenue</TH>
+  </TR>
+  <TR>
+    <TD ALIGN="right">$<% $total %>
+    <TD ALIGN="right">
+      <% $now == $time ? "\$$total_legacy" : '<i>N/A</i>'%>
+    </TD>
+  </TR>
 
-%>
-<TR><TH>Total</TH><TD ALIGN="right"><%= sprintf("%.2f", $total) %></TD></TR>
 </TABLE>
+<BR>
+Actual unearned revenue is the amount of unearned revenue Freeside has  
+actually invoiced for packages with longer-than monthly terms.
+<BR><BR>
+Legacy unearned revenue is the amount of unearned revenue represented by 
+customer packages.  This number may be larger than actual unearned 
+revenue if you have imported longer-than monthly customer packages from
+a previous billing system.
 </BODY>
 </HTML>