diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2018-06-29 14:01:36 -0500 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2018-06-29 14:01:36 -0500 |
| commit | 7fd62888579944b840c5d7fc8ff980bb815512e1 (patch) | |
| tree | fea9fa2fce1f339b4305d6b368eecd188fd5dc75 /httemplate/browse | |
| parent | e2ee874843b19f6c5221f5ce0af90979dba34e57 (diff) | |
RT# 31208 Fix Browse Discounts sorting error
Diffstat (limited to 'httemplate/browse')
| -rw-r--r-- | httemplate/browse/discount.html | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/httemplate/browse/discount.html b/httemplate/browse/discount.html index 9b2298ae4..deb98c3c7 100644 --- a/httemplate/browse/discount.html +++ b/httemplate/browse/discount.html @@ -1,22 +1,18 @@ <% include( 'elements/browse.html', 'title' => 'Discounts', 'name' => 'discounts', - 'menubar' => [ 'Add a new discount' => - $p.'edit/discount.html', - ], - 'query' => { 'table' => 'discount', }, + 'menubar' => \@menubar, + 'query' => \%query, + 'order_by_sql' => { description => 'discountnum' }, 'count_query' => 'SELECT COUNT(*) FROM discount', 'disableable' => 1, 'disabled_statuspos' => 1, - 'header' => [ 'Name', 'Comment', 'Class', 'Discount', ], + 'header' => [ 'Name', 'Class', 'Discount', ], 'fields' => [ 'name', - 'comment', 'classname', 'description', ], - 'links' => [ $link, - $link, - ], + 'links' => \@links ) %> <%init> @@ -24,6 +20,20 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('Configuration'); -my $link = [ "${p}edit/discount.html?", 'discountnum' ]; +my @links = ( + [ "${p}edit/discount.html?", 'discountnum' ], + [ "${p}edit/discount_class.html?", 'classnum' ], +); + +my %query = ( + select => 'discount.*, discount_class.*', + table => 'discount', + addl_from => 'LEFT JOIN discount_class USING(classnum)', +); + +my @menubar = ( + 'Add a new discount' => $p.'edit/discount.html', + 'Discount classes' => $p.'browse/discount_class.html', +); </%init> |