diff options
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/browse/sales.html | 44 | ||||
| -rwxr-xr-x | httemplate/edit/agent.cgi | 37 | ||||
| -rw-r--r-- | httemplate/edit/process/sales.html | 35 | ||||
| -rwxr-xr-x | httemplate/edit/sales.html | 10 | ||||
| -rw-r--r-- | httemplate/elements/table-commissions.html | 44 | ||||
| -rw-r--r-- | httemplate/search/agent_commission.html | 3 |
6 files changed, 135 insertions, 38 deletions
diff --git a/httemplate/browse/sales.html b/httemplate/browse/sales.html index 1cdc49085..6fac058f9 100644 --- a/httemplate/browse/sales.html +++ b/httemplate/browse/sales.html @@ -14,9 +14,10 @@ <%init> my $curuser = $FS::CurrentUser::CurrentUser; - die "access denied" unless $curuser->access_right('Edit sales people'); +#Sales people bring in business.<BR><BR> + my @header = ( 'Sales person' ); my @fields = ( 'salesperson' ); my @links = ( [$p.'edit/sales.html?', 'salesnum'] ); @@ -27,6 +28,45 @@ if ( $curuser->access_right('Configuration') ) { push @links, [ $p.'edit/agent.cgi?', 'agentnum' ]; } -#Sales people bring in business.<BR><BR> +push @header, 'Commissions'; +push @fields, sub { + + my $sales = shift; + + #started out as false laziness w/browse/agent.cgi + # (which said surprising amount of false laziness w/ edit/process/agent.cgi) + # but this now returns an edit.html data structure that renders to a table + # instead of HTML + + my @pkg_class = qsearch('pkg_class', { 'disabled'=>'' }); + + [ + map { + my %sales_pkg_class = ( 'salesnum' => $sales->salesnum, + 'classnum' => $_ ? $_->classnum : '' + ); + my $sales_pkg_class = + qsearchs( 'sales_pkg_class', \%sales_pkg_class ) + || new FS::sales_pkg_class \%sales_pkg_class; + #my $param = 'classnum'. $sales_pkg_class{classnum}; + + [ + { align => 'right', + data => ($sales_pkg_class->commission_percent || 0). '%', + }, + { align => 'left', + data => ' '. encode_entities( + $_ ? $_->classname : mt('(no package class)') + ), + }, + ]; + + } + ( '', @pkg_class ) + + ]; + +}; +#push @links, ''; </%init> diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi index b043d1efe..fe5b16417 100755 --- a/httemplate/edit/agent.cgi +++ b/httemplate/edit/agent.cgi @@ -141,38 +141,13 @@ </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> - - +<& /elements/table-commissions.html, + 'source_obj' => $agent, + 'link_table' => 'agent_pkg_class', + #'target_table' => 'pkg_class', +&> <BR> + <INPUT TYPE="submit" VALUE="<% $agent->agentnum ? "Apply changes" : "Add agent" %>"> </FORM> diff --git a/httemplate/edit/process/sales.html b/httemplate/edit/process/sales.html index b60276dcb..1bb1797df 100644 --- a/httemplate/edit/process/sales.html +++ b/httemplate/edit/process/sales.html @@ -1,12 +1,41 @@ <& elements/process.html, - 'table' => 'sales', - 'viewall_dir' => 'browse', - 'agent_virt' => 1, + 'table' => 'sales', + 'viewall_dir' => 'browse', + 'agent_virt' => 1, + 'noerror_callback' => $process_sales_pkg_class, &> <%init> die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Edit sales people'); +#false laziness w/process/agent.cgi +my $process_sales_pkg_class = sub { + my( $cgi, $sales ) = @_; + + #surprising amount of false laziness w/ edit/agent.cgi + my @pkg_class = qsearch('pkg_class', { 'disabled'=>'' }); + foreach my $pkg_class ( '', @pkg_class ) { + my %sales_pkg_class = ( 'salesnum' => $sales->salesnum, + 'classnum' => $pkg_class ? $pkg_class->classnum : '' + ); + my $sales_pkg_class = + qsearchs( 'sales_pkg_class', \%sales_pkg_class ) + || new FS::sales_pkg_class \%sales_pkg_class; + + my $param = 'classnum'. $sales_pkg_class{classnum}; + + $sales_pkg_class->commission_percent( $cgi->param($param) ); + + my $method = $sales_pkg_class->salespkgclassnum ? 'replace' : 'insert'; + + my $error = $sales_pkg_class->$method; + die $error if $error; #XXX push this down into sales.pm w/better/transactional error handling + + } + +}; + + </%init> diff --git a/httemplate/edit/sales.html b/httemplate/edit/sales.html index 65cddfc13..763f86124 100755 --- a/httemplate/edit/sales.html +++ b/httemplate/edit/sales.html @@ -12,6 +12,16 @@ }, 'viewall_dir' => 'browse', 'agent_virt' => 1, + 'html_bottom' => sub { + my $sales = shift; + + '<BR>'. + include('/elements/table-commissions.html', + 'source_obj' => $sales, + 'link_table' => 'sales_pkg_class', + #'target_table' => 'pkg_class', + ); + }, &> <%init> diff --git a/httemplate/elements/table-commissions.html b/httemplate/elements/table-commissions.html new file mode 100644 index 000000000..ce5808ded --- /dev/null +++ b/httemplate/elements/table-commissions.html @@ -0,0 +1,44 @@ +<FONT CLASS="fsinnerbox-title"><% mt('Commissions') |h %></FONT> +<TABLE CLASS="fsinnerbox"> + +% my $pkey = $object->primary_key; +% my $pkey_value = $object->$pkey(); +% my $link_class = 'FS::'.$link_table; +% +% #surprising amount of false laziness w/ edit/process/agent.cgi +% # (somewhat less now that we're more generic) +% my @pkg_class = qsearch($target_table, { 'disabled'=>'' }); +% foreach my $pkg_class ( '', @pkg_class ) { +% my %thing_pkg_class = ( $pkey => $pkey_value, +% classnum => $pkg_class ? $pkg_class->classnum : '' +% ); +% my $thing_pkg_class = +% qsearchs( $link_table, \%thing_pkg_class ) +% || $link_class->new( \%thing_pkg_class ); +% my $param = 'classnum'. $thing_pkg_class{classnum}; + + <TR> + <TD><INPUT TYPE = "text" + NAME = "<% $param %>" + VALUE = "<% $cgi->param($param) || $thing_pkg_class->commission_percent |h %>" + SIZE = 6 + MAXLENGTH = 7 + >% + </TD> + <TD><% $pkg_class ? $pkg_class->classname : mt('(no package class)') |h %> + </TD> + </TR> + +% } + +</TABLE> + +<%init> + +my %opt = @_; + +my $object = $opt{'source_obj'}; +my $link_table = $opt{'link_table'}; +my $target_table = $opt{'target_table'} || 'pkg_class'; + +</%init> diff --git a/httemplate/search/agent_commission.html b/httemplate/search/agent_commission.html index b94ae9f6e..2818d2ee5 100644 --- a/httemplate/search/agent_commission.html +++ b/httemplate/search/agent_commission.html @@ -33,11 +33,10 @@ td.money:before { content: '<% $money_char %>'; } % if ( $custnum ne $cust_pkg->custnum ) { % # start of a new customer section % my $cust_main = $cust_pkg->cust_main; -% my $label = $cust_main->custnum . ': '. $cust_main->name; % $bgcolor = 0; <TR> <TD COLSPAN=4 CLASS="cust_head"> - <A HREF="<%$p%>view/cust_main.cgi?<%$cust_main->custnum%>"><% $label %></A> + <A HREF="<%$p%>view/cust_main.cgi?<%$cust_main->custnum%>"><% $cust_main->display_custnum %>: <% $cust_main->name |h %></A> </TD> </TR> % } |