diff options
| author | Mitch Jackson <mitch@freeside.biz> | 2018-06-29 14:01:36 -0500 |
|---|---|---|
| committer | Mitch Jackson <mitch@freeside.biz> | 2018-10-19 17:39:17 -0400 |
| commit | e1424fa99483e7d5944dcd729f96ee43f7b6c10d (patch) | |
| tree | 7cc451f5f70b45ee11a4ba0427fefe9e12d3df52 | |
| parent | 793766b8e51bf0bf4c61cbb0fb613d746db3b4fa (diff) | |
RT# 31208 Fix Browse Discounts sorting error
| -rw-r--r-- | httemplate/browse/discount.html | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/httemplate/browse/discount.html b/httemplate/browse/discount.html index d3cf873..5ed43cf 100644 --- a/httemplate/browse/discount.html +++ b/httemplate/browse/discount.html @@ -1,10 +1,9 @@ <% 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, @@ -13,9 +12,7 @@ 'classname', 'description', ], - 'links' => [ $link, - $link, - ], + 'links' => \@links ) %> <%init> @@ -23,6 +20,24 @@ 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' ], +); + +# Fixes disableable, because discount and discount_class tables +# both contain a 'disabled' column +local $FS::Record::qsearch_qualify_columns = 1; + +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> |