X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=f40d4a9e3908cb3819151341099dff6fbe931bc3;hb=9d96031e79187a549c2c150e96363d421e59efc5;hp=e6651964dd5263583a1848f6bd3847fe7bc87cf4;hpb=88d3c33682585244571ee7622949c3e9213284bf;p=freeside.git

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index e6651964d..f40d4a9e3 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -43,11 +43,13 @@
                             'plan'             => 'Price plan',
                             'disabled'         => 'Disable new orders',
                             'disable_line_item_date_ranges' => 'Disable line item date ranges',
+                            'start_on_hold'    => 'Start on hold',
                             'setup_cost'       => 'Setup cost',
                             'recur_cost'       => 'Recur cost',
                             'pay_weight'       => 'Payment weight',
                             'credit_weight'    => 'Credit weight',
-                            'agentnum'         => 'Agent',
+                            'agent_pkgpartid'  => 'External ID',
+			    'agentnum'         => 'Agent',
                             'setup_fee'        => 'Setup fee',
                             'setup_show_zero'  => 'Show zero setup',
                             'recur_fee'        => 'Recurring fee',
@@ -101,6 +103,10 @@
                               ),
                               {field=>'disabled', type=>$disabled_type, value=>'Y'},
                               {field=>'disable_line_item_date_ranges', type=>$disabled_type, value=>'Y'},
+                              { field => 'start_on_hold',
+                                type => 'checkbox',
+                                value => 'Y'
+                              },
 
                               { type     => 'tablebreak-tr-title',
                                 value    => 'Pricing', #better name?
@@ -176,8 +182,15 @@
                               { type  => 'tablebreak-tr-title',
                                 value => 'Cost tracking', #better name?
                               },
-                              { field=>'setup_cost', type=>'money', },
-                              { field=>'recur_cost', type=>'money', },
+
+                              ( $curuser->access_right('Edit package definition costs')
+                                ? ( { field=>'setup_cost', type=>'money', },
+                                    { field=>'recur_cost', type=>'money', },
+                                  )
+                                : ( { field=>'setup_cost', type=>'fixed', },
+                                    { field=>'recur_cost', type=>'fixed', },
+                                  )
+                              ),
 
                               ( $conf->exists('part_pkg-delay_start')
                                 ? ( { type  => 'tablebreak-tr-title',
@@ -201,25 +214,36 @@
                                 },
                               },
 
-                              { type  => 'tablebreak-tr-title',
-                                value => 'Line-item revenue recogition', #better name?
-                              },
-                              { field=>'pay_weight',    type=>'text', size=>6 },
-                              { field=>'credit_weight', type=>'text', size=>6 },
-
-                              ( $conf->exists('cust_pkg-show_fcc_voice_grade_equivalent')
-                                ? ( 
-                                    { type  => 'tablebreak-tr-title',
-                                      value => 'FCC Form 477 information',
-                                    },
-                                    { field=>'fcc_voip_class',
-                                      type=>'select-voip_class',
-                                    },
-                                    { field=>'fcc_ds0s', type=>'text', size=>6 },
-                                  )
-                                 : ()
-                              ),
-
+                      { type  => 'tablebreak-tr-title',
+                        value => 'External Links', #better name?
+                      },
+                      { field=>'agent_pkgpartid', type=>'text', size=>21 },
+
+                      { type  => 'tablebreak-tr-title',
+                        value => 'Line-item revenue recogition', #better name?
+                      },
+                      { field=>'pay_weight',    type=>'text', size=>6 },
+                      { field=>'credit_weight', type=>'text', size=>6 },
+                    ($fcc_opts ? ( 
+                      { type  => 'tablebreak-tr-title',
+                        value => 'FCC Form 477 information',
+                      },
+                      { field => 'fcc_options_string',
+                        type  => 'input-fcc_options',
+                        curr_value_callback => sub {
+                          my ($cgi, $part_pkg, $fref) = @_;
+                          if ( $cgi->param('fcc_options_string') ) {
+                            # error redirect
+                            return $cgi->param('fcc_options_string');
+                          }
+                          my %hash;
+                          %hash = $part_pkg->fcc_options 
+                            if ($part_pkg->pkgpart);
+                          return encode_json(\%hash);
+                        },
+                      },
+                      ) : ()
+                    ),
                             { type => 'columnend' },
 
                             { 'type'  => $report_option ? 'tablebreak-tr-title'
@@ -262,6 +286,7 @@
                                                      ? "AND pkgpart != $pkgpart"
                                                      : ''
                                                   },
++                             'label_callback' => sub { shift->pkg_comment_only },
                               'm2_label'   => 'Include line item(s) from package',
                               'm2m_method' => 'bill_part_pkg_link',
                               'm2m_dstcol' => 'dst_pkgpart',
@@ -288,6 +313,7 @@
                                                      ? "AND pkgpart != $pkgpart"
                                                      : ''
                                                   },
++                             'label_callback' => sub { shift->pkg_comment_only },
                               'm2_label'   => 'Include services of package: ',
                               'm2m_method' => 'svc_part_pkg_link',
                               'm2m_dstcol' => 'dst_pkgpart',
@@ -304,6 +330,7 @@
                             },
                             { 'field'       => 'supp_dst_pkgpart',
                               'type'        => 'select-part_pkg',
++                             'label_callback' => sub { shift->pkg_comment_only },
                               'm2_label'    => 'When ordering package, also order',
                               'm2m_method'  => 'supp_part_pkg_link',
                               'm2m_dstcol'  => 'dst_pkgpart',
@@ -353,6 +380,8 @@ my $agent_clone_extra_sql =
 my $conf = new FS::Conf;
 my $taxproducts = $conf->exists('enable_taxproducts');
 
+my $fcc_opts = $conf->exists('part_pkg-show_fcc_options');
+
 my @locales = grep { ! /^en_/i } $conf->config('available-locales'); #should filter from the default locale lang instead of en_
 my %locale_labels =  map {
   ( $_ => 'Package -- '. FS::Locales->description($_) )
@@ -834,11 +863,16 @@ my $html_bottom = sub {
   
     foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) {
   
-       if(!exists($href->{$field})) {
+      if(!exists($href->{$field})) {
         # shouldn't happen
         warn "nonexistent part_pkg option: '$field'\n";
         next;
       }
+      if ( exists($href->{$field}->{display_if}) ) {
+        my %args = ( 'plan' => $layer ); # anything else?
+        my $display = &{ $href->{$field}->{display_if} }(%args);
+        next if !$display;
+      }
 
       $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
   
@@ -863,7 +897,17 @@ my $html_bottom = sub {
                    ? ' CHECKED'
                    : ''
                  ). '>';
-  
+
+      } elsif ( $href->{$field}{'type'} eq 'select-rate' ) {
+
+        $html .= include('/elements/select-rate.html',
+                           'field'      => $layer.'__'.$field,
+                           'curr_value' => $options{$field},
+                           map { $_ => $href->{$field}{$_} }
+                             grep { $_ !~ /^(name|type)$/ }
+                               keys %{ $href->{$field} }
+                        );
+
       } elsif ( $href->{$field}{'type'} =~ /^select/ ) {
   
         $html .= '<SELECT';