X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Faradial.pm;h=c5c55452c0a9bdd22975db370ae2cc03c83b8fbf;hb=ffa18709ee8a4d05e18d2d406cf73afe79e52524;hp=1963e95f6db1f7815c85ece4007d5520c91ebb8c;hpb=2e2c96e93a676eeca5bfa621ffc51570896cf450;p=freeside.git

diff --git a/FS/FS/part_export/aradial.pm b/FS/FS/part_export/aradial.pm
index 1963e95f6..c5c55452c 100644
--- a/FS/FS/part_export/aradial.pm
+++ b/FS/FS/part_export/aradial.pm
@@ -41,11 +41,12 @@ service types, create another export instance.</p>
 '
 );
 
-sub export_insert {
+sub _export_insert {
   my ($self, $svc) = @_;
   my $result = $self->request_user_edit(
     'Add'   => 1,
     $self->svc_acct_params($svc),
+    'db_$N$Users.Status' => 0,
   );
   if ($svc->cust_svc->cust_pkg->susp > 0 ) {
     $result ||= $self->export_suspend($svc);
@@ -53,45 +54,45 @@ sub export_insert {
   $result;
 }
 
-sub export_replace {
+sub _export_replace {
   my ($self, $new, $old) = @_;
-  if ($new->username ne $old->username) {
+  if ($new->email ne $old->email) {
     return $old->export_delete || $new->export_insert;
   }
-  my $UserLockout = 0;
-  $UserLockout = 1 if $new->cust_svc->cust_pkg->susp > 0;
+  my $Status = 0;
+  $Status = 3 if $new->cust_svc->cust_pkg->susp > 0;
   $self->request_user_edit(
     'Page'    => 'UserEdit',
     'Modify'  => 1,
-    'UserID'  => $old->username,
+    'UserID'  => $old->email,
     $self->svc_acct_params($new),
-    UserLockout => $UserLockout,
+    'db_$N$Users.Status' => $Status,
   );
 }
 
-sub export_suspend {
+sub _export_suspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
-    'UserID'  => $svc->username,
-    'UserLockout' => 1,
+    'UserID'  => $svc->email,
+    'db_$N$Users.Status' => '3',
   );
 }
 
-sub export_unsuspend {
+sub _export_unsuspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
-    'UserID'  => $svc->username,
-    'UserLockout' => 0,
+    'UserID'  => $svc->email,
+    'db_$N$Users.Status' => 0,
   );
 }
 
-sub export_delete {
+sub _export_delete {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'ConfirmDelete' => 1,
-    ('$Checked$' . $svc->username) => 1,
+    ('$Checked$' . $svc->email) => 1,
   );
 }
 
@@ -149,9 +150,8 @@ sub svc_acct_params {
   my $expire_date = $pkg->expire ? time2str('D%Y-%m-%d', $pkg->expire) : '';
 
   (
-    'db_Users.UserID'               => $svc->username,
+    'db_Users.UserID'               => $svc->email,
     $self->password_params($svc),
-    'db_$N$Users.Status'            => 0, # we suspend using UserLockout
     'db_$D$Users.StartDate'         => $setup_date,
     'db_$D$Users.UserExpiryDate'    => $expire_date,
     'db_$RS$Users.GroupName'        => $self->option('group'),