projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e2ee874
)
RT# 31208 Fix Browse Discounts sorting error
author
Mitch Jackson
<mitch@freeside.biz>
Fri, 29 Jun 2018 19:01:36 +0000
(14:01 -0500)
committer
Mitch Jackson
<mitch@freeside.biz>
Fri, 29 Jun 2018 19:01:36 +0000
(14:01 -0500)
httemplate/browse/discount.html
patch
|
blob
|
history
diff --git
a/httemplate/browse/discount.html
b/httemplate/browse/discount.html
index
9b2298a
..
deb98c3
100644
(file)
--- a/
httemplate/browse/discount.html
+++ b/
httemplate/browse/discount.html
@@
-1,22
+1,18
@@
<% include( 'elements/browse.html',
'title' => 'Discounts',
'name' => 'discounts',
<% 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,
'count_query' => 'SELECT COUNT(*) FROM discount',
'disableable' => 1,
'disabled_statuspos' => 1,
- 'header' => [ 'Name', 'C
omment', 'C
lass', 'Discount', ],
+ 'header' => [ 'Name', 'Class', 'Discount', ],
'fields' => [ 'name',
'fields' => [ 'name',
- 'comment',
'classname',
'description',
],
'classname',
'description',
],
- 'links' => [ $link,
- $link,
- ],
+ 'links' => \@links
)
%>
<%init>
)
%>
<%init>
@@
-24,6
+20,20
@@
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
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>
</%init>