X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_cust_main.html;h=3dd92af2e55e0b162210639de85b02d1c5f84386;hp=ba7c99a45f84f244c99121c1485a151d3347f365;hb=6b5dda03831aef0cb5689cf2acf3fac47e4b12cb;hpb=99721eb3ca5b9200d2aaec4cab0cf120e382ed99

diff --git a/httemplate/search/report_cust_main.html b/httemplate/search/report_cust_main.html
index ba7c99a45..3dd92af2e 100755
--- a/httemplate/search/report_cust_main.html
+++ b/httemplate/search/report_cust_main.html
@@ -3,11 +3,8 @@
 <FORM ACTION="cust_main.html" METHOD="GET">
 <INPUT TYPE="hidden" NAME="magic" VALUE="bill">
 
-  <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
-
-    <TR>
-      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1"><% mt('Basic search options') |h %></FONT></TH>
-    </TR>
+  <FONT CLASS="fsinnerbox-title"><% emt('Basic search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
 
     <& /elements/tr-select-agent.html,
                   'curr_value'    => scalar($cgi->param('agentnum')),
@@ -19,6 +16,7 @@
                   'pre_options'   => [ '' => 'all',
                                        0  => '(none)', ],
                   'disable_empty' => 1,
+                  'th' => 1,
     &>
 
     <& /elements/tr-select-cust_main-status.html,
@@ -40,7 +38,7 @@
     &>
 
     <TR>
-        <TD ALIGN="right" VALIGN="center"><% mt('Signup date') |h %></TD>
+        <TH ALIGN="right" VALIGN="center"><% mt('Signup date') |h %></TH>
         <TD>
         <TABLE>
             <& /elements/tr-input-beginning_ending.html,
@@ -53,7 +51,7 @@
 
 %    if ( $conf->exists('cust_main-enable_birthdate') ) {
       <TR>
-          <TD ALIGN="right" VALIGN="center"><% mt('Date of Birth') |h %></TD>
+          <TH ALIGN="right" VALIGN="center"><% mt('Date of Birth') |h %></TH>
           <TD>
           <TABLE>
               <& /elements/tr-input-beginning_ending.html,
@@ -67,7 +65,7 @@
 
 %    if ( $conf->exists('cust_main-enable_spouse_birthdate') ) {
       <TR>
-          <TD ALIGN="right" VALIGN="center"><% mt('Spouse Date of Birth') |h %></TD>
+          <TH ALIGN="right" VALIGN="center"><% mt('Spouse Date of Birth') |h %></TH>
           <TD>
           <TABLE>
               <& /elements/tr-input-beginning_ending.html,
@@ -81,7 +79,7 @@
 
 %    if ( $conf->exists('cust_main-enable_anniversary_date') ) {
       <TR>
-          <TD ALIGN="right" VALIGN="center"><% mt('Anniversary Date') |h %></TD>
+          <TH ALIGN="right" VALIGN="center"><% mt('Anniversary Date') |h %></TH>
           <TD>
           <TABLE>
               <& /elements/tr-input-beginning_ending.html,
@@ -94,7 +92,7 @@
 %   }
 
       <TR>
-        <TD ALIGN="right">Tags</TD>
+        <TH ALIGN="right">Tags</TH>
         <TD>
             <& /elements/select-cust_tag.html,
                           'cgi'	        => $cgi,
@@ -104,13 +102,48 @@
           <DIV STYLE="display:inline-block; vertical-align:baseline">
             <INPUT TYPE="radio" NAME="all_tags" VALUE="0" CHECKED> Any of these
             <BR>
-            <INPUT TYPE="radio" NAME="all_tags" VALUE="1"> All of these
+            <INPUT TYPE="radio" NAME="all_tags" VALUE="all"> All of these
+            <BR>
+            <INPUT TYPE="radio" NAME="all_tags" VALUE="none"> None of these
           </DIV>
         </TD>
       </TR>
 
+  </TABLE>
+  <BR>
+
+  <FONT CLASS="fsinnerbox-title"><% emt('Referral search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
+
+      <& /elements/tr-input-text.html,
+           label     => emt('At least this many'),
+           field     => 'with_referrals',
+           size      => 4,
+           maxlength => 4,
+      &>
+
+      <& /elements/tr-select-cust_main-status.html,
+           label => emt('Referral status'),
+           field => 'referral_status',
+      &>
+
+  </TABLE>
+  <BR>
+
+  <FONT CLASS="fsinnerbox-title"><% emt('Package search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
+
       <TR>
-        <TD ALIGN="right">With package of class</TD>
+
+        <TH ALIGN="right">With</TH>
+        <TD><SELECT NAME="any_pkg_status">
+              <OPTION VALUE="0">active packages
+              <OPTION VALUE="1">any status packages
+            </SELECT>
+        </TD>
+     </TR>
+
+        <TH ALIGN="right">of class</TH>
         <TD>
             <& /elements/select-pkg_class.html,
                           'field'       => 'pkg_classnum',
@@ -126,85 +159,38 @@
         </TD>
       </TR>
 
-    <TR>
-      <TH CLASS="background" COLSPAN=2>&nbsp;</TH>
-    </TR>
-
-    <TR>
-      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1"><% mt('Location search options') |h %></FONT></TH>
-    </TR>
-
-    <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Address') |h %></TD>
-      <TD><INPUT TYPE="text" NAME="address" SIZE=54></TD>
-    </TR>
-
-    <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('City') |h %></TD>
-      <TD>
-        <& /elements/city.html,
-             disable_empty => 0,
-             empty_label   => '(all)',
-             disable_text  => 1,
-        &>
-      </TD>
-    </TR>
-
-    <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('County') |h %></TD>
-      <TD>
-        <& /elements/select-county.html,
-             disable_empty => 0,
-             empty_label   => '(all)',
-        &>
-      </TD>
-    </TR>
-    
-    <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('State') |h %></TD>
-      <TD>
-        <& /elements/select-state.html,
-             disable_empty => 0,
-             empty_label   => '(all)',
-        &>
-      </TD>
-    </TR>
-    
-    <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Zip') |h %></TD>
-      <TD><INPUT TYPE="text" NAME="zip" SIZE=12></TD>
-    </TR>
+  </TABLE>
+  <BR>
 
-    <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Country') |h %></TD>
-      <TD>
-        <& /elements/select-country.html,
-             disable_empty       => 0,
-             state_disable_empty => 0,
-             state_empty_label   => '(all)',
-        &>
-      </TD>
-    </TR>
+  <FONT CLASS="fsinnerbox-title"><% emt('Location search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
+    <& elements/options_cust_location.html &>
+    <& elements/cust_main_phones.html &>
+  </TABLE>
+  <BR>
 
-    <TR>
-      <TH CLASS="background" COLSPAN=2>&nbsp;</TH>
-    </TR>
+  <FONT CLASS="fsinnerbox-title"><% emt('Contacts search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
+    <& elements/options_cust_contacts.html,
+        'pre_fix'   => 'contacts_',
+    &>
+  </TABLE>
+  <BR>
 
-    <TR>
-      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1"><% mt('Billing search options') |h %></FONT></TH>
-    </TR>
+  <FONT CLASS="fsinnerbox-title"><% emt('Billing search options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
 
 % my @exempt_groups = grep /\S/, $conf->config('tax-cust_exempt-groups');
 % unless ( @exempt_groups ) { 
 
 %   #falze laziness with With/Without postal mail invoices
      <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Tax exempt') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('Tax exempt') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="tax" ID="tax" onClick="tax_changed();"></TD>
     </TR>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Not tax exempt') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('Not tax exempt') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="no_tax" ID="no_tax" onClick="no_tax_changed();"></TD>
     </TR>
 
@@ -223,7 +209,7 @@
 % }
 
     <TR>
-      <TD ALIGN="right"><% mt('Invoice terms') |h %></TD>
+      <TH ALIGN="right"><% mt('Invoice terms') |h %></TH>
       <TD>
 %       my @agentnums = $FS::CurrentUser::CurrentUser->agentnums;
 %       my $agentnum = scalar(@agentnums) == 1 ? $agentnums[0] : '';
@@ -241,17 +227,17 @@
     &>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('With invoicing email address(es)') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('With invoicing email address(es)') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="with_email"></TD>
     </TR>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('With postal mail invoices') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('With postal mail invoices') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="POST" ID="POST" onClick="POST_changed();"></TD>
     </TR>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Without postal mail invoices') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('Without postal mail invoices') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="no_POST" ID="no_POST" onClick="no_POST_changed();"></TD>
     </TR>
 
@@ -268,22 +254,21 @@
       }
     </SCRIPT>
 
-    <TR>
-      <TH CLASS="background" COLSPAN=2>&nbsp;</TH>
-    </TR>
+  </TABLE>
+  <BR>
+
+  <FONT CLASS="fsinnerbox-title"><% emt('Display options') %></FONT>
+  <TABLE CLASS="fsinnerbox">
 
-    <TR>
-      <TH CLASS="background" COLSPAN=2 ALIGN="left"><FONT SIZE="+1"><% mt('Display options') |h %></FONT></TH>
-    </TR>
     <& /elements/tr-select-cust-fields.html &>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Add package columns') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('Add package columns') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="flattened_pkgs"></TD>
     </TR>
 
     <TR>
-      <TD ALIGN="right" VALIGN="center"><% mt('Include cancelled packages') |h %></TD>
+      <TH ALIGN="right" VALIGN="center"><% mt('Include cancelled packages') |h %></TH>
         <TD><INPUT TYPE="checkbox" NAME="cancelled_pkgs"></TD>
     </TR>