X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=fcde22bf654f051e06672a69952039d935dfb77e;hb=09d3b99715ac707d64b1a06d8a2432b76ddb173d;hp=db706ab926db781db89fb5fbb6f5f03c17e8eda8;hpb=7d49fd20be0d0756334043439832de923507fa2e;p=freeside.git diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index db706ab92..fcde22bf6 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -1,23 +1,35 @@ <% include( 'elements/edit.html', - 'post_url' => popurl(1).'process/part_pkg.cgi', - 'name' => "Package definition", - 'table' => 'part_pkg', - #'viewall_dir' => 'browse', - 'viewall_url' => $p.'browse/part_pkg.cgi', - 'html_init' => include('/elements/init_overlib.html'). - $freq_changed, - 'html_bottom' => $html_bottom, - 'new_hashref_callback' => $new_hashref_callback, - 'new_object_callback' => $new_object_callback, - 'new_callback' => $new_callback, - 'edit_callback' => $edit_callback, - 'error_callback' => $error_callback, + '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, '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', @@ -26,13 +38,16 @@ 'taxproduct_select'=> 'Tax products', 'plan' => 'Price plan', 'disabled' => 'Disable new orders', + 'setup_cost' => 'Setup cost', + 'recur_cost' => 'Recur cost', 'pay_weight' => 'Payment weight', 'credit_weight' => 'Credit weight', - 'agentnum' => '', + 'agentnum' => 'Agent', 'setup_fee' => 'Setup fee', 'recur_fee' => 'Recurring fee', 'bill_dst_pkgpart' => 'Include line item(s) from package', 'svc_dst_pkgpart' => 'Include services of package', + 'report_option' => 'Report classes', }, 'fields' => [ @@ -45,12 +60,31 @@ sub { shift->param('pkgnum') }, }, + { field=>'custom', type=>'hidden' }, + { type => 'columnstart' }, - {field=>'pkg', type=>'text', size=>40 }, #32 + { 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' }, - {field=>'disabled', type=>'checkbox', value=>'Y'}, + ( $conf->exists('pkg-addon_classnum') + ? ( { field=>'addon_classnum', + type =>'select-pkg_class', + } + ) + : () + ), + {field=>'disabled', type=>$disabled_type, value=>'Y'}, { type => 'tablebreak-tr-title', value => 'Pricing', #better name? @@ -110,15 +144,16 @@ { field=>'promo_code', type=>'text', size=>15 }, { type => 'tablebreak-tr-title', - value => 'Line-item revenue recogition', #better name? + value => 'Cost tracking', #better name? }, - { field=>'pay_weight', type=>'text', size=>6 }, - { field=>'credit_weight', type=>'text', size=>6 }, + { field=>'setup_cost', type=>'money', }, + { field=>'recur_cost', type=>'money', }, { type => 'columnnext' }, - { field=>'agent_type', - type => 'select-agent_types', + { field => 'agent_type', + type => 'select-agent_types', + disabled => ! $acl_edit_global, curr_value_callback => sub { my($cgi, $object, $field) = @_; #in the other callbacks..? hmm. @@ -126,10 +161,31 @@ }, }, + { 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 }, + + { type => 'columnend' }, - { 'type' => 'tablebreak-tr-title', - 'value' => 'Pricing add-ons', + { 'type' => $census ? 'tablebreak-tr-title' + : 'hidden', + 'value' => 'Optional report classes', + 'field' => 'census_title', + }, + { 'field' => 'report_option', + 'type' => $census ? 'select-table' : 'hidden', + 'table' => 'part_pkg_report_option', + 'name_col' => 'name', + 'multiple' => 1, + }, + + + { 'type' => 'tablebreak-tr-title', + 'value' => 'Pricing add-ons', + 'colspan' => 4, }, { 'field' => 'bill_dst_pkgpart', 'type' => 'select-part_pkg', @@ -138,6 +194,13 @@ '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', @@ -167,13 +230,31 @@ my $curuser = $FS::CurrentUser::CurrentUser; -die "access denied" - unless $curuser->access_right('Edit package definitions') - || $curuser->access_right('Edit global package definitions') - || ( $cgi->param('pkgnum') && $curuser->access_right('Customize customer package') ); +my $edit_global = 'Edit global package definitions'; +my $acl_edit = $curuser->access_right('Edit package definitions'); +my $acl_edit_global = $curuser->access_right($edit_global); + +my $acl_edit_either = $acl_edit || $acl_edit_global; + +my $begin_callback = sub { + my( $cgi, $fields, $opt ) = @_; + die "access denied" + unless $acl_edit_either + || ( $cgi->param('pkgnum') + && $curuser->access_right('Customize customer package') + ); +}; + +my $disabled_type = $acl_edit_either ? 'checkbox' : 'hidden'; + +my $agent_clone_extra_sql = + ' ( '. FS::part_pkg->curuser_pkgs_sql. + " OR ( part_pkg.custom = 'Y' ) ". + ' ) '; my $conf = new FS::Conf; my $taxproducts = $conf->exists('enable_taxproducts'); +my $census = scalar( qsearch( 'part_pkg_report_option', {} ) ); #XXX # - tr-part_pkg_freq: month_increments_only (from price plans) @@ -189,43 +270,28 @@ my $taxproducts = $conf->exists('enable_taxproducts'); my @agent_type = (); my %tax_override = (); -my $clone_part_pkg = ''; - my %taxproductnums = map { ($_->classnum => 1) } qsearch('usage_class', { 'disabled' => '' }); - -if ( $cgi->param('error') ) { # oh well - foreach ($cgi->param) { - /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1); - } -} elsif ( my $pkgpart = $cgi->keywords || $cgi->param('pkgpart') ) { - $pkgpart =~ /^(\d+)$/ or die "illegal pkgpart"; - my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $pkgpart } ); - die "no part_pkg for pkgpart $pkgpart" unless $pkgpart; - foreach ($part_pkg->options) { - /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1); - } - foreach ($part_pkg->part_pkg_taxoverride) { - $taxproductnums{$_->usage_class} = 1 - if $_->usage_class; - } -} else { - # do nothing -} my @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) ); my %options = (); my $recur_disabled = 1; + my $error_callback = sub { my($cgi, $object, $fields, $opt ) = @_; + (@agent_type) = $cgi->param('agent_type'); + + $opt->{action} = 'Custom' if $cgi->param('pkgnum'); + + $recur_disabled = $cgi->param('freq') ? 0 : 1; + + foreach ($cgi->param) { + /^usage_taxproductnum_(\d+)$/ && ($taxproductnums{$1} = 1); + } $tax_override{''} = $cgi->param('tax_override'); $tax_override{$_} = $cgi->param('tax_override_$_') foreach(grep { /^tax_override_(\w+)$/ } $cgi->param); - $opt->{action} = 'Custom' if $cgi->param('clone'); - $clone_part_pkg= qsearchs('part_pkg', { 'pkgpart' => $cgi->param('clone') } ); - - $recur_disabled = $cgi->param('freq') ? 0 : 1; #some false laziness w/process $cgi->param('plan') =~ /^(\w+)$/ or die 'unparsable plan'; @@ -251,21 +317,9 @@ my $new_hashref_callback = sub { { 'plan' => 'flat' }; }; my $new_object_callback = sub { my( $cgi, $hashref, $fields, $opt ) = @_; - my $part_pkg = ''; - if ( $cgi->param('clone') ) { - $opt->{action} = 'Custom'; - $clone_part_pkg = qsearchs('part_pkg', { pkgpart=>$cgi->param('clone') } ); - $part_pkg = $clone_part_pkg->clone; - $part_pkg->disabled('Y'); - %options = $clone_part_pkg->options; - $part_pkg->set($_ => $options{$_}) - foreach (qw( setup_fee recur_fee )); - $recur_disabled = $part_pkg->freq ? 0 : 1; - } else { - $part_pkg = FS::part_pkg->new( $hashref ); - $part_pkg->set($_ => '0') - foreach (qw( setup_fee recur_fee )); - } + my $part_pkg = FS::part_pkg->new( $hashref ); + $part_pkg->set($_ => '0') + foreach (qw( setup_fee recur_fee )); $part_pkg; @@ -277,19 +331,27 @@ my $edit_callback = sub { $recur_disabled = $object->freq ? 0 : 1; (@agent_type) = map {$_->typenum} qsearch('type_pkgs',{'pkgpart'=>$1}); - $tax_override{$_} = - join (",", map {$_->taxclassnum} - qsearch( 'part_pkg_taxoverride', { 'pkgpart' => $object->pkgpart, - 'usage_class' => $_, - } - ) - ) - foreach ( '', @taxproductnums ); - -# join (",", map {$_->taxclassnum} -# $part_pkg->part_pkg_taxrate( 'cch', $conf->config('defaultloc') -# ); -# unless $tax_override; + + 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); + } %options = $object->options; @@ -309,24 +371,60 @@ my $new_callback = sub { }; +my $clone_callback = sub { + my( $cgi, $object, $fields, $opt ) = @_; + + if ( $cgi->param('pkgnum') ) { + + my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cgi->param('pkgnum') } ); + $object->agentnum( $cust_pkg->cust_main->agentnum ); + + $opt->{action} = 'Custom'; + + #my $part_pkg = $clone_part_pkg->clone; + #this is all clone does anyway + $object->custom('Y'); + + $object->disabled('Y'); + + } + + %options = $object->options; + + $object->set($_ => $options{$_}) + foreach (qw( setup_fee recur_fee )); + + $recur_disabled = $object->freq ? 0 : 1; +}; + my $m2_error_callback_maker = sub { my $link_type = shift; #yay closures return sub { my( $cgi, $object ) = @_; - map { - new FS::part_pkg_link { - 'link_type' => $link_type, - 'src_pkgpart' => $object->pkgpart, - 'dst_pkgpart' => $_, - }; - } - grep $_, - map $cgi->param($_), - grep /^${link_type}_dst_pkgpart(\d+)$/, $cgi->param; + my $num; + map { + + if ( /^${link_type}_dst_pkgpart(\d+)$/ && + ( my $dst = $cgi->param("${link_type}_dst_pkgpart$1") ) ) + { + + my $hidden = $cgi->param("${link_type}_dst_pkgpart__hidden$1") + || ''; + new FS::part_pkg_link { + 'link_type' => $link_type, + 'src_pkgpart' => $object->pkgpart, + 'dst_pkgpart' => $dst, + 'hidden' => $hidden, + }; + } else { + (); + } + } + $cgi->param; }; }; -my $freq_changed = <<'END'; +my $javascript = <<'END'; END @@ -482,11 +596,18 @@ my $html_bottom = sub { layer_callback => $layer_callback, ); - include('/elements/selectlayers.html', %selectlayers, 'layers_only'=>1 ). - ''; + my $return = + include('/elements/selectlayers.html', %selectlayers, 'layers_only'=>1 ). + ''; + + $return; }; @@ -495,21 +616,42 @@ my %usage_class = map { ($_->classnum => $_->classname) } $usage_class{setup} = 'Setup'; $usage_class{recur} = 'Recurring'; -my %taxproduct_fields = map { $_ => [ "taxproductnum_$_", - { type => 'select-taxproduct', - #label => "$usage_class{$_} tax product", - }, - "tax_override_$_", - { type => 'select-taxoverride' } - ] - } - @taxproductnums; -$taxproduct_fields{'(default)'} = - [ 'taxproductnum', { type => 'select-taxproduct', - #label => 'Default tax product', - }, - 'tax_override', { type => 'select-taxoverride' }, - ]; +my %taxproduct_fields = (); +my $end_callback = sub { + my( $cgi, $object, $fields, $opt ) = @_; + + @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) ); + + if ( $object->pkgpart ) { + foreach my $usage_class ( '', @taxproductnums ) { + $tax_override{$usage_class} = + join (",", map $_->taxclassnum, + qsearch( 'part_pkg_taxoverride', { + 'pkgpart' => $object->pkgpart, + 'usage_class' => $usage_class, + }) + ); + } + } + + %taxproduct_fields = + map { $_ => [ "taxproductnum_$_", + { type => 'select-taxproduct', + #label => "$usage_class{$_} tax product", + }, + "tax_override_$_", + { type => 'select-taxoverride' } + ] + } + @taxproductnums; + + $taxproduct_fields{'(default)'} = + [ 'taxproductnum', { type => 'select-taxproduct', + #label => 'Default tax product', + }, + 'tax_override', { type => 'select-taxoverride' }, + ]; +}; my $taxproduct_values = sub { my ($cgi, $object, $flags) = @_; @@ -538,4 +680,21 @@ my $taxproduct_values = sub { }; +my $field_callback = sub { + my ($cgi, $object, $fieldref) = @_; + + 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; + } +}; +