X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=aa27fddeb9cba231c788153b8037208e62befdaf;hb=f576e065fb741448cc4834cdb9b09b718ca4ece2;hp=93a3b24c3bf3ceb471b694d787b4ce510089d3d9;hpb=c7bf005860b761a55ca075df987fb3b5ade8c242;p=freeside.git diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index 93a3b24c3..aa27fddeb 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -12,7 +12,8 @@ $javascript, 'html_bottom' => $html_bottom, 'body_etc' => - 'onLoad="agent_changed(document.edit_topform.agentnum)"', + 'onLoad="agent_changed(document.edit_topform.agentnum); + hide_supp_pkgs()"', 'begin_callback' => $begin_callback, 'end_callback' => $end_callback, @@ -24,9 +25,12 @@ 'error_callback' => $error_callback, 'field_callback' => $field_callback, + 'onsubmit' => 'confirm_submit', + 'labels' => { 'pkgpart' => 'Package Definition', - 'pkg' => 'Package (customer-visible)', + 'pkg' => 'Package', + %locale_field_labels, 'comment' => 'Comment (customer-hidden)', 'classnum' => 'Package class', 'addon_classnum' => 'Restrict additional orders to package class', @@ -38,19 +42,24 @@ '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', + 'supp_dst_pkgpart' => 'When ordering package, also order', 'report_option' => 'Report classes', - 'fcc_ds0s' => 'Voice-grade eqivalents', + 'fcc_ds0s' => 'Voice-grade equivalents', + 'fcc_voip_class' => 'Category', + 'delay_start' => 'Default delay (days)', }, 'fields' => [ @@ -64,6 +73,8 @@ }, { field=>'custom', type=>'hidden' }, + { field=>'family_pkgpart', type=>'hidden' }, + { field=>'successor', type=>'hidden' }, { type => 'columnstart' }, @@ -72,6 +83,7 @@ size => 40, #32 maxlength => 50, }, + #@locale_fields, {field=>'comment', type=>'text', size=>40 }, #32 { field => 'agentnum', type => 'select-agent', @@ -88,18 +100,25 @@ : () ), {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? + { type => 'tablebreak-tr-title', + value => 'Pricing', #better name? }, - { field => 'plan', - type => 'selectlayers-select', - options => [ keys %plan_labels ], - labels => \%plan_labels, + { field => 'plan', + type => 'selectlayers-select', + options => [ keys %plan_labels ], + labels => \%plan_labels, onchange => 'aux_planchanged(what);', }, - { field => 'setup_fee', - type => 'money', + { 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', @@ -157,8 +176,25 @@ { type => 'tablebreak-tr-title', value => 'Cost tracking', #better name? }, - { field=>'setup_cost', type=>'money', }, - { field=>'recur_cost', type=>'money', }, + + ( $curuser->access_right('Edit package definition costs') + ? ( { field=>'setup_cost', type=>'money', }, + { field=>'recur_cost', type=>'money', }, + ) + : ( { field=>'setup_cost', type=>'fixed', }, + { field=>'recur_cost', type=>'fixed', }, + ) + ), + + ( $conf->exists('part_pkg-delay_start') + ? ( { type => 'tablebreak-tr-title', + value => 'Delayed start', + }, + { field => 'delay_start', + type => 'text', size => 6 }, + ) + : () + ), { type => 'columnnext' }, @@ -172,23 +208,30 @@ }, }, - { type => 'tablebreak-tr-title', - value => 'Line-item revenue recogition', #better name? - }, - { field=>'pay_weight', type=>'text', size=>6 }, - { field=>'credit_weight', type=>'text', size=>6 }, - - ( $conf->exists('cust_pkg-show_fcc_voice_grade_equivalent') + { type => 'tablebreak-tr-title', + value => 'External Links', #better name? + }, + { field=>'agent_pkgpartid', type=>'text', size=>21 }, + + { type => 'tablebreak-tr-title', + value => 'Line-item revenue recogition', #better name? + }, + { field=>'pay_weight', type=>'text', size=>6 }, + { field=>'credit_weight', type=>'text', size=>6 }, + + ( $conf->exists('cust_pkg-show_fcc_voice_grade_equivalent') ? ( { type => 'tablebreak-tr-title', value => 'FCC Form 477 information', }, + { field=>'fcc_voip_class', + type=>'select-voip_class', + }, { field=>'fcc_ds0s', type=>'text', size=>6 }, ) : () ), - { type => 'columnend' }, { 'type' => $report_option ? 'tablebreak-tr-title' @@ -264,6 +307,22 @@ &{$m2_error_callback_maker}('svc'), }, + { 'type' => 'tablebreak-tr-title', + 'value' => 'Supplemental packages', + 'colspan' => '4', + 'include_opt_callback' => sub { + 'id' => 'show_supp_pkgs', + }, + }, + { 'field' => 'supp_dst_pkgpart', + 'type' => 'select-part_pkg', + 'm2_label' => 'When ordering package, also order', + 'm2m_method' => 'supp_part_pkg_link', + 'm2m_dstcol' => 'dst_pkgpart', + 'm2_error_callback' => + &{$m2_error_callback_maker}('supp'), + }, + { type => 'tablebreak-tr-title', value => 'Price plan options', }, @@ -306,6 +365,22 @@ my $agent_clone_extra_sql = my $conf = new FS::Conf; my $taxproducts = $conf->exists('enable_taxproducts'); +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 = '' ") or die dbh->errstr; @@ -332,10 +407,47 @@ my @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) ); my %options = (); my $recur_disabled = 1; +my $setup_show_zero_disabled = 0; my $recur_show_zero_disabled = 1; my $pkgpart = ''; +my $splice_locale_fields = sub { + my( $fields, $pkey_value_callback, $pkg_value_callback ) = @_; + + my $n = 0; + my @locale_fields = ( + map { + my $pkey_value= $pkey_value_callback ? &$pkey_value_callback($_) : ''; + my $pkg_value = $pkg_value_callback + ? $pkg_value_callback eq 'cgiparam' + ? $cgi->param('pkgpartmsgnum'. $n. '_pkg') + : &$pkg_value_callback($_) + : ''; + ( + { field => 'pkgpartmsgnum'. $n, + type => 'hidden', + value => $pkey_value, + }, + { field => 'pkgpartmsgnum'. $n. '_locale', + type => 'hidden', + value => $_, + }, + { field => 'pkgpartmsgnum'. $n++. '_pkg', + type => 'text', + size => 40, + #maxlength => 50, + value => $pkg_value, + }, + ); + + } + @locales + ); + splice(@$fields, 7, 0, @locale_fields); #XXX 7 is arbitrary above + +}; + my $error_callback = sub { my($cgi, $object, $fields, $opt ) = @_; @@ -343,10 +455,12 @@ my $error_callback = sub { $opt->{action} = 'Custom' if $cgi->param('pkgnum'); + $setup_show_zero_disabled = ($cgi->param('setup_fee') > 0) ? 1 : 0; + $recur_disabled = $cgi->param('freq') ? 0 : 1; $recur_show_zero_disabled = $cgi->param('freq') - ? $cgi->param('recur_fee') ? 0 : 1 + ? $cgi->param('recur_fee') > 0 ? 1 : 0 : 1; foreach ($cgi->param) { @@ -369,12 +483,21 @@ my $error_callback = sub { } @options; - #$cgi->param($_, $options{$_}) foreach (qw( setup_fee recur_fee )); $object->set($_ => scalar($cgi->param($_)) ) - foreach (qw( setup_fee recur_fee )); + foreach (qw( setup_fee recur_fee disable_line_item_date_ranges )); $pkgpart = $object->pkgpart; + &$splice_locale_fields( + $fields, + sub { + my $locale = shift; + my $part_pkg_msgcat = $object->part_pkg_msgcat($locale); + $part_pkg_msgcat ? $part_pkg_msgcat->pkgpartmsgnum : ''; + }, + 'cgiparam' + ); + }; my $new_hashref_callback = sub { { 'plan' => 'flat' }; }; @@ -384,19 +507,14 @@ my $new_object_callback = sub { my $part_pkg = FS::part_pkg->new( $hashref ); $part_pkg->set($_ => '0') - foreach (qw( setup_fee recur_fee )); + 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 } ); +sub set_report_option { + my($cgi, $object, $fields ) = @_; #, $opt my @report_option = (); foreach ($object->options) { @@ -419,13 +537,46 @@ my $edit_callback = sub { $field->{value} = join(',', @report_option); } +} + +my $edit_callback = sub { + my( $cgi, $object, $fields, $opt ) = @_; + + $setup_show_zero_disabled = ($object->option('setup_fee') > 0) ? 1 : 0; + + $recur_disabled = $object->freq ? 0 : 1; + + $recur_show_zero_disabled = + $object->freq + ? $object->option('recur_fee') > 0 ? 1 : 0 + : 1; + + (@agent_type) = + map {$_->typenum} qsearch('type_pkgs', { 'pkgpart' => $object->pkgpart } ); + + set_report_option( $cgi, $object, $fields); + %options = $object->options; - $object->set($_ => $object->option($_)) - foreach (qw( setup_fee recur_fee )); + $object->set($_ => $object->option($_, 1)) + foreach (qw( setup_fee recur_fee disable_line_item_date_ranges )); $pkgpart = $object->pkgpart; + &$splice_locale_fields( + $fields, + sub { + my $locale = shift; + my $part_pkg_msgcat = $object->part_pkg_msgcat($locale); + $part_pkg_msgcat ? $part_pkg_msgcat->pkgpartmsgnum : ''; + }, + sub { + my $locale = shift; + my $part_pkg_msgcat = $object->part_pkg_msgcat($locale); + $part_pkg_msgcat ? $part_pkg_msgcat->pkg : ''; + } + ); + }; my $new_callback = sub { @@ -440,6 +591,8 @@ my $new_callback = sub { $options{'suspend_bill'}=1 if $conf->exists('part_pkg-default_suspend_bill'); + &$splice_locale_fields($fields, '', ''); + }; my $clone_callback = sub { @@ -458,19 +611,31 @@ 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 )); + foreach (qw( setup_fee recur_fee disable_line_item_date_ranges )); $recur_disabled = $object->freq ? 0 : 1; + + &$splice_locale_fields( + $fields, + '', + sub { + my $locale = shift; + my $part_pkg_msgcat = $object->part_pkg_msgcat($locale); + $part_pkg_msgcat ? $part_pkg_msgcat->pkg : ''; + } + ); }; my $discount_error_callback = sub { @@ -530,15 +695,24 @@ my $javascript = <<'END'; } else { what.form.recur_fee.disabled = false; what.form.recur_fee.style.backgroundColor = '#ffffff'; - what.form.recur_show_zero.disabled = false; + recur_changed( what.form.recur_fee ); //what.form.recur_show_zero.style.backgroundColor= '#ffffff'; } } + function setup_changed(what) { + var setup = what.value; + if ( parseFloat(setup) == 0 ) { + what.form.setup_show_zero.disabled = false; + } else { + what.form.setup_show_zero.disabled = true; + } + } + function recur_changed(what) { var recur = what.value; - if ( recur == 0 ) { + if ( parseFloat(recur) == 0 ) { what.form.recur_show_zero.disabled = false; } else { what.form.recur_show_zero.disabled = true; @@ -566,11 +740,10 @@ my $javascript = <<'END'; } - function aux_planchanged(what) { + function aux_planchanged(what) { //? - alert('called!'); var plan = what.options[what.selectedIndex].value; - var table = document.getElementById('TableNumber7') // XXX NOT ROBUST + var table = document.getElementById('TableNumber6') // XXX NOT ROBUST if ( plan == 'flat' || plan == 'prorate' || plan == 'subscription' ) { //table.disabled = false; @@ -582,9 +755,57 @@ my $javascript = <<'END'; } - + // some magic to make "supplemental packages" less obvious + var supp_pkg_rows = []; + function show_supp_pkgs_click() { + supp_pkg_rows[0].style.display = ''; + this.onclick = ''; + this.style.backgroundColor = ''; + this.style.border = ''; + this.style.padding = ''; + } + + function hide_supp_pkgs() { + var all_selects = document.getElementsByTagName('select'); + for (var i=0; i < all_selects.length; i++) { + if ( all_selects[i].id.match(/^supp_dst_pkgpart/) ) { + supp_pkg_rows.push( all_selects[i].parentNode.parentNode ); + } + } + if ( supp_pkg_rows.length == 1 ) { + // there are none configured, so hide the row to create a new one + supp_pkg_rows[0].style.display = 'none'; + var button = document.getElementById('show_supp_pkgs'); + button.onclick = show_supp_pkgs_click; + button.style.backgroundColor = '#cccccc'; + button.style.border = '1px solid #7e0079'; + button.style.padding = '1px'; + } + } + END +my $warning = + 'Changing the setup or recurring fee will create a new package definition. '. + 'Continue?'; + +$javascript .= "function confirm_submit(f) {"; +if ( $conf->exists('part_pkg-lineage') ) { + $javascript .= " + + var fields = Array('setup_fee','recur_fee'); + for(var i=0; i < fields.length; i++) { + if ( f[fields[i]].value != f[fields[i]].defaultValue ) { + return confirm('$warning'); + } + } +"; +} +$javascript .= " + return true; +} +"; + tie my %plans, 'Tie::IxHash', %{ FS::part_pkg::plan_info() }; tie my %plan_labels, 'Tie::IxHash', @@ -625,11 +846,16 @@ my $html_bottom = sub { foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) { - if(!exists($href->{$field})) { + if(!exists($href->{$field})) { # shouldn't happen warn "nonexistent part_pkg option: '$field'\n"; next; } + if ( exists($href->{$field}->{display_if}) ) { + my %args = ( 'plan' => $layer ); # anything else? + my $display = &{ $href->{$field}->{display_if} }(%args); + next if !$display; + } $html .= ''. $href->{$field}{'name'}. ''; @@ -731,6 +957,7 @@ my $html_bottom = sub { labels => \%plan_labels, curr_value => $object->plan, layer_callback => $layer_callback, + onchange => 'aux_planchanged(what);', ); my $return =