option to force one-time charges to be billed separately, #32866

[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 ecec9c4..90d1b66 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',
@@ -14,17 +15,24 @@
         'is_consumer'     => 'Consumer/mass market',
         'is_business'     => 'Business/government',
         'blocknum'        => '',
+        'active_date'     => 'Active since',
+        'file'            => 'Import blocks from text file',
+        'censusyear'      => 'as census year',
     },
     'fields'        => [
         { field         => 'zonetype',
           type          => 'hidden',
           value         => 'B'
         },
-        { field         => 'servicetype',
+        { field         => 'is_broadband',
           type          => 'hidden',
-          value         => 'broadband'
+          value         => 'Y',
         },
         'description',
+        { field         => 'active_date',
+          type          => 'fixed-date',
+          value         => time,
+        },
         { field         => 'agentnum',
           type          => 'select-agent',
           disable_empty => 1,
@@ -33,7 +41,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' },
@@ -48,6 +56,19 @@
         'cir_speed_up',
 
         { type => 'tablebreak-tr-title', value => 'Census blocks'},
+        { field => 'file',
+          type  => 'file-upload',
+        },
+        { field => 'format',
+          type  => 'hidden',
+          value => 'plain',
+        },
+        { field => 'censusyear',
+          type  => 'select',
+          options => [ '', qw( 2013 2012 2011 ) ],
+        },
+
+        { type => 'tablebreak-tr-title', value => '', },
         { field => 'blocknum',
           type              => 'deploy_zone_block',
           o2m_table         => 'deploy_zone_block',
@@ -66,6 +87,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) = @_;
@@ -73,6 +96,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({