[freeside-commits] branch master updated. 6912944a9959e4046b095fbd378f5545c2caca9e

David F. Houghton houghton at 420.am
Wed Sep 10 12:19:41 PDT 2014


The branch, master has been updated
       via  6912944a9959e4046b095fbd378f5545c2caca9e (commit)
      from  7b714ce82744920c03ac8275f59a98b085e644d7 (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 6912944a9959e4046b095fbd378f5545c2caca9e
Author: David Houghton <houghton at freeside.biz>
Date:   Wed Sep 10 12:09:40 2014 -0400

    ticket: 27309; add accountcode
    
    I tested this as best I could. I worked with my fake data. I accounted
    for ' and blank lines, assuming terminal whitespace was irrelevant.

diff --git a/httemplate/search/cdr.html b/httemplate/search/cdr.html
index ca303d3..10b3863 100644
--- a/httemplate/search/cdr.html
+++ b/httemplate/search/cdr.html
@@ -258,6 +258,25 @@ if ( $cgi->param('acctid') =~ /\d/ ) {
 }
 
 ###
+# accountcode
+###
+
+if ( $cgi->param('accountcode') =~ /\S/ ) {
+  my $accountcode = $cgi->param('accountcode');
+  my @accountcode = map {
+    ( my $v = $_ ) =~ s/^\s+|\s+$//g;
+    if ( $v =~ /'/ ) { $v =~ s/'/\\'/g; $v = "E'$v'" }
+    elsif ( length $v ) { $v = "'$v'" }
+    length $v ? $v : ()
+  } grep /\S/, split /\R/, $accountcode;
+  if (@accountcode) {
+    my $search = 'accountcode IN ( ' . join( ',', @accountcode ) . ' )';
+    push @qsearch, $search;
+    push @search,  $search;
+  }
+}
+
+###
 # finish it up
 ###
 
diff --git a/httemplate/search/report_cdr.html b/httemplate/search/report_cdr.html
index 0e1693b..fe840ea 100644
--- a/httemplate/search/report_cdr.html
+++ b/httemplate/search/report_cdr.html
@@ -148,6 +148,11 @@
   </TR>
 
   <TR>
+    <TD ALIGN="right">Acct Code (one per-line):</TD>
+    <TD><TEXTAREA NAME="accountcode"></TEXTAREA></TD>
+  </TR>
+
+  <TR>
     <TH CLASS="background" COLSPAN=2> </TH>
   </TR>
 

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

Summary of changes:
 httemplate/search/cdr.html        |   19 +++++++++++++++++++
 httemplate/search/report_cdr.html |    5 +++++
 2 files changed, 24 insertions(+)




More information about the freeside-commits mailing list