X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_acct_sm.cgi;h=0fd5f76224883f5430121bea4e475b2c5e58fa1d;hb=ddb53fcc9fc80561354b97e4e7803004990138d0;hp=4eb3d83333444a48009cb4e17b3cedd461a37b58;hpb=c464a78c64f8a55eff61c205dc368482cdeba01d;p=freeside.git
diff --git a/httemplate/edit/svc_acct_sm.cgi b/httemplate/edit/svc_acct_sm.cgi
index 4eb3d8333..0fd5f7622 100755
--- a/httemplate/edit/svc_acct_sm.cgi
+++ b/httemplate/edit/svc_acct_sm.cgi
@@ -1,23 +1,10 @@
+
<%
-#
-use strict;
-use vars qw( $conf $cgi $mydomain $action $svcnum $svc_acct_sm $pkgnum $svcpart
- $part_svc $query %username %domain $p1 $domuser $domsvc $domuid );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(header popurl);
-use FS::Record qw(qsearch qsearchs fields);
-use FS::svc_acct_sm;
-use FS::Conf;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-$mydomain = $conf->config('domain');
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
+my($svcnum, $pkgnum, $svcpart, $part_svc, $svc_acct_sm );
if ( $cgi->param('error') ) {
$svc_acct_sm = new FS::svc_acct_sm ( {
map { $_, scalar($cgi->param($_)) } fields('svc_acct_sm')
@@ -25,8 +12,8 @@ if ( $cgi->param('error') ) {
$svcnum = $svc_acct_sm->svcnum;
$pkgnum = $cgi->param('pkgnum');
$svcpart = $cgi->param('svcpart');
- $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
- die "No part_svc entry!" unless $part_svc;
+ #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+ #die "No part_svc entry!" unless $part_svc;
} else {
my($query) = $cgi->keywords;
if ( $query =~ /^(\d+)$/ ) { #editing
@@ -40,8 +27,8 @@ if ( $cgi->param('error') ) {
$pkgnum=$cust_svc->pkgnum;
$svcpart=$cust_svc->svcpart;
- $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
- die "No part_svc entry!" unless $part_svc;
+ #$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+ #die "No part_svc entry!" unless $part_svc;
} else { #adding
@@ -51,23 +38,26 @@ if ( $cgi->param('error') ) {
$pkgnum=$1 if /^pkgnum(\d+)$/;
$svcpart=$1 if /^svcpart(\d+)$/;
}
- $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+ my $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
die "No part_svc entry!" unless $part_svc;
$svcnum='';
#set fixed and default fields from part_svc
- my($field);
- foreach $field ( fields('svc_acct_sm') ) {
- if ( $part_svc->getfield('svc_acct_sm__'. $field. '_flag') ne '' ) {
- $svc_acct_sm->setfield($field,$part_svc->getfield('svc_acct_sm__'. $field) );
- }
+ foreach my $part_svc_column (
+ grep { $_->columnflag } $part_svc->all_part_svc_column
+ ) {
+ $svc_acct_sm->setfield( $part_svc_column->columnname,
+ $part_svc_column->columnvalue,
+ );
}
}
}
-$action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
+my $action = $svc_acct_sm->svcnum ? 'Edit' : 'Add';
+my %username = ();
+my %domain = ();
if ($pkgnum) {
#find all possible uids (and usernames)
@@ -79,7 +69,6 @@ if ($pkgnum) {
my($cust_pkg)=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
my($custnum)=$cust_pkg->getfield('custnum');
- %username = ();
foreach my $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
my($acct_svcpart);
@@ -101,7 +90,6 @@ if ($pkgnum) {
push @d_acct_svcparts,$d_part_svc->getfield('svcpart');
}
- %domain = ();
foreach $i_cust_pkg ( qsearch('cust_pkg',{'custnum'=>$custnum}) ) {
my($cust_pkgnum)=$i_cust_pkg->getfield('pkgnum');
my($acct_svcpart);
@@ -126,8 +114,8 @@ if ($pkgnum) {
die "\$action eq Add, but \$pkgnum is null!\n";
}
-$p1 = popurl(1);
-print $cgi->header( '-expires' => 'now' ), header("Mail Alias $action", '');
+my $p1 = popurl(1);
+print header("Mail Alias $action", '');
print qq!Error: !, $cgi->param('error'),
""
@@ -150,7 +138,7 @@ print qq!!;
#svcpart
print qq!!;
-($domuser,$domsvc,$domuid)=(
+my($domuser,$domsvc,$domuid)=(
$svc_acct_sm->domuser,
$svc_acct_sm->domsvc,
$svc_acct_sm->domuid,