Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / httemplate / edit / deploy_zone-fixed.html

diff --git a/httemplate/edit/deploy_zone-fixed.html b/httemplate/edit/deploy_zone-fixed.html
index 8c6d54e..fb26c49 100644 (file)
--- a/httemplate/edit/deploy_zone-fixed.html
+++ b/httemplate/edit/deploy_zone-fixed.html
@@ -2,6 +2,7 @@
     'name_singular' => 'deployment zone',
     'table'         => 'deploy_zone',
     'post_url'      => popurl(1).'process/deploy_zone-fixed.html',
+    'viewall_dir'   => 'browse',
     'labels'        => {
         'description'     => 'Description',
         'agentnum'        => 'Agent',
@@ -21,9 +22,9 @@
           type          => 'hidden',
           value         => 'B'
         },
-        { field         => 'servicetype',
+        { field         => 'is_broadband',
           type          => 'hidden',
-          value         => 'broadband'
+          value         => 'Y',
         },
         'description',
         { field         => 'active_date',
@@ -38,7 +39,7 @@
         'dbaname',
         { field         => 'technology',
           type          => 'select',
-          options       => [ keys(%$technology_labels) ],
+          options       => [ map { @$_ } values(%$media_types) ],
           labels        => $technology_labels,
         },
         { field         => 'is_consumer', type => 'checkbox', value=>'Y' },
@@ -71,6 +72,8 @@ die "access denied"
   ]);
 
 my $technology_labels = FS::part_pkg_fcc_option->technology_labels;
+my $media_types = FS::part_pkg_fcc_option->media_types;
+delete $media_types->{'Mobile Wireless'}; # cause this is the fixed zone page
 
 my $m2_error_callback = sub {
   my ($cgi, $deploy_zone) = @_;
@@ -78,6 +81,7 @@ my $m2_error_callback = sub {
     /^blocknum\d+/ and length($cgi->param($_.'_censusblock'))
   } $cgi->param;
 
+  sort { $a->censusblock <=> $b->censusblock }
   map {
     my $k = $_;
     FS::deploy_zone_block->new({