projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
miss you, mark
[freeside.git]
/
httemplate
/
search
/
cust_main.cgi
diff --git
a/httemplate/search/cust_main.cgi
b/httemplate/search/cust_main.cgi
index
76cbe49
..
cce4f0d
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'] ],
% })
% ) {
@@
-327,10
+330,11
@@
my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
my $curuser = $FS::CurrentUser::CurrentUser;
die "access denied"
- unless $curuser->access_right('List all customers');
+ unless $curuser->access_right('List all customers')
+ || $curuser->access_right('List customers');
my $conf = new FS::Conf;
my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
+my $maxrecords = $conf->config('maxsearchrecordsperpage')
|| 100
;
# summarize more than this many services of the same svcpart
my $large_pkg_size = $conf->config('cust_pkg-large_pkg_size') || 0;
# summarize more than this many services of the same svcpart
my $large_pkg_size = $conf->config('cust_pkg-large_pkg_size') || 0;
@@
-348,9
+352,11
@@
my(@cust_main, $sortby, $orderby);
my @select = ();
my @addl_headers = ();
my @addl_cols = ();
my @select = ();
my @addl_headers = ();
my @addl_cols = ();
-if ( $cgi->param('browse')
- || $cgi->param('otaker_on')
- || $cgi->param('agentnum_on')
+if ( ( $cgi->param('browse')
+ || $cgi->param('otaker_on')
+ || $cgi->param('agentnum_on')
+ )
+ and $curuser->access_right('List all customers')
) {
my %search = ();
) {
my %search = ();
@@
-498,7
+504,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
@@
-579,7
+585,7
@@
sub cardsearch {
my($card)=$cgi->param('card');
$card =~ s/\D//g;
my($card)=$cgi->param('card');
$card =~ s/\D//g;
- $card =~ /^(\d{13,1
6
}|\d{8,9})$/ or errorpage(emt("Illegal card number"));
+ $card =~ /^(\d{13,1
9
}|\d{8,9})$/ or errorpage(emt("Illegal card number"));
my($payinfo)=$1;
[ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}),
my($payinfo)=$1;
[ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}),