diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/browse/access_group.html | 4 | ||||
| -rwxr-xr-x | httemplate/browse/part_pkg.cgi | 23 | ||||
| -rw-r--r-- | httemplate/edit/elements/edit.html | 16 | ||||
| -rwxr-xr-x | httemplate/edit/part_pkg.cgi | 85 | ||||
| -rw-r--r-- | httemplate/elements/select-part_pkg.html | 16 |
5 files changed, 78 insertions, 66 deletions
diff --git a/httemplate/browse/access_group.html b/httemplate/browse/access_group.html index cecf3d6e2..aa9097f36 100644 --- a/httemplate/browse/access_group.html +++ b/httemplate/browse/access_group.html @@ -81,9 +81,7 @@ my $rights_sub = sub { '<TR><TH BGCOLOR="#dcdcdc">'. $_. '</TH></TR>'. '<TR><TD>'. - join('<BR>', grep { warn "$access_group->access_right($_): ". - $access_group->access_right($_). "\n"; - $access_group->access_right($_); } + join('<BR>', grep { $access_group->access_right($_); } map { ref($_) ? $_->{'rightname'} : $_; } @{ $rights{$_} } ). diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi index cdaa2c92a..1fed614a2 100755 --- a/httemplate/browse/part_pkg.cgi +++ b/httemplate/browse/part_pkg.cgi @@ -46,25 +46,11 @@ if ( $cgi->param('active') ) { my $extra_sql = ''; -#false laziness w/elements/select-part_pkg.html -my $agentnums = join(',', $curuser->agentnums); - unless ( $acl_edit_global ) { - $extra_sql .= " - WHERE ( - agentnum IS NOT NULL OR 0 < ( - SELECT COUNT(*) - FROM type_pkgs - LEFT JOIN agent_type USING ( typenum ) - LEFT JOIN agent AS typeagent USING ( typenum ) - WHERE type_pkgs.pkgpart = part_pkg.pkgpart - AND typeagent.agentnum IN ($agentnums) - ) - ) - "; + $extra_sql .= ' WHERE '. FS::part_pkg->curuser_pkgs_sql; } -#eofalse +my $agentnums = join(',', $curuser->agentnums); my $count_cust_pkg = " SELECT COUNT(*) FROM cust_pkg LEFT JOIN cust_main USING ( custnum ) WHERE cust_pkg.pkgpart = part_pkg.pkgpart @@ -97,7 +83,12 @@ my $html_init; One or more service definitions are grouped together into a package definition and given pricing information. Customers purchase packages rather than purchase services directly.<BR><BR> + <FORM METHOD="POST" ACTION="${p}edit/part_pkg.cgi"> <A HREF="${p}edit/part_pkg.cgi"><I>Add a new package definition</I></A> + or + !.include('/elements/select-part_pkg.html', 'element_name' => 'clone' ). qq! + <INPUT TYPE="submit" VALUE="Clone existing package"> + </FORM> <BR><BR> !; #} diff --git a/httemplate/edit/elements/edit.html b/httemplate/edit/elements/edit.html index 76fcd384b..d18a37d5a 100644 --- a/httemplate/edit/elements/edit.html +++ b/httemplate/edit/elements/edit.html @@ -91,8 +91,12 @@ Example: 'menubar' => '', #menubar arrayref #agent virtualization - 'agent_virt' => 1, - 'agent_null_right' => 'Access Right Name', + 'agent_virt' => 1, + 'agent_null_right' => 'Access Right Name', + 'agent_clone_extra_sql' => '', #if provided, this overrides the extra_sql + #implementing agent virt, for clone + #operations. i.e. pass "1=1" to allow + #cloning anything 'viewall_dir' => '', #'search' or 'browse', defaults to 'search' @@ -106,6 +110,8 @@ Example: # HTML callbacks ### + 'body_etc' => '', # Additional BODY attributes, i.e. onLoad="" + 'html_init' => '', #after the header/menubar #string or coderef of additional HTML to add before </TABLE> @@ -172,7 +178,8 @@ Example: <% include('/elements/header'. ( $opt{popup} ? '-popup' : '' ). '.html', $title, - include( '/elements/menubar.html', @menubar ) + include( '/elements/menubar.html', @menubar ), + $opt{'body_etc'}, ) %> @@ -620,6 +627,9 @@ if ( $cgi->param('error') ) { $clone = $1; + $qsearch{'extra_sql'} = ' AND '. $opt{'agent_clone_extra_sql'} + if $opt{'agent_clone_extra_sql'}; + $object = qsearchs({ %qsearch, 'hashref' => { $pkey => $clone } }); &{$opt{'clone_callback'}}($cgi, $object, $fields, \%opt ) diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index 3efc26cc3..5a9bb109f 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -1,25 +1,28 @@ <% include( 'elements/edit.html', - 'post_url' => popurl(1).'process/part_pkg.cgi', - 'name' => "Package definition", - 'table' => 'part_pkg', - - 'agent_virt' => 1, - 'agent_null_right' => $edit_global, - - #'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' => FS::part_pkg->curuser_pkgs_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, 'labels' => { 'pkgpart' => 'Package Definition', @@ -65,6 +68,7 @@ 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'}, @@ -230,7 +234,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; @@ -309,14 +313,21 @@ my $new_callback = sub { my $clone_callback = sub { my( $cgi, $object, $fields, $opt ) = @_; - $opt->{action} = 'Custom'; + if ( $cgi->param('pkgnum') ) { - #my $part_pkg = $clone_part_pkg->clone; - #this is all clone did anyway - $object->comment( '(CUSTOM) '. $object->comment ) - unless $object->comment =~ /^\(CUSTOM\) /; + my $cust_pkg = qsearchs('cust_pkg', { 'pkgnum' => $cgi->param('pkgnum') } ); + $object->agentnum( $cust_pkg->cust_main->agentnum ); - $object->disabled('Y'); + $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\) /; + + $object->disabled('Y'); + + } %options = $object->options; @@ -343,7 +354,7 @@ my $m2_error_callback_maker = sub { }; }; -my $freq_changed = <<'END'; +my $javascript = <<'END'; <SCRIPT TYPE="text/javascript"> function freq_changed(what) { @@ -359,6 +370,22 @@ my $freq_changed = <<'END'; } + function agent_changed(what) { + + var agentnum = what.options[what.selectedIndex].value; + + if ( agentnum == 0 ) { + what.form.agent_type.disabled = false; + //what.form.agent_type.style.backgroundColor = '#ffffff'; + what.form.agent_type.style.visibility = ''; + } else { + what.form.agent_type.disabled = true; + //what.form.agent_type.style.backgroundColor = '#dddddd'; + what.form.agent_type.style.visibility = 'hidden'; + } + + } + </SCRIPT> END diff --git a/httemplate/elements/select-part_pkg.html b/httemplate/elements/select-part_pkg.html index cd6d24c28..52b1ccaf1 100644 --- a/httemplate/elements/select-part_pkg.html +++ b/httemplate/elements/select-part_pkg.html @@ -33,20 +33,6 @@ my( %opt ) = @_; $opt{'records'} = delete $opt{'part_pkg'} if $opt{'part_pkg'}; -#false laziness w/browse/part_pkg.cgi -my $agentnums = join(',', $FS::CurrentUser::CurrentUser->agentnums); - -$opt{'extra_sql'} .= - " AND ( agentnum IS NOT NULL - OR 0 < ( SELECT COUNT(*) - FROM type_pkgs - LEFT JOIN agent_type USING ( typenum ) - LEFT JOIN agent AS typeagent USING ( typenum ) - WHERE type_pkgs.pkgpart = part_pkg.pkgpart - AND typeagent.agentnum IN ($agentnums) - ) - ) - "; -#eofalse +$opt{'extra_sql'} .= ' AND '. FS::part_pkg->curuser_pkgs_sql; </%init> |