X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_broadband.cgi;h=2a5a6509ae26786339426377f76365f01928cd6b;hb=22c7daa1fd079e3ec9dee4da241f83e174132e4e;hp=16116f52dd4f05ce100e29c899164d7625c0e95e;hpb=4a54e68baa0fe7c4171d57c3eb0e1579aa21ae77;p=freeside.git

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index 16116f52d..2a5a6509a 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -1,15 +1,12 @@
-<!-- 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)
 %  } );
@@ -18,38 +15,40 @@
 %  $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!";
+%} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
 %
-%    $pkgnum=$cust_svc->pkgnum;
-%    $svcpart=$cust_svc->svcpart;
-%  
-%    $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
-%    die "No part_svc entry!" unless $part_svc;
+%  $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
+%  $pkgnum = $1;
+%  $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
+%  $svcpart = $1;
 %
-%  } else { #adding
+%  $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
+%  die "No part_svc entry!" unless $part_svc;
 %
-%    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 });
 %
-%    $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart });
+%  $svcnum='';
 %
-%    $svcnum='';
+%  $svc_broadband->set_default_and_fixed;
 %
-%    $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';
 %
@@ -68,7 +67,8 @@
 %my $p1 = popurl(1);
 %
 %my ($ip_addr, $speed_up, $speed_down, $blocknum, $mac_addr,
-%    $latitude, $longitude, $altitude, $vlan_profile, $auth_key) =
+%    $latitude, $longitude, $altitude, $vlan_profile, $auth_key,
+%    $description) =
 %    ($svc_broadband->ip_addr,
 %     $svc_broadband->speed_up,
 %     $svc_broadband->speed_down,
@@ -79,6 +79,7 @@
 %     $svc_broadband->altitude,
 %     $svc_broadband->vlan_profile,
 %     $svc_broadband->auth_key,
+%     $svc_broadband->description,
 %    );
 %
 %
@@ -100,6 +101,19 @@ Service #<B><%$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
 
   <%&ntable("#cccccc",2)%>
     <TR>
+      <TD ALIGN="right">Description</TD>
+      <TD BGCOLOR="#ffffff">
+% if ( $part_svc->part_svc_column('description')->columnflag eq 'F' ) { 
+
+        <INPUT TYPE="hidden" NAME="description" VALUE="<%$description%>"><%$description%>
+% } else { 
+
+    <INPUT TYPE="text" NAME="description" VALUE="<%$description%>">
+% } 
+
+      </TD>
+    </TR>
+    <TR>
       <TD ALIGN="right">IP Address</TD>
       <TD BGCOLOR="#ffffff">
 % if ( $part_svc->part_svc_column('ip_addr')->columnflag eq 'F' ) {