diff options
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/browse/agent.cgi | 28 | ||||
| -rwxr-xr-x | httemplate/edit/agent.cgi | 46 | ||||
| -rwxr-xr-x | httemplate/edit/process/agent.cgi | 41 |
3 files changed, 105 insertions, 10 deletions
diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi index 64288b830..fc9ce5413 100755 --- a/httemplate/browse/agent.cgi +++ b/httemplate/browse/agent.cgi @@ -25,6 +25,7 @@ full offerings (via their type).<BR><BR> <TH CLASS="grid" BGCOLOR="#cccccc" COLSPAN=<% ( $cgi->param('showdisabled') || !dbdef->table('agent')->column('disabled') ) ? 2 : 3 %>>Agent</TH> <TH CLASS="grid" BGCOLOR="#cccccc">Type</TH> <TH CLASS="grid" BGCOLOR="#cccccc">Master Customer</TH> + <TH CLASS="grid" BGCOLOR="#cccccc">Commissions</TH> <TH CLASS="grid" BGCOLOR="#cccccc">Access Groups</TH> <TH CLASS="grid" BGCOLOR="#cccccc"><FONT SIZE=-1>Invoice<BR>Template</FONT></TH> <TH CLASS="grid" BGCOLOR="#cccccc">Customers</TH> @@ -93,6 +94,33 @@ full offerings (via their type).<BR><BR> </TD> <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"> + + <TABLE> + +% #surprising amount of false laziness w/ edit/process/agent.cgi +% my @pkg_class = qsearch('pkg_class', { 'disabled'=>'' }); +% foreach my $pkg_class ( '', @pkg_class ) { +% my %agent_pkg_class = ( 'agentnum' => $agent->agentnum, +% 'classnum' => $pkg_class ? $pkg_class->classnum : '' +% ); +% my $agent_pkg_class = +% qsearchs( 'agent_pkg_class', \%agent_pkg_class ) +% || new FS::agent_pkg_class \%agent_pkg_class; +% my $param = 'classnum'. $agent_pkg_class{classnum}; + + <TR> + <TD><% $agent_pkg_class->commission_percent || 0 %>%</TD> + <TD><% $pkg_class ? $pkg_class->classname : mt('(no package class)') |h %> + </TD> + </TR> + +% } + + </TABLE> + + </TD> + + <TD CLASS="grid" BGCOLOR="<% $bgcolor %>"> % foreach my $access_group ( % map $_->access_group, % qsearch('access_groupagent', { 'agentnum' => $agent->agentnum }) diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi index 6707d66a4..b043d1efe 100755 --- a/httemplate/edit/agent.cgi +++ b/httemplate/edit/agent.cgi @@ -19,9 +19,12 @@ </SCRIPT> <INPUT TYPE="hidden" NAME="agentnum" VALUE="<% $agent->agentnum %>"> -Agent #<% $agent->agentnum ? $agent->agentnum : "(NEW)" %> -<% &ntable("#cccccc", 2, '') %> +<FONT CLASS="fsinnerbox-title"> + Agent #<% $agent->agentnum ? $agent->agentnum : "(NEW)" %> +</FONT> + +<TABLE CLASS="fsinnerbox"> <TR> <TH ALIGN="right">Agent</TH> @@ -117,8 +120,13 @@ Agent #<% $agent->agentnum ? $agent->agentnum : "(NEW)" %> </TR> % } +</TABLE> +<BR> + +<FONT CLASS="fsinnerbox-title"><% mt('Access Groups') |h %></FONT> +<TABLE CLASS="fsinnerbox"> + <TR> - <TD ALIGN="right">Access Groups</TD> <TD><% include('/elements/checkboxes-table.html', 'source_obj' => $agent, 'link_table' => 'access_groupagent', @@ -131,6 +139,38 @@ Agent #<% $agent->agentnum ? $agent->agentnum : "(NEW)" %> </TR> </TABLE> +<BR> + +<FONT CLASS="fsinnerbox-title"><% mt('Commissions') |h %></FONT> +<TABLE CLASS="fsinnerbox"> + +% #surprising amount of false laziness w/ edit/process/agent.cgi +% my @pkg_class = qsearch('pkg_class', { 'disabled'=>'' }); +% foreach my $pkg_class ( '', @pkg_class ) { +% my %agent_pkg_class = ( 'agentnum' => $agent->agentnum, +% 'classnum' => $pkg_class ? $pkg_class->classnum : '' +% ); +% my $agent_pkg_class = +% qsearchs( 'agent_pkg_class', \%agent_pkg_class ) +% || new FS::agent_pkg_class \%agent_pkg_class; +% my $param = 'classnum'. $agent_pkg_class{classnum}; + + <TR> + <TD><INPUT TYPE = "text" + NAME = "<% $param %>" + VALUE = "<% $cgi->param($param) || $agent_pkg_class->commission_percent |h %>" + SIZE = 6 + MAXLENGTH = 7 + >% + </TD> + <TD><% $pkg_class ? $pkg_class->classname : mt('(no package class)') |h %> + </TD> + </TR> + +% } + +</TABLE> + <BR> <INPUT TYPE="submit" VALUE="<% $agent->agentnum ? "Apply changes" : "Add agent" %>"> diff --git a/httemplate/edit/process/agent.cgi b/httemplate/edit/process/agent.cgi index e776d281c..034c4cc50 100755 --- a/httemplate/edit/process/agent.cgi +++ b/httemplate/edit/process/agent.cgi @@ -1,11 +1,12 @@ <% include( 'elements/process.html', - 'table' => 'agent', - 'viewall_dir' => 'browse', - 'viewall_ext' => 'cgi', - 'process_m2m' => { 'link_table' => 'access_groupagent', - 'target_table' => 'access_group', - }, - 'edit_ext' => 'cgi', + 'table' => 'agent', + 'viewall_dir' => 'browse', + 'viewall_ext' => 'cgi', + 'process_m2m' => { 'link_table' => 'access_groupagent', + 'target_table' => 'access_group', + }, + 'edit_ext' => 'cgi', + 'noerror_callback' => $process_agent_pkg_class, ) %> <%init> @@ -18,4 +19,30 @@ if ( FS::Conf->new->exists('disable_acl_changes') ) { die "shouldn't be reached"; } +my $process_agent_pkg_class = sub { + my( $cgi, $agent ) = @_; + + #surprising amount of false laziness w/ edit/agent.cgi + my @pkg_class = qsearch('pkg_class', { 'disabled'=>'' }); + foreach my $pkg_class ( '', @pkg_class ) { + my %agent_pkg_class = ( 'agentnum' => $agent->agentnum, + 'classnum' => $pkg_class ? $pkg_class->classnum : '' + ); + my $agent_pkg_class = + qsearchs( 'agent_pkg_class', \%agent_pkg_class ) + || new FS::agent_pkg_class \%agent_pkg_class; + + my $param = 'classnum'. $agent_pkg_class{classnum}; + + $agent_pkg_class->commission_percent( $cgi->param($param) ); + + my $method = $agent_pkg_class->agentpkgclassnum ? 'replace' : 'insert'; + + my $error = $agent_pkg_class->$method; + die $error if $error; #XXX push this down into agent.pm w/better/transactional error handling + + } + +}; + </%init> |