X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_broadband.cgi;h=9e064c5c8b0aaa08763b771f02ae5dcceddec8d0;hp=ee7f8becf011ce61585876cf800b700cb341d442;hb=557b6397be9c5a92985b0cbac849e9dd72c54b43;hpb=c4a7388a676878b64a3d3b2b2e0a4004e4daf669

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index ee7f8becf..9e064c5c8 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -11,11 +11,11 @@ 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')
+    map { $_, scalar($cgi->param($_)) } fields('svc_broadband'), qw(svcpart)
   } );
   $svcnum = $svc_broadband->svcnum;
   $pkgnum = $cgi->param('pkgnum');
-  $svcpart = $cgi->param('svcpart');
+  $svcpart = $svc_broadband->svcpart;
   $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
   die "No part_svc entry!" unless $part_svc;
 } else {
@@ -36,8 +36,6 @@ if ( $cgi->param('error') ) {
 
   } else { #adding
 
-    $svc_broadband = new FS::svc_broadband({});
-
     foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
       $pkgnum=$1 if /^pkgnum(\d+)$/;
       $svcpart=$1 if /^svcpart(\d+)$/;
@@ -45,7 +43,7 @@ if ( $cgi->param('error') ) {
     $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
     die "No part_svc entry!" unless $part_svc;
 
-    $svc_broadband->setfield('svcpart', $svcpart);
+    $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart });
 
     $svcnum='';
 
@@ -134,7 +132,9 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
       <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' : ''%>>
@@ -159,30 +159,13 @@ Service #<B><%=$svcnum ? $svcnum : "(NEW)"%></B><BR><BR>
 <% } %>
 
 <%
-
-  my @part_sb_field = qsearch('part_sb_field', { svcpart => $svcpart });
-  my $sbf_hashref = $svc_broadband->sb_field_hashref($svcpart);
-  foreach (sort { $a->name cmp $b->name } @part_sb_field) {
-    %>
-    <TR>
-      <TD ALIGN="right"><%=$_->name%></TD>
-      <TD><%
-      if(my @opts = $_->list_values) {
-        %>
-	<SELECT NAME="sbf_<%=$_->sbfieldpart%>" SIZE=1> <%
-        foreach $opt (@opts) { %>
-          <OPTION VALUE="<%=$opt%>"<%=
-	    ($opt eq $sbf_hashref->{$_->name}) ? ' SELECTED' : ''%>>
-	    <%=$opt%></OPTION><%
-        } %></SELECT>
-   <% } else { %>
-        <INPUT NAME="sbf_<%=$_->sbfieldpart%>"
-	    VALUE="<%=$sbf_hashref->{$_->name}%>"
-     <%=$_->length ? 'SIZE="'.$_->length.'"' : ''%>>
-   <% } %>
-      </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));
+  }
+} %>
   </TABLE>
   <BR>
   <INPUT TYPE="submit" NAME="submit" VALUE="Submit">