X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_prepaid_income.cgi;h=ce928b81cb72e1ef0aa869772d1e09933cdc8eff;hb=eda93f35695b06e89d54cb1f2f115aabf536103a;hp=1677591a3d74aa137a8b223c0c44a62051553974;hpb=76e907f24d984319b7c1e0e9374b99535a99ab43;p=freeside.git

diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index 1677591a3..ce928b81c 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -1,75 +1,14 @@
-<!-- mason kludge -->
-<%
+<% include("/elements/header.html", '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);
-
-%>
-
-<%= header( 'Prepaid Income (Unearned Revenue) Report',
-            menubar( 'Main Menu'=>$p, ) )               %>
-<%= table() %>
+<% table() %>
   <TR>
     <TH>Actual Unearned Revenue</TH>
     <TH>Legacy Unearned Revenue</TH>
   </TR>
   <TR>
-    <TD ALIGN="right">$<%= $total %>
+    <TD ALIGN="right">$<% $total %>
     <TD ALIGN="right">
-      <%= $now == $time ? "\$$total_legacy" : '<i>N/A</i>'%>
+      <% $now == $time ? "\$$total_legacy" : '<i>N/A</i>'%>
     </TD>
   </TR>
 
@@ -84,3 +23,89 @@ revenue if you have imported longer-than monthly customer packages from
 a previous billing system.
 </BODY>
 </HTML>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Financial reports');
+
+#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 @where = ();
+
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+  my $agentnum = $1;
+  push @where, "agentnum = $agentnum";
+}
+
+#here is the agent virtualization
+push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
+
+my $where = join(' AND ', @where);
+$where = "AND $where" if $where;
+
+my( $total, $total_legacy ) = ( 0, 0 );
+
+my @cust_bill_pkg =
+  grep { $_->cust_pkg && $_->cust_pkg->part_pkg->freq !~ /^([01]|\d+[dw])$/ }
+    qsearch({
+      'select'    => 'cust_bill_pkg.*',
+      'table'     => 'cust_bill_pkg',
+      'addl_from' => ' LEFT JOIN cust_bill USING ( invnum  ) '.
+                     ' LEFT JOIN cust_main USING ( custnum ) ',
+      'hashref'   => {
+                       'recur' => { op=>'!=', value=>0    },
+                       'edate' => { op=>'>',  value=>$now },
+                     },
+      'extra_sql' => $where,
+    });
+
+my @cust_pkg = 
+  grep { $_->part_pkg->recur != 0
+         && $_->part_pkg->freq !~ /^([01]|\d+[dw])$/
+       }
+    qsearch({
+      'select'    => 'cust_pkg.*',
+      'table'     => 'cust_pkg',
+      'addl_from' => ' LEFT JOIN cust_main USING ( custnum ) ',
+      'hashref'   => { 'bill' => { op=>'>', value=>$now } },
+      'extra_sql' => $where,
+    });
+
+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);
+
+</%init>