fix incoming CDR links wrt cdrbatch field

[freeside.git] / httemplate / view / svc_phone.cgi

diff --git a/httemplate/view/svc_phone.cgi b/httemplate/view/svc_phone.cgi
index 8c0c9e0..09d5be4 100644 (file)
--- a/httemplate/view/svc_phone.cgi
+++ b/httemplate/view/svc_phone.cgi
@@ -22,6 +22,74 @@
 my $html_foot = sub {
   my $svc_phone = shift;
 
+  ###
+  # Devices
+  ###
+
+  my $devices = '';
+
+  my $sth = dbh->prepare("SELECT COUNT(*) FROM part_device") #WHERE disabled = '' OR disabled IS NULL;");
+    or die dbh->errstr;
+  $sth->execute or die $sth->errstr;
+  my $num_part_device = $sth->fetchrow_arrayref->[0];
+
+  my @phone_device = $svc_phone->phone_device;
+  if ( @phone_device || $num_part_device ) {
+    my $svcnum = $svc_phone->svcnum;
+    $devices .=
+      qq[Devices (<A HREF="${p}edit/phone_device.html?svcnum=$svcnum">Add device</A>)<BR>];
+    if ( @phone_device ) {
+
+      $devices .= qq!
+        <SCRIPT>
+          function areyousure(href) {
+           if (confirm("Are you sure you want to delete this device?") == true)
+             window.location.href = href;
+          }
+        </SCRIPT>
+      !;
+
+
+      $devices .= 
+        include('/elements/table-grid.html').
+          '<TR>'.
+            '<TH CLASS="grid" BGCOLOR="#cccccc">Type</TH>'.
+            '<TH CLASS="grid" BGCOLOR="#cccccc">MAC Addr</TH>'.
+            '<TH CLASS="grid" BGCOLOR="#cccccc"></TH>'.
+          '</TR>';
+      my $bgcolor1 = '#eeeeee';
+      my $bgcolor2 = '#ffffff';
+      my $bgcolor = '';
+
+      foreach my $phone_device ( @phone_device ) {
+
+        if ( $bgcolor eq $bgcolor1 ) {
+          $bgcolor = $bgcolor2;
+        } else {
+          $bgcolor = $bgcolor1;
+        }
+        my $td = qq(<TD CLASS="grid" BGCOLOR="$bgcolor">);
+
+        my $devicenum = $phone_device->devicenum;
+
+        $devices .= '<TR>'.
+                      $td. $phone_device->part_device->devicename. '</TD>'.
+                      $td. $phone_device->mac_addr. '</TD>'.
+                      "$td( ".
+                        qq(<A HREF="${p}edit/phone_device.html?$devicenum">edit</A> | ).
+                        qq(<A HREF="javascript:areyousure('${p}misc/delete-phone_device.html?$devicenum')">delete</A>).
+                      ' )</TD>'.
+                    '</TR>';
+      }
+      $devices .= '</TABLE><BR>';
+    }
+    $devices .= '<BR>';
+  }
+
+  ##
+  # CDR links
+  ##
+
   tie my %what, 'Tie::IxHash',
     'pending' => 'NULL',
     'billed'  => 'done',
@@ -31,6 +99,8 @@ my $html_foot = sub {
   #XXX handle toll free too
 
   my $number = $svc_phone->phonenum;
+  $number = $svc_phone->countrycode. $number
+    unless $svc_phone->countrycode eq '1';
 
   #my @links = map {
   #  qq(<A HREF="${p}search/cdr.html?src=$number;freesidestatus=$what{$_}">).
@@ -41,9 +111,14 @@ my $html_foot = sub {
     "View $_ CDRs</A>";
   } keys(%what);
 
-  my @ilinks = ( qq(<A HREF="${p}search/cdr.html?dst=$number">).
+  my @ilinks = ( qq(<A HREF="${p}search/cdr.html?cdrbatch=__ALL__;dst=$number">).
                  'View incoming CDRs</A>' );
 
+  ###
+  # concatenate & return
+  ###
+
+  $devices.
   join(' | ', @links ). '<BR>'.
   join(' | ', @ilinks). '<BR>';