X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fpart_pkg.cgi;h=d3479951ef092a6c0c5e7533e6e81f9bbd6415e5;hb=ec48007f6bec82068c7a00fd8aa659ea4b999f92;hp=4b519f5fa9d05ef85690979bfa52a8d876218148;hpb=dae1d4ab33e5aee1ca8fcba89c8cf4ce4cbd1810;p=freeside.git diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index 4b519f5fa..d3479951e 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -1,21 +1,28 @@ <% 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, - - '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, + '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', @@ -32,7 +39,7 @@ 'disabled' => 'Disable new orders', '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', @@ -57,6 +64,12 @@ 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=>$disabled_type, value=>'Y'}, @@ -125,8 +138,9 @@ { 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. @@ -175,19 +189,28 @@ my $curuser = $FS::CurrentUser::CurrentUser; -my $edit_right = $curuser->access_right('Edit package definitions') - || $curuser->access_right('Edit global package definitions'); +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 $edit_right + unless $acl_edit_either || ( $cgi->param('pkgnum') && $curuser->access_right('Customize customer package') ); }; -my $disabled_type = $edit_right ? 'checkbox' : 'hidden'; +my $disabled_type = $acl_edit_either ? 'checkbox' : 'hidden'; + +my $agent_clone_extra_sql = + ' ( '. FS::part_pkg->curuser_pkgs_sql. + #kludge to clone custom customer packages you otherwise couldn't see + " OR ( part_pkg.disabled = 'Y' AND part_pkg.comment LIKE '(CUSTOM)' ) ". + ' ) '; my $conf = new FS::Conf; my $taxproducts = $conf->exists('enable_taxproducts'); @@ -208,6 +231,7 @@ my %tax_override = (); my %taxproductnums = map { ($_->classnum => 1) } qsearch('usage_class', { 'disabled' => '' }); +my @taxproductnums = ( qw( setup recur ), sort (keys %taxproductnums) ); my %options = (); my $recur_disabled = 1; @@ -217,7 +241,7 @@ my $error_callback = sub { (@agent_type) = $cgi->param('agent_type'); - $opt->{action} = 'Custom' if $cgi->param('clone'); + $opt->{action} = 'Custom' if $cgi->param('pkgnum'); $recur_disabled = $cgi->param('freq') ? 0 : 1; @@ -296,14 +320,21 @@ my $new_callback = sub { my $clone_callback = sub { my( $cgi, $object, $fields, $opt ) = @_; - $opt->{action} = 'Custom'; + 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 did anyway - $object->comment( '(CUSTOM) '. $object->comment ) - unless $object->comment =~ /^\(CUSTOM\) /; + #my $part_pkg = $clone_part_pkg->clone; + #this is all clone did anyway + $object->comment( '(CUSTOM) '. $object->comment ) + unless $object->comment =~ /^\(CUSTOM\) /; - $object->disabled('Y'); + $object->disabled('Y'); + + } %options = $object->options; @@ -330,7 +361,7 @@ my $m2_error_callback_maker = sub { }; }; -my $freq_changed = <<'END'; +my $javascript = <<'END'; END @@ -506,7 +553,6 @@ my %usage_class = map { ($_->classnum => $_->classname) } $usage_class{setup} = 'Setup'; $usage_class{recur} = 'Recurring'; -my @taxproductnums = (); my %taxproduct_fields = (); my $end_callback = sub { my( $cgi, $object, $fields, $opt ) = @_; @@ -571,4 +617,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; + } +}; +