X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FClientAPI%2FMyAccount.pm;h=9e1a4adc4e4100c480caba1eb9d1dd29e58b4536;hb=c4257ec0783ad40d697c22590f804e7d8ce063cd;hp=476ef078992035b314515e8074d1c5fb8c7275bc;hpb=c85d36a31cd15e8d06f9dfc7d2591f918d278d89;p=freeside.git

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index 476ef0789..9e1a4adc4 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -334,6 +334,7 @@ sub login {
 
   return { 'error'      => '',
            'session_id' => $session_id,
+           %$session,
          };
 }
 
@@ -600,6 +601,8 @@ sub customer_info_short {
     for (@cust_main_editable_fields) {
       $return{$_} = $cust_main->get($_);
     }
+    $return{$_} = $cust_main->masked($_) for qw/ss stateid/;
+
     #maybe a little more expensive, but it should be cached by now
     for (@location_editable_fields) {
       $return{$_} = $cust_main->bill_location->get($_);
@@ -1013,9 +1016,6 @@ sub validate_payment {
     my $payinfo2 = $1;
     $payinfo = $payinfo1. '@'. $payinfo2;
 
-    $payinfo = $cust_main->payinfo
-      if $cust_main->paymask eq $payinfo;
-
     my $achonfile = 0;
       if ( $cust_main->paymask eq $payinfo ) {
         $payinfo = $cust_main->payinfo;
@@ -1652,128 +1652,6 @@ sub payment_receipt {
          };
 }
 
-sub list_payby {
-  my $p = shift;
-
-  my($context, $session, $custnum) = _custoragent_session_custnum($p);
-  return { 'error' => $session } if $context eq 'error';
-
-  my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } )
-    or return { 'error' => "unknown custnum $custnum" };
-
-  return {
-    'payby' => [ map {
-                       my $cust_payby = $_;
-                       +{
-                          map { $_ => $cust_payby->$_ }
-                            qw( custpaybynum weight payby paymask paydate
-                                payname paystate paytype
-                              )
-                        };
-                     }
-                   $cust_main->cust_payby
-               ],
-  };
-}
-
-sub insert_payby {
-  my $p = shift;
-
-  my($context, $session, $custnum) = _custoragent_session_custnum($p);
-  return { 'error' => $session } if $context eq 'error';
-
-  #XXX payinfo1 + payinfo2 for CHEK?
-  #or take the opportunity to use separate, more well- named fields?
-  # my $payinfo;
-  # $p->{'payinfo1'} =~ /^([\dx]+)$/
-  #   or return { 'error' => "illegal account number ". $p->{'payinfo1'} };
-  # my $payinfo1 = $1;
-  #  $p->{'payinfo2'} =~ /^([\dx\.]+)$/ # . turned on by echeck-country CA ?
-  #   or return { 'error' => "illegal ABA/routing number ". $p->{'payinfo2'} };
-  # my $payinfo2 = $1;
-  # $payinfo = $payinfo1. '@'. $payinfo2;
-
-  my $cust_payby = new FS::cust_payby {
-    'custnum' => $custnum,
-    map { $_ => $p->{$_} } qw( weight payby payinfo paycvv paydate payname
-                               paystate paytype payip 
-                             ),
-  };
-
-  my $error = $cust_payby->insert;
-  if ( $error ) {
-    return { 'error' => $error };
-  } else {
-    return { 'custpaybynum' => $cust_payby->custpaybynum };
-  }
-  
-}
-
-sub update_payby {
-  my $p = shift;
-
-  my($context, $session, $custnum) = _custoragent_session_custnum($p);
-  return { 'error' => $session } if $context eq 'error';
-
-  my $cust_payby = qsearchs('cust_payby', {
-                              'custnum'      => $custnum,
-                              'custpaybynum' => $p->{'custpaybynum'},
-                           })
-    or return { 'error' => 'unknown custpaybynum '. $p->{'custpaybynum'} };
-
-  foreach my $field (
-    qw( weight payby payinfo paycvv paydate payname paystate paytype payip )
-  ) {
-    next unless exists($p->{$field});
-    $cust_payby->set($field,$p->{$field});
-  }
-
-  my $error = $cust_payby->replace;
-  if ( $error ) {
-    return { 'error' => $error };
-  } else {
-    return { 'custpaybynum' => $cust_payby->custpaybynum };
-  }
-  
-}
-
-sub verify_payby {
-  my $p = shift;
-
-  my($context, $session, $custnum) = _custoragent_session_custnum($p);
-  return { 'error' => $session } if $context eq 'error';
-
-  my $cust_payby = qsearchs('cust_payby', {
-                              'custnum'      => $custnum,
-                              'custpaybynum' => $p->{'custpaybynum'},
-                           })
-    or return { 'error' => 'unknown custpaybynum '. $p->{'custpaybynum'} };
-
-  return { 'error' => $cust_payby->verify };
-  
-}
-
-sub delete_payby {
-  my $p = shift;
-
-  my($context, $session, $custnum) = _custoragent_session_custnum($p);
-  return { 'error' => $session } if $context eq 'error';
-
-  my $cust_payby = qsearchs('cust_payby', {
-                              'custnum'      => $custnum,
-                              'custpaybynum' => $p->{'custpaybynum'},
-                           })
-    or return { 'error' => 'unknown custpaybynum '. $p->{'custpaybynum'} };
-
-  my $conf = new FS::Conf;
-  if (($cust_payby->payby eq "DCHK" || $cust_payby->payby eq "CHEK") && $conf->exists('selfservice-ACH_info_readonly')) {
-    return { 'error' => "Sorry you do not have permission to delete bank information." };
-  }
-  else {
-    return { 'error' => $cust_payby->delete };
-  }
-}
-
 sub cancel {
   my $p = shift;
   my $session = _cache->get($p->{'session_id'})
@@ -3880,4 +3758,3 @@ sub _custoragent_session_custnum {
 }
 
 1;
-