X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=aa27fddeb9cba231c788153b8037208e62befdaf;hb=f576e065fb741448cc4834cdb9b09b718ca4ece2;hp=98d9cdeacde8b9b0642f4f515c0ac5f02448f5c2;hpb=defeeae532736bcbccb01ab01035b36f8e21c9ef;p=freeside.git

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 98d9cdeac..aa27fddeb 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -12,7 +12,8 @@
                                          $javascript,
               'html_bottom'           => $html_bottom,
               'body_etc'              =>
-                'onLoad="agent_changed(document.edit_topform.agentnum)"',
+                'onLoad="agent_changed(document.edit_topform.agentnum);
+                         hide_supp_pkgs()"',
 
               'begin_callback'        => $begin_callback,
               'end_callback'          => $end_callback,
@@ -54,10 +55,11 @@
                             'discountnum'      => 'Offer discounts for longer terms',
                             'bill_dst_pkgpart' => 'Include line item(s) from package',
                             'svc_dst_pkgpart'  => 'Include services of package',
-                            'supp_dst_pkgpart' => 'Include complete package',
+                            'supp_dst_pkgpart' => 'When ordering package, also order',
                             'report_option'    => 'Report classes',
                             'fcc_ds0s'         => 'Voice-grade equivalents',
                             'fcc_voip_class'   => 'Category',
+                            'delay_start'      => 'Default delay (days)',
                           },
 
               'fields' => [
@@ -174,8 +176,25 @@
                               { 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',
+                                      value => 'Delayed start',
+                                    },
+                                    { field => 'delay_start',
+                                      type => 'text', size => 6 },
+                                  )
+                                : ()
+                              ),
 
                             { type => 'columnnext' },
 
@@ -189,13 +208,18 @@
                                 },
                               },
 
-                              { 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 => '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 },
+                      
+ 		        ( $conf->exists('cust_pkg-show_fcc_voice_grade_equivalent')
                                 ? ( 
                                     { type  => 'tablebreak-tr-title',
                                       value => 'FCC Form 477 information',
@@ -208,7 +232,6 @@
                                  : ()
                               ),
 
-
                             { type => 'columnend' },
 
                             { 'type'  => $report_option ? 'tablebreak-tr-title'
@@ -242,19 +265,6 @@
                             },
 
                             { 'type'    => 'tablebreak-tr-title',
-                              'value'   => 'Supplemental packages',
-                              'colspan' => '4',
-                            },
-                            { 'field'       => 'supp_dst_pkgpart',
-                              'type'        => 'select-part_pkg',
-                              'm2_label'    => 'Include complete package',
-                              'm2m_method'  => 'supp_part_pkg_link',
-                              'm2m_dstcol'  => 'dst_pkgpart',
-                              'm2_error_callback' =>
-                                &{$m2_error_callback_maker}('supp'),
-                            },
-
-                            { 'type'    => 'tablebreak-tr-title',
                               'value'   => 'Pricing add-ons',
                               'colspan' => 4,
                             },
@@ -297,6 +307,22 @@
                                 &{$m2_error_callback_maker}('svc'),
                             },
 
+                            { 'type'    => 'tablebreak-tr-title',
+                              'value'   => 'Supplemental packages',
+                              'colspan' => '4',
+                              'include_opt_callback' => sub {
+                                 'id' => 'show_supp_pkgs',
+                              },
+                            },
+                            { 'field'       => 'supp_dst_pkgpart',
+                              'type'        => 'select-part_pkg',
+                              'm2_label'    => 'When ordering package, also order',
+                              'm2m_method'  => 'supp_part_pkg_link',
+                              'm2m_dstcol'  => 'dst_pkgpart',
+                              'm2_error_callback' =>
+                                &{$m2_error_callback_maker}('supp'),
+                            },
+
                             { type  => 'tablebreak-tr-title',
                               value => 'Price plan options',
                             },
@@ -729,6 +755,34 @@ my $javascript = <<'END';
 
     }
 
+    // some magic to make "supplemental packages" less obvious
+    var supp_pkg_rows = [];
+    function show_supp_pkgs_click() {
+      supp_pkg_rows[0].style.display = '';
+      this.onclick = '';
+      this.style.backgroundColor = '';
+      this.style.border = '';
+      this.style.padding = '';
+    }
+
+    function hide_supp_pkgs() {
+      var all_selects = document.getElementsByTagName('select');
+      for (var i=0; i < all_selects.length; i++) {
+        if ( all_selects[i].id.match(/^supp_dst_pkgpart/) ) {
+          supp_pkg_rows.push( all_selects[i].parentNode.parentNode );
+        }
+      }
+      if ( supp_pkg_rows.length == 1 ) {
+        // there are none configured, so hide the row to create a new one
+        supp_pkg_rows[0].style.display = 'none';
+        var button = document.getElementById('show_supp_pkgs');
+        button.onclick = show_supp_pkgs_click;
+        button.style.backgroundColor = '#cccccc';
+        button.style.border = '1px solid #7e0079';
+        button.style.padding = '1px';
+      }
+    }
+
 END
 
 my $warning =
@@ -792,11 +846,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>';