[freeside-commits] branch FREESIDE_3_BRANCH updated. 21ed77f12154170ab5a5ec73b68321a2456e5a99

[Jeremy Davis]

The branch, FREESIDE_3_BRANCH has been updated
       via  21ed77f12154170ab5a5ec73b68321a2456e5a99 (commit)
      from  f06ed0e1de0725b63f6d05eff539a6516e223c07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 21ed77f12154170ab5a5ec73b68321a2456e5a99
Author: Jeremy Davis <jeremyd at freeside.biz>
Date:   Tue Sep 9 15:49:26 2014 -0400

    #29052 Pass domain to Aradial

diff --git a/FS/FS/part_export/aradial.pm b/FS/FS/part_export/aradial.pm
index 1963e95..296430a 100644
--- a/FS/FS/part_export/aradial.pm
+++ b/FS/FS/part_export/aradial.pm
@@ -55,7 +55,7 @@ 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;
@@ -63,7 +63,7 @@ sub export_replace {
   $self->request_user_edit(
     'Page'    => 'UserEdit',
     'Modify'  => 1,
-    'UserID'  => $old->username,
+    'UserID'  => $old->email,
     $self->svc_acct_params($new),
     UserLockout => $UserLockout,
   );
@@ -73,7 +73,7 @@ sub export_suspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
-    'UserID'  => $svc->username,
+    'UserID'  => $svc->email,
     'UserLockout' => 1,
   );
 }
@@ -82,7 +82,7 @@ sub export_unsuspend {
   my ($self, $svc) = @_;
   $self->request_user_edit(
     'Modify'  => 1,
-    'UserID'  => $svc->username,
+    'UserID'  => $svc->email,
     'UserLockout' => 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,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_export/aradial.pm |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)