agent-virt prepaid income report, RT#5311

2 files changed, 75 insertions, 33 deletions

diff --git a/httemplate/search/report_prepaid_income.cgi b/httemplate/search/report_prepaid_income.cgi
index 27dbcbf9f..ce928b81c 100644
--- a/httemplate/search/report_prepaid_income.cgi
+++ b/httemplate/search/report_prepaid_income.cgi
@@ -38,22 +38,46 @@ 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( 'cust_bill_pkg', {
-                                'recur' => { op=>'!=', value=>0 },
-                                'edate' => { op=>'>', value=>$now },
-                              }, );
+    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 ( 'cust_pkg', {
-                            'bill' => { op=>'>', value=>$now }
-                          } );
+    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;
diff --git a/httemplate/search/report_prepaid_income.html b/httemplate/search/report_prepaid_income.html
index 81adb64ad..d707bd81b 100644
--- a/httemplate/search/report_prepaid_income.html
+++ b/httemplate/search/report_prepaid_income.html
@@ -1,28 +1,46 @@
-<% include('/elements/header.html', 'Prepaid Income (Unearned Revenue) Report',
-  '',
-  '',
-  '<LINK REL="stylesheet" TYPE="text/css" HREF="../elements/calendar-win2k-2.css" TITLE="win2k-2">
-  <SCRIPT TYPE="text/javascript" SRC="../elements/calendar_stripped.js"></SCRIPT>
-  <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-en.js"></SCRIPT>
-  <SCRIPT TYPE="text/javascript" SRC="../elements/calendar-setup.js"></SCRIPT>
-  '
-) %>
-
-    <FORM ACTION="report_prepaid_income.cgi" METHOD="GET">
-    <TABLE>
-      <TR>
-        <TD>Prepaid income (unearned revenue) as of </TD>
-        <TD>
-          <INPUT TYPE="text" NAME="date" ID="date_text" VALUE="now">
-          <IMG SRC="../images/calendar.png" ID="date_button" STYLE="cursor: pointer" TITLE="Select date">
-        </TD>
-      </TR>
-      <TR>
-        <TD>
-        </TD>
-        <TD><i>m/d/y</i></TD>
-      </TR>
-    </TABLE>
+<% include('/elements/header.html','Prepaid Income (Unearned Revenue) Report')%>
+
+<% include('/elements/init_calendar.html') %>
+
+<FORM ACTION="report_prepaid_income.cgi" METHOD="GET">
+
+<TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+
+  <TR>
+    <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left">
+      <FONT SIZE="+1">Search options</FONT>
+    </TH>
+  </TR>
+
+  <TR>
+    <TD>As of </TD>
+    <TD>
+      <INPUT TYPE="text" NAME="date" ID="date_text" VALUE="now">
+      <IMG SRC="../images/calendar.png" ID="date_button" STYLE="cursor: pointer" TITLE="Select date">
+    </TD>
+  </TR>
+  <TR>
+    <TD>
+    </TD>
+    <TD><FONT SIZE="-1"><i>m/d/y</i></FONT></TD>
+  </TR>
+
+  <TR>
+    <TD COLSPAN=2>&nbsp;</TD>
+  </TR>
+
+  <% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %>
+
+  <TR>
+    <TD COLSPAN=2>&nbsp;</TD>
+  </TR>
+
+  <TR>
+    <TD COLSPAN=2 ALIGN="center"><INPUT TYPE="submit" VALUE="Generate report"></TD>
+  </TR>
+
+</TABLE>
+
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "date_text",
@@ -32,7 +50,7 @@
   });
 </SCRIPT>
 
-<INPUT TYPE="submit" VALUE="Generate report">
+</FORM>
 
 <% include('/elements/footer.html') %>
 <%init>