[freeside-commits] freeside/httemplate/search cust_bill.html, 1.16, 1.17 svc_acct.cgi, 1.35, 1.36 svc_domain.cgi, 1.19, 1.20 svc_forward.cgi, 1.8, 1.9 svc_www.cgi, 1.5, 1.6

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv4705/httemplate/search

Modified Files:
	cust_bill.html svc_acct.cgi svc_domain.cgi svc_forward.cgi 
	svc_www.cgi 
Log Message:
odds and ends

Index: svc_www.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_www.cgi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- svc_www.cgi	14 Jul 2005 10:52:46 -0000	1.5
+++ svc_www.cgi	16 Jul 2006 00:55:06 -0000	1.6
@@ -17,6 +17,7 @@
   'hashref'   => {},
   'select'    => join(', ',
                    'svc_www.*',
+                   'part_svc.svc',
                    'cust_main.custnum',
                    FS::UI::Web::cust_sql_fields(),
                  ),
@@ -43,11 +44,13 @@
                  'count_query' => $count_query,
                  'redirect'    => $link,
                  'header'      => [ '#',
+                                    'Service',
                                     'Zone',
                                     'User',
                                     FS::UI::Web::cust_header(),
                                   ],
                  'fields'      => [ 'svcnum',
+                                    'svc',
                                     sub { $_[0]->domain_record->zone },
                                     sub {
                                           my $svc_www = shift;
@@ -59,6 +62,7 @@
                                     \&FS::UI::Web::cust_fields,
                                   ],
                  'links'       => [ $link,
+                                    $link,
                                     '',
                                     $ulink,
                                     ( map { $link_cust }

Index: cust_bill.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_bill.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cust_bill.html	19 Jun 2006 02:33:52 -0000	1.16
+++ cust_bill.html	16 Jul 2006 00:55:06 -0000	1.17
@@ -37,7 +37,7 @@
        $begin = str2time($1);
        push @where, "cust_bill._date >= $begin";
      }
-     if (  $cgi->param('ending')
+     if ( $cgi->param('ending')
            && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
        $end = str2time($1) + 86399;
        push @where, "cust_bill._date < $end";
@@ -52,6 +52,13 @@
        push @where, "cust_bill._date < $end";
      }
 
+     if ( $cgi->param('invnum_min') =~ /^\s*(\d+)\s*$/ ) {
+       push @where, "cust_bill.invnum >= $1";
+     }
+     if ( $cgi->param('invnum_max') =~ /^\s*(\d+)\s*$/ ) {
+       push @where, "cust_bill.invnum <= $1";
+     }
+
      if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
        $agentnum = $1;
        push @where, "cust_main.agentnum = $agentnum";

Index: svc_domain.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_domain.cgi,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- svc_domain.cgi	19 Jun 2006 02:33:52 -0000	1.19
+++ svc_domain.cgi	16 Jul 2006 00:55:06 -0000	1.20
@@ -56,8 +56,9 @@
   'hashref'   => \%svc_domain,
   'select'    => join(', ',
                    'svc_domain.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
+                   'part_svc.svc',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
   'addl_from' => $addl_from,

Index: svc_forward.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_forward.cgi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- svc_forward.cgi	19 Jun 2006 02:33:52 -0000	1.8
+++ svc_forward.cgi	16 Jul 2006 00:55:06 -0000	1.9
@@ -39,8 +39,9 @@
   'hashref'   => {},
   'select'    => join(', ',
                    'svc_forward.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
+                   'part_svc.svc',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
                  ),
   'extra_sql' => "$extra_sql $orderby",
   'addl_from' => $addl_from,

Index: svc_acct.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/svc_acct.cgi,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- svc_acct.cgi	19 Jun 2006 02:33:52 -0000	1.35
+++ svc_acct.cgi	16 Jul 2006 00:55:06 -0000	1.36
@@ -95,6 +95,7 @@
   'hashref'   => {}, # \%svc_acct,
   'select'    => join(', ',
                     'svc_acct.*',
+                    'part_svc.svc',
                     'cust_main.custnum',
                     FS::UI::Web::cust_sql_fields(),
                   ),