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_main.cgi
diff --git
a/httemplate/search/cust_main.cgi
b/httemplate/search/cust_main.cgi
index
76cbe49
..
da6c89d
100755
(executable)
--- a/
httemplate/search/cust_main.cgi
+++ b/
httemplate/search/cust_main.cgi
@@
-129,7
+129,10
@@
% 'select' => 'part_svc.*, COUNT(*) AS num_cust_svc',
% 'table' => 'part_svc',
% 'addl_from' => 'LEFT JOIN cust_svc USING ( svcpart )',
% 'select' => 'part_svc.*, COUNT(*) AS num_cust_svc',
% 'table' => 'part_svc',
% 'addl_from' => 'LEFT JOIN cust_svc USING ( svcpart )',
-% 'extra_sql' => 'WHERE pkgnum = ? GROUP BY part_svc.svcpart',
+% 'extra_sql' => 'WHERE pkgnum = ? '.
+% ' GROUP BY '. join(', ',
+% map "part_svc.$_", fields('part_svc')
+% ),
% 'extra_param' => [ [$cust_pkg->pkgnum,'int'] ],
% })
% ) {
% 'extra_param' => [ [$cust_pkg->pkgnum,'int'] ],
% })
% ) {
@@
-498,7
+501,7
@@
if ( $cgi->param('browse')
);
}
);
}
- @cust_main = grep { $_->
num_ncancelled_pkgs || ! $_->num_pkgs
} @cust_main
+ @cust_main = grep { $_->
status ne 'cancelled'
} @cust_main
if ! $cgi->param('cancelled')
&& (
$cgi->param('showcancelledcustomers') eq '0' #see if it was set by me
if ! $cgi->param('cancelled')
&& (
$cgi->param('showcancelledcustomers') eq '0' #see if it was set by me