add a per-package disable_line_item_date_ranges option, RT13200
[freeside.git] / httemplate / edit / part_pkg.cgi
index 86a4920..d36fac6 100755 (executable)
-<!-- mason kludge -->
-<%
-
-if ( $cgi->param('clone') && $cgi->param('clone') =~ /^(\d+)$/ ) {
-  $cgi->param('clone', $1);
-} else {
-  $cgi->param('clone', '');
-}
-if ( $cgi->param('pkgnum') && $cgi->param('pkgnum') =~ /^(\d+)$/ ) {
-  $cgi->param('pkgnum', $1);
-} else {
-  $cgi->param('pkgnum', '');
-}
-
-my ($query) = $cgi->keywords;
-my $action = '';
-my $part_pkg = '';
-if ( $cgi->param('error') ) {
-  $part_pkg = new FS::part_pkg ( {
-    map { $_, scalar($cgi->param($_)) } fields('part_pkg')
-  } );
-}
-if ( $cgi->param('clone') ) {
-  $action='Custom Pricing';
-  my $old_part_pkg =
-    qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } );
-  $part_pkg ||= $old_part_pkg->clone;
-  $part_pkg->disabled('Y');
-} elsif ( $query && $query =~ /^(\d+)$/ ) {
-  $part_pkg ||= qsearchs('part_pkg',{'pkgpart'=>$1});
-} else {
-  unless ( $part_pkg ) {
-    $part_pkg = new FS::part_pkg {};
-    $part_pkg->plan('flat');
-  }
-}
-unless ( $part_pkg->plan ) { #backwards-compat
-  $part_pkg->plan('flat');
-  $part_pkg->plandata("setup_fee=". $part_pkg->setup. "\n".
-                      "recur_fee=". $part_pkg->recur. "\n");
-}
-$action ||= $part_pkg->pkgpart ? 'Edit' : 'Add';
-my $hashref = $part_pkg->hashref;
-
-
-print header("$action Package Definition", menubar(
-  'Main Menu' => popurl(2),
-  'View all packages' => popurl(2). 'browse/part_pkg.cgi',
-));
-#), ' onLoad="visualize()"');
-
-print qq!<FONT SIZE="+1" COLOR="#ff0000">Error: !, $cgi->param('error'),
-      "</FONT>"
-  if $cgi->param('error');
-
-#print '<FORM ACTION="', popurl(1), 'process/part_pkg.cgi" METHOD=POST>';
-print '<FORM NAME="dummy">';
-
-#if ( $cgi->param('clone') ) {
-#  print qq!<INPUT TYPE="hidden" NAME="clone" VALUE="!, $cgi->param('clone'), qq!">!;
-#}
-#if ( $cgi->param('pkgnum') ) {
-#  print qq!<INPUT TYPE="hidden" NAME="pkgnum" VALUE="!, $cgi->param('pkgnum'), qq!">!;
-#}
-#
-#print qq!<INPUT TYPE="hidden" NAME="pkgpart" VALUE="$hashref->{pkgpart}">!,
-print "Package Part #", $hashref->{pkgpart} ? $hashref->{pkgpart} : "(NEW)";
-
-#false laziness w/view/cust_main.cgi
-my %freq;
-tie %freq, 'Tie::IxHash', 
-  '0'  => '(no recurring fee)',
-  '1d' => 'daily',
-  '1w' => 'weekly',
-  '2w' => 'biweekly (every 2 weeks)',
-  '1'  => 'monthly',
-  '2'  => 'bimonthly (every 2 months)',
-  '3'  => 'quarterly (every 3 months)',
-  '6'  => 'semiannually (every 6 months)',
-  '12' => 'annually',
-  '24' => 'biannually (every 2 years)',
-;
-if ( $part_pkg->dbdef_table->column('freq')->type =~ /(int)/i ) {
-  delete $freq{$_} foreach grep { ! /^\d+$/ } keys %freq;
-}
+<% include( 'elements/edit.html',
+              'post_url'              => popurl(1).'process/part_pkg.cgi',
+              'name'                  => "Package definition",
+              'table'                 => 'part_pkg',
+
+              'agent_virt'            => 1,
+              'agent_null_right'      => $edit_global,
+              'agent_clone_extra_sql' => $agent_clone_extra_sql,
+              #'viewall_dir'           => 'browse',
+              'viewall_url'           => $p.'browse/part_pkg.cgi',
+              'html_init'             => include('/elements/init_overlib.html').
+                                         $javascript,
+              'html_bottom'           => $html_bottom,
+              'body_etc'              =>
+                'onLoad="agent_changed(document.edit_topform.agentnum)"',
+
+              'begin_callback'        => $begin_callback,
+              'end_callback'          => $end_callback,
+              'new_hashref_callback'  => $new_hashref_callback,
+              'new_object_callback'   => $new_object_callback,
+              'new_callback'          => $new_callback,
+              'clone_callback'        => $clone_callback,
+              'edit_callback'         => $edit_callback,
+              'error_callback'        => $error_callback,
+              'field_callback'        => $field_callback,
+
+              'labels' => { 
+                            'pkgpart'          => 'Package Definition',
+                            'pkg'              => 'Package (customer-visible)',
+                            'comment'          => 'Comment (customer-hidden)',
+                            'classnum'         => 'Package class',
+                            'addon_classnum'   => 'Restrict additional orders to package class',
+                            'promo_code'       => 'Promotional code',
+                            'freq'             => 'Recurring fee frequency',
+                            'setuptax'         => 'Setup fee tax exempt',
+                            'recurtax'         => 'Recurring fee tax exempt',
+                            'taxclass'         => 'Tax class',
+                            'taxproduct_select'=> 'Tax products',
+                            'plan'             => 'Price plan',
+                            'disabled'         => 'Disable new orders',
+                            'disable_line_item_date_ranges' => 'Disable line item date ranges',
+                            'setup_cost'       => 'Setup cost',
+                            'recur_cost'       => 'Recur cost',
+                            'pay_weight'       => 'Payment weight',
+                            'credit_weight'    => 'Credit weight',
+                            'agentnum'         => 'Agent',
+                            'setup_fee'        => 'Setup fee',
+                            'recur_fee'        => 'Recurring fee',
+                            'recur_show_zero'  => 'Show zero recurring',
+                            '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 equivalents',
+                          },
 
-%>
-<%= ntable("#cccccc",2) %>
-  <TR>
-    <TD ALIGN="right">Package (customer-visible)</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="pkg" SIZE=32 VALUE="<%= $part_pkg->pkg %>">
-    </TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Comment (customer-hidden)</TD>
-    <TD>
-      <INPUT TYPE="text" NAME="comment" SIZE=32 VALUE="<%=$part_pkg->comment%>">
-    </TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Recurring fee frequency </TD>
-    <TD>
-      <SELECT NAME="freq">
-        <% foreach my $freq ( keys %freq ) { %>
-          <OPTION VALUE="<%= $freq %>"<%= $freq eq $part_pkg->freq ? ' SELECTED' : '' %>><%= $freq{$freq} %>
-        <% } %>
-      </SELECT>
-    </TD>
-  </TR>
-  <TR>
-    <TD ALIGN="right">Setup fee tax exempt</TD>
-    <TD>
-<%
-
-print '<INPUT TYPE="checkbox" NAME="setuptax" VALUE="Y"';
-print ' CHECKED' if $hashref->{setuptax} eq "Y";
-print '>';
-
-print <<END;
-</TD></TR>
-<TR><TD ALIGN="right">Recurring fee tax exempt</TD><TD>
-END
+              'fields' => [
+                            { field=>'clone',  type=>'hidden',
+                              curr_value_callback =>
+                                sub { shift->param('clone') },
+                            },
+                            { field=>'pkgnum', type=>'hidden',
+                              curr_value_callback =>
+                                sub { shift->param('pkgnum') },
+                            },
 
-print '<INPUT TYPE="checkbox" NAME="recurtax" VALUE="Y"';
-print ' CHECKED' if $hashref->{recurtax} eq "Y";
-print '>';
+                            { field=>'custom',  type=>'hidden' },
 
-print '</TD></TR>';
+                            { type => 'columnstart' },
+                            
+                              { field     => 'pkg',
+                                type      => 'text',
+                                size      => 40, #32
+                                maxlength => 50,
+                              },
+                              {field=>'comment',  type=>'text', size=>40 }, #32
+                              { field         => 'agentnum',
+                                type          => 'select-agent',
+                                disable_empty => ! $acl_edit_global,
+                                empty_label   => '(global)',
+                                onchange      => 'agent_changed',
+                              },
+                              {field=>'classnum', type=>'select-pkg_class' },
+                              ( $conf->exists('pkg-addon_classnum')
+                                  ? ( { field=>'addon_classnum',
+                                        type =>'select-pkg_class',
+                                      }
+                                    )
+                                   : ()
+                              ),
+                              {field=>'disabled', type=>$disabled_type, value=>'Y'},
+                              {field=>'disable_line_item_date_ranges', type=>$disabled_type, value=>'Y'},
+
+                              { type  => 'tablebreak-tr-title',
+                                value => 'Pricing', #better name?
+                              },
+                              { field => 'plan',
+                                type  => 'selectlayers-select',
+                                options => [ keys %plan_labels ],
+                                labels  => \%plan_labels,
+                                onchange => 'aux_planchanged(what);',
+                              },
+                              { field => 'setup_fee',
+                                type  => 'money',
+                              },
+                              { field    => 'freq',
+                                type     => 'part_pkg_freq',
+                                onchange => 'freq_changed',
+                              },
+                              { field    => 'recur_fee',
+                                type     => 'money',
+                                disabled => sub { $recur_disabled },
+                                onchange => 'recur_changed',
+                              },
 
-my $conf = new FS::Conf;
-#false laziness w/ view/cust_main.cgi quick order
-if ( $conf->exists('enable_taxclasses') ) {
-  print '<TR><TD ALIGN="right">Tax class</TD><TD><SELECT NAME="taxclass">';
-  my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-    or die dbh->errstr;
-  $sth->execute or die $sth->errstr;
-  foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
-    print qq!<OPTION VALUE="$taxclass"!;
-    print ' SELECTED' if $taxclass eq $hashref->{taxclass};
-    print qq!>$taxclass</OPTION>!;
-  }
-  print '</SELECT></TD></TR>';
-} else {
-  print
-    '<INPUT TYPE="hidden" NAME="taxclass" VALUE="'. $hashref->{taxclass}. '">';
-}
-
-print '<TR><TD ALIGN="right">Disable new orders</TD><TD>';
-print '<INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"';
-print ' CHECKED' if $hashref->{disabled} eq "Y";
-print '>';
-print '</TD></TR></TABLE>';
-
-my $thead =  "\n\n". ntable('#cccccc', 2).
-             '<TR><TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Quan.</FONT></TH>';
-$thead .=  '<TH BGCOLOR="#dcdcdc"><FONT SIZE=-1>Primary</FONT></TH>'
-  if dbdef->table('pkg_svc')->column('primary_svc');
-$thead .= '<TH BGCOLOR="#dcdcdc">Service</TH></TR>';
-
-#unless ( $cgi->param('clone') ) {
-#dunno why...
-unless ( 0 ) {
-  #print <<END, $thead;
-  print <<END, itable(), '<TR><TD VALIGN="top">', $thead;
-<BR><BR>Enter the quantity of each service this package includes.<BR><BR>
-END
-}
-
-my @fixups = ();
-my $count = 0;
-my $columns = 3;
-my @part_svc = qsearch( 'part_svc', { 'disabled' => '' } );
-foreach my $part_svc ( @part_svc ) {
-  my $svcpart = $part_svc->svcpart;
-  my $pkgpart = $cgi->param('clone') || $part_pkg->pkgpart;
-  my $pkg_svc = $pkgpart && qsearchs( 'pkg_svc', {
-    'pkgpart'  => $pkgpart,
-    'svcpart'  => $svcpart,
-  } ) || new FS::pkg_svc ( {
-    'pkgpart'     => $pkgpart,
-    'svcpart'     => $svcpart,
-    'quantity'    => 0,
-    'primary_svc' => '',
-  });
-  #? #next unless $pkg_svc;
-
-  push @fixups, "pkg_svc$svcpart";
-
-  #unless ( defined ($cgi->param('clone')) && $cgi->param('clone') ) {
-  #dunno why...
-  unless ( 0 ) {
-    print '<TR>'; # if $count == 0 ;
-    print qq!<TD><INPUT TYPE="text" NAME="pkg_svc$svcpart" SIZE=4 MAXLENGTH=3 VALUE="!,
-          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0,
-          qq!"></TD>!;
-    if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
-      print qq!<TD><INPUT TYPE="radio" NAME="pkg_svc_primary" VALUE="$svcpart"!;
-      print ' CHECKED' if $pkg_svc->primary_svc =~ /^Y/i;
-      print '></TD>';
-    }
-    print qq!<TD><A HREF="part_svc.cgi?!,$part_svc->svcpart,
-          qq!">!, $part_svc->getfield('svc'), "</A></TD></TR>";
-#    print "</TABLE></TD><TD>$thead" if ++$count == int(scalar(@part_svc) / 2);
-    $count+=1;
-    foreach ( 1 .. $columns-1 ) {
-      print "</TABLE></TD><TD VALIGN=\"top\">$thead"
-        if $count == int( $_ * scalar(@part_svc) / $columns );
-    }
-  } else {
-    print qq!<INPUT TYPE="hidden" NAME="pkg_svc$svcpart" VALUE="!,
-          $cgi->param("pkg_svc$svcpart") || $pkg_svc->quantity || 0, qq!">\n!;
-  }
-}
-
-#unless ( $cgi->param('clone') ) {
-#dunno why...
-unless ( 0 ) {
-  print "</TR></TABLE></TD></TR></TABLE>";
-  #print "</TR></TABLE>";
-}
-
-foreach my $f ( qw( clone pkgnum ) ) {
-  print qq!<INPUT TYPE="hidden" NAME="$f" VALUE="!. $cgi->param($f). '">';
-}
-print '<INPUT TYPE="hidden" NAME="pkgpart" VALUE="'. $part_pkg->pkgpart. '">';
-
-# prolly should be in database
-tie my %plans, 'Tie::IxHash',
-  'flat' => {
-    'name' => 'Flat rate (anniversary billing)',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => 'what.recur_fee.value',
-  },
-
-  'flat_delayed' => {
-    'name' => 'Free for X days, then flat rate (anniversary billing)',
-    'fields' =>  {
-      'free_days' => { 'name' => 'Initial free days',
-                       'default' => 0,
-                     },
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'free_days', 'setup_fee', 'recur_fee' ],
-    'setup' => '\'my $d = $cust_pkg->bill || $time; $d += 86400 * \' + what.free_days.value + \'; $cust_pkg->bill($d); $cust_pkg_mod_flag=1; \' + what.setup_fee.value',
-    'recur' => 'what.recur_fee.value',
-  },
-
-  'prorate' => {
-    'name' => 'First partial month pro-rated, then flat-rate (1st of month billing)',
-    'fields' =>  {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
-  },
-
-  'subscription' => {
-    'name' => 'First partial month full charge, then flat-rate (1st of month billing)',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                      },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; $sdate = timelocal(0,0,0,1,$mon,$year); \' + what.recur_fee.value',
-  },
-
-  'flat_comission_cust' => {
-    'name' => 'Flat rate with recurring commission per active customer',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                     },
-      'comission_amount' => { 'name' => 'Commission amount per month (per active customer)',
-                              'default' => 0,
+                              { field    => 'recur_show_zero',
+                                type     => 'checkbox',
+                                value    => 'Y',
+                                disabled => sub { $recur_show_zero_disabled },
+                              },
+
+                              #price plan
+                              #setup fee
+                              #recurring frequency
+                              #recurring fee (auto-disable)
+
+                            { type => 'columnnext' },
+
+                              {type=>'justtitle', value=>'Taxation' },
+                              {field=>'setuptax', type=>'checkbox', value=>'Y'},
+                              {field=>'recurtax', type=>'checkbox', value=>'Y'},
+                              {field=>'taxclass', type=>'select-taxclass' },
+                              { field => 'taxproductnums',
+                                type  => 'hidden',
+                                value => join(',', @taxproductnums),
+                              },
+                              { field => 'taxproduct_select',
+                                type  => 'selectlayers',
+                                options => [ '(default)', @taxproductnums ],
+                                curr_value => '(default)',
+                                labels  => { ( '(default)' => '(default)' ),
+                                             map {($_=>$usage_class{$_})}
+                                             @taxproductnums
+                                           },
+                                layer_fields => \%taxproduct_fields,
+                                layer_values_callback => $taxproduct_values,
+                                layers_only  =>   !$taxproducts,
+                                cell_style   => ( !$taxproducts
+                                                  ? 'display:none'
+                                                  : ''
+                                                ),
+                              },
+
+                              { type  => 'tablebreak-tr-title',
+                                value => 'Promotions', #better name?
+                              },
+                              { field=>'promo_code', type=>'text', size=>15 },
+
+                              { type  => 'tablebreak-tr-title',
+                                value => 'Cost tracking', #better name?
+                              },
+                              { field=>'setup_cost', type=>'money', },
+                              { field=>'recur_cost', type=>'money', },
+
+                            { type => 'columnnext' },
+
+                              { field    => 'agent_type',
+                                type     => 'select-agent_types',
+                                disabled => ! $acl_edit_global,
+                                curr_value_callback => sub {
+                                  my($cgi, $object, $field) = @_;
+                                  #in the other callbacks..?  hmm.
+                                  \@agent_type;
+                                },
+                              },
+
+                              { 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_ds0s', type=>'text', size=>6 },
+                                  )
+                                 : ()
+                              ),
+
+
+                            { type => 'columnend' },
+
+                            { 'type'  => $report_option ? 'tablebreak-tr-title'
+                                                        : 'hidden',
+                              'value' => 'Optional report classes',
+                              'field' => 'census_title',
                             },
-      'comission_depth'  => { 'name' => 'Number of layers',
-                              'default' => 1,
+                            { 'field'    => 'report_option',
+                              'type'     => $report_option ? 'select-table'
+                                                           : 'hidden',
+                              'table'    => 'part_pkg_report_option',
+                              'name_col' => 'name',
+                              'hashref'  => { 'disabled' => '' },
+                              'multiple' => 1,
                             },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_main_ncancelled(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  },
-
-  'flat_comission' => {
-    'name' => 'Flat rate with recurring commission per (any) active package',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                     },
-      'comission_amount' => { 'name' => 'Commission amount per month (per active package)',
-                              'default' => 0,
+
+                            { 'type'    => 'tablebreak-tr-title',
+                              'value'   => 'Term discounts',
                             },
-      'comission_depth'  => { 'name' => 'Number of layers',
-                              'default' => 1,
+                            { '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,
                             },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar($cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  },
-
-  'flat_comission_pkg' => {
-    'name' => 'Flat rate with recurring commission per (selected) active package',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_fee' => { 'name' => 'Recurring fee for this package',
-                       'default' => 0,
-                     },
-      'comission_amount' => { 'name' => 'Commission amount per month (per uncancelled package)',
-                              'default' => 0,
+
+                            { 'type'    => 'tablebreak-tr-title',
+                              'value'   => 'Pricing add-ons',
+                              'colspan' => 4,
                             },
-      'comission_depth'  => { 'name' => 'Number of layers',
-                              'default' => 1,
+                            { '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',
+                              'm2_error_callback' =>
+                                &{$m2_error_callback_maker}('bill'),
+                              'm2_fields' => [ { 'field' => 'hidden',
+                                                 'type'  => 'checkbox',
+                                                 'value' => 'Y',
+                                                 'curr_value' => '',
+                                                 'label' => 'Bundle',
+                                               },
+                                             ],
                             },
-      'comission_pkgpart' => { 'name' => 'Applicable packages<BR><FONT SIZE="-1">(hold <b>ctrl</b> to select multiple packages)</FONT>',
-                               'type' => 'select_multiple',
-                               'select_table' => 'part_pkg',
-                               'select_hash'  => { 'disabled' => '' } ,
-                               'select_key'   => 'pkgpart',
-                               'select_label' => 'pkg',
-                             },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_fee', 'comission_depth', 'comission_amount', 'comission_pkgpart' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '""; var pkgparts = ""; for ( var c=0; c < document.flat_comission_pkg.comission_pkgpart.options.length; c++ ) { if (document.flat_comission_pkg.comission_pkgpart.options[c].selected) { pkgparts = pkgparts + document.flat_comission_pkg.comission_pkgpart.options[c].value + \', \'; } } what.recur.value = \'my $error = $cust_pkg->cust_main->credit( \' + what.comission_amount.value + \' * scalar( grep { my $pkgpart = $_->pkgpart; grep { $_ == $pkgpart } ( \' + pkgparts + \'  ) } $cust_pkg->cust_main->referral_cust_pkg(\' + what.comission_depth.value+ \')), "commission" ); die $error if $error; \' + what.recur_fee.value + \';\'',
-  },
-
-
-
-  'sesmon_hour' => {
-    'name' => 'Base charge plus charge per-hour from the session monitor',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included_hours' => { 'name' => 'Hours included',
-                                  'default' => 0,
-                                },
-      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
-                                 'default' => 0,
-                               },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_hours', 'recur_hourly_charge' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $hours = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; \' + what.recur_flat.value + \' + \' + what.recur_hourly_charge.value + \' * $hours;\'',
-  },
-
-  'sesmon_minute' => {
-    'name' => 'Base charge plus charge per-minute from the session monitor',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included_min' => { 'name' => 'Minutes included',
-                                'default' => 0,
-                                },
-      'recur_minly_charge' => { 'name' => 'Additional charge per minute',
-                                'default' => 0,
-                              },
-    },
-    'fieldorder' => [ 'setup_fee', 'recur_flat', 'recur_included_min', 'recur_minly_charge' ],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $min = $cust_pkg->seconds_since($cust_pkg->bill || 0) / 60 - \' + what.recur_included_min.value + \'; $min = 0 if $min < 0; \' + what.recur_flat.value + \' + \' + what.recur_minly_charge.value + \' * $min;\'',
-
-  },
-
-  'sqlradacct_hour' => {
-    'name' => 'Base charge plus charge per-hour (and for data) from an external sqlradius radacct table',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included_hours' => { 'name' => 'Hours included',
-                                  'default' => 0,
-                                },
-      'recur_hourly_charge' => { 'name' => 'Additional charge per hour',
-                                 'default' => 0,
-                               },
-      'recur_included_input' => { 'name' => 'Input megabytes included',
-                                  'default' => 0,
-                                },
-      'recur_input_charge' => { 'name' =>
-                                        'Additional charge per input megabyte',
-                                'default' => 0,
-                              },
-      'recur_included_output' => { 'name' => 'Output megabytes included',
-                                   'default' => 0,
-                                },
-      'recur_output_charge' => { 'name' =>
-                                       'Additional charge per output megabyte',
-                                'default' => 0,
-                              },
-      'recur_included_total' => { 'name' =>
-                                       'Total input+output megabytes included',
-                                  'default' => 0,
-                                },
-      'recur_total_charge' => { 'name' =>
-                                 'Additional charge per input+output megabyte',
-                                'default' => 0,
-                              },
-    },
-    'fieldorder' => [qw( setup_fee recur_flat recur_included_hours recur_hourly_charge recur_included_input recur_input_charge recur_included_output recur_output_charge recur_included_total recur_total_charge )],
-    'setup' => 'what.setup_fee.value',
-    'recur' => '\'my $last_bill = $cust_pkg->last_bill; my $hours = $cust_pkg->seconds_since_sqlradacct($last_bill, $sdate ) / 3600 - \' + what.recur_included_hours.value + \'; $hours = 0 if $hours < 0; my $input = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctInputOctets\" ) / 1048576; my $output = $cust_pkg->attribute_since_sqlradacct($last_bill, $sdate, \"AcctOutputOctets\" ) / 1048576; my $total = $input + $output - \' + what.recur_included_total.value + \'; $total = 0 if $total < 0; my $input = $input - \' + what.recur_included_input.value + \'; $input = 0 if $input < 0; my $output = $output - \' + what.recur_included_output.value + \'; $output = 0 if $output < 0; my $totalcharge = sprintf(\"%.2f\", \' + what.recur_total_charge.value + \' * $total); my $inputcharge = sprintf(\"%.2f\", \' + what.recur_input_charge.value + \' * $input); my $outputcharge = sprintf(\"%.2f\", \' + what.recur_output_charge.value + \' * $output); my $hourscharge = sprintf(\"%.2f\", \' + what.recur_hourly_charge.value + \' * $hours); if ( \' + what.recur_total_charge.value + \' > 0 ) { push @details, \"Last month\\\'s data \". sprintf(\"%.1f\", $total). \" megs: \\\$$totalcharge\" } if ( \' + what.recur_input_charge.value + \' > 0 ) { push @details, \"Last month\\\'s download \". sprintf(\"%.1f\", $input). \" megs: \\\$$inputcharge\" } if ( \' + what.recur_output_charge.value + \' > 0 ) { push @details, \"Last month\\\'s upload \". sprintf(\"%.1f\", $output). \" megs: \\\$$outputcharge\" } if ( \' + whathorlly_charge.value + \' > 0 ) { push @details, \"Last month\\\'s time \". sprintf(\"%.1f\", $hours). \" hours: \\\$$hourscharge\"; } \' + what.recur_flat.value + \' + $hourscharge + $inputcharge + $outputcharge + $totalcharge ;\'',
-  },
-
-  'sql_generic' => {
-    'name' => 'Base charge plus a metered rate from a configurable SQL query',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'recur_included' => { 'name' => 'Units included',
-                            'default' => 0,
-                          },
-      'recur_unit_charge' => { 'name' => 'Additional charge per unit',
-                               'default' => 0,
-                             },
-      'datasrc' => { 'name' => 'DBI data source',
-                     'default' => '',
-                   },
-      'db_username' => { 'name' => 'Database username',
-                         'default' => '',
-                       },
-      'db_password' => { 'name' => 'Database username',
-                         'default' => '',
-                       },
-      'query' => { 'name' => 'SQL query',
-                   'default' => '',
-                 },
-    },
-    'fieldorder' => [qw( setup_fee recur_flat recur_included recur_unit_charge datasrc db_username db_password query )],
-    'setup' => 'what.setup_fee.value',
-   # 'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\") or die $DBI::errstr; \'',
-   'recur' => '\'my $dbh = DBI->connect(\"\' + what.datasrc.value + \'\", \"\' + what.db_username.value + \'\", \"\' + what.db_password.value + \'\" ) or die $DBI::errstr; my $sth = $dbh->prepare(\"\' + what.query.value + \'\") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq \"svc_domain\" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge.value + \';\'',
-    #'recur' => '\'my $dbh = DBI->connect("\' + what.datasrc.value + \'", "\' + what.db_username.value + \'", "\' what.db_password.value + \'" ) or die $DBI::errstr; my $sth = $dbh->prepare("\' + what.query.value + \'") or die $dbh->errstr; my $units = 0; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_domain" } $cust_pkg->cust_svc ) { my $domain = $cust_svc->svc_x->domain; $sth->execute($domain) or die $sth->errstr; $units += $sth->fetchrow_arrayref->[0]; } $units -= \' + what.recur_included.value + \'; $units = 0 if $units < 0; \' + what.recur_flat.value + \' + $units * \' + what.recur_unit_charge + \';\'',
-  },
-
-
-
-  'sql_external' => {
-    'name' => 'Base charge plus additional fees for external services from a configurable SQL query',
-    'fields' => {
-      'setup_fee' => { 'name' => 'Setup fee for this package',
-                       'default' => 0,
-                     },
-      'recur_flat' => { 'name' => 'Base monthly charge for this package',
-                        'default' => 0,
-                      },
-      'datasrc' => { 'name' => 'DBI data source',
-                     'default' => '',
-                   },
-      'db_username' => { 'name' => 'Database username',
-                         'default' => '',
-                       },
-      'db_password' => { 'name' => 'Database password',
-                         'default' => '',
-                       },
-      'query' => { 'name' => 'SQL query',
-                   'default' => '',
-                 },
-    },
-    'fieldorder' => [qw( setup_fee recur_flat datasrc db_username db_password query )],
-    'setup' => 'what.setup_fee.value',
-    'recur' => q!'my $dbh = DBI->connect("' + what.datasrc.value + '", "' + what.db_username.value + '", "' + what.db_password.value + '" ) or die $DBI::errstr; my $sth = $dbh->prepare("' + what.query.value + '") or die $dbh->errstr; my $price = ' + what.recur_flat.value + '; foreach my $cust_svc ( grep { $_->part_svc->svcdb eq "svc_external" } $cust_pkg->cust_svc ){ my $id = $cust_svc->svc_x->id; $sth->execute($id) or die $sth->errstr; $price += $sth->fetchrow_arrayref->[0]; } $price;'!,
-
-  },
-
-;
-
-my %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-                    split("\n", $part_pkg->plandata );
-
-tie my %options, 'Tie::IxHash', map { $_=>$plans{$_}->{'name'} } keys %plans;
-
-my @form_select = ();
-if ( $conf->exists('enable_taxclasses') ) {
-  push @form_select, 'taxclass';
-} else {
-  push @fixups, 'taxclass'; #hidden
-}
-
-my @form_radio = ();
-if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
-  push @form_radio, 'pkg_svc_primary';
-}
-
-my $widget = new HTML::Widgets::SelectLayers(
-  'selected_layer' => $part_pkg->plan,
-  'options'        => \%options,
-  'form_name'      => 'dummy',
-  'form_action'    => 'process/part_pkg.cgi',
-  'form_text'      => [ qw(pkg comment freq clone pkgnum pkgpart), @fixups ],
-  'form_checkbox'  => [ qw(setuptax recurtax disabled) ],
-  'form_radio'     => \@form_radio,
-  'form_select'    => \@form_select,
-  'fixup_callback' => sub {
-                        #my $ = @_;
-                        my $html = '';
-                        for my $p ( keys %plans ) {
-                          $html .= "if ( what.plan.value == \"$p\" ) {
-                                      what.setup.value = $plans{$p}->{setup} ;
-                                      what.recur.value = $plans{$p}->{recur} ;
-                                    }\n";
-                        }
-                        $html;
-                      },
-  'layer_callback' => sub {
+
+                            { type  => 'tablebreak-tr-title',
+                              value => 'Services',
+                            },
+                            { type => 'pkg_svc', },
+
+                            { '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',
+                              'm2_error_callback' =>
+                                &{$m2_error_callback_maker}('svc'),
+                            },
+
+                            { type  => 'tablebreak-tr-title',
+                              value => 'Price plan options',
+                            },
+
+                          ],
+
+           )
+%>
+<%init>
+
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+my $edit_global = 'Edit global package definitions';
+my $acl_edit        = $curuser->access_right('Edit package definitions');
+my $acl_edit_global = $curuser->access_right($edit_global);
+
+my $acl_edit_either = $acl_edit || $acl_edit_global;
+
+my $begin_callback = sub {
+  my( $cgi, $fields, $opt ) = @_;
+  die "access denied"
+    unless $acl_edit_either
+        || ( $cgi->param('pkgnum')
+             && $curuser->access_right('Customize customer package')
+           );
+};
+
+my $disabled_type = $acl_edit_either ? 'checkbox' : 'hidden';
+
+#arg.  access rights for cloning are Hard.
+# on the one hand we don't really want cloning (customizing a package) to fail 
+#  for want of finding the source package in normal usage
+# on the other hand, we don't want people using the clone link to be able to
+#  see 
+my $agent_clone_extra_sql = 
+  ' ( '. FS::part_pkg->curuser_pkgs_sql.
+  "   OR ( part_pkg.custom = 'Y' ) ".
+  ' ) ';
+
+my $conf = new FS::Conf;
+my $taxproducts = $conf->exists('enable_taxproducts');
+
+my $sth = dbh->prepare("SELECT COUNT(*) FROM part_pkg_report_option".
+                       "  WHERE disabled IS NULL OR disabled = ''  ")
+  or die dbh->errstr;
+$sth->execute or die $sth->errstr;
+my $report_option = $sth->fetchrow_arrayref->[0];
+
+#XXX
+# - tr-part_pkg_freq: month_increments_only (from price plans)
+# - test cloning
+# - test errors cloning
+# - test custom pricing
+# - move the selectlayer divs away from lame layer_callback
+
+#my ($query) = $cgi->keywords;
+#
+#my $part_pkg = '';
+
+my @agent_type = ();
+my %tax_override = ();
+
+my %taxproductnums = map { ($_->classnum => 1) }
+                     qsearch('usage_class', { 'disabled' => '' });
+my @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) );
+
+my %options = ();
+my $recur_disabled = 1;
+my $recur_show_zero_disabled = 1;
+
+my $pkgpart = '';
+
+my $error_callback = sub {
+  my($cgi, $object, $fields, $opt ) = @_;
+
+  (@agent_type) = $cgi->param('agent_type');
+
+  $opt->{action} = 'Custom' if $cgi->param('pkgnum');
+
+  $recur_disabled = $cgi->param('freq') ? 0 : 1;
+  $recur_show_zero_disabled =
+    $cgi->param('freq')
+      ? $cgi->param('recur_fee') ? 0 : 1
+      : 1;
+
+  foreach ($cgi->param) {
+    /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1);
+  }
+  $tax_override{''} = $cgi->param('tax_override');
+  $tax_override{$_} = $cgi->param('tax_override_$_')
+    foreach(grep { /^tax_override_(\w+)$/ } $cgi->param);
+
+  #some false laziness w/process
+  $cgi->param('plan') =~ /^(\w+)$/ or die 'unparsable plan';
+  my $plan = $1;
+  my $options = $cgi->param($plan."__OPTIONS");
+  my @options = split(',', $options);
+  %options =
+    map { my $optionname = $_;
+          my $param = $plan."__$optionname";
+          my $value = join(', ', $cgi->param($param));
+          ( $optionname => $value );
+        }
+        @options;
+
+  $object->set($_ => scalar($cgi->param($_)) )
+    foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+
+  $pkgpart = $object->pkgpart;
+
+};
+
+my $new_hashref_callback = sub { { 'plan' => 'flat' }; };
+
+my $new_object_callback = sub {
+  my( $cgi, $hashref, $fields, $opt ) = @_;
+
+  my $part_pkg = FS::part_pkg->new( $hashref );
+  $part_pkg->set($_ => '0')
+    foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+
+  $part_pkg;
+
+};
+
+my $edit_callback = sub {
+  my( $cgi, $object, $fields, $opt ) = @_;
+
+  $recur_disabled = $object->freq ? 0 : 1;
+
+  (@agent_type) =
+    map {$_->typenum} qsearch('type_pkgs', { 'pkgpart' => $object->pkgpart } );
+
+  my @report_option = ();
+  foreach ($object->options) {
+    /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1);
+    /^report_option_(\d+)$/ && (push @report_option, $1);
+  }
+  foreach ($object->part_pkg_taxoverride) {
+    $taxproductnums{$_->usage_class} = 1
+      if $_->usage_class;
+  }
+
+  $cgi->param('report_option', join(',', @report_option));
+  foreach my $field ( @$fields ) {
+    next unless ( 
+      ref($field) eq 'HASH' &&
+      $field->{field} &&
+      $field->{field} eq 'report_option'
+    );
+    #$field->{curr_value} = join(',', @report_option);
+    $field->{value} = join(',', @report_option);
+  }
+
+  %options = $object->options;
+
+  $object->set($_ => $object->option($_))
+    foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+
+  $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 {
+  my( $cgi, $object, $fields, $opt ) = @_;
+
+  if ( $cgi->param('pkgnum') ) {
+
+    my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cgi->param('pkgnum') } );
+    $object->agentnum( $cust_pkg->cust_main->agentnum );
+
+    $opt->{action} = 'Custom';
+
+    #my $part_pkg = $clone_part_pkg->clone;
+    #this is all clone does anyway
+    $object->custom('Y');
+
+    $object->disabled('Y');
+
+  } else { #not when cloning...
+
+    (@agent_type) =
+      map {$_->typenum} qsearch('type_pkgs',{ 'pkgpart' => $object->pkgpart } );
+
+  }
+
+  %options = $object->options;
+
+  $object->set($_ => $options{$_})
+    foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
+
+  $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 {
+    my( $cgi, $object ) = @_;
+    map {
+
+          if ( /^${link_type}_dst_pkgpart(\d+)$/ &&
+               ( my $dst = $cgi->param("${link_type}_dst_pkgpart$1") ) )
+          {
+
+            my $hidden = $cgi->param("${link_type}_dst_pkgpart__hidden$1")
+                         || '';
+            new FS::part_pkg_link {
+              'link_type'   => $link_type,
+              'src_pkgpart' => $object->pkgpart,
+              'dst_pkgpart' => $dst,
+              'hidden'      => $hidden,
+            };
+          } else {
+            ();
+          }
+        }
+    $cgi->param;
+  };
+};
+
+my $javascript = <<'END';
+  <SCRIPT TYPE="text/javascript">
+
+    function freq_changed(what) {
+      var freq = what.options[what.selectedIndex].value;
+
+      if ( freq == '0' ) {
+        what.form.recur_fee.disabled = true;
+        what.form.recur_fee.style.backgroundColor = '#dddddd';
+        what.form.recur_show_zero.disabled = true;
+        //what.form.recur_show_zero.style.backgroundColor= '#dddddd';
+      } else {
+        what.form.recur_fee.disabled = false;
+        what.form.recur_fee.style.backgroundColor = '#ffffff';
+        what.form.recur_show_zero.disabled = false;
+        //what.form.recur_show_zero.style.backgroundColor= '#ffffff';
+      }
+
+    }
+
+    function recur_changed(what) {
+      var recur = what.value;
+      if ( recur == 0 ) {
+        what.form.recur_show_zero.disabled = false;
+      } else {
+        what.form.recur_show_zero.disabled = true;
+      }
+    }
+
+    function agent_changed(what) {
+
+      var agentnum;
+      if ( what.type == 'select-one' ) {
+        agentnum = what.options[what.selectedIndex].value;
+      } else {
+        agentnum = what.value;
+      }
+
+      if ( agentnum == 0 ) {
+        what.form.agent_type.disabled = false;
+        //what.form.agent_type.style.backgroundColor = '#ffffff';
+        what.form.agent_type.style.visibility = '';
+      } else {
+        what.form.agent_type.disabled = true;
+        //what.form.agent_type.style.backgroundColor = '#dddddd';
+        what.form.agent_type.style.visibility = 'hidden';
+      }
+
+    }
+
+    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
+
+tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() };
+
+tie my %plan_labels, 'Tie::IxHash',
+  map {  $_ => ( $plans{$_}->{'shortname'} || $plans{$_}->{'name'} ) }
+      keys %plans;
+
+my $html_bottom = sub {
+  my( $object ) = @_;
+
+  #warn join("\n", map { "$_: $options{$_}" } keys %options ). "\n";
+
+  my $layer_callback = sub {
+  
     my $layer = shift;
-    my $html = qq!<INPUT TYPE="hidden" NAME="plan" VALUE="$layer">!.
-               ntable("#cccccc",2);
+    my $html = ntable("#cccccc",2);
+  
+    #$html .= '
+    #  <TR>
+    #    <TD ALIGN="right">Recurring fee frequency </TD>
+    #    <TD><SELECT NAME="freq">
+    #';
+    #
+    #my @freq = keys %freq;
+    #@freq = grep { /^\d+$/ } @freq
+  #XXX this bit#  #  if exists($plans{$layer}->{'freq'}) && $plans{$layer}->{'freq'} eq 'm';
+    #foreach my $freq ( @freq ) {
+    #  $html .= qq(<OPTION VALUE="$freq");
+    #  $html .= ' SELECTED' if $freq eq $part_pkg->freq;
+    #  $html .= ">$freq{$freq}";
+    #}
+
+   #$html .= '</SELECT></TD></TR>';
+  
     my $href = $plans{$layer}->{'fields'};
-    foreach my $field ( exists($plans{$layer}->{'fieldorder'})
-                          ? @{$plans{$layer}->{'fieldorder'}}
-                          : keys %{ $href }
-                      ) {
+    my @fields = exists($plans{$layer}->{'fieldorder'})
+                   ? @{$plans{$layer}->{'fieldorder'}}
+                   : keys %{ $href };
+  
+    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 };
+      $format = $href->{$field}{'format'} if exists($href->{$field}{'format'});
 
+      #XXX these should use elements/ fields... (or this whole thing should
+      #just use layer_fields instead of layer_callback)
+  
       if ( ! exists($href->{$field}{'type'}) ) {
-        $html .= qq!<INPUT TYPE="text" NAME="$field" VALUE="!.
-                 ( exists($plandata{$field})
-                     ? $plandata{$field}
+  
+        $html .= qq!<INPUT TYPE="text" NAME="${layer}__$field" VALUE="!.
+                 ( exists($options{$field})
+                     ? &$format($options{$field})
                      : $href->{$field}{'default'} ).
-                 qq!" onChange="fchanged(this)">!;
-      } elsif ( $href->{$field}{'type'} eq 'select_multiple' ) {
-        $html .= qq!<SELECT MULTIPLE NAME="$field" onChange="fchanged(this)">!;
-        foreach my $record (
-          qsearch( $href->{$field}{'select_table'},
-                   $href->{$field}{'select_hash'}   )
-        ) {
-          my $value = $record->getfield($href->{$field}{'select_key'});
-          $html .= qq!<OPTION VALUE="$value"!.
-                   (  $plandata{$field} =~ /(^|, *)$value *(,|$)/
-                        ? ' SELECTED'
-                        : ''          ).
-                   '>'. $record->getfield($href->{$field}{'select_label'})
+                 qq!">!;
+  
+      } elsif ( $href->{$field}{'type'} eq 'checkbox' ) {
+  
+        $html .= qq!<INPUT TYPE="checkbox" NAME="${layer}__$field" VALUE=1 !.
+                 ( exists($options{$field}) && $options{$field}
+                   ? ' CHECKED'
+                   : ''
+                 ). '>';
+  
+      } elsif ( $href->{$field}{'type'} =~ /^select/ ) {
+  
+        $html .= '<SELECT';
+        $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 (
+            qsearch( $href->{$field}{'select_table'},
+                     $href->{$field}{'select_hash'}   )
+          ) {
+            my $value = $record->getfield($href->{$field}{'select_key'});
+            $html .= qq!<OPTION VALUE="$value"!.
+                     (  $options{$field} =~ /(^|, *)$value *(,|$)/ #?
+                          ? ' SELECTED'
+                          : ''
+                     ).
+                     '>'. $record->getfield($href->{$field}{'select_label'});
+          }
+        } elsif ( $href->{$field}{'select_options'} ) {
+          foreach my $key ( keys %{ $href->{$field}{'select_options'} } ) {
+            my $label = $href->{$field}{'select_options'}{$key};
+            $html .= qq!<OPTION VALUE="$key"!.
+                     ( $options{$field} =~ /(^|, *)$key *(,|$)/ #?
+                         ? ' SELECTED'
+                         : ''
+                     ).
+                     '>'. $label;
+          }
+  
+        } else {
+          $html .= '<font color="#ff0000">warning: '.
+                   "don't know how to retreive options for $field select field".
+                   '</font>';
         }
         $html .= '</SELECT>';
+  
+      } elsif ( $href->{$field}{'type'} eq 'radio' ) {
+  
+        my $radio =
+          qq!<INPUT TYPE="radio" NAME="${layer}__$field"!;
+  
+        foreach my $key ( keys %{ $href->{$field}{'options'} } ) {
+          my $label = $href->{$field}{'options'}{$key};
+          $html .= qq!$radio VALUE="$key"!.
+                   ( $options{$field} =~ /(^|, *)$key *(,|$)/ #?
+                       ? ' CHECKED'
+                       : ''
+                   ).
+                   "> $label<BR>";
+        }
+  
       }
-
+  
       $html .= '</TD></TR>';
     }
     $html .= '</TABLE>';
-
-    $html .= '<INPUT TYPE="hidden" NAME="plandata" VALUE="'.
-             join(',', keys %{ $href } ). '">'.
-             '<BR><BR>';
-             
-    $html .= '<INPUT TYPE="submit" VALUE="'.
-             ( $hashref->{pkgpart} ? "Apply changes" : "Add package" ).
-             '" onClick="fchanged(this)">';
-
-    $html .= '<BR><BR>don\'t edit this unless you know what you\'re doing '.
-             '<INPUT TYPE="button" VALUE="refresh expressions" '.
-               'onClick="fchanged(this)">'.
-             ntable("#cccccc",2).
-             '<TR><TD>'.
-             '<FONT SIZE="1">Setup expression<BR>'.
-             '<INPUT TYPE="text" NAME="setup" SIZE="160" VALUE="'.
-               encode_entities($hashref->{setup}). '" onLoad="fchanged(this)">'.
-             '</FONT><BR>'.
-             '<FONT SIZE="1">Recurring espression<BR>'.
-             '<INPUT TYPE="text" NAME="recur" SIZE="160" VALUE="'.
-               encode_entities($hashref->{recur}). '" onLoad="fchanged(this)">'.
-             '</FONT>'.
-             '</TR></TD>'.
-             '</TABLE>';
-
+  
+    $html .= qq(<INPUT TYPE="hidden" NAME="${layer}__OPTIONS" VALUE=").
+             join(',', keys %{ $href } ). '">';
+  
     $html;
+  
+  };
+
+  my %selectlayers = (
+    field          => 'plan',
+    options        => [ keys %plan_labels ],
+    labels         => \%plan_labels,
+    curr_value     => $object->plan,
+    layer_callback => $layer_callback,
+  );
+
+  my $return =
+    include('/elements/selectlayers.html', %selectlayers, 'layers_only'=>1 ).
+    '<SCRIPT TYPE="text/javascript">'.
+      include('/elements/selectlayers.html', %selectlayers, 'js_only'=>1 );
+
+  $return .=
+    "taxproduct_selectchanged(document.getElementById('taxproduct_select'));\n"
+      if $taxproducts;
+
+  $return .= '</SCRIPT>';
+
+  $return;
+
+};
+
+my %usage_class = map { ($_->classnum => $_->classname) }
+                  qsearch('usage_class', {});
+$usage_class{setup} = 'Setup';
+$usage_class{recur} = 'Recurring';
+
+my %taxproduct_fields = ();
+my $end_callback = sub {
+  my( $cgi, $object, $fields, $opt ) = @_;
+
+  @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) );
+
+  if ( $object->pkgpart ) {
+    foreach my $usage_class ( '', @taxproductnums ) {
+      $tax_override{$usage_class} =
+        join (",", map $_->taxclassnum,
+                       qsearch( 'part_pkg_taxoverride', {
+                                  'pkgpart'     => $object->pkgpart,
+                                  'usage_class' => $usage_class,
+                              })
+             );
+    }
+  }
 
-  },
-);
+  %taxproduct_fields =
+    map { $_ => [ "taxproductnum_$_", 
+                  { type  => 'select-taxproduct',
+                    #label => "$usage_class{$_} tax product",
+                  },
+                  "tax_override_$_", 
+                  { type  => 'select-taxoverride' }
+                ]
+        }
+        @taxproductnums;
 
-%>
+  $taxproduct_fields{'(default)'} =
+    [ 'taxproductnum', { type => 'select-taxproduct',
+                         #label => 'Default tax product',
+                       },
+      'tax_override',  { type => 'select-taxoverride' },
+    ];
+};
+
+my $taxproduct_values = sub {
+  my ($cgi, $object, $flags) = @_;
+  my $routine =
+    sub { my $layer = shift;
+          my @fields = @{$taxproduct_fields{$layer}};
+          my @values = ();
+          while( @fields ) {
+            my $field = shift @fields;
+            shift @fields;
+            $field =~ /^taxproductnum_\w+$/ &&
+              push @values, ( $field => $options{"usage_$field"} );
+            $field =~ /^tax_override_(\w+)$/ &&
+              push @values, ( $field => $tax_override{$1} );
+            $field =~ /^taxproductnum$/ &&
+              push @values, ( $field => $object->taxproductnum );
+            $field =~ /^tax_override$/ &&
+              push @values, ( $field => $tax_override{''} );
+          }
+          { (@values) };
+        };
+  
+  my @result = 
+    map { ( $_ => { &{$routine}($_) } ) } ( '(default)', @taxproductnums );
+  return({ @result });
+  
+};
+
+my $field_callback = sub {
+  my ($cgi, $object, $fieldref) = @_;
+
+  my $field = $fieldref->{field};
+  if ($field eq 'taxproductnums') {
+    $fieldref->{value} = join(',', @taxproductnums);
+  } elsif ($field eq 'taxproduct_select') {
+    $fieldref->{options} = [ '(default)', @taxproductnums ];
+    $fieldref->{labels}  = { ( '(default)' => '(default)' ),
+                             map {( $_ => ($usage_class{$_} || $_) )}
+                               @taxproductnums
+                           };
+    $fieldref->{layer_fields} = \%taxproduct_fields;
+    $fieldref->{layer_values_callback} = $taxproduct_values;
+  }
+};
+
+my $discountnum_hashref = {
+                            'disabled' => '',
+                            'months' => { 'op' => '>', 'value' => 1 },
+                          };
 
-<BR>
-Price plan <%= $widget->html %>
-  </BODY>
-</HTML>
+</%init>