X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=50aeb4595c255c0f9c55e6155c6e09be19514cdf;hp=be8b0f68f82c7ba03c3771e0174f0c57f1a0c74e;hb=0f701fc214468f8fb242435893de3fe084ba63f5;hpb=e2cff16135741b166473d18f828ad54f57037dae diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index be8b0f68f..50aeb4595 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -24,6 +24,8 @@ 'error_callback' => $error_callback, 'field_callback' => $field_callback, + 'onsubmit' => 'confirm_submit', + 'labels' => { 'pkgpart' => 'Package Definition', 'pkg' => 'Package (customer-visible)', @@ -38,18 +40,22 @@ '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 eqivalents', + 'fcc_ds0s' => 'Voice-grade equivalents', + 'fcc_voip_class' => 'Category', }, 'fields' => [ @@ -63,6 +69,8 @@ }, { field=>'custom', type=>'hidden' }, + { field=>'family_pkgpart', type=>'hidden' }, + { field=>'successor', type=>'hidden' }, { type => 'columnstart' }, @@ -87,18 +95,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', @@ -107,8 +122,15 @@ { 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 @@ -175,6 +197,9 @@ { type => 'tablebreak-tr-title', value => 'FCC Form 477 information', }, + { field=>'fcc_voip_class', + type=>'select-voip_class', + }, { field=>'fcc_ds0s', type=>'text', size=>6 }, ) : () @@ -324,6 +349,8 @@ 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 = ''; @@ -334,7 +361,13 @@ 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 : 0 + : 1; foreach ($cgi->param) { /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1); @@ -356,9 +389,8 @@ 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; @@ -371,7 +403,7 @@ 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; @@ -380,8 +412,15 @@ my $new_object_callback = sub { 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 } ); @@ -408,8 +447,8 @@ my $edit_callback = sub { %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; @@ -455,7 +494,7 @@ my $clone_callback = sub { %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; }; @@ -512,16 +551,43 @@ my $javascript = <<'END'; 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'; + 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 ( parseFloat(recur) == 0 ) { + what.form.recur_show_zero.disabled = false; + } else { + what.form.recur_show_zero.disabled = true; + } } function agent_changed(what) { - var agentnum = what.options[what.selectedIndex].value; + 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; @@ -535,7 +601,7 @@ my $javascript = <<'END'; } - function aux_planchanged(what) { + function aux_planchanged(what) { //? alert('called!'); var plan = what.options[what.selectedIndex].value; @@ -551,9 +617,29 @@ my $javascript = <<'END'; } - 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',