X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fpart_pkg.cgi;h=631a26b0adb65e4b95f6e31839c563d3eab053c0;hb=0141b002ab937b2b3a21a92c3728bc3101f4668a;hp=d338b8299d6cd07d034d037b3071e8f464fa8628;hpb=669bd6b315633c99ac61441198c2c4e45401c36b;p=freeside.git diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi index d338b8299..631a26b0a 100755 --- a/httemplate/edit/process/part_pkg.cgi +++ b/httemplate/edit/process/part_pkg.cgi @@ -1,24 +1,35 @@ <% include( 'elements/process.html', #'debug' => 1, 'table' => 'part_pkg', + 'agent_virt' => 1, + 'agent_null_right' => \@agent_null_right, 'redirect' => $redirect_callback, 'viewall_dir' => 'browse', 'viewall_ext' => 'cgi', 'edit_ext' => 'cgi', - #XXX usable with cloning? #'agent_null_right' => 'Edit global package definitions', 'precheck_callback' => $precheck_callback, 'args_callback' => $args_callback, + 'process_locale' => 'pkg', 'process_m2m' => \@process_m2m, ) %> <%init> +my $customizing = ( ! $cgi->param('pkgpart') && $cgi->param('pkgnum') ); + my $curuser = $FS::CurrentUser::CurrentUser; +my $edit_global = 'Edit global package definitions'; +my $customize = 'Customize customer package'; + die "access denied" unless $curuser->access_right('Edit package definitions') - || $curuser->access_right('Edit global package definitions') - || ( ! $cgi->param('pkgpart') && $cgi->param('pkgnum') && $curuser->access_right('Customize customer package') ); + || $curuser->access_right($edit_global) + || ( $customizing && $curuser->access_right($customize) ); + +my @agent_null_right = ( $edit_global ); +push @agent_null_right, $customize if $customizing; + my $precheck_callback = sub { my( $cgi ) = @_; @@ -39,9 +50,9 @@ my $precheck_callback = sub { } return "At least one agent type must be specified." unless scalar(@agents) - || ( $cgi->param('clone') && $cgi->param('clone') =~ /^\d+$/ ) - || ( !$cgi->param('pkgpart') && $conf->exists('agent-defaultpkg') ) - || $cgi->param('disabled'); + #wtf? || ( $cgi->param('clone') && $cgi->param('clone') =~ /^\d+$/ ) + || $cgi->param('disabled') + || $cgi->param('agentnum'); return ''; @@ -82,6 +93,7 @@ my $args_callback = sub { } ( $optionname => $value ); } + grep { $_ !~ /^report_option_/ } @options; foreach ( split(',', $cgi->param('taxproductnums') ) ) { @@ -91,20 +103,36 @@ my $args_callback = sub { $options{"usage_taxproductnum_$_"} = $value; } + 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; ### + # fcc options + ### + my $fcc_options_string = $cgi->param('fcc_options_string'); + if ($fcc_options_string) { + push @args, 'fcc_options' => decode_json($fcc_options_string); + } + + ### #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; + my %provision_hold = map { $_ => scalar($cgi->param("provision_hold$_" )) } @svcparts; - push @args, 'pkg_svc' => \%pkg_svc; + push @args, 'pkg_svc' => \%pkg_svc, + 'hidden_svc' => \%hidden_svc, + 'provision_hold' => \%provision_hold; ### # cust_pkg and custnum_ref (inserts only) @@ -114,7 +142,17 @@ my $args_callback = sub { 'custnum_ref' => \$custnum; } - warn "args: ".join('/', @args). "\n"; + my %part_pkg_vendor; + foreach my $param ( $cgi->param ) { + if ( $param =~ /^export(\d+)$/ && length($cgi->param($param)) > 0 ) { + $part_pkg_vendor{$1} = $cgi->param($param); + } + } + if ( keys %part_pkg_vendor > 0 ) { + push @args, 'part_pkg_vendor' => \%part_pkg_vendor; + } + + #warn "args: ".join('/', @args). "\n"; @args; @@ -123,7 +161,13 @@ my $args_callback = sub { my $redirect_callback = sub { #my( $cgi, $new ) = @_; return '' unless $custnum; - popurl(3). "view/cust_main.cgi?keywords=$custnum;dummy="; + my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/ + ? '' + : ';show=packages'; + #my $frag = "cust_pkg$pkgnum"; #hack for IE ignoring real #fragment + + #can we link back to the specific customized package? it would be nice... + popurl(3). "view/cust_main.cgi?custnum=$custnum$show;dummy="; }; #these should probably move to @args above and be processed by part_pkg.pm... @@ -137,20 +181,47 @@ 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', 'target_field' => 'dst_pkgpart', - 'hashref' => { 'link_type' => 'bill' }, - 'params' => [ map $cgi->param($_), grep /^bill_dst_pkgpart/, $cgi->param ], + 'hashref' => { 'link_type' => 'svc', 'hidden' => '' }, + 'params' => [ map $cgi->param($_), + grep /^svc_dst_pkgpart/, $cgi->param + ], }, { 'link_table' => 'part_pkg_link', 'target_table' => 'part_pkg', 'base_field' => 'src_pkgpart', 'target_field' => 'dst_pkgpart', - 'hashref' => { 'link_type' => 'svc' }, - 'params' => [ map $cgi->param($_), grep /^svc_dst_pkgpart/, $cgi->param ], + 'hashref' => { 'link_type' => 'supp', 'hidden' => '' }, + 'params' => [ map $cgi->param($_), + grep /^supp_dst_pkgpart/, $cgi->param + ], }, + map { + my $hidden = $_; + { 'link_table' => 'part_pkg_link', + 'target_table' => 'part_pkg', + 'base_field' => 'src_pkgpart', + 'target_field' => 'dst_pkgpart', + 'hashref' => { 'link_type' => 'bill', 'hidden' => $hidden }, + 'params' => [ map { $cgi->param($_) } + grep { my $param = "bill_dst_pkgpart__hidden"; + my $digit = ''; + (($digit) = /^bill_dst_pkgpart(\d+)/ ) && + $cgi->param("$param$digit") eq $hidden; + } + $cgi->param + ], + }, + } ( '', 'Y' ), ); foreach my $override_class ($cgi->param) { @@ -164,24 +235,22 @@ foreach my $override_class ($cgi->param) { 'link_table' => 'part_pkg_taxoverride', 'target_table' => 'tax_class', 'hashref' => { 'usage_class' => $class }, - 'params' => \@tax_overrides, + 'params' => [ @tax_overrides ], }; } my $conf = new FS::Conf; -if ( $cgi->param('pkgpart') || ! $conf->exists('agent_defaultpkg') ) { - my @agents = (); - foreach ($cgi->param('agent_type')) { - /^(\d+)$/; - push @agents, $1 if $1; - } - push @process_m2m, { - 'link_table' => 'type_pkgs', - 'target_table' => 'agent_type', - 'params' => \@agents, - }; +my @agents = (); +foreach ($cgi->param('agent_type')) { + /^(\d+)$/; + push @agents, $1 if $1; } +push @process_m2m, { + 'link_table' => 'type_pkgs', + 'target_table' => 'agent_type', + 'params' => \@agents, +};