Ticket #31129 fix user suspends

[freeside.git] / FS / FS / part_export / aradial.pm

diff --git a/FS/FS/part_export/aradial.pm b/FS/FS/part_export/aradial.pm
index 1963e95..db99156 100644 (file)
--- a/FS/FS/part_export/aradial.pm
+++ b/FS/FS/part_export/aradial.pm
@@ -55,17 +55,17 @@ sub export_insert {
 
 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 = 1 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,
+   'Status' => $Status,
   );
 }
 
@@ -73,8 +73,8 @@ sub export_suspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
-    'UserID'  => $svc->username,
-    'UserLockout' => 1,
+    'UserID'  => $svc->email,
+    'Status' => 1,
   );
 }
 
@@ -82,8 +82,8 @@ sub export_unsuspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
-    'UserID'  => $svc->username,
-    'UserLockout' => 0,
+    'UserID'  => $svc->email,
+    'Status' => 0,
   );
 }
 
@@ -91,7 +91,7 @@ sub export_delete {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'ConfirmDelete' => 1,
-    ('$Checked$' . $svc->username) => 1,
+    ('$Checked$' . $svc->email) => 1,
   );
 }
 
@@ -149,7 +149,7 @@ 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,