diff options
Diffstat (limited to 'htdocs/view')
-rwxr-xr-x | htdocs/view/cust_main.cgi | 15 | ||||
-rwxr-xr-x | htdocs/view/svc_acct_sm.cgi | 23 |
2 files changed, 22 insertions, 16 deletions
diff --git a/htdocs/view/cust_main.cgi b/htdocs/view/cust_main.cgi index 2119b3e0c..7d51e288a 100755 --- a/htdocs/view/cust_main.cgi +++ b/htdocs/view/cust_main.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: cust_main.cgi,v 1.11 1999-01-25 12:26:04 ivan Exp $ +# $Id: cust_main.cgi,v 1.12 1999-02-07 09:59:40 ivan Exp $ # # Usage: cust_main.cgi custnum # http://server.name/path/cust_main.cgi?custnum @@ -33,7 +33,10 @@ # lose background, FS::CGI ivan@sisd.com 98-sep-2 # # $Log: cust_main.cgi,v $ -# Revision 1.11 1999-01-25 12:26:04 ivan +# Revision 1.12 1999-02-07 09:59:40 ivan +# more mod_perl fixes, and bugfixes Peter Wemm sent via email +# +# Revision 1.11 1999/01/25 12:26:04 ivan # yet more mod_perl stuff # # Revision 1.10 1999/01/19 05:14:19 ivan @@ -182,7 +185,7 @@ print "Billing information (", ( grep { $_ eq 'POST' } @invoicing_list ) ? 'yes' : 'no', '</TD></TR>', '<TR><TD ALIGN="right">Email invoices</TD><TD BGCOLOR="#ffffff">', - join(', ', grep { $_ ne 'POST' } @invoicing_list ), + join(', ', grep { $_ ne 'POST' } @invoicing_list ) || 'no', '</TD></TR>', '<TR><TD ALIGN="right">Billing type</TD><TD BGCOLOR="#ffffff">', ; @@ -219,7 +222,7 @@ print "</TABLE></TD></TR></TABLE></TD></TR></TABLE>"; print qq!<BR><BR><A NAME="cust_pkg">Packages</A> !, # qq!<BR>Click on package number to view/edit package.!, - qq!( <A HREF="!, popurl(2), qq!/edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> )!, + qq!( <A HREF="!, popurl(2), qq!edit/cust_pkg.cgi?$custnum">Order and cancel packages</A> )!, ; #display packages @@ -239,7 +242,7 @@ print qq!!, table, "\n", @packages = $cust_main->all_pkgs; #@packages = $cust_main->ncancelled_pkgs; -$n1 = ''; +$n1 = '<TR>'; foreach $package (@packages) { my $pkgnum = $package->pkgnum; my $pkg = $package->part_pkg->pkg; @@ -258,7 +261,7 @@ foreach $package (@packages) { qq!<TD ROWSPAN=$rowspan><FONT SIZE=-1>!, #qq!<A HREF="$pkgview">$pkg - $comment</A>!, qq!$pkg - $comment!, - qq! ( <A HREF="$pkgview">Edit</A> | <A HREF="$button_url">Customize pricing</A>)</FONT></TD>!, + qq! ( <A HREF="$pkgview">Edit</A> | <A HREF="$button_url">Customize pricing</A> )</FONT></TD>!, ; for ( qw( setup bill susp expire cancel ) ) { print "<TD ROWSPAN=$rowspan><FONT SIZE=-1>", ( $package->getfield($_) diff --git a/htdocs/view/svc_acct_sm.cgi b/htdocs/view/svc_acct_sm.cgi index 80bd48967..24c78ad18 100755 --- a/htdocs/view/svc_acct_sm.cgi +++ b/htdocs/view/svc_acct_sm.cgi @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw # -# $Id: svc_acct_sm.cgi,v 1.6 1999-01-19 05:14:22 ivan Exp $ +# $Id: svc_acct_sm.cgi,v 1.7 1999-02-07 09:59:42 ivan Exp $ # # Usage: svc_acct_sm.cgi svcnum # http://server.name/path/svc_acct_sm.cgi?svcnum @@ -22,7 +22,10 @@ # /var/spool/freeside/conf/domain ivan@sisd.com 98-jul-17 # # $Log: svc_acct_sm.cgi,v $ -# Revision 1.6 1999-01-19 05:14:22 ivan +# Revision 1.7 1999-02-07 09:59:42 ivan +# more mod_perl fixes, and bugfixes Peter Wemm sent via email +# +# Revision 1.6 1999/01/19 05:14:22 ivan # for mod_perl: no more top-level my() variables; use vars instead # also the last s/create/new/; # @@ -42,7 +45,7 @@ use strict; use vars qw($conf $cgi $mydomain $query $svcnum $svc_acct_sm $cust_svc - $pkgnum cust_pkg $custnum $part_svc $p $domsvc,$domuid,$domuser + $pkgnum $cust_pkg $custnum $part_svc $p $domsvc $domuid $domuser $svc $svc_domain $domain $svc_acct $username ); use CGI; use FS::UID qw(cgisuidsetup); @@ -68,6 +71,9 @@ $pkgnum = $cust_svc->getfield('pkgnum'); if ($pkgnum) { $cust_pkg=qsearchs('cust_pkg',{'pkgnum'=>$pkgnum}); $custnum=$cust_pkg->getfield('custnum'); +} else { + $cust_pkg = ''; + $custnum = ''; } $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } ); @@ -88,10 +94,9 @@ END } print <<END; - <A HREF="${p}">Main menu</A></CENTER><BR< - <FONT SIZE=+1>Service #$svcnum</FONT> + <A HREF="${p}">Main menu</A></CENTER><BR> + Service #$svcnum <P><A HREF="${p}edit/svc_acct_sm.cgi?$svcnum">Edit this information</A> - <BASEFONT SIZE=3> END ($domsvc,$domuid,$domuser) = ( @@ -106,17 +111,15 @@ $svc_acct = qsearchs('svc_acct',{'uid'=>$domuid}); $username = $svc_acct->username; #formatting -print qq!<HR>!; +print qq!<BR><BR>!; #svc print "Service: <B>$svc</B>"; -print "<HR>"; +print "<BR><BR>"; print qq!Mail to <B>!, ( ($domuser eq '*') ? "<I>(anything)</I>" : $domuser ) , qq!</B>\@<B>$domain</B> forwards to <B>$username</B>\@$mydomain mailbox.!; -print "<HR>"; - #formatting print <<END; |