[freeside-commits] freeside/httemplate/search report_cdr.html, 1.8, 1.9 cdr.html, 1.14, 1.15

[Ivan,,,]

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

Modified Files:
	report_cdr.html cdr.html 
Log Message:
settlement cdr processing, RT#5495

Index: report_cdr.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/report_cdr.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- report_cdr.html	29 Aug 2008 01:09:09 -0000	1.8
+++ report_cdr.html	2 Jul 2009 11:22:48 -0000	1.9
@@ -3,6 +3,7 @@
 <FORM ACTION="cdr.html" METHOD="GET">
 
 <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
+
   <TR>
     <TD ALIGN="right">Status: </TD>
     <TD>
@@ -14,6 +15,23 @@
     </TD>
   </TR>
 
+% #if ( ) {  # disable for everyone not using termination billing...
+%   foreach my $termpart ( 1..1 ) { #qsearch('part_termination
+
+    <TR>
+      <TD ALIGN="right">Termination Status: </TD>
+      <TD>
+        <SELECT NAME="termpart<%$termpart%>status">
+          <OPTION VALUE="">(all)
+          <OPTION VALUE="NULL">unprocessed
+          <OPTION VALUE="done">processed
+        </SELECT>
+      </TD>
+    </TR>
+
+%   }
+% #}
+
   <% include ( '/elements/tr-input-beginning_ending.html' ) %>
 
   <TR>

Index: cdr.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cdr.html,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- cdr.html	29 May 2009 23:36:14 -0000	1.14
+++ cdr.html	2 Jul 2009 11:22:48 -0000	1.15
@@ -65,46 +65,87 @@
 my @search = ();
 
 ###
+# dates
+###
+
+my $str2time_sql = str2time_sql;
+
+my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+push @search, "$str2time_sql calldate) >= $beginning ",
+              "$str2time_sql calldate) <= $ending";
+
+###
+# duration / billsec
+###
+
+push @search, FS::UI::Web::parse_lt_gt($cgi, 'duration');
+push @search, FS::UI::Web::parse_lt_gt($cgi, 'billsec');
+
+#above here things just push @search
+#below here things also have to define $hashref->{} or push @qsearch
+my @qsearch = @search;
+
+###
 # freesidestatus
 ###
 
 if ( $cgi->param('freesidestatus') eq 'NULL' ) {
 
-  my $title = "Unprocessed $title";
+  $title = "Unprocessed $title";
   $hashref->{'freesidestatus'} = ''; # Record.pm will take care of it
   push @search, "( freesidestatus IS NULL OR freesidestatus = '' )";
 
 } elsif ( $cgi->param('freesidestatus') =~ /^([\w ]+)$/ ) {
 
-  my $title = "Processed $title";
+  $title = "Processed $title";
   $hashref->{'freesidestatus'} = $1;
   push @search, "freesidestatus = '$1'";
 
 }
 
 ###
-# dates
+# termpartNstatus
 ###
 
-my $str2time_sql = str2time_sql;
+foreach my $param ( grep /^termpart\d+status$/, $cgi->param ) {
 
-my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
-push @search, "$str2time_sql calldate) >= $beginning ",
-              "$str2time_sql calldate) <= $ending";
+  my $status = $cgi->param($param);
 
-###
-# duration / billsec
-###
+  $param =~ /^termpart(\d+)status$/ or die 'guru meditation 54something';
+  my $termpart = $1;
 
-push @search, FS::UI::Web::parse_lt_gt($cgi, 'duration');
-push @search, FS::UI::Web::parse_lt_gt($cgi, 'billsec');
+  my $search = '';
+  if ( $status eq 'NULL' ) {
+
+    #false lazienss w/cdr_termination.pm (i should be a part_termination method)
+    my $where_term =
+      "( cdr.acctid = cdr_termination.acctid AND termpart = $termpart ) ";
+    #my $join_term = "LEFT JOIN cdr_termination ON ( $where_term )";
+    $search =
+      "NOT EXISTS ( SELECT 1 FROM cdr_termination WHERE $where_term )";
+
+  } elsif ( $cgi->param('freesidestatus') =~ /^([\w ]+)$/ ) {
+
+    #false lazienss w/cdr_termination.pm (i should be a part_termination method)
+    my $where_term =
+      "( cdr.acctid = cdr_termination.acctid AND termpart = $termpart AND status = '$1' ) ";
+    #my $join_term = "LEFT JOIN cdr_termination ON ( $where_term )";
+    $search =
+      "EXISTS ( SELECT 1 FROM cdr_termination WHERE $where_term )";
+
+  }
+
+  if ( $search ) {
+    push @search,  $search;
+    push @qsearch, $search;
+  }
+
+}
 
 ###
 # src/dest/charged_party
 ###
 
-my @qsearch = @search;
-
 if ( $cgi->param('src') =~ /^\s*([\d\-\+\ ]+)\s*$/ ) {
   ( my $src = $1 ) =~ s/\D//g;
   $hashref->{'src'} = $src;
@@ -122,10 +163,12 @@
   #$hashref->{'charged_party'} = $charged_party;
   #push @search, "charged_party = '$charged_party'";
   #XXX countrycode
-  push @search,  " (    charged_party = '$charged_party'
-                     OR charged_party = '1$charged_party' ) ";
-  push @qsearch, " (    charged_party = '$charged_party'
-                    OR charged_party = '1$charged_party' ) ";
+
+  my $search = " (    charged_party = '$charged_party'
+                   OR charged_party = '1$charged_party' ) ";
+
+  push @search,  $search;
+  push @qsearch, $search;
 }
 
 ###