X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=inline;f=httemplate%2Fview%2Fsvc_acct.cgi;h=496dab366e4c7bbb59ff08bd93b3fd1e5e8fd337;hb=87af741da0dd5f6a76bbb566b4d6c54cd5b15315;hp=3a222710f3e74f0395a02eccf1efbec1092f72cb;hpb=3d671921441ba8422650b54435a1959ad1d4c71d;p=freeside.git
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 3a222710f..496dab366 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,50 +1,45 @@
+
<%
-#
-
-use strict;
-use vars qw( $conf $cgi $svc_domain $query $svcnum $svc_acct $cust_svc $pkgnum
- $cust_pkg $custnum $part_svc $p $svc_acct_pop $password );
-use CGI;
-use CGI::Carp qw( fatalsToBrowser );
-use FS::UID qw( cgisuidsetup );
-use FS::CGI qw( header popurl menubar);
-use FS::Record qw( qsearchs fields );
-use FS::Conf;
-use FS::svc_acct;
-use FS::cust_svc;
-use FS::cust_pkg;
-use FS::part_svc;
-use FS::svc_acct_pop;
-
-$cgi = new CGI;
-&cgisuidsetup($cgi);
-
-$conf = new FS::Conf;
-
-($query) = $cgi->keywords;
+
+my $conf = new FS::Conf;
+my $mydomain = $conf->config('domain');
+
+my($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
-$svcnum = $1;
-$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+my $svcnum = $1;
+my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
die "Unknown svcnum" unless $svc_acct;
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-$pkgnum = $cust_svc->getfield('pkgnum');
+#false laziness w/all svc_*.cgi
+my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
+my $pkgnum = $cust_svc->getfield('pkgnum');
+my($cust_pkg, $custnum);
if ($pkgnum) {
- $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum});
- $custnum=$cust_pkg->getfield('custnum');
+ $cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
+ $custnum = $cust_pkg->custnum;
} else {
$cust_pkg = '';
$custnum = '';
}
+#eofalse
-$part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
+my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
die "Unknown svcpart" unless $part_svc;
-$svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-die "Unknown domain" unless $svc_domain;
+my $domain;
+if ( $svc_acct->domsvc ) {
+ my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+ die "Unknown domain" unless $svc_domain;
+ $domain = $svc_domain->domain;
+} else {
+ unless ( $mydomain ) {
+ die "No legacy domain config file and no svc_domain.svcnum record ".
+ "for svc_acct.domsvc: ". $cust_svc->domsvc;
+ }
+ $domain = $mydomain;
+}
-$p = popurl(2);
-print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
+print header('Account View', menubar(
( ( $pkgnum || $custnum )
? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
"View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
@@ -57,58 +52,94 @@ print $cgi->header( '-expires' => 'now' ), header('Account View', menubar(
#print qq!
Send account information!;
-print qq!Edit this information!,
- "
Service #$svcnum",
- "
Service: ", $part_svc->svc, "",
- "
Username: ", $svc_acct->username, ""
+print qq!Edit this information
!.
+ &ntable("#cccccc"). '