X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=be8b0f68f82c7ba03c3771e0174f0c57f1a0c74e;hb=3714fa41c5306981c9f500df13eea52c72d82545;hp=538ba3478699e1902a9f287dbed54cd541d9308a;hpb=a6bd5190b8b5434c6b59517fc6467491e00e2edb;p=freeside.git

diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi
index 538ba3478..be8b0f68f 100755
--- a/httemplate/edit/part_pkg.cgi
+++ b/httemplate/edit/part_pkg.cgi
@@ -45,9 +45,11 @@
                             'agentnum'         => 'Agent',
                             'setup_fee'        => 'Setup fee',
                             'recur_fee'        => 'Recurring fee',
+                            'discountnum'      => 'Offer discounts for longer terms',
                             'bill_dst_pkgpart' => 'Include line item(s) from package',
                             'svc_dst_pkgpart'  => 'Include services of package',
                             'report_option'    => 'Report classes',
+                            'fcc_ds0s'         => 'Voice-grade eqivalents',
                           },
 
               'fields' => [
@@ -93,6 +95,7 @@
                                 type  => 'selectlayers-select',
                                 options => [ keys %plan_labels ],
                                 labels  => \%plan_labels,
+                                onchange => 'aux_planchanged(what);',
                               },
                               { field => 'setup_fee',
                                 type  => 'money',
@@ -167,6 +170,16 @@
                               { 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_ds0s', type=>'text', size=>6 },
+                                  )
+                                 : ()
+                              ),
+
 
                             { type => 'columnend' },
 
@@ -184,6 +197,21 @@
                               'multiple' => 1,
                             },
 
+                            { 'type'    => 'tablebreak-tr-title',
+                              'value'   => 'Term discounts',
+                            },
+                            { 'field'      => 'discountnum',
+                              'type'       => 'select-table',
+                              'table'      => 'discount',
+                              'name_col'   => 'name',
+                              'hashref'    => { %$discountnum_hashref },
+                              #'extra_sql'  => 'AND (months IS NOT NULL OR months != 0)',
+                              'empty_label'=> 'Select discount',
+                              'm2_label'   => 'Offer discounts for longer terms',
+                              'm2m_method' => 'part_pkg_discount',
+                              'm2m_dstcol' => 'discountnum',
+                              'm2_error_callback' => $discount_error_callback,
+                            },
 
                             { 'type'    => 'tablebreak-tr-title',
                               'value'   => 'Pricing add-ons',
@@ -191,6 +219,10 @@
                             },
                             { 'field'      => 'bill_dst_pkgpart',
                               'type'       => 'select-part_pkg',
+                              'extra_sql'  => sub { $pkgpart
+                                                     ? "AND pkgpart != $pkgpart"
+                                                     : ''
+                                                  },
                               'm2_label'   => 'Include line item(s) from package',
                               'm2m_method' => 'bill_part_pkg_link',
                               'm2m_dstcol' => 'dst_pkgpart',
@@ -213,6 +245,10 @@
                             { 'field'      => 'svc_dst_pkgpart',
                               'label'      => 'Also include services from package: ',
                               'type'       => 'select-part_pkg',
+                              'extra_sql'  => sub { $pkgpart
+                                                     ? "AND pkgpart != $pkgpart"
+                                                     : ''
+                                                  },
                               'm2_label'   => 'Include services of package: ',
                               'm2m_method' => 'svc_part_pkg_link',
                               'm2m_dstcol' => 'dst_pkgpart',
@@ -289,6 +325,8 @@ my @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) );
 my %options = ();
 my $recur_disabled = 1;
 
+my $pkgpart = '';
+
 my $error_callback = sub {
   my($cgi, $object, $fields, $opt ) = @_;
 
@@ -322,6 +360,8 @@ my $error_callback = sub {
   $object->set($_ => scalar($cgi->param($_)) )
     foreach (qw( setup_fee recur_fee ));
 
+  $pkgpart = $object->pkgpart;
+
 };
 
 my $new_hashref_callback = sub { { 'plan' => 'flat' }; };
@@ -371,17 +411,22 @@ my $edit_callback = sub {
   $object->set($_ => $object->option($_))
     foreach (qw( setup_fee recur_fee ));
 
+  $pkgpart = $object->pkgpart;
+
 };
 
 my $new_callback = sub {
   my( $cgi, $object, $fields ) = @_;
 
   my $conf = new FS::Conf; 
+
   if ( $conf->exists('agent_defaultpkg') ) {
     #my @all_agent_types = map {$_->typenum} qsearch('agent_type',{});
     @agent_type = map {$_->typenum} qsearch('agent_type',{});
   }
 
+  $options{'suspend_bill'}=1 if $conf->exists('part_pkg-default_suspend_bill');
+
 };
 
 my $clone_callback = sub {
@@ -415,6 +460,23 @@ my $clone_callback = sub {
   $recur_disabled = $object->freq ? 0 : 1;
 };
 
+my $discount_error_callback = sub {
+  my( $cgi, $object ) = @_;
+  map {
+        if ( /^discountnum(\d+)$/ &&
+             ( my $discountnum = $cgi->param("discountnum$1") ) )
+        {
+          new FS::part_pkg_discount {
+            'pkgpart'     => $object->pkgpart,
+            'discountnum' => $discountnum,
+          };
+        } else {
+          ();
+        }
+      }
+  $cgi->param;
+};
+
 my $m2_error_callback_maker = sub {
   my $link_type = shift; #yay closures
   return sub {
@@ -473,6 +535,22 @@ my $javascript = <<'END';
 
     }
 
+    function aux_planchanged(what) {
+
+      alert('called!');
+      var plan = what.options[what.selectedIndex].value;
+      var table = document.getElementById('TableNumber7') // XXX NOT ROBUST
+
+      if ( plan == 'flat' || plan == 'prorate' || plan == 'subscription' ) {
+        //table.disabled = false;
+        table.style.visibility = '';
+      } else {
+        //table.disabled = true;
+        table.style.visibility = 'hidden';
+      }
+
+    }
+
   </SCRIPT>
 END
 
@@ -506,7 +584,8 @@ my $html_bottom = sub {
     #  $html .= ' SELECTED' if $freq eq $part_pkg->freq;
     #  $html .= ">$freq{$freq}";
     #}
-    #$html .= '</SELECT></TD></TR>';
+
+   #$html .= '</SELECT></TD></TR>';
   
     my $href = $plans{$layer}->{'fields'};
     my @fields = exists($plans{$layer}->{'fieldorder'})
@@ -515,6 +594,12 @@ my $html_bottom = sub {
   
     foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) {
   
+       if(!exists($href->{$field})) {
+        # shouldn't happen
+        warn "nonexistent part_pkg option: '$field'\n";
+        next;
+      }
+
       $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>';
   
       my $format = sub { shift };
@@ -545,6 +630,10 @@ my $html_bottom = sub {
         $html .= ' MULTIPLE'
           if $href->{$field}{'type'} eq 'select_multiple';
         $html .= qq! NAME="${layer}__$field">!;
+
+        $html .= '<OPTION VALUE="">'. $href->{$field}{'empty_label'}
+          if exists($href->{$field}{'disable_empty'})
+               && ! $href->{$field}{'disable_empty'};
   
         if ( $href->{$field}{'select_table'} ) {
           foreach my $record (
@@ -714,4 +803,9 @@ my $field_callback = sub {
   }
 };
 
+my $discountnum_hashref = {
+                            'disabled' => '',
+                            'months' => { 'op' => '>', 'value' => 1 },
+                          };
+
 </%init>