projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wording
[freeside.git]
/
httemplate
/
search
/
cust_pkg.cgi
diff --git
a/httemplate/search/cust_pkg.cgi
b/httemplate/search/cust_pkg.cgi
index
adbec7a
..
207e4f6
100755
(executable)
--- a/
httemplate/search/cust_pkg.cgi
+++ b/
httemplate/search/cust_pkg.cgi
@@
-19,6
+19,7
@@
'Adjourn',
'Susp.',
'Expire',
'Adjourn',
'Susp.',
'Expire',
+ 'Contract end',
'Cancel',
'Reason',
FS::UI::Web::cust_header(
'Cancel',
'Reason',
FS::UI::Web::cust_header(
@@
-59,7
+60,7
@@
#sub { time2str('%b %d %Y', shift->expire); },
#sub { time2str('%b %d %Y', shift->get('cancel')); },
( map { time_or_blank($_) }
#sub { time2str('%b %d %Y', shift->expire); },
#sub { time2str('%b %d %Y', shift->get('cancel')); },
( map { time_or_blank($_) }
-
qw( setup last_bill bill adjourn susp expire
cancel ) ),
+
qw( setup last_bill bill adjourn susp expire contract_end
cancel ) ),
sub { my $self = shift;
my $return = '';
sub { my $self = shift;
my $return = '';
@@
-80,6
+81,18
@@
# '</table>';
# },
sub {
# '</table>';
# },
sub {
+ my $cust_pkg = shift;
+ my $type = $cgi->param('_type') || '';
+ if ($type =~ /xls|csv/) {
+ my $cust_svc = $cust_pkg->primary_cust_svc;
+ if($cust_svc) {
+ return join ": ",($cust_svc->label)[0,1];
+ }
+ else {
+ return '';
+ }
+ }
+ else {
[ map {
[
{ 'data' => $_->[0]. ':',
[ map {
[
{ 'data' => $_->[0]. ':',
@@
-91,9
+104,10
@@
$_->[2]. '.cgi?'. $_->[3],
},
];
$_->[2]. '.cgi?'. $_->[3],
},
];
- }
shift
->labels
+ }
$cust_pkg
->labels
];
];
- },
+ }
+ }
],
'color' => [
'',
],
'color' => [
'',
@@
-162,8
+176,9
@@
my %search_hash = ();
#some false laziness w/misc/bulk_change_pkg.cgi
$search_hash{'query'} = $cgi->keywords;
#some false laziness w/misc/bulk_change_pkg.cgi
$search_hash{'query'} = $cgi->keywords;
-
-for (qw( agentnum custnum magic status classnum custom cust_fields )) {
+
+#scalars
+for (qw( agentnum custnum magic status classnum custom cust_fields pkgbatch )) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
@@
-192,7
+207,7
@@
my %disable = (
'' => {},
);
'' => {},
);
-foreach my $field (qw( setup last_bill bill adjourn susp expire cancel active )) {
+foreach my $field (qw( setup last_bill bill adjourn susp expire c
ontract_end c
ancel active )) {
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
@@
-276,6
+291,10
@@
my $html_init = sub {
'height' => 210,
). '<BR>';
}
'height' => 210,
). '<BR>';
}
+ $text .= include( '/elements/email-link.html',
+ 'search_hash' => \%search_hash,
+ 'table' => 'cust_pkg',
+ );
}
return $text;
};
}
return $text;
};