show imported region and rate #s, RT#83146

[freeside.git] / httemplate / edit / svc_broadband.cgi

diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index 0d4b989..5a3692e 100644 (file)
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -100,12 +100,40 @@ END
 ;
 
 my @fields = (
-  qw( description speed_down speed_up ),
-  { field=>'sectornum', type=>'select-tower_sector', },
-  { field=>'routernum', type=>'select-router_block_ip' },
+  qw( description speed_down speed_up speed_test_down speed_test_up speed_test_latency),
+  { field=>'sectornum', type=>'select-tower_sector',
+    include_opt_callback => sub {
+      my $svc_broadband = shift;
+      my $part_svc = $svc_broadband->part_svc;
+      my $sectors_only;
+      foreach ($part_svc->part_export()) {
+        $sectors_only = '1' if $_->can('require_tower_and_sector');
+      }
+      ## incase export requires a sector and service only has tower attached it will not show on edit.
+      my $non_option_label;
+      my $sector = qsearchs({'table' => 'tower_sector', 'hashref' => { 'sectornum' => $svc_broadband->sectornum }, });
+      $non_option_label = $sector->description if $sector;
+      return ('sectorsonly' => $sectors_only, 'non_option_label' => $non_option_label);
+    },
+  },
+  { field=>'routernum', type=>'select-router_block_ip', 
+    include_opt_callback => sub { 
+      my $svc_broadband = shift;
+      my $part_svc = $svc_broadband->part_svc;
+      return () unless $part_svc; #sanity check
+      my $col = $part_svc->part_svc_column('ip_addr');
+      return () unless $col; #sanity check
+      $col->set('required', 'Y') unless $conf->exists('svc_broadband-allow_null_ip_addr');
+      return ('ip_addr_required' => $col->required);
+    },
+  },
   { field=>'mac_addr' , type=>'input-mac_addr' },
-    qw( latitude longitude altitude vlan_profile 
-    performance_profile authkey plan_id )
+  qw(
+      latitude longitude altitude
+      radio_serialnum radio_location poe_location rssi suid
+    ),
+  { field=>'shared_svcnum', type=>'search-svc_broadband', },
+  qw( vlan_profile performance_profile authkey plan_id ),
 );
 
 if ( $conf->exists('svc_broadband-radius') ) {
@@ -166,7 +194,6 @@ my $svc_field_callback = sub {
 
   my $columndef = $part_svc->part_svc_column($fieldref->{'field'});
   if ($fieldref->{field} eq 'usergroup' && $columndef->columnflag eq 'F') {
-    
     $fieldref->{'formatted_value'} = 
       [ $object->radius_groups('long_description') ];
   }