[freeside-commits] branch FREESIDE_3_BRANCH updated. f837a22b94c7eab3cfeeb1740a1617084bb7645b
Jeremy Davis
jeremyd at 420.am
Wed Nov 12 18:13:33 PST 2014
The branch, FREESIDE_3_BRANCH has been updated
via f837a22b94c7eab3cfeeb1740a1617084bb7645b (commit)
from f423d4c76d2bef990dc9abeb74256cab9968dd31 (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 f837a22b94c7eab3cfeeb1740a1617084bb7645b
Author: Jeremy Davis <jeremyd at freeside.biz>
Date: Wed Nov 12 21:13:27 2014 -0500
Ticket #31129 Correct Aradial suspends
diff --git a/FS/FS/part_export/aradial.pm b/FS/FS/part_export/aradial.pm
index db99156..c7356bf 100644
--- a/FS/FS/part_export/aradial.pm
+++ b/FS/FS/part_export/aradial.pm
@@ -46,6 +46,7 @@ sub export_insert {
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);
@@ -59,13 +60,13 @@ sub export_replace {
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,
);
}
@@ -74,7 +75,7 @@ sub export_suspend {
$self->request_user_edit(
'Modify' => 1,
'UserID' => $svc->email,
- 'Status' => 1,
+ 'db_$N$Users.Status' => '3',
);
}
@@ -83,7 +84,7 @@ sub export_unsuspend {
$self->request_user_edit(
'Modify' => 1,
'UserID' => $svc->email,
- 'Status' => 0,
+ 'db_$N$Users.Status' => 0,
);
}
@@ -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'),
-----------------------------------------------------------------------
Summary of changes:
FS/FS/part_export/aradial.pm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
More information about the freeside-commits
mailing list