X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_broadband.cgi;h=f552e9bc7733883714ab578bcb3e274f74023aea;hb=5657663a43689787fdc3c5da73775502daecc588;hp=a76e5a3d1150b0961cde4403db6a85e267504d15;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index a76e5a3d1..f552e9bc7 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -1,15 +1,16 @@
<%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" )
- ),
- "Main menu" => $p,
+ )
))
%>
-Edit this information
+<% include('/elements/init_overlib.html') %>
+
+Edit this information
<%ntable("#cccccc")%>
@@ -23,10 +24,14 @@
Description |
<%$description%> |
-
- Router |
- <%$routernum%>: <%$routername%> |
-
+
+% if ( $router ) {
+
+ Router |
+ <%$router->routernum%>: <%$router->routername%> |
+
+% }
+
Download Speed |
<%$speed_down%> |
@@ -35,18 +40,25 @@
Upload Speed |
<%$speed_up%> |
-
- IP Address |
- <%$ip_addr%> |
-
-
- IP Netmask |
- <%$ip_netmask%> |
-
-
- IP Gateway |
- <%$ip_gateway%> |
-
+
+% if ( $ip_addr ) {
+
+ IP Address |
+
+ <%$ip_addr%>
+ (<% include('/elements/popup_link-ping.html', 'ip'=>$ip_addr ) %>)
+ |
+
+
+ IP Netmask |
+ <%$addr_block->NetAddr->mask%> |
+
+
+ IP Gateway |
+ <%$addr_block->ip_gateway%> |
+
+% }
+
MAC Address |
<%$mac_addr%> |
@@ -144,8 +156,7 @@ Add router named
<%init>
die "access denied"
- unless $FS::CurrentUser::CurrentUser->access_right('View customer services')
- || $FS::CurrentUser::CurrentUser->access_right('View customer'); #XXX remove me
+ unless $FS::CurrentUser::CurrentUser->access_right('View customer services');
my($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
@@ -157,16 +168,19 @@ my $svc_broadband = qsearchs({
' LEFT JOIN cust_pkg USING ( pkgnum ) '.
' LEFT JOIN cust_main USING ( custnum ) ',
'hashref' => { 'svcnum' => $svcnum },
- 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql,
+ 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
+ 'null_right' => 'View/link unlinked services'
+ ),
}) or die "svc_broadband: Unknown svcnum $svcnum";
#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 = '';
@@ -174,18 +188,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,
@@ -194,13 +204,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,