X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fpart_pkg.cgi;h=b4d2eb99df989ca439fda530245ef64e7b3a235b;hb=26e91d6afcd21b7113cdc6aebb37ad5acd3d5de8;hp=c0febf82892af212447b8713dcaf164d90118091;hpb=624b2d44625f69d71175c3348cae635d580c890b;p=freeside.git diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi index c0febf828..b4d2eb99d 100755 --- a/httemplate/edit/process/part_pkg.cgi +++ b/httemplate/edit/process/part_pkg.cgi @@ -103,13 +103,13 @@ my $args_callback = sub { $options{"usage_taxproductnum_$_"} = $value; } - foreach ( $cgi->param('report_option') ) { + foreach ( grep $_, $cgi->param('report_option') ) { $error ||= "Illegal optional report class: $_" unless ( $_ =~ /^\d*$/ ); $options{"report_option_$_"} = 1; } $options{$_} = scalar( $cgi->param($_) ) - for (qw( setup_fee recur_fee )); + for (qw( setup_fee recur_fee disable_line_item_date_ranges )); push @args, 'options' => \%options; @@ -117,11 +117,11 @@ my $args_callback = sub { #pkg_svc ### - my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) } - map { $_->svcpart } - qsearch('part_svc', {} ); + my @svcparts = map { $_->svcpart } qsearch('part_svc', {}); + my %pkg_svc = map { $_ => scalar($cgi->param("pkg_svc$_")) } @svcparts; + my %hidden_svc = map { $_ => scalar($cgi->param("hidden$_")) } @svcparts; - push @args, 'pkg_svc' => \%pkg_svc; + push @args, 'pkg_svc' => \%pkg_svc, 'hidden_svc' => \%hidden_svc; ### # cust_pkg and custnum_ref (inserts only) @@ -160,6 +160,12 @@ my @process_m2m = ( 'target_table' => 'tax_class', 'params' => \@tax_overrides, }, + { 'link_table' => 'part_pkg_discount', + 'target_table' => 'discount', + 'params' => [ map $cgi->param($_), + grep /^discountnum/, $cgi->param + ], + }, { 'link_table' => 'part_pkg_link', 'target_table' => 'part_pkg', 'base_field' => 'src_pkgpart',