X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=7cebdf8dad11d389740a7601a1388c9900ad31fe;hb=b63544b9961e09bfc95908f867993f2c44139b42;hp=ad7e6539d8947daf24451b1179321c9ec087303a;hpb=844855ae401bc5a7167b5fa8898275f89719ed71;p=freeside.git
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index ad7e6539d..7cebdf8da 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,13 +1,14 @@
<%
-#
+#
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 vars qw( $conf $cgi $domain $query $svcnum $svc_acct $cust_svc $pkgnum
+ $cust_pkg $custnum $part_svc $p $svc_acct_pop $password
+ $mydomain $svc_domain );
use CGI;
use CGI::Carp qw( fatalsToBrowser );
use FS::UID qw( cgisuidsetup );
-use FS::CGI qw( header popurl menubar);
+use FS::CGI qw( header popurl menubar ntable);
use FS::Record qw( qsearchs fields );
use FS::Conf;
use FS::svc_acct;
@@ -28,24 +29,35 @@ $svcnum = $1;
$svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
die "Unknown svcnum" unless $svc_acct;
-$cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+#false laziness w/all svc_*.cgi
+$cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
$pkgnum = $cust_svc->getfield('pkgnum');
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 } );
die "Unknown svcpart" unless $part_svc;
-$svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-die "Unknown domain" unless $svc_domain;
+if ( $svc_acct->domsvc ) {
+ $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+ die "Unknown domain" unless $svc_domain;
+ $domain = $svc_domain->domain;
+} else {
+ unless ( $mydomain = $conf->config('domain') ) {
+ 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",
@@ -58,63 +70,83 @@ 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"). '