X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Faradial.pm;h=c5c55452c0a9bdd22975db370ae2cc03c83b8fbf;hb=019dca96ad502e0a28d6efc66a9f481a324822e5;hp=db99156b99257c97bf2647a041d509b8bfc15ee0;hpb=446865fcba43deb85beb4f703a1f768816201d0b;p=freeside.git

diff --git a/FS/FS/part_export/aradial.pm b/FS/FS/part_export/aradial.pm
index db99156b9..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,41 +54,41 @@ sub export_insert {
   $result;
 }
 
-sub export_replace {
+sub _export_replace {
   my ($self, $new, $old) = @_;
   if ($new->email ne $old->email) {
     return $old->export_delete || $new->export_insert;
   }
   my $Status = 0;
-  $Status = 1 if $new->cust_svc->cust_pkg->susp > 0;
+  $Status = 3 if $new->cust_svc->cust_pkg->susp > 0;
   $self->request_user_edit(
     'Page'    => 'UserEdit',
     'Modify'  => 1,
     'UserID'  => $old->email,
     $self->svc_acct_params($new),
-   'Status' => $Status,
+    'db_$N$Users.Status' => $Status,
   );
 }
 
-sub export_suspend {
+sub _export_suspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
     'UserID'  => $svc->email,
-    'Status' => 1,
+    'db_$N$Users.Status' => '3',
   );
 }
 
-sub export_unsuspend {
+sub _export_unsuspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
     'UserID'  => $svc->email,
-    'Status' => 0,
+    'db_$N$Users.Status' => 0,
   );
 }
 
-sub export_delete {
+sub _export_delete {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'ConfirmDelete' => 1,
@@ -151,7 +152,6 @@ sub svc_acct_params {
   (
     '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'),