projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
httemplate
/
search
/
cust_bill_pkg_discount.html
diff --git
a/httemplate/search/cust_bill_pkg_discount.html
b/httemplate/search/cust_bill_pkg_discount.html
index
b472366
..
f598341
100644
(file)
--- a/
httemplate/search/cust_bill_pkg_discount.html
+++ b/
httemplate/search/cust_bill_pkg_discount.html
@@
-1,4
+1,4
@@
-<
% include( 'elements/search.html'
,
+<
& elements/search.html
,
'title' => 'Discounts',
'name' => 'discounts',
'query' => $query,
'title' => 'Discounts',
'name' => 'discounts',
'query' => $query,
@@
-26,6
+26,14
@@
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
sub { time2str('%b %d %Y', shift->_date ) },
\&FS::UI::Web::cust_fields,
],
+ 'sort_fields' => [
+ '',
+ 'amount',
+ 'months',
+ 'pkg',
+ 'invnum',
+ '_date',
+ ],
'links' => [
#'',
'', #link to customer discount???
'links' => [
#'',
'', #link to customer discount???
@@
-60,8
+68,8
@@
'',
FS::UI::Web::cust_styles(),
],
'',
FS::UI::Web::cust_styles(),
],
- )
-
%
>
+
+
&
>
<%init>
#a little false laziness below w/cust_bill_pkg.cgi
<%init>
#a little false laziness below w/cust_bill_pkg.cgi
@@
-119,12
+127,12
@@
my $join_cust_pkg_discount =
'LEFT JOIN cust_pkg_discount USING (pkgdiscountnum)';
my $join_cust =
'LEFT JOIN cust_pkg_discount USING (pkgdiscountnum)';
my $join_cust =
- ' JOIN cust_bill_pkg USING ( billpkgnum )
- JOIN cust_bill USING ( invnum )
- LEFT JOIN cust_main USING ( custnum ) ';
+ ' JOIN cust_bill USING ( invnum ) '.
+ FS::UI::Web::join_cust_main('cust_bill', 'cust_pkg');
my $join_pkg =
my $join_pkg =
- ' LEFT JOIN cust_pkg ON ( cust_bill_pkg.pkgnum = cust_pkg.pkgnum )
+ ' JOIN cust_bill_pkg USING ( billpkgnum )
+ LEFT JOIN cust_pkg ON ( cust_bill_pkg.pkgnum = cust_pkg.pkgnum )
LEFT JOIN part_pkg USING ( pkgpart ) ';
#LEFT JOIN part_pkg AS override
# ON pkgpart_override = override.pkgpart ';
LEFT JOIN part_pkg USING ( pkgpart ) ';
#LEFT JOIN part_pkg AS override
# ON pkgpart_override = override.pkgpart ';
@@
-132,7
+140,7
@@
my $join_pkg =
my $where = ' WHERE '. join(' AND ', @where);
$count_query .=
my $where = ' WHERE '. join(' AND ', @where);
$count_query .=
- " FROM cust_bill_pkg_discount $join_cust_pkg_discount $join_
cust $join_pkg
".
+ " FROM cust_bill_pkg_discount $join_cust_pkg_discount $join_
pkg $join_cust
".
$where;
my @select = (
$where;
my @select = (
@@
-147,7
+155,7
@@
push @select, 'cust_main.custnum',
my $query = {
'table' => 'cust_bill_pkg_discount',
my $query = {
'table' => 'cust_bill_pkg_discount',
- 'addl_from' => "$join_cust_pkg_discount $join_
cust $join_pkg
",
+ 'addl_from' => "$join_cust_pkg_discount $join_
pkg $join_cust
",
'hashref' => {},
'select' => join(', ', @select ),
'extra_sql' => $where,
'hashref' => {},
'select' => join(', ', @select ),
'extra_sql' => $where,