projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix ports with dashes (-) not showing their monitoring status, RT#14926
[freeside.git]
/
httemplate
/
search
/
cust_bill.html
diff --git
a/httemplate/search/cust_bill.html
b/httemplate/search/cust_bill.html
index
1e9ee8d
..
4117112
100755
(executable)
--- a/
httemplate/search/cust_bill.html
+++ b/
httemplate/search/cust_bill.html
@@
-1,5
+1,5
@@
-<
% include( 'elements/search.html'
,
- 'title' =>
'Invoice Search Results'
,
+<
& elements/search.html
,
+ 'title' =>
emt('Invoice Search Results')
,
'html_init' => $html_init,
'menubar' => $menubar,
'name' => 'invoices',
'html_init' => $html_init,
'menubar' => $menubar,
'name' => 'invoices',
@@
-7,11
+7,11
@@
'count_query' => $count_query,
'count_addl' => $count_addl,
'redirect' => $link,
'count_query' => $count_query,
'count_addl' => $count_addl,
'redirect' => $link,
- 'header' => [
'Invoice #'
,
-
'Balance'
,
-
'Net Amount'
,
-
'Gross Amount'
,
-
'Date'
,
+ 'header' => [
emt('Invoice #')
,
+
emt('Balance')
,
+
emt('Net Amount')
,
+
emt('Gross Amount')
,
+
emt('Date')
,
FS::UI::Web::cust_header(),
],
'fields' => [
FS::UI::Web::cust_header(),
],
'fields' => [
@@
-22,6
+22,13
@@
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' => [
+ 'COALESCE( agent_invid, invnum )',
+ FS::cust_bill->owed_sql,
+ FS::cust_bill->net_sql,
+ 'charged',
+ '_date',
+ ],
'align' => 'rrrrl'.FS::UI::Web::cust_aligns(),
'links' => [
$link,
'align' => 'rrrrl'.FS::UI::Web::cust_aligns(),
'links' => [
$link,
@@
-49,10
+56,7
@@
'',
FS::UI::Web::cust_styles(),
],
'',
FS::UI::Web::cust_styles(),
],
-
-
- )
-%>
+&>
<%init>
die "access denied"
<%init>
die "access denied"
@@
-64,7
+68,6
@@
my $agentnums_sql = $FS::CurrentUser::CurrentUser->agentnums_sql;
my( $count_query, $sql_query );
my $count_addl = '';
my( $count_query, $sql_query );
my $count_addl = '';
-#my $distinct = '';
my %search;
if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
my %search;
if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
@@
-75,7
+78,6
@@
if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
$count_query = "SELECT COUNT(*) FROM cust_bill $join_cust_main $where";
$sql_query = {
$count_query = "SELECT COUNT(*) FROM cust_bill $join_cust_main $where";
$sql_query = {
- #'select' => '*',
'table' => 'cust_bill',
'addl_from' => $join_cust_main,
'hashref' => {},
'table' => 'cust_bill',
'addl_from' => $join_cust_main,
'hashref' => {},
@@
-91,6
+93,10
@@
if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
$search{'agentnum'} = $1;
}
$search{'agentnum'} = $1;
}
+ if ( $cgi->param('custnum') =~ /^(\d+)$/ ) {
+ $search{'custnum'} = $1;
+ }
+
# begin/end/beginning/ending
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '');
$search{'_date'} = [ $beginning, $ending ]
# begin/end/beginning/ending
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, '');
$search{'_date'} = [ $beginning, $ending ]
@@
-122,8
+128,16
@@
if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
$search{'newest_percust'} = 1;
$count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'";
}
$search{'newest_percust'} = 1;
$count_query = "SELECT COUNT(DISTINCT cust_bill.custnum), 'N/A', 'N/A'";
}
+
+ my $payby_sql = '';
+ $payby_sql = ' AND (' .
+ join(' OR ', map { "cust_main.payby = '$_'" } $cgi->param('payby') ) .
+ ')'
+ if $cgi->param('payby');
- my $extra_sql = ' WHERE '. FS::cust_bill->search_sql_where( \%search );
+ my $extra_sql = ' WHERE '.
+ FS::cust_bill->search_sql_where( \%search ).
+ $payby_sql;
unless ( $count_query ) {
$count_query = 'SELECT COUNT(*), '. join(', ',
unless ( $count_query ) {
$count_query = 'SELECT COUNT(*), '. join(', ',
@@
-144,7
+158,6
@@
if ( $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/ ) {
'table' => 'cust_bill',
'addl_from' => $join_cust_main,
'hashref' => {},
'table' => 'cust_bill',
'addl_from' => $join_cust_main,
'hashref' => {},
- #'select' => "$distinct ". join(', ',
'select' => join(', ',
'cust_bill.*',
#( map "cust_main.$_", qw(custnum last first company) ),
'select' => join(', ',
'cust_bill.*',
#( map "cust_main.$_", qw(custnum last first company) ),
@@
-192,31
+205,31
@@
my $html_init = join("\n", map {
'<SCRIPT TYPE="text/javascript">
function confirm_print_process() {
'<SCRIPT TYPE="text/javascript">
function confirm_print_process() {
- if ( ! confirm(
"Are you sure you want to reprint these invoices?"
) ) {
+ if ( ! confirm(
'.js_mt("Are you sure you want to reprint these invoices?").'
) ) {
return;
}
print_process();
}
function confirm_email_process() {
return;
}
print_process();
}
function confirm_email_process() {
- if ( ! confirm(
"Are you sure you want to re-email these invoices?"
) ) {
+ if ( ! confirm(
'.js_mt("Are you sure you want to re-email these invoices?").'
) ) {
return;
}
email_process();
}
function confirm_fax_process() {
return;
}
email_process();
}
function confirm_fax_process() {
- if ( ! confirm(
"Are you sure you want to re-fax these invoices?"
) ) {
+ if ( ! confirm(
'.js_mt("Are you sure you want to re-fax these invoices?").'
) ) {
return;
}
fax_process();
}
function confirm_ftp_process() {
return;
}
fax_process();
}
function confirm_ftp_process() {
- if ( ! confirm(
"Are you sure you want to re-FTP these invoices?"
) ) {
+ if ( ! confirm(
'.js_mt("Are you sure you want to re-FTP these invoices?").'
) ) {
return;
}
ftp_process();
}
function confirm_spool_process() {
return;
}
ftp_process();
}
function confirm_spool_process() {
- if ( ! confirm(
"Are you sure you want to re-spool these invoices?"
) ) {
+ if ( ! confirm(
'.js_mt("Are you sure you want to re-spool these invoices?").'
) ) {
return;
}
spool_process();
return;
}
spool_process();
@@
-228,20
+241,20
@@
my $menubar = [];
if ( $FS::CurrentUser::CurrentUser->access_right('Resend invoices') ) {
if ( $FS::CurrentUser::CurrentUser->access_right('Resend invoices') ) {
- push @$menubar,
'Print these invoices'
=>
+ push @$menubar,
emt('Print these invoices')
=>
"javascript:confirm_print_process()",
"javascript:confirm_print_process()",
-
'Email these invoices'
=>
+
emt('Email these invoices')
=>
"javascript:confirm_email_process()";
"javascript:confirm_email_process()";
- push @$menubar,
'Fax these invoices'
=>
+ push @$menubar,
emt('Fax these invoices')
=>
"javascript:confirm_fax_process()"
if $conf->exists('hylafax');
"javascript:confirm_fax_process()"
if $conf->exists('hylafax');
- push @$menubar,
'FTP these invoices'
=>
+ push @$menubar,
emt('FTP these invoices')
=>
"javascript:confirm_ftp_process()"
if $conf->exists('cust_bill-ftpformat');
"javascript:confirm_ftp_process()"
if $conf->exists('cust_bill-ftpformat');
- push @$menubar,
'Spool these invoices'
=>
+ push @$menubar,
emt('Spool these invoices')
=>
"javascript:confirm_spool_process()"
if $conf->exists('cust_bill-spoolformat');
"javascript:confirm_spool_process()"
if $conf->exists('cust_bill-spoolformat');