X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_export%2Fshellcommands.pm;h=cec9619aa3c392ae3d780f08160380b64366e4fd;hb=9d7ba1bad5c6db5c1c03b5c2c0aad1315d1f6705;hp=faf06559314df8c5862b7de9f62ae24cfa9f7a3a;hpb=01b857aa5fb209905d569844bc44710999df84e6;p=freeside.git
diff --git a/FS/FS/part_export/shellcommands.pm b/FS/FS/part_export/shellcommands.pm
index faf065593..cec9619aa 100644
--- a/FS/FS/part_export/shellcommands.pm
+++ b/FS/FS/part_export/shellcommands.pm
@@ -175,6 +175,8 @@ old_ for replace operations):
$reasontext (when suspending)
$reasontypenum (when suspending)
$reasontypetext (when suspending)
+ $pkgnum
+ $custnum
All other fields in svc_acct are also available.
END
@@ -299,6 +301,8 @@ sub _export_command {
$finger = shell_quote $finger;
$crypt_password = shell_quote $crypt_password;
$ldap_password = shell_quote $ldap_password;
+ $pkgnum = $cust_pkg ? $cust_pkg->pkgnum : '';
+ $custnum = $cust_pkg ? $cust_pkg->custnum : '';
my $command_string = eval(qq("$command"));
my @ssh_cmd_args = (
@@ -316,7 +320,7 @@ sub _export_command {
if $error;
}
else {
- $self->shellcommands_queue( $new->svcnum, @ssh_cmd_args );
+ $self->shellcommands_queue( $svc_acct->svcnum, @ssh_cmd_args );
}
}
@@ -330,6 +334,8 @@ sub _export_replace {
${"old_$_"} = $old->getfield($_) foreach $old->fields;
${"new_$_"} = $new->getfield($_) foreach $new->fields;
}
+ my $old_cust_pkg = $old->cust_svc->cust_pkg;
+ my $new_cust_pkg = $new->cust_svc->cust_pkg;
$new_finger =~ /^(.*)\s+(\S+)$/ or $new_finger =~ /^((.*))$/;
($new_first, $new_last ) = ( $1, $2 );
$quoted_new__password = shell_quote $new__password; #old, wrong?
@@ -377,6 +383,10 @@ sub _export_replace {
$new_finger = shell_quote $new_finger;
$new_crypt_password = shell_quote $new_crypt_password;
$new_ldap_password = shell_quote $new_ldap_password;
+ $old_pkgnum = $old_cust_pkg ? $old_cust_pkg->pkgnum : '';
+ $old_custnum = $old_cust_pkg ? $old_cust_pkg->custnum : '';
+ $new_pkgnum = $new_cust_pkg ? $new_cust_pkg->pkgnum : '';
+ $new_custnum = $new_cust_pkg ? $new_cust_pkg->custnum : '';
my $command_string = eval(qq("$command"));