4.x style
[freeside.git] / httemplate / edit / part_pkg.cgi
index 50aeb45..0a0b01e 100755 (executable)
-<% 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,
-
-              'onsubmit'              => 'confirm_submit',
-
-              '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',
-                            'setup_show_zero'  => 'Show zero setup',
-                            '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',
-                            'fcc_voip_class'   => 'Category',
-                          },
-
-              'fields' => [
-                            { field=>'clone',  type=>'hidden',
-                              curr_value_callback =>
-                                sub { shift->param('clone') },
-                            },
-                            { field=>'pkgnum', type=>'hidden',
-                              curr_value_callback =>
-                                sub { shift->param('pkgnum') },
-                            },
-
-                            { field=>'custom',  type=>'hidden' },
-                            { field=>'family_pkgpart', type=>'hidden' },
-                            { field=>'successor', type=>'hidden' },
-
-                            { 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',
-                                onchange => 'setup_changed',
-                              },
-                              { field    => 'setup_show_zero',
-                                type     => 'checkbox',
-                                value    => 'Y',
-                                disabled => sub { $setup_show_zero_disabled },
-                              },
-                              { field    => 'freq',
-                                type     => 'part_pkg_freq',
-                                onchange => 'freq_changed',
-                              },
-                              { field    => 'recur_fee',
-                                type     => 'money',
-                                disabled => sub { $recur_disabled },
-                                onchange => 'recur_changed',
-                              },
-
-                              { 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_voip_class',
-                                      type=>'select-voip_class',
-                                    },
-                                    { field=>'fcc_ds0s', type=>'text', size=>6 },
-                                  )
-                                 : ()
-                              ),
-
-
-                            { type => 'columnend' },
-
-                            { 'type'  => $report_option ? 'tablebreak-tr-title'
-                                                        : 'hidden',
-                              'value' => 'Optional report classes',
-                              'field' => 'census_title',
-                            },
-                            { 'field'    => 'report_option',
-                              'type'     => $report_option ? 'select-table'
-                                                           : 'hidden',
-                              'table'    => 'part_pkg_report_option',
-                              'name_col' => 'name',
-                              'hashref'  => { 'disabled' => '' },
-                              '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',
-                              'colspan' => 4,
-                            },
-                            { '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',
-                                               },
-                                             ],
-                            },
-
-                            { 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',
-                            },
-
-                          ],
-
-           )
-%>
+<& 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').
+                                include('/elements/init_calendar.html').
+                                $javascript,
+     'html_bottom'           => $html_bottom,
+     'extra_fields_validate' => $validate_priceplan_fields,
+     'body_etc'              =>
+       'onLoad="agent_changed(document.edit_topform.agentnum);
+                aux_planchanged(document.edit_topform.plan);
+                hide_supp_pkgs()"',
+
+     '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,
+
+     'onsubmit'              => 'confirm_submit',
+
+     'labels' => {
+                   'pkgpart'          => 'Package Definition',
+                   'pkg'              => 'Package',
+                   %locale_field_labels,
+                   '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',
+                   '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',
+                   'agent_pkgpartid'  => 'External ID',
+                   'agentnum'         => 'Agent',
+                   'agent_type'       => ' ', #just its title headingn is fine
+                   'setup_fee'        => 'Setup fee',
+                   'setup_show_zero'  => 'Show zero setup',
+                   'recur_fee'        => 'Recurring fee',
+                   'recur_show_zero'  => 'Show zero recurring',
+                   ( map { ( "setup_fee_$_" => "Setup fee $_",
+                             "recur_fee_$_" => "Recurring fee $_",
+                           );
+                         }
+                       $conf->config('currencies')
+                   ),
+                   'usagepricepart'   => ' ',
+                   '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' => 'When ordering package, also order',
+                   'report_option'    => 'Report classes',
+                   'delay_start'      => 'Default delay (days)',
+                   'adjourn_months'   => 'Suspend the package after ',
+                   'contract_end_months' => 'Contract ends after ',
+                   'expire_months'    => 'Cancel the package after ',
+                   'change_to_pkgpart'=> 'and replace it with ',
+                   'units_taxproductnum' => 'Per-line tax product',
+                 },
+
+     'fields' => [
+                   { field=>'clone',  type=>'hidden',
+                     curr_value_callback =>
+                       sub { shift->param('clone') },
+                   },
+                   { field=>'pkgnum', type=>'hidden',
+                     curr_value_callback =>
+                       sub { shift->param('pkgnum') },
+                   },
+
+                   { field=>'custom',  type=>'hidden' },
+                   { field=>'family_pkgpart', type=>'hidden' },
+                   { field=>'successor', type=>'hidden' },
+
+                   { type => 'columnstart' },
+                   
+                     { field     => 'pkg',
+                       type      => 'input-locale-text',
+                       size      => 40, #32
+                       maxlength => 50,
+                     },
+                     #@locale_fields,
+                     {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'},
+                     { field => 'start_on_hold',
+                       type => 'checkbox',
+                       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',
+                       onchange => 'setup_changed',
+                     },
+                     { field    => 'setup_show_zero',
+                       type     => 'checkbox',
+                       value    => 'Y',
+                       disabled => sub { $setup_show_zero_disabled },
+                     },
+                     ( map { +{ field => "setup_fee_$_",
+                                type  => 'text',
+                                prefix=> currency_symbol($_, SYM_HTML),
+                                size  => 8,
+                              }
+                           }
+                         sort $conf->config('currencies')
+                     ),
+                     { field    => 'freq',
+                       type     => 'part_pkg_freq',
+                       onchange => 'freq_changed',
+                     },
+                     { field    => 'recur_fee',
+                       type     => 'money',
+                       disabled => sub { $recur_disabled },
+                       onchange => 'recur_changed',
+                     },
+                     { field    => 'recur_show_zero',
+                       type     => 'checkbox',
+                       value    => 'Y',
+                       disabled => sub { $recur_show_zero_disabled },
+                     },
+                     ( map { +{ field => "recur_fee_$_",
+                                type  => 'text',
+                                prefix=> currency_symbol($_, SYM_HTML),
+                                size  => 8,
+                              }
+                           }
+                         sort $conf->config('currencies')
+                     ),
+
+                     ( $conf->exists('part_pkg-delay_start')
+                       ? ( { type  => 'tablebreak-tr-title',
+                             value => 'Delayed start',
+                           },
+                           { field => 'delay_start',
+                             type => 'text', size => 6 },
+                         )
+                       : ()
+                     ),
+
+                     { type   => 'tablebreak-tr-title',
+                       value  => 'Limited duration',
+                     },
+                     { field  => 'adjourn_months',
+                       type   => 'select-months',
+                     },
+                     { field  => 'contract_end_months',
+                       type   => 'select-months',
+                     },
+                     { field  => 'expire_months',
+                       type   => 'select-expire_months',
+                     },
+                     { field  => 'change_to_pkgpart',
+                       type   => 'select-part_pkg',
+                       extra_sql  => sub { $pkgpart
+                        ? "AND part_pkg.pkgpart != $pkgpart"
+                        : ''
+                       },
+                       empty_label => 'no package',
+                     },
+
+                     #price plan
+                     #setup fee
+                     #recurring frequency
+                     #recurring fee (auto-disable)
+
+                   { type => 'columnnext', 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 => 'taxproductnum',
+                       type  => 'part_pkg-taxproducts',
+                       include_opt_callback =>
+                         sub { pkgpart => $_[0]->pkgpart },
+                     },
+                     { field => 'units_taxproductnum',
+                       type  => ($tax_data_vendor ?
+                                  'select-taxproduct' : 'hidden'),
+                     },
+                     { type  => 'tablebreak-tr-title',
+                       value => 'Promotions', #better name?
+                     },
+                     { field=>'promo_code', type=>'text', size=>15 },
+
+                     { type  => 'tablebreak-tr-title',
+                       value => 'Cost tracking', #better name?
+                     },
+
+                     ( $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', },
+                         )
+                     ),
+
+                   { type => 'columnnext', value=>'Agent (reseller) types' },
+
+                     { field       => 'agent_type',
+                       type        => 'select-agent_type',
+                       disabled    => ! $acl_edit_global,
+                       element_etc => 'size="10"',
+                       multiple    =>  '1', #cause edit.html is dum
+                       curr_value_callback => sub {
+                         my($cgi, $object, $field) = @_;
+                         #in the other callbacks..?  hmm.
+                         \@agent_type;
+                       },
+                     },
+
+                     ($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  => 'tablebreak-tr-title',
+                       value => 'External Links', #better name?
+                     },
+                     { field=>'agent_pkgpartid', type=>'text', size=>21 },
+
+                     { type  => 'tablebreak-tr-title',
+                       value => 'Line-item revenue recognition', #better name?
+                     },
+                     { field=>'pay_weight',    type=>'text', size=>6 },
+                     { field=>'credit_weight', type=>'text', size=>6 },
+
+                   { type => 'columnend' },
+
+                   { type     => 'tablebreak-tr-title',
+                     value    => 'Usage pricing add-ons', #better name?  just 'Usage pricing' ?  there's also CDR usage pricing, RADIUS usage pricing, etc :/
+                   },
+                   { 'field'     => 'usagepricepart',
+                     'type'      => 'part_pkg_usageprice',
+                     'o2m_table' => 'part_pkg_usageprice',
+                     'm2_label'  => ' ',
+                     'm2_error_callback' => $usageprice_error_callback,
+                   },
+
+                   { 'type'  => $report_option ? 'tablebreak-tr-title'
+                                               : 'hidden',
+                     'value' => 'Optional report classes',
+                     'field' => 'census_title',
+                   },
+                   { 'field'    => 'report_option',
+                     'type'     => $report_option ? 'select-table'
+                                                  : 'hidden',
+                     'table'    => 'part_pkg_report_option',
+                     'name_col' => 'name',
+                     'hashref'  => { 'disabled' => '' },
+                     'multiple' => 1,
+                     'curr_value_callback' => $report_option_value_callback,
+                   },
+
+                   { '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',
+                     'colspan' => 4,
+                   },
+                   { 'field'      => 'bill_dst_pkgpart',
+                     'type'       => 'select-part_pkg',
+                     'extra_sql'  => sub { $pkgpart
+                                            ? "AND part_pkg.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',
+                     'm2_error_callback' =>
+                       &{$m2_error_callback_maker}('bill'),
+                     'm2_fields' => [ { 'field' => 'hidden',
+                                        'type'  => 'checkbox',
+                                        'value' => 'Y',
+                                        'curr_value' => '',
+                                        'label' => 'Bundle',
+                                      },
+                                    ],
+                   },
+
+                   { 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 part_pkg.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',
+                     'm2_error_callback' =>
+                       &{$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',
+                     'label_callback' => sub { shift->pkg_comment_only },
+                     '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',
+                   },
+
+                 ],
+&>
 <%init>
 
 my $curuser = $FS::CurrentUser::CurrentUser;
@@ -321,7 +431,25 @@ my $agent_clone_extra_sql =
   ' ) ';
 
 my $conf = new FS::Conf;
-my $taxproducts = $conf->exists('enable_taxproducts');
+my $tax_data_vendor = $conf->config('tax_data_vendor');
+
+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($_) )
+} @locales;
+@locales = 
+  sort { $locale_labels{$a} cmp $locale_labels{$b} }
+    @locales;
+
+my $n = 0;
+my %locale_field_labels = (
+  map {
+        ( 'pkgpartmsgnum'. $n++. '_pkg' => $locale_labels{$_} );
+      }
+    @locales
+);
 
 my $sth = dbh->prepare("SELECT COUNT(*) FROM part_pkg_report_option".
                        "  WHERE disabled IS NULL OR disabled = ''  ")
@@ -392,8 +520,21 @@ my $error_callback = sub {
   $object->set($_ => scalar($cgi->param($_)) )
     foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
 
+  foreach my $currency ( $conf->config('currencies') ) {
+    my %part_pkg_currency = $object->part_pkg_currency_options($currency);
+    foreach (qw( setup_fee recur_fee )) {
+      my $param = $_.'_'.$currency;
+      $object->set( $param, $cgi->param($param) );
+    }
+  }
+
   $pkgpart = $object->pkgpart;
 
+  if ( $cgi->param('error') =~ / is suggested with / ) {
+    #yeah, detection is a shitty kludge, but we don't have exception objects
+    $opt->{form_init} = '<INPUT TYPE="checkbox" NAME="part_pkg_restrict_soft_override" VALUE="Y"> Override suggestion<BR><BR>';
+  }
+
 };
 
 my $new_hashref_callback = sub { { 'plan' => 'flat' }; };
@@ -409,6 +550,45 @@ my $new_object_callback = sub {
 
 };
 
+my $report_option_value_callback = sub {
+  my ($cgi, $object) = @_;
+  my @report_option;
+  if ( defined $cgi->param('report_option') ) {
+    @report_option = $cgi->param('report_option');
+  } else {
+    foreach ($object->options) {
+      /^report_option_(\d+)$/ && (push @report_option, $1);
+    }
+  }
+  join(',', @report_option);
+};
+
+sub set_report_option {
+  my($cgi, $object, $fields ) = @_; #, $opt
+
+  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);
+#  }
+
+}
+
 my $edit_callback = sub {
   my( $cgi, $object, $fields, $opt ) = @_;
 
@@ -424,32 +604,19 @@ my $edit_callback = sub {
   (@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);
-  }
+  set_report_option( $cgi, $object, $fields);
 
   %options = $object->options;
 
   $object->set($_ => $object->option($_, 1))
     foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
 
+  foreach my $currency ( $conf->config('currencies') ) {
+    my %part_pkg_currency = $object->part_pkg_currency_options($currency);
+    $object->set( $_.'_'.$currency, $part_pkg_currency{$_} )
+      foreach keys %part_pkg_currency;
+  }
+
   $pkgpart = $object->pkgpart;
 
 };
@@ -460,8 +627,7 @@ my $new_callback = sub {
   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',{});
+    @agent_type = map {$_->typenum} qsearch('agent_type', { 'disabled'=>'' });
   }
 
   $options{'suspend_bill'}=1 if $conf->exists('part_pkg-default_suspend_bill');
@@ -473,7 +639,7 @@ my $clone_callback = sub {
 
   if ( $cgi->param('pkgnum') ) {
 
-    my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cgi->param('pkgnum') } );
+    my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => scalar($cgi->param('pkgnum')) } );
     $object->agentnum( $cust_pkg->cust_main->agentnum );
 
     $opt->{action} = 'Custom';
@@ -484,19 +650,32 @@ my $clone_callback = sub {
 
     $object->disabled('Y');
 
-  } else { #not when cloning...
+  } else { #when explicitly cloning, not customizing
 
     (@agent_type) =
       map {$_->typenum} qsearch('type_pkgs',{ 'pkgpart' => $object->pkgpart } );
 
   }
 
+  set_report_option( $cgi, $object, $fields);
+
   %options = $object->options;
 
   $object->set($_ => $options{$_})
     foreach (qw( setup_fee recur_fee disable_line_item_date_ranges ));
 
   $recur_disabled = $object->freq ? 0 : 1;
+  $recur_show_zero_disabled =
+    $object->freq
+      ? $object->option('recur_fee') > 0 ? 1 : 0
+      : 1;
+
+  foreach my $currency ( $conf->config('currencies') ) {
+    my %part_pkg_currency = $object->part_pkg_currency_options($currency);
+    $object->set( $_.'_'.$currency, $part_pkg_currency{$_} )
+      foreach keys %part_pkg_currency;
+  }
+
 };
 
 my $discount_error_callback = sub {
@@ -516,6 +695,28 @@ my $discount_error_callback = sub {
   $cgi->param;
 };
 
+my $usageprice_error_callback = sub {
+  my( $cgi, $object ) = @_;
+  map {
+        if ( /^usagepricepart(\d+)_price$/
+               && $cgi->param("usagepricepart$1_price") )
+        {
+          new FS::part_pkg_usageprice {
+            'usagepricepart' => scalar($cgi->param("usagepricepart$1")),
+            'pkgpart'        => $object->pkgpart,
+            'price'          => scalar($cgi->param("usagepricepart$1_price")),
+            #'currency
+            'action'         => scalar($cgi->param("usagepricepart$1_action")),
+            'target'         => scalar($cgi->param("usagepricepart$1_target")),
+            'amount'         => scalar($cgi->param("usagepricepart$1_amount")),
+          };
+        } else {
+          ();
+        }
+      }
+  $cgi->param;
+};
+
 my $m2_error_callback_maker = sub {
   my $link_type = shift; #yay closures
   return sub {
@@ -603,20 +804,68 @@ my $javascript = <<'END';
 
     function aux_planchanged(what) { //?
 
-      alert('called!');
       var plan = what.options[what.selectedIndex].value;
-      var table = document.getElementById('TableNumber7') // XXX NOT ROBUST
 
+      var term_table = document.getElementById('TableNumber8') // XXX NOT ROBUST
       if ( plan == 'flat' || plan == 'prorate' || plan == 'subscription' ) {
-        //table.disabled = false;
-        table.style.visibility = '';
+        //term_table.disabled = false;
+        //term_table.style.visibility = '';
+        term_table.style.display = '';
       } else {
-        //table.disabled = true;
-        table.style.visibility = 'hidden';
+        //term_table.disabled = true;
+        //term_table.style.visibility = 'hidden';
+        term_table.style.display = 'none';
+      }
+
+      var currency_regex = /^(setup|recur)_fee_[A-Z]{3}$/;
+
+      var form = what.form
+      for ( var i=0; i < form.length; i++ ) {
+        if ( currency_regex.test(form[i].name) ) {
+          if ( plan == 'currency_fixed' ) {
+            form[i].disabled = false;
+          } else {
+            form[i].disabled = true;
+          }
+        }
       }
 
     }
 
+    // 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.border = 'thin solid #999999';
+        button.style.padding = '1px';
+      }
+    }
+
+    function finish_edit_fcc(id) {
+      cClick();
+      show_fcc_options(id); // refresh the display
+    }
+
 END
 
 my $warning =
@@ -646,6 +895,15 @@ tie my %plan_labels, 'Tie::IxHash',
   map {  $_ => ( $plans{$_}->{'shortname'} || $plans{$_}->{'name'} ) }
       keys %plans;
 
+my $validate_priceplan_fields = {};
+foreach my $priceplan (keys %plans) {
+  my $plan_fields = $plans{$priceplan}->{fields};
+  foreach my $price_plan_field (keys %$plan_fields) {
+    $validate_priceplan_fields->{$priceplan."__".$price_plan_field} = $plan_fields->{$price_plan_field}->{"js_validate"}
+      if exists $plan_fields->{$price_plan_field}->{"js_validate"};
+  }
+}
+
 my $html_bottom = sub {
   my( $object ) = @_;
 
@@ -654,7 +912,7 @@ my $html_bottom = sub {
   my $layer_callback = sub {
   
     my $layer = shift;
-    my $html = ntable("#cccccc",2);
+    my $html = '<TABLE CLASS="fsinnerbox">';
   
     #$html .= '
     #  <TR>
@@ -674,19 +932,52 @@ my $html_bottom = sub {
    #$html .= '</SELECT></TD></TR>';
   
     my $href = $plans{$layer}->{'fields'};
-    my @fields = exists($plans{$layer}->{'fieldorder'})
-                   ? @{$plans{$layer}->{'fieldorder'}}
-                   : keys %{ $href };
-  
+    my @fields;
+    if ( $plans{$layer}->{'fieldorder'} ) {
+      @fields = @{ $plans{$layer}->{'fieldorder'} };
+    } else {
+      warn "FS::part_pkg::$layer has no fieldorder.\n";
+      @fields = keys %$href;
+    }
+    
+    # hash of dependencies for each of the Pricing Plan fields.
+    # make sure NOT to use double-quotes inside the 'msg' value.
+    my $dependencies = {
+        'unused_credit_suspend' => {
+            'msg'       => q|You must set the 'suspend_credit_type' option in Configuration->Settings to gain access to this option.|,
+            'are_met'   => sub{
+                my $conf = new FS::conf;
+                my @conf_info = qsearch('conf', { 'name' => 'suspend_credit_type' } );
+                return 1 if (exists($conf_info[0]) && $conf_info[0]->{Hash}{value});
+                return 0;
+            }
+        },
+        'unused_credit_cancel' => {
+            'msg'       => q|You must set the 'cancel_credit_type' option in Configuration->Settings to gain access to this option.|,
+            'are_met'   => sub{
+                my $conf = new FS::conf;
+                my @conf_info = qsearch('conf', { 'name' => 'cancel_credit_type' } );
+                return 1 if (exists($conf_info[0]) && $conf_info[0]->{Hash}{value});
+                return 0;
+            }
+        }
+    };
+
     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>';
+      $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>
+      ';
   
       my $format = sub { shift };
       $format = $href->{$field}{'format'} if exists($href->{$field}{'format'});
@@ -694,7 +985,10 @@ my $html_bottom = sub {
       #XXX these should use elements/ fields... (or this whole thing should
       #just use layer_fields instead of layer_callback)
   
-      if ( ! exists($href->{$field}{'type'}) ) {
+      if (exists($dependencies->{$field}) && !$dependencies->{$field}{'are_met'}()) {
+          $html .= q!<span title="!.$dependencies->{$field}{'msg'}.q!">N/A</span>!;
+          
+      } elsif ( ! exists($href->{$field}{'type'}) ) {
   
         $html .= qq!<INPUT TYPE="text" NAME="${layer}__$field" VALUE="!.
                  ( exists($options{$field})
@@ -702,6 +996,14 @@ my $html_bottom = sub {
                      : $href->{$field}{'default'} ).
                  qq!">!;
   
+      } elsif ( $href->{$field}{'type'} eq 'textarea' ) {
+
+        $html .= qq!<TEXTAREA NAME="${layer}__$field">!.
+                 ( exists($options{$field})
+                     ? &$format($options{$field})
+                     : $href->{$field}{'default'} ).
+                 qq!</TEXTAREA>!;
+
       } elsif ( $href->{$field}{'type'} eq 'checkbox' ) {
   
         $html .= qq!<INPUT TYPE="checkbox" NAME="${layer}__$field" VALUE=1 !.
@@ -709,7 +1011,34 @@ my $html_bottom = sub {
                    ? ' CHECKED'
                    : ''
                  ). '>';
-  
+
+      } elsif ( $href->{$field}{'type'} eq 'date' ) {
+
+        $html .= include('/elements/input-date-field.html', {
+                           'name'  => $layer.'__'.$field,
+                           'value' => $options{$field},
+                        });
+
+      } elsif ( $href->{$field}{'type'} =~ /^select-rt-/ ) {
+
+        $html .= include('/elements/'.$href->{$field}{'type'}.'.html',
+                           'name'       => $layer.'__'.$field,
+                           'curr_value' => $options{$field},
+                           map { $_ => $href->{$field}{$_} }
+                             grep { $_ !~ /^(name|type|parse)$/ }
+                               keys %{ $href->{$field} }
+                        );
+
+      } 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';
@@ -772,9 +1101,11 @@ my $html_bottom = sub {
       $html .= '</TD></TR>';
     }
     $html .= '</TABLE>';
-  
-    $html .= qq(<INPUT TYPE="hidden" NAME="${layer}__OPTIONS" VALUE=").
-             join(',', keys %{ $href } ). '">';
+    $html .= include('/elements/hidden.html',
+                field => $layer.'__OPTIONS',
+                value => join(',', @fields)
+             );
   
     $html;
   
@@ -786,18 +1117,14 @@ my $html_bottom = sub {
     labels         => \%plan_labels,
     curr_value     => $object->plan,
     layer_callback => $layer_callback,
+    onchange       => 'aux_planchanged(what);',
   );
 
   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>';
+      include('/elements/selectlayers.html', %selectlayers, 'js_only'=>1 ) .
+    '</SCRIPT>';
 
   $return;
 
@@ -878,14 +1205,11 @@ my $field_callback = sub {
   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;
+  } elsif ($field eq 'taxproductnum') { # part_pkg-taxproduct, new style
+    if ( !$tax_data_vendor ) {
+      # then make the widget go away
+      $fieldref->{type} = 'hidden';
+    }
   }
 };