X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_broadband.cgi;h=a1580ce0143b9226c7fa7fe208abe79925635eb0;hb=2a6aa24137ddd389c1e644f5ece325c5b5dbaf3a;hp=d66cff690766591431ff37729bbf7b3e15c234ec;hpb=947c955be56140c4a10b16345c1b15c44b02070a;p=freeside.git

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index d66cff690..a1580ce01 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -1,164 +1,247 @@
-<!-- mason kludge -->
-<%
-
-# If it's stupid but it works, it's still stupid.
-#  -Kristian
-
-
-use HTML::Widgets::SelectLayers;
-use Tie::IxHash;
-
-my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_broadband );
-if ( $cgi->param('error') ) {
-  $svc_broadband = new FS::svc_broadband ( {
-    map { $_, scalar($cgi->param($_)) } fields('svc_broadband'), qw(svcpart)
-  } );
-  $svcnum = $svc_broadband->svcnum;
-  $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $svc_broadband->svcpart;
-  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-  die "No part_svc entry!" unless $part_svc;
-} else {
-  my($query) = $cgi->keywords;
-  if ( $query =~ /^(\d+)$/ ) { #editing
-    $svcnum=$1;
-    $svc_broadband=qsearchs('svc_broadband',{'svcnum'=>$svcnum})
-      or die "Unknown (svc_broadband) svcnum!";
-
-    my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
-      or die "Unknown (cust_svc) svcnum!";
-
-    $pkgnum=$cust_svc->pkgnum;
-    $svcpart=$cust_svc->svcpart;
-  
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-  } else { #adding
-
-    foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
-      $pkgnum=$1 if /^pkgnum(\d+)$/;
-      $svcpart=$1 if /^svcpart(\d+)$/;
-    }
-    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-    die "No part_svc entry!" unless $part_svc;
-
-    $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart });
+%# If it's stupid but it works, it's still stupid.
+%#  -Kristian
+%
+%use HTML::Widgets::SelectLayers;
+%use Tie::IxHash;
+%
+%my( $svcnum,  $pkgnum, $svcpart, $part_svc, $svc_broadband );
+%if ( $cgi->param('error') ) {
+%
+%  $svc_broadband = new FS::svc_broadband ( {
+%    map { $_, scalar($cgi->param($_)) } fields('svc_broadband'), qw(svcpart)
+%  } );
+%  $svcnum = $svc_broadband->svcnum;
+%  $pkgnum = $cgi->param('pkgnum');
+%  $svcpart = $svc_broadband->svcpart;
+%  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+%  die "No part_svc entry!" unless $part_svc;
+%
+%} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
+%
+%  $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
+%  $pkgnum = $1;
+%  $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
+%  $svcpart = $1;
+%
+%  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+%  die "No part_svc entry!" unless $part_svc;
+%
+%  $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart });
+%
+%  $svcnum='';
+%
+%  $svc_broadband->set_default_and_fixed;
+%
+%} else { #editing
+%
+%  my($query) = $cgi->keywords;
+%  $query =~ /^(\d+)$/ or die "unparsable svcnum";
+%  $svcnum=$1;
+%  $svc_broadband=qsearchs('svc_broadband',{'svcnum'=>$svcnum})
+%    or die "Unknown (svc_broadband) svcnum!";
+%
+%  my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
+%    or die "Unknown (cust_svc) svcnum!";
+%
+%  $pkgnum=$cust_svc->pkgnum;
+%  $svcpart=$cust_svc->svcpart;
+%  
+%  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+%  die "No part_svc entry!" unless $part_svc;
+%
+%}
+%my $action = $svc_broadband->svcnum ? 'Edit' : 'Add';
+%
+%if ($pkgnum) {
+%
+%  #Nothing?
+%
+%} elsif ( $action eq 'Edit' ) {
+%
+%  #Nothing?
+%
+%} else {
+%  die "\$action eq Add, but \$pkgnum is null!\n";
+%}
+%
+%my $p1 = popurl(1);
+%
+%my ($ip_addr, $speed_up, $speed_down, $blocknum, $mac_addr,
+%    $latitude, $longitude, $altitude, $vlan_profile, $auth_key,
+%    $description) =
+%    ($svc_broadband->ip_addr,
+%     $svc_broadband->speed_up,
+%     $svc_broadband->speed_down,
+%     $svc_broadband->blocknum,
+%     $svc_broadband->mac_addr,
+%     $svc_broadband->latitude,
+%     $svc_broadband->longitude,
+%     $svc_broadband->altitude,
+%     $svc_broadband->vlan_profile,
+%     $svc_broadband->auth_key,
+%     $svc_broadband->description,
+%    );
+%
+%
+
+
+<% include("/elements/header.html","Broadband Service $action", '') %>
+
+<% include('/elements/error.html') %>
+
+Service #<B><%$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
+
+<FORM ACTION="<%${p1}%>process/svc_broadband.cgi" METHOD=POST>
+  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%$svcnum%>">
+  <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%$pkgnum%>">
+  <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%$svcpart%>">
+
+  <%&ntable("#cccccc",2)%>
+    <TR>
+      <TD ALIGN="right">Description</TD>
+      <TD BGCOLOR="#ffffff">
+% if ( $part_svc->part_svc_column('description')->columnflag eq 'F' ) { 
 
-    $svcnum='';
+        <INPUT TYPE="hidden" NAME="description" VALUE="<%$description%>"><%$description%>
+% } else { 
 
-    $svc_broadband->set_default_and_fixed;
+    <INPUT TYPE="text" NAME="description" VALUE="<%$description%>">
+% } 
 
-  }
-}
-my $action = $svc_broadband->svcnum ? 'Edit' : 'Add';
+      </TD>
+    </TR>
+    <TR>
+      <TD ALIGN="right">IP Address</TD>
+      <TD BGCOLOR="#ffffff">
+% if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) { 
 
-if ($pkgnum) {
+        <INPUT TYPE="hidden" NAME="ip_addr" VALUE="<%$ip_addr%>"><%$ip_addr%>
+% } else { 
 
-  #Nothing?
+        <INPUT TYPE="text" NAME="ip_addr" VALUE="<%$ip_addr%>">
+% } 
 
-} elsif ( $action eq 'Edit' ) {
+      </TD>
+    </TR>
+    <TR>
+      <TD ALIGN="right">Download speed</TD>
+      <TD BGCOLOR="#ffffff">
+% if ( $part_svc->part_svc_column('speed_down')->columnflag eq 'F' ) { 
 
-  #Nothing?
+        <INPUT TYPE="hidden" NAME="speed_down" VALUE="<%$speed_down%>"><%$speed_down%>Kbps
+% } else { 
 
-} else {
-  die "\$action eq Add, but \$pkgnum is null!\n";
-}
+    <INPUT TYPE="text" NAME="speed_down" SIZE=5 VALUE="<%$speed_down%>">Kbps
+% } 
 
-my $p1 = popurl(1);
+      </TD>
+    </TR>
+    <TR>
+      <TD ALIGN="right">Upload speed</TD>
+      <TD BGCOLOR="#ffffff">
+% if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) { 
 
-my ($ip_addr, $speed_up, $speed_down, $blocknum) =
-    ($svc_broadband->ip_addr,
-     $svc_broadband->speed_up,
-     $svc_broadband->speed_down,
-     $svc_broadband->blocknum);
+        <INPUT TYPE="hidden" NAME="speed_up" VALUE="<%$speed_up%>"><%$speed_up%>Kbps
+% } else { 
 
-%>
+        <INPUT TYPE="text" NAME="speed_up" SIZE=5 VALUE="<%$speed_up%>">Kbps
+% } 
 
-<%=include("/elements/header.html","Broadband Service $action", '')%>
+      </TD>
+    </TR>
+% if ($action eq 'Add') { 
 
-<% if ($cgi->param('error')) { %>
-<FONT SIZE="+1" COLOR="#ff0000">Error: <%=$cgi->param('error')%></FONT><BR>
-<% } %>
+    <TR>
+      <TD ALIGN="right">Router/Block</TD>
+      <TD BGCOLOR="#ffffff">
+        <SELECT NAME="blocknum">
+%
+%  warn $svc_broadband->svcpart;
+%  foreach my $router ($svc_broadband->allowed_routers) {
+%    warn $router->routername;
+%    foreach my $addr_block ($router->addr_block) {
+%
+
+        <OPTION VALUE="<%$addr_block->blocknum%>"<%($addr_block->blocknum eq $blocknum) ? ' SELECTED' : ''%>>
+          <%$router->routername%>:<%$addr_block->ip_gateway%>/<%$addr_block->ip_netmask%></OPTION>
+%
+%    }
+%  }
+%
 
-Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
+        </SELECT>
+      </TD>
+    </TR>
+% } else { 
 
-<FORM ACTION="<%=${p1}%>process/svc_broadband.cgi" METHOD=POST>
-  <INPUT TYPE="hidden" NAME="svcnum" VALUE="<%=$svcnum%>">
-  <INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%=$pkgnum%>">
-  <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%=$svcpart%>">
 
-  <%=&ntable("#cccccc",2)%>
     <TR>
-      <TD ALIGN="right">IP Address</TD>
+      <TD ALIGN="right">Router/Block</TD>
       <TD BGCOLOR="#ffffff">
-<% if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) { %>
-        <INPUT TYPE="hidden" NAME="ip_addr" VALUE="<%=$ip_addr%>"><%=$ip_addr%>
-<% } else { %>
-        <INPUT TYPE="text" NAME="ip_addr" VALUE="<%=$ip_addr%>">
-<% } %>
+        <%$svc_broadband->addr_block->router->routername%>:<%$svc_broadband->addr_block->NetAddr%>
+        <INPUT TYPE="hidden" NAME="blocknum" VALUE="<%$svc_broadband->blocknum%>">
       </TD>
     </TR>
+% } 
     <TR>
-      <TD ALIGN="right">Download speed</TD>
+      <TD ALIGN="right">MAC Address</TD>
       <TD BGCOLOR="#ffffff">
-<% if ( $part_svc->part_svc_column('speed_down')->columnflag eq 'F' ) { %>
-        <INPUT TYPE="hidden" NAME="speed_down" VALUE="<%=$speed_down%>"><%=$speed_down%>Kbps
-<% } else { %>
-    <INPUT TYPE="text" NAME="speed_down" SIZE=5 VALUE="<%=$speed_down%>">Kbps
-<% } %>
+        <INPUT TYPE="text" NAME="mac_addr" VALUE="<%$mac_addr%>">
       </TD>
     </TR>
     <TR>
-      <TD ALIGN="right">Upload speed</TD>
+      <TD ALIGN="right">Latitude</TD>
       <TD BGCOLOR="#ffffff">
-<% if ( $part_svc->part_svc_column('speed_up')->columnflag eq 'F' ) { %>
-        <INPUT TYPE="hidden" NAME="speed_up" VALUE="<%=$speed_up%>"><%=$speed_up%>Kbps
-<% } else { %>
-        <INPUT TYPE="text" NAME="speed_up" SIZE=5 VALUE="<%=$speed_up%>">Kbps
-<% } %>
+        <INPUT TYPE="text" NAME="latitude" VALUE="<%$latitude%>">
       </TD>
     </TR>
-<% if ($action eq 'Add') { %>
     <TR>
-      <TD ALIGN="right">Router/Block</TD>
+      <TD ALIGN="right">Longitude</TD>
       <TD BGCOLOR="#ffffff">
-        <SELECT NAME="blocknum">
-<%
-  warn $svc_broadband->svcpart;
-  foreach my $router ($svc_broadband->allowed_routers) {
-    warn $router->routername;
-    foreach my $addr_block ($router->addr_block) {
-%>
-        <OPTION VALUE="<%=$addr_block->blocknum%>"<%=($addr_block->blocknum eq $blocknum) ? ' SELECTED' : ''%>>
-          <%=$router->routername%>:<%=$addr_block->ip_gateway%>/<%=$addr_block->ip_netmask%></OPTION>
-<%
-    }
-  }
-%>
-        </SELECT>
+        <INPUT TYPE="text" NAME="longitude" VALUE="<%$longitude%>">
       </TD>
     </TR>
-<% } else { %>
-
     <TR>
-      <TD ALIGN="right">Router/Block</TD>
+      <TD ALIGN="right">Altitude</TD>
       <TD BGCOLOR="#ffffff">
-        <%=$svc_broadband->addr_block->router->routername%>:<%=$svc_broadband->addr_block->NetAddr%>
-        <INPUT TYPE="hidden" NAME="blocknum" VALUE="<%=$svc_broadband->blocknum%>">
+        <INPUT TYPE="text" NAME="altitude" VALUE="<%$altitude%>">
+      </TD>
+    </TR>
+    <TR>
+      <TD ALIGN="right">VLAN Profile</TD>
+      <TD BGCOLOR="#ffffff">
+% if ( $part_svc->part_svc_column('vlan_profile')->columnflag eq 'F' ) { 
+
+        <INPUT TYPE="hidden" NAME="vlan_profile" VALUE="<%$vlan_profile%>"><%$vlan_profile%>
+% } else { 
+
+        <INPUT TYPE="text" NAME="vlan_profile" VALUE="<%$vlan_profile%>">
+% } 
+
       </TD>
     </TR>
+    <TR>
+      <TD ALIGN="right">Authentication Key</TD>
+      <TD BGCOLOR="#ffffff">
+% if ( $part_svc->part_svc_column('auth_key')->columnflag eq 'F' ) { 
+
+        <INPUT TYPE="hidden" NAME="auth_key" VALUE="<%$auth_key%>"><%$auth_key%>
+% } else { 
 
-<% } %>
+        <INPUT TYPE="text" NAME="auth_key" VALUE="<%$auth_key%>">
+% } 
+
+      </TD>
+    </TR>
+%
+%foreach my $field ($svc_broadband->virtual_fields) {
+%  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' &&
+%       $part_svc->part_svc_column($field)->columnflag ne 'X') {
+%    print $svc_broadband->pvf($field)->widget('HTML', 'edit',
+%        $svc_broadband->getfield($field));
+%  }
+%} 
 
-<%
-foreach my $field ($svc_broadband->virtual_fields) {
-  if ( $part_svc->part_svc_column($field)->columnflag ne 'F' &&
-       $part_svc->part_svc_column($field)->columnflag ne 'X') {
-    print $svc_broadband->pvf($field)->widget('HTML', 'edit',
-        $svc_broadband->getfield($field));
-  }
-} %>
   </TABLE>
   <BR>
   <INPUT TYPE="submit" NAME="submit" VALUE="Submit">