projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't include stack backtrace with email errors, RT#83078, RT#83088
[freeside.git]
/
httemplate
/
search
/
svc_external.cgi
diff --git
a/httemplate/search/svc_external.cgi
b/httemplate/search/svc_external.cgi
index
cb51d44
..
426ac16
100755
(executable)
--- a/
httemplate/search/svc_external.cgi
+++ b/
httemplate/search/svc_external.cgi
@@
-1,4
+1,4
@@
-<
% include( 'elements/search.html'
,
+<
& elements/svc_Common.html
,
'title' => 'External service search results',
'name' => 'external services',
'query' => $sql_query,
'title' => 'External service search results',
'name' => 'external services',
'query' => $sql_query,
@@
-8,29
+8,42
@@
'Service',
( FS::Msgcat::_gettext('svc_external-id') || 'External ID' ),
( FS::Msgcat::_gettext('svc_external-title') || 'Title' ),
'Service',
( FS::Msgcat::_gettext('svc_external-id') || 'External ID' ),
( FS::Msgcat::_gettext('svc_external-title') || 'Title' ),
+ emt('Pkg. Status'),
FS::UI::Web::cust_header(),
],
'fields' => [ 'svcnum',
'svc',
'id',
'title',
FS::UI::Web::cust_header(),
],
'fields' => [ 'svcnum',
'svc',
'id',
'title',
+ sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
+ $cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
+ },
\&FS::UI::Web::cust_fields,
],
'links' => [ $link,
$link,
$link,
$link,
\&FS::UI::Web::cust_fields,
],
'links' => [ $link,
$link,
$link,
$link,
+ '', # pkg status
( map { $_ ne 'Cust. Status' ? $link_cust : '' }
FS::UI::Web::cust_header()
),
],
( map { $_ ne 'Cust. Status' ? $link_cust : '' }
FS::UI::Web::cust_header()
),
],
- 'align' => 'rlrr'.
+ 'align' => 'rlrr
r
'.
FS::UI::Web::cust_aligns(),
'color' => [
'',
'',
'',
'',
FS::UI::Web::cust_aligns(),
'color' => [
'',
'',
'',
'',
+ sub {
+ $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+ return '' unless $cust_pkg_cache{$_[0]->svcnum};
+ my $c = FS::cust_pkg::statuscolors;
+ $c->{$cust_pkg_cache{$_[0]->svcnum}->status };
+ }, # pkg status
FS::UI::Web::cust_colors(),
],
'style' => [
FS::UI::Web::cust_colors(),
],
'style' => [
@@
-38,16
+51,18
@@
'',
'',
'',
'',
'',
'',
+ 'b',
FS::UI::Web::cust_styles(),
],
FS::UI::Web::cust_styles(),
],
- )
-%>
-
+
+&>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('List services');
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('List services');
+my %cust_pkg_cache;
+
my $conf = new FS::Conf;
my %svc_external;
my $conf = new FS::Conf;
my %svc_external;
@@
-70,6
+85,13
@@
if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
} elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
push @extra_sql, "svcpart = $1";
} elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
push @extra_sql, "svcpart = $1";
+ if (defined($cgi->param('cancelled'))) {
+ if ($cgi->param('cancelled')) {
+ push @extra_sql, "cust_pkg.cancel IS NOT NULL";
+ } else {
+ push @extra_sql, "cust_pkg.cancel IS NULL";
+ }
+ }
} elsif ( $cgi->param('title') =~ /^(.*)$/ ) {
} elsif ( $cgi->param('title') =~ /^(.*)$/ ) {
@@
-90,7
+112,7
@@
if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
my $addl_from = ' LEFT JOIN cust_svc USING ( svcnum ) '.
' LEFT JOIN part_svc USING ( svcpart ) '.
' LEFT JOIN cust_pkg USING ( pkgnum ) '.
my $addl_from = ' LEFT JOIN cust_svc USING ( svcnum ) '.
' LEFT JOIN part_svc USING ( svcpart ) '.
' LEFT JOIN cust_pkg USING ( pkgnum ) '.
-
' LEFT JOIN cust_main USING ( custnum ) '
;
+
FS::UI::Web::join_cust_main('cust_pkg', 'cust_pkg')
;
#here is the agent virtualization
push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql(
#here is the agent virtualization
push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql(