From b1fc20ef3b68a8536163fbb17c57bca15555f3c4 Mon Sep 17 00:00:00 2001
From: ivan <ivan>
Date: Fri, 4 Mar 2005 12:34:56 +0000
Subject: add agent selection to payment and credit reports, add link to agent
 browse, closes: Bug#1105

---
 httemplate/browse/agent.cgi               | 11 +++++++++++
 httemplate/search/cust_credit.html        | 24 ++++++++++++++++--------
 httemplate/search/cust_pay.cgi            | 27 +++++++++++++++++----------
 httemplate/search/elements/search.html    |  8 +++++---
 httemplate/search/report_cust_credit.html | 10 ++++++++++
 httemplate/search/report_cust_pay.html    | 10 ++++++++++
 6 files changed, 69 insertions(+), 21 deletions(-)

(limited to 'httemplate')

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index f24266fb2..82f18bff7 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -35,6 +35,7 @@ full offerings (via their type).<BR><BR>
   <TH COLSPAN=<%= ( $cgi->param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent</TH>
   <TH>Type</TH>
   <TH>Customers</TH>
+  <TH>Reports</TH>
   <TH>Registration Codes</TH>
   <TH><FONT SIZE=-1>Freq.</FONT></TH>
   <TH><FONT SIZE=-1>Prog.</FONT></TH>
@@ -64,6 +65,7 @@ foreach my $agent ( sort {
         <TD><A HREF="<%=$p%>edit/agent.cgi?<%= $agent->agentnum %>">
           <%= $agent->agent %></A></TD>
         <TD><A HREF="<%=$p%>edit/agent_type.cgi?<%= $agent->typenum %>"><%= $agent->agent_type->atype %></A></TD>
+
         <TD>
 
           <B>
@@ -90,14 +92,23 @@ foreach my $agent ( sort {
           <% if ( $num_cancel ) { %>
             <A HREF="<%= $cust_main_link %>&showcancelledcustomers=1&cancelled=1"><% } %>cancelled<% if ( $num_cancel ) { %></A><% } %>
         </TD>
+
+        <TD>
+          <A HREF="<%= $p %>search/report_cust_pay.html?agentnum=<%= $agent->agentnum %>">Payments</A>
+          <BR><A HREF="<%= $p %>search/report_cust_credit.html?agentnum=<%= $agent->agentnum %>">Credits</A>
+
+        </TD>
+
         <TD>
           <%= my $num_reg_code = $agent->num_reg_code %>
           <% if ( $num_reg_code ) { %>
             <A HREF="<%=$p%>search/reg_code.html?agentnum=<%= $agent->agentnum %>"><% } %>Unused<% if ( $num_reg_code ) { %></A><% } %>
           <BR><A HREF="<%=$p%>edit/reg_code.cgi?agentnum=<%= $agent->agentnum %>">Generate codes</A>
         </TD>
+
         <TD><%= $agent->freq %></TD>
         <TD><%= $agent->prog %></TD>
+
       </TR>
 
 <% } %>
diff --git a/httemplate/search/cust_credit.html b/httemplate/search/cust_credit.html
index faaa7a817..a3f88cc21 100755
--- a/httemplate/search/cust_credit.html
+++ b/httemplate/search/cust_credit.html
@@ -1,4 +1,5 @@
 <%
+   my $title = 'Credit Search Results';
    #my( $count_query, $sql_query );
 
    my @search = ();
@@ -7,6 +8,13 @@
      push @search, "otaker = '$1'";
    }
 
+   if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+     push @search, "agentnum = $1"; # $search{'agentnum'} = $1;
+     my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+     die "unknown agentnum $1" unless $agent;
+     $title = $agent->agent. " $title";
+   }
+
    #false laziness with cust_pkg.cgi and cust_pay.cgi
    if ( $cgi->param('beginning')
         && $cgi->param('beginning') =~ /^([ 0-9\-\/]{1,10})$/ ) {
@@ -32,18 +40,22 @@
                  ? 'WHERE '. join(' AND ', @search)
                  : '';
 
-   my $count_query = "SELECT COUNT(*), SUM(amount) FROM cust_credit $where";
+   my $count_query = 'SELECT COUNT(*), SUM(amount) '.
+                     'FROM cust_credit JOIN cust_main USING ( custnum ) '.
+                     $where;
+
    my $sql_query   = {
      'table'     => 'cust_credit',
      'hashref'   => {},
      'extra_sql' => $where,
+     'addl_from' => 'JOIN cust_main USING ( custnum )',
    };
 
    my $clink = [ "${p}view/cust_main.cgi?", 'custnum' ];
 
 %>
 <%= include( 'elements/search.html',
-               'title'       => 'Credit Search Results',
+               'title'       => $title,
                'name'        => 'credits',
                'query'       => $sql_query,
                'count_query' => $count_query,
@@ -57,12 +69,8 @@
                  sub { sprintf('$%.2f', shift->amount ) },
                  sub { time2str('%b %d %Y', shift->_date ) },
                  'custnum',
-                 sub { my $cust_main = shift->cust_main;
-                       $cust_main->get('last'). ', '. $cust_main->first;
-                     },
-                 sub { my $cust_main = shift->cust_main;
-                       $cust_main->company;
-                     },
+                 sub { $_[0]->get('last'). ', '. $_[0]->first; },
+                 'company',
                  'otaker',
                  'reason',
                ],
diff --git a/httemplate/search/cust_pay.cgi b/httemplate/search/cust_pay.cgi
index 3f5b72ab5..42b3c01bc 100755
--- a/httemplate/search/cust_pay.cgi
+++ b/httemplate/search/cust_pay.cgi
@@ -1,9 +1,17 @@
 <%
+   my $title = 'Payment Search Results';
    my( $count_query, $sql_query );
    if ( $cgi->param('magic') && $cgi->param('magic') eq '_date' ) {
    
-     my %search;
-     my @search;
+     my %search = ();
+     my @search = ();
+
+     if ( $cgi->param('agentnum') && $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+       push @search, "agentnum = $1"; # $search{'agentnum'} = $1;
+       my $agent = qsearchs('agent', { 'agentnum' => $1 } );
+       die "unknown agentnum $1" unless $agent;
+       $title = $agent->agent. " $title";
+     }
    
      if ( $cgi->param('payby') ) {
        $cgi->param('payby') =~ /^(CARD|CHEK|BILL)(-(VisaMC|Amex|Discover))?$/
@@ -59,14 +67,17 @@
      }
 
      my $hsearch = join(' AND ', map { "$_ = '$search{$_}'" } keys %search );
-     $count_query = "SELECT COUNT(*), SUM(paid) FROM cust_pay ".
+     $count_query = "SELECT COUNT(*), SUM(paid) ".
+                    "FROM cust_pay JOIN cust_main USING ( custnum )".
                     ( $hsearch ? " WHERE $hsearch " : '' ).
                     $search;
    
+     warn join('-', keys %search);
      $sql_query = {
        'table'     => 'cust_pay',
        'hashref'   => \%search,
        'extra_sql' => "$search ORDER BY _date",
+       'addl_from' => 'JOIN cust_main USING ( custnum )',
      };
    
    } else {
@@ -93,7 +104,7 @@
 
 %>
 <%= include( 'elements/search.html',
-               'title'       => 'Payment Search Results',
+               'title'       => $title,
                'name'        => 'payments',
                'query'       => $sql_query,
                'count_query' => $count_query,
@@ -117,12 +128,8 @@
                  sub { sprintf('$%.2f', shift->paid ) },
                  sub { time2str('%b %d %Y', shift->_date ) },
                  'custnum',
-                 sub { my $cust_main = shift->cust_main;
-                       $cust_main->get('last'). ', '. $cust_main->first;
-                     },
-                 sub { my $cust_main = shift->cust_main;
-                       $cust_main->company;
-                     },
+                 sub { $_[0]->get('last'). ', '. $_[0]->first; },
+                 'company',
                ],
                'align' => 'lrrrll',
                'links' => [
diff --git a/httemplate/search/elements/search.html b/httemplate/search/elements/search.html
index 566ea8391..712d63a91 100644
--- a/httemplate/search/elements/search.html
+++ b/httemplate/search/elements/search.html
@@ -12,9 +12,9 @@
   $opt{align} = [ map $align{$_}, split(//, $opt{align}) ],
     unless !$opt{align} || ref($opt{align});
 
-  if ( ref($opt{'query'}) ) {
-
-  }
+  #if ( ref($opt{'query'}) ) {
+  #
+  #}
 
   unless (exists($opt{'count_query'}) && length($opt{'count_query'})) {
     ( $opt{'count_query'} = $opt{'query'} ) =~
@@ -47,6 +47,8 @@
       $opt{'query'}->{'hashref'} || {}, 
       $opt{'query'}->{'select'},
       $opt{'query'}->{'extra_sql'}. " $limit",
+      '',
+      (exists($opt{'query'}->{'addl_from'}) ? $opt{'query'}->{'addl_from'} : '')
     ) ];
   } else {
     my $sth = dbh->prepare("$opt{'query'} $limit")
diff --git a/httemplate/search/report_cust_credit.html b/httemplate/search/report_cust_credit.html
index ceffca75d..b614e87b2 100644
--- a/httemplate/search/report_cust_credit.html
+++ b/httemplate/search/report_cust_credit.html
@@ -27,6 +27,16 @@
             </SELECT>
         </TD>
       </TR>
+      <TR>
+        <TD ALIGN="right">for agent: </TD>
+        <TD><SELECT NAME="agentnum">
+              <OPTION VALUE="">all</OPTION>
+              <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
+                <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
+              <% } %>
+            </SELECT>
+        </TD>
+      </TR>
       <TR>
         <TD ALIGN="right">From: </TD>
         <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
diff --git a/httemplate/search/report_cust_pay.html b/httemplate/search/report_cust_pay.html
index 95198c7b2..d1d4cb983 100644
--- a/httemplate/search/report_cust_pay.html
+++ b/httemplate/search/report_cust_pay.html
@@ -24,6 +24,16 @@
             </SELECT>
         </TD>
       </TR>
+      <TR>
+        <TD ALIGN="right">for agent: </TD>
+        <TD><SELECT NAME="agentnum">
+              <OPTION VALUE="">all</OPTION>
+              <% foreach my $agent ( qsearch('agent', { disabled=>'' } ) ) { %>
+                <OPTION VALUE="<%= $agent->agentnum %>"<%= $cgi->param('agentnum') == $agent->agentnum ? ' SELECTED' : '' %>><%= $agent->agent %>
+              <% } %>
+            </SELECT>
+        </TD>
+      </TR>
       <TR>
         <TD ALIGN="right">From: </TD>
         <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=11 MAXLENGTH=10> <IMG SRC="../images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y</i></TD>
-- 
cgit v1.2.1