X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FMyAccount.pm;h=e3afac14ada2edf7f1cceda58e8d1d6d0d6cd337;hb=c9678906cb89a0c05a67d8118898202b64f84fd6;hp=9533d6a7350e67ce07af3fadec497affc1dd16f5;hpb=a473ab56f0fcceb4dbe2ddd4fdf3940974bfc91f;p=freeside.git

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 9533d6a73..e3afac14a 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -25,6 +25,8 @@ use FS::svc_acct;
 use FS::svc_domain;
 use FS::svc_phone;
 use FS::svc_external;
+use FS::svc_dsl;
+use FS::dsl_device;
 use FS::part_svc;
 use FS::cust_main;
 use FS::cust_bill;
@@ -1310,12 +1312,18 @@ sub list_svcs {
   my $cust_main = qsearchs('cust_main', $search )
     or return { 'error' => "unknown custnum $custnum" };
 
+  my $pkgnum = $session->{'pkgnum'} || $p->{'pkgnum'} || '';
+  if ( ! $pkgnum && $p->{'svcnum'} ) {
+    my $cust_svc = qsearchs('cust_svc', { 'svcnum' => $p->{'svcnum'} } );
+    $pkgnum = $cust_svc->pkgnum if $cust_svc;
+  }
+
   my @cust_svc = ();
   #foreach my $cust_pkg ( $cust_main->ncancelled_pkgs ) {
   foreach my $cust_pkg ( $p->{'ncancelled'} 
                          ? $cust_main->ncancelled_pkgs
                          : $cust_main->unsuspended_pkgs ) {
-    next if $session->{'pkgnum'} && $cust_pkg->pkgnum != $session->{'pkgnum'};
+    next if $pkgnum && $cust_pkg->pkgnum != $pkgnum;
     push @cust_svc, @{[ $cust_pkg->cust_svc ]}; #@{[ ]} to force array context
   }
   if ( $p->{'svcdb'} ) {
@@ -1356,6 +1364,7 @@ sub list_svcs {
                 %hash,
                 'username'   => $svc_x->username,
                 'email'      => $svc_x->email,
+                'finger'     => $svc_x->finger,
                 'seconds'    => $svc_x->seconds,
                 'upbytes'    => display_bytecount($svc_x->upbytes),
                 'downbytes'  => display_bytecount($svc_x->downbytes),
@@ -1372,11 +1381,21 @@ sub list_svcs {
                 # more...
               );
 
-            } elsif ( $svcdb eq 'svc_phone' || $svcdb eq 'svc_port' ) {
-              %hash = (
-                %hash,
-              );
+            } elsif ( $svcdb eq 'svc_dsl' ) {
+              $hash{'phonenum'} = $svc_x->phonenum;
+              if ( $svc_x->first || $svc_x->get('last') || $svc_x->company ) {
+                $hash{'name'} = $svc_x->first. ' '. $svc_x->get('last');
+                $hash{'name'} = $svc_x->company. ' ('. $hash{'name'}. ')'
+                  if $svc_x->company;
+              } else {
+                $hash{'name'} = $cust_main->name;
+              }
             }
+            # elsif ( $svcdb eq 'svc_phone' || $svcdb eq 'svc_port' ) {
+            #  %hash = (
+            #    %hash,
+            #  );
+            #}
 
             \%hash;
           }
@@ -1386,6 +1405,82 @@ sub list_svcs {
 
 }
 
+sub _customer_svc_x {
+  my($custnum, $svcnum, $table) = @_;
+
+  $custnum =~ /^(\d+)$/ or die "illegal custnum";
+  my $search = " AND custnum = $1";
+  #$search .= " AND agentnum = ". $session->{'agentnum'} if $context eq 'agent';
+
+  qsearchs( {
+    'table'     => ($table || 'svc_acct'),
+    'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                   'LEFT JOIN cust_pkg  USING ( pkgnum  ) ',#.
+                   #'LEFT JOIN cust_main USING ( custnum ) ',
+    'hashref'   => { 'svcnum' => $svcnum, },
+    'extra_sql' => $search, #important
+  } );
+
+}
+
+sub list_dsl_devices {
+  my $p = shift;
+
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  my $svc_dsl = _customer_svc_x( $custnum, $p->{'svcnum'}, 'svc_dsl' )
+    or return { 'error' => "Service not found" };
+
+  return {
+    'devices' => [ map {
+                         +{ 'mac_addr' => $_->mac_addr };
+                       } $svc_dsl->dsl_device
+                 ],
+  };
+
+}
+
+sub add_dsl_device {
+  my $p = shift;
+
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  my $svc_dsl = _customer_svc_x( $custnum, $p->{'svcnum'}, 'svc_dsl' )
+    or return { 'error' => "Service not found" };
+
+  return { 'error' => 'No MAC address supplied' }
+    unless length($p->{'mac_addr'});
+
+  my $dsl_device = new FS::dsl_device { 'svcnum'   => $svc_dsl->svcnum,
+                                        'mac_addr' => scalar($p->{'mac_addr'}),
+                                      };
+  my $error = $dsl_device->insert;
+  return { 'error' => $error };
+
+}
+
+sub delete_dsl_device {
+  my $p = shift;
+
+  my($context, $session, $custnum) = _custoragent_session_custnum($p);
+  return { 'error' => $session } if $context eq 'error';
+
+  my $svc_dsl = _customer_svc_x( $custnum, $p->{'svcnum'}, 'svc_dsl' )
+    or return { 'error' => "Service not found" };
+
+  my $dsl_device = qsearchs('dsl_device', { 'svcnum'   => $svc_dsl->svcnum,
+                                            'mac_addr' => scalar($p->{'mac_addr'}),
+                                          }
+                           )
+    or return { 'error' => 'Unknown MAC address: '. $p->{'mac_addr'} };
+
+  my $error = $dsl_device->delete;
+  return { 'error' => $error };
+
+}
+
 sub port_graph {
   my $p = shift;
   _usage_details( \&_port_graph, $p,
@@ -2149,7 +2244,7 @@ sub myaccount_passwd {
     or return { 'error' => "Service not found" };
 
   if ( exists($p->{'old_password'}) ) {
-    return { 'error' => "Incorrect password." };
+    return { 'error' => "Incorrect password." }
       unless $svc_acct->check_password($p->{'old_password'});
   }