projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix new tax report w/FS::tax_rate_location->location_sql, RT#12332
[freeside.git]
/
httemplate
/
search
/
cust_pkg.cgi
diff --git
a/httemplate/search/cust_pkg.cgi
b/httemplate/search/cust_pkg.cgi
index
74a3a6d
..
2b6db8c
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 = '';
@@
-125,13
+126,14
@@
'',
'',
'',
'',
'',
'',
+ '',
FS::UI::Web::cust_colors(),
'',
],
FS::UI::Web::cust_colors(),
'',
],
- 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '',
+ 'style' => [ '', '', '', '', 'b', '', '', '', '', '', '', '', '', '', '', '',
'',
FS::UI::Web::cust_styles() ],
'size' => [ '', '', '', '', '-1' ],
FS::UI::Web::cust_styles() ],
'size' => [ '', '', '', '', '-1' ],
- 'align' => 'rrlccrrlrrrrrrrl'. FS::UI::Web::cust_aligns(). 'r',
+ 'align' => 'rrlccrrlrrrrrrr
r
l'. FS::UI::Web::cust_aligns(). 'r',
'links' => [
$link,
$link,
'links' => [
$link,
$link,
@@
-149,6
+151,7
@@
'',
'',
'',
'',
'',
'',
+ '',
( map { $_ ne 'Cust. Status' ? $clink : '' }
FS::UI::Web::cust_header(
$cgi->param('cust_fields')
( map { $_ ne 'Cust. Status' ? $clink : '' }
FS::UI::Web::cust_header(
$cgi->param('cust_fields')
@@
-175,8
+178,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($_);
}
@@
-205,7
+209,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);
@@
-289,6
+293,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;
};