[freeside-commits] branch master updated. eaf1b3660fc8ce4436dae0b2e50545c563c6a8b5

[Ivan]

The branch, master has been updated
       via  eaf1b3660fc8ce4436dae0b2e50545c563c6a8b5 (commit)
      from  06e353b743e7be88afa8fce50ea10f27ebb7adef (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit eaf1b3660fc8ce4436dae0b2e50545c563c6a8b5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Mar 25 23:45:45 2013 -0700

    add "with postal invoicing" to customer search, RT#14148

diff --git a/FS/FS/cust_main/Search.pm b/FS/FS/cust_main/Search.pm
index f799b51..d8f620f 100644
--- a/FS/FS/cust_main/Search.pm
+++ b/FS/FS/cust_main/Search.pm
@@ -646,6 +646,16 @@ sub search {
     if $params->{'with_email'};
 
   ##
+  # "with postal mail invoices" checkbox
+  ##
+
+  push @where,
+    "EXISTS ( SELECT 1 FROM cust_main_invoice
+                WHERE cust_main_invoice.custnum = cust_main.custnum
+                  AND dest = 'POST' )"
+    if $params->{'POST'};
+
+  ##
   # "without postal mail invoices" checkbox
   ##
 
diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html
index af9e959..24348ff 100755
--- a/httemplate/search/cust_main.html
+++ b/httemplate/search/cust_main.html
@@ -42,7 +42,7 @@ my %search_hash = ();
 #scalars
 my @scalars = qw (
   agentnum status address zip paydate_year paydate_month invoice_terms
-  no_censustract with_geocode with_email no_POST
+  no_censustract with_geocode with_email POST no_POST
   custbatch usernum
   cancelled_pkgs
   cust_fields flattened_pkgs
diff --git a/httemplate/search/report_cust_main.html b/httemplate/search/report_cust_main.html
index 13f9396..bac4346 100755
--- a/httemplate/search/report_cust_main.html
+++ b/httemplate/search/report_cust_main.html
@@ -184,10 +184,28 @@
     </TR>
 
     <TR>
+      <TD ALIGN="right" VALIGN="center"><% mt('With postal mail invoices') |h %></TD>
+        <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>
-        <TD><INPUT TYPE="checkbox" NAME="no_POST"></TD>
+        <TD><INPUT TYPE="checkbox" NAME="no_POST" ID="no_POST" onClick="no_POST_changed();"></TD>
     </TR>
 
+    <SCRIPT TYPE="text/javascript">
+      function POST_changed() {
+        if ( document.getElementById('POST').checked == true ) {
+          document.getElementById('no_POST').checked = false;
+        }
+      }
+      function no_POST_changed() {
+        if ( document.getElementById('no_POST').checked == true ) {
+          document.getElementById('POST').checked = false;
+        }
+      }
+    </SCRIPT>
+
     <TR>
       <TH CLASS="background" COLSPAN=2> </TH>
     </TR>

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/cust_main/Search.pm               |   10 ++++++++++
 httemplate/search/cust_main.html        |    2 +-
 httemplate/search/report_cust_main.html |   20 +++++++++++++++++++-
 3 files changed, 30 insertions(+), 2 deletions(-)