[freeside-commits] freeside/httemplate/search cust_main.html, 1.10, 1.11 report_cust_main.html, 1.7, 1.8

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail.420.am:/tmp/cvs-serv29865/httemplate/search

Modified Files:
	cust_main.html report_cust_main.html 
Log Message:
add customer status to adv. customer report, template customer search for future use in emailing notices, RT#2731

Index: report_cust_main.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cust_main.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- report_cust_main.html	26 Mar 2008 02:19:42 -0000	1.7
+++ report_cust_main.html	5 Jun 2008 10:36:42 -0000	1.8
@@ -8,11 +8,18 @@
     <TR>
       <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH>
     </TR>
+
     <% include( '/elements/tr-select-agent.html',
                    ($cgi->param('agentnum') || ''),
                )
     %>
 
+    <% include( '/elements/tr-select-cust_main-status.html',
+                  'label' => 'Status'
+              )
+    %>
+
+
 %   foreach my $field (qw( signupdate )) {
 
       <TR>

Index: cust_main.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_main.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- cust_main.html	1 Mar 2008 22:39:21 -0000	1.10
+++ cust_main.html	5 Jun 2008 10:36:42 -0000	1.11
@@ -42,131 +42,51 @@
            $FS::CurrentUser::CurrentUser->access_right('List packages')
          );
 
-my $dbh = dbh;
-my $conf = new FS::Conf;
-my $countrydefault = $conf->config('countrydefault');
-
-my($query) = $cgi->keywords;
-
-my @where = ();
+my %search_hash = ();
 
-##
-# parse agent
-##
+#$search_hash{'query'} = $cgi->keywords;
 
-if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
-  push @where,
-    "agentnum = $1";
+#scalars
+for my $param (qw( agentnum status cancelled_pkgs cust_fields flattened_pkgs)) {
+  $search_hash{$param} = scalar( $cgi->param($param) )
+    if $cgi->param($param);
 }
 
-##
-# parse cancelled package checkbox
-##
-
-my $pkgwhere = "";
-
-$pkgwhere .= "AND (cancel = 0 or cancel is null)"
-  unless $cgi->param('cancelled_pkgs');
-
-my $orderby;
+#lists
+for my $param (qw( payby )) {
+  $search_hash{$param} = [ $cgi->param($param) ]
+    if $cgi->param($param);
+}
 
-##
-# dates
-##
+###
+# parse dates
+###
 
 foreach my $field (qw( signupdate )) {
 
   my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
 
   next if $beginning == 0 && $ending == 4294967295;
+       #or $disable{$cgi->param('status')}->{$field};
 
-  push @where,
-    "cust_main.$field IS NOT NULL",
-    "cust_main.$field >= $beginning",
-    "cust_main.$field <= $ending";
-
-  $orderby ||= "ORDER BY cust_main.$field";
-
-}
-
-###
-# payby
-###
+  $search_hash{$field} = [ $beginning, $ending ];
 
-my @payby = grep /^([A-Z]{4})$/, $cgi->param('payby');
-if ( @payby ) {
-  push @where, '( '. join(' OR ', map "cust_main.payby = '$_'", @payby). ' )';
 }
 
 ##
 # amounts
 ##
 
-my $balance_sql = FS::cust_main->balance_sql();
-
-push @where, map { s/current_balance/$balance_sql/; $_ }
-                 FS::UI::Web::parse_lt_gt($cgi, 'current_balance');
-
-##
-# setup queries, subs, etc. for the search
-##
-
-$orderby ||= 'ORDER BY custnum';
-
-# here is the agent virtualization
-push @where, $FS::CurrentUser::CurrentUser->agentnums_sql;
-
-my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
-
-my $addl_from = 'LEFT JOIN cust_pkg USING ( custnum  ) ';
-
-my $count_query = "SELECT COUNT(*) FROM cust_main $extra_sql";
-
-my $select = join(', ', 
-               'cust_main.custnum',
-               FS::UI::Web::cust_sql_fields($cgi->param('cust_fields')),
-             );
-
-my (@extra_headers) = ();
-my (@extra_fields) = ();
-
-if ($cgi->param('flattened_pkgs')) {
-
-  if ($dbh->{Driver}->{Name} eq 'Pg') {
-
-    $select .= ", array_to_string(array(select pkg from cust_pkg left join part_pkg using ( pkgpart ) where cust_main.custnum = cust_pkg.custnum $pkgwhere),'|') as magic";
-
-  }elsif ($dbh->{Driver}->{Name} =~ /^mysql/i) {
-    $select .= ", GROUP_CONCAT(pkg SEPARATOR '|') as magic";
-    $addl_from .= " LEFT JOIN part_pkg using ( pkgpart )";
-  }else{
-    warn "warning: unknown database type ". $dbh->{Driver}->{Name}. 
-         "omitting packing information from report.";
-  }
-  
-  my $header_query = "SELECT COUNT(cust_pkg.custnum = cust_main.custnum) AS count FROM cust_main $addl_from $extra_sql $pkgwhere group by cust_main.custnum order by count desc limit 1";
-
-  my $sth = dbh->prepare($header_query) or die dbh->errstr;
-  $sth->execute() or die $sth->errstr;
-  my $headerrow = $sth->fetchrow_arrayref;
-  my $headercount = $headerrow ? $headerrow->[0] : 0;
-  while($headercount) {
-    unshift @extra_headers, "Package ". $headercount;
-    unshift @extra_fields, eval q!sub {my $c = shift;
-                                       my @a = split '\|', $c->magic;
-                                       my $p = $a[!.--$headercount. q!];
-                                       $p;
-                                      };!;
-  }
-
-}
+$search_hash{'current_balance'} =
+  [ FS::UI::Web::parse_lt_gt($cgi, 'current_balance') ];
 
-my $sql_query = {
-  'table'     => 'cust_main',
-  'select'    => $select,
-  'hashref'   => {},
-  'extra_sql' => "$extra_sql $orderby",
-};
+###
+# etc
+###
 
+my $sql_query = FS::cust_main->search_sql(\%search_hash);
+my $count_query   = delete($sql_query->{'count_query'});
+my @extra_headers = @{ delete($sql_query->{'extra_headers'}) };
+my @extra_fields  = @{ delete($sql_query->{'extra_fields'})  };
 
 </%init>