X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_broadband.cgi;h=0e9656b1547aa63e129dfa8c92f5d4eb341fb38a;hb=7e4c4494f0ca232a482fe94f78083fc250e2bd4b;hp=e614fe4183536d1b0db4c3d6eccb9b807ba1a2b0;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index e614fe418..0e9656b15 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -1,6 +1,6 @@
<%include("/elements/header.html",'Broadband Service View', menubar(
( ( $custnum )
- ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+ ? ( "View this customer (#$display_custnum)" => "${p}view/cust_main.cgi?$custnum",
)
: ( "Cancel this (unaudited) website" =>
"${p}misc/cancel-unaudited.cgi?$svcnum" )
@@ -22,10 +22,14 @@
Description |
<%$description%> |
-
- Router |
- <%$routernum%>: <%$routername%> |
-
+
+% if ( $router ) {
+
+ Router |
+ <%$router->routernum%>: <%$router->routername%> |
+
+% }
+
Download Speed |
<%$speed_down%> |
@@ -34,18 +38,22 @@
Upload Speed |
<%$speed_up%> |
-
- IP Address |
- <%$ip_addr%> |
-
-
- IP Netmask |
- <%$ip_netmask%> |
-
-
- IP Gateway |
- <%$ip_gateway%> |
-
+
+% if ( $ip_addr ) {
+
+ IP Address |
+ <%$ip_addr%> |
+
+
+ IP Netmask |
+ <%$addr_block->NetAddr->mask%> |
+
+
+ IP Gateway |
+ <%$addr_block->ip_gateway%> |
+
+% }
+
MAC Address |
<%$mac_addr%> |
@@ -161,10 +169,11 @@ my $svc_broadband = qsearchs({
#false laziness w/all svc_*.cgi
my $cust_svc = qsearchs( 'cust_svc', { 'svcnum' => $svcnum } );
my $pkgnum = $cust_svc->getfield('pkgnum');
-my($cust_pkg, $custnum);
+my($cust_pkg, $custnum, $display_custnum);
if ($pkgnum) {
$cust_pkg = qsearchs( 'cust_pkg', { 'pkgnum' => $pkgnum } );
$custnum = $cust_pkg->custnum;
+ $display_custnum = $cust_pkg->cust_main->display_custnum;
} else {
$cust_pkg = '';
$custnum = '';
@@ -172,18 +181,14 @@ if ($pkgnum) {
#eofalse
my $addr_block = $svc_broadband->addr_block;
-my $router = $addr_block->router;
+my $router = $addr_block->router if $addr_block;
-if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
+#if (not $router) { die "Could not lookup router for svc_broadband (svcnum $svcnum)" };
my (
- $routername,
- $routernum,
$speed_down,
$speed_up,
$ip_addr,
- $ip_gateway,
- $ip_netmask,
$mac_addr,
$latitude,
$longitude,
@@ -192,13 +197,9 @@ my (
$auth_key,
$description,
) = (
- $router->getfield('routername'),
- $router->getfield('routernum'),
$svc_broadband->getfield('speed_down'),
$svc_broadband->getfield('speed_up'),
$svc_broadband->getfield('ip_addr'),
- $addr_block->ip_gateway,
- $addr_block->NetAddr->mask,
$svc_broadband->mac_addr,
$svc_broadband->latitude,
$svc_broadband->longitude,