projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding export to read mailbox status information, RT#15987
[freeside.git]
/
httemplate
/
search
/
svc_phone.cgi
diff --git
a/httemplate/search/svc_phone.cgi
b/httemplate/search/svc_phone.cgi
index
6ee7d1d
..
2943408
100644
(file)
--- a/
httemplate/search/svc_phone.cgi
+++ b/
httemplate/search/svc_phone.cgi
@@
-81,8
+81,8
@@
if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
$redirect = '';
$redirect = '';
- my $and_date = " AND startdate >= $beginning ".
-
" AND start
date <= $ending ";
+ #my $and_date = " AND startdate >= $beginning AND startdate <= $ending ";
+
my $and_date = " AND enddate >= $beginning AND end
date <= $ending ";
my $fromwhere = " FROM cdr WHERE cdr.svcnum = svc_phone.svcnum $and_date";
my $fromwhere = " FROM cdr WHERE cdr.svcnum = svc_phone.svcnum $and_date";
@@
-102,11
+102,11
@@
if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
my $f_w =
" FROM cdr_termination LEFT JOIN cdr USING ( acctid ) ".
my $f_w =
" FROM cdr_termination LEFT JOIN cdr USING ( acctid ) ".
- " WHERE cdr.
acctid = svc_phone.phonenum ". # XXX connectone-specific
+ " WHERE cdr.
carrierid = CAST(svc_phone.phonenum AS BIGINT) ". # XXX connectone-specific, has to match svc_external.id :/
$and_date;
push @select,
$and_date;
push @select,
- " ( SELECT SUM(billsec) $f_w ) AS term_billsec "
.
+ " ( SELECT SUM(billsec) $f_w ) AS term_billsec "
,
" ( SELECT SUM(cdr_termination.rated_price) $f_w ) AS term_rated_price";
push @header, 'Term Min', 'Term Billed';
" ( SELECT SUM(cdr_termination.rated_price) $f_w ) AS term_rated_price";
push @header, 'Term Min', 'Term Billed';
@@
-157,10
+157,12
@@
my $sql_query = {
'select' => join(', ',
'svc_phone.*',
'part_svc.svc',
'select' => join(', ',
'svc_phone.*',
'part_svc.svc',
- 'cust_main.custnum',
- FS::UI::Web::cust_sql_fields(),
+ @select,
+ 'cust_main.custnum',
+ FS::UI::Web::cust_sql_fields(),
),
),
- 'extra_sql' => "$extra_sql $orderby",
+ 'extra_sql' => $extra_sql,
+ 'order_by' => $orderby,
'addl_from' => $addl_from,
};
'addl_from' => $addl_from,
};