diff options
| -rw-r--r-- | httemplate/browse/sales.html | 12 | ||||
| -rw-r--r-- | httemplate/edit/process/sales.html | 1 | ||||
| -rwxr-xr-x | httemplate/edit/sales.html | 5 | ||||
| -rw-r--r-- | httemplate/elements/table-commissions.html | 25 |
4 files changed, 37 insertions, 6 deletions
diff --git a/httemplate/browse/sales.html b/httemplate/browse/sales.html index d2b6cfef5..d7375b9f8 100644 --- a/httemplate/browse/sales.html +++ b/httemplate/browse/sales.html @@ -65,13 +65,19 @@ push @fields, sub { #my $param = 'classnum'. $sales_pkg_class{classnum}; [ + { align => 'left', + data => encode_entities( + $_ ? $_->classname : mt('(no package class)') + ). ': ', + }, { align => 'right', data => ($sales_pkg_class->commission_percent || 0). '%', }, { align => 'left', - data => ' '. encode_entities( - $_ ? $_->classname : mt('(no package class)') - ), + data => + $sales_pkg_class->commission_duration + ? ' for '. $sales_pkg_class->commission_duration. ' months' + : '' }, ]; diff --git a/httemplate/edit/process/sales.html b/httemplate/edit/process/sales.html index 1bb1797df..4befc02cc 100644 --- a/httemplate/edit/process/sales.html +++ b/httemplate/edit/process/sales.html @@ -26,6 +26,7 @@ my $process_sales_pkg_class = sub { my $param = 'classnum'. $sales_pkg_class{classnum}; $sales_pkg_class->commission_percent( $cgi->param($param) ); + $sales_pkg_class->commission_duration( $cgi->param($param.'_duration') ); my $method = $sales_pkg_class->salespkgclassnum ? 'replace' : 'insert'; diff --git a/httemplate/edit/sales.html b/httemplate/edit/sales.html index 90f651dda..5a7a49e5b 100755 --- a/httemplate/edit/sales.html +++ b/httemplate/edit/sales.html @@ -19,9 +19,10 @@ '<BR>'. include('/elements/table-commissions.html', - 'source_obj' => $sales, - 'link_table' => 'sales_pkg_class', + 'source_obj' => $sales, + 'link_table' => 'sales_pkg_class', #'target_table' => 'pkg_class', + 'show_duration' => 1, ); }, &> diff --git a/httemplate/elements/table-commissions.html b/httemplate/elements/table-commissions.html index ce5808ded..b972ed927 100644 --- a/httemplate/elements/table-commissions.html +++ b/httemplate/elements/table-commissions.html @@ -18,6 +18,8 @@ % my $param = 'classnum'. $thing_pkg_class{classnum}; <TR> + <TD><% $pkg_class ? $pkg_class->classname : mt('(no package class)') |h %>: + </TD> <TD><INPUT TYPE = "text" NAME = "<% $param %>" VALUE = "<% $cgi->param($param) || $thing_pkg_class->commission_percent |h %>" @@ -25,7 +27,28 @@ MAXLENGTH = 7 >% </TD> - <TD><% $pkg_class ? $pkg_class->classname : mt('(no package class)') |h %> +% if ( $opt{'show_duration'} ) { + <TD> + for <INPUT TYPE = "text" + NAME = "<% $param %>_duration" + VALUE = "<% $cgi->param($param.'_duration') || $thing_pkg_class->commission_duration |h %>" + SIZE = 2 + MAXLENGTH = 3 + > + months + </TD> +% } + </TR> + +% } + +% if ( $opt{'show_duration'} ) { + + <TR> + <TD COLSPAN=2> + </TD> + <TD> + <FONT SIZE="-2"><I>blank for no time limit</I></FONT> </TD> </TR> |