<TR>
<TD ALIGN="right" COLSPAN="3" VALIGN="top" STYLE="padding-bottom:1px;padding-top:0px"><FONT SIZE="-2" COLOR="#FFD000">
- <% $cust_svc->overlimit ? "Overlimit: ". time2str('%b %o %Y' . ($conf->exists('cust_pkg-display_times') ? ' %l:%M %P' : ''), $cust_svc->overlimit) : '' %>
+ <% $cust_svc->overlimit ? "Overlimit: ". time2str('%b %o %Y' . ($opt{'cust_pkg-display_times'} ? ' %l:%M %P' : ''), $cust_svc->overlimit) : '' %>
</FONT></TD>
</TR>
<TR>
<TD COLSPAN=3 ALIGN="center" STYLE="padding-bottom:4px;padding-top:0px">
- <B><% svc_provision_link($cust_pkg, $part_svc, $conf, $curuser) %></B>
+ <B><% svc_provision_link($cust_pkg, $part_svc, \%opt, $curuser) %></B>
</TD>
</TR>
my $cust_pkg = $opt{'cust_pkg'};
my $part_pkg = $opt{'part_pkg'};
my $curuser = $FS::CurrentUser::CurrentUser;
-my $conf = new FS::Conf;
sub svc_provision_link {
- my ($cust_pkg, $part_svc, $conf, $curuser) = @_;
+ my ($cust_pkg, $part_svc, $opt, $curuser) = @_;
( my $svc_nbsp = $part_svc->svc ) =~ s/\s+/ /g;
my $num_avail = $part_svc->num_avail;
my $pkgnum_svcpart = "pkgnum=". $cust_pkg->pkgnum. ';'.
"svcpart=". $part_svc->svcpart;
my $url;
if ( $part_svc->svcdb eq 'svc_external' #could be generalized
- && $conf->exists('svc_external-skip_manual')
+ && $opt->{'svc_external-skip_manual'}
) {
$url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart";
} else {
my $link = qq!<A CLASS="provision" HREF="$url">!.
"Provision $svc_nbsp ($num_avail)</A>";
- if ( $conf->exists('legacy_link')
+ if ( $opt->{'legacy_link'}
&& $curuser->access_right('View/link unlinked services')
)
{
% if ( $cust_pkg->get('cancel') ) { #status: cancelled
% my $cpr = $cust_pkg->last_cust_pkg_reason('cancel');
- <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000', conf=>$conf ) %>
+ <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000', %opt ) %>
<% pkg_status_row_colspan(
( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
% } else {
- <% pkg_status_row( $cust_pkg, 'Setup', 'setup', conf=>$conf ) %>
- <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
- <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf, curuser=>$curuser ) %>
- <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp', conf=>$conf, curuser=>$curuser ) %>
+ <% pkg_status_row( $cust_pkg, 'Setup', 'setup', %opt ) %>
+ <% pkg_status_row_changed( $cust_pkg, %opt ) %>
+ <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp', %opt, curuser=>$curuser ) %>
% }
%
% if ( $cust_pkg->get('susp') ) { #status: suspended
% my $cpr = $cust_pkg->last_cust_pkg_reason('susp');
- <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', conf=>$conf ) %>
+ <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', %opt ) %>
<% pkg_status_row_colspan(
( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
% unless ( $cust_pkg->get('setup') ) {
<% pkg_status_row_colspan('Never billed') %>
% } else {
- <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf ) %>
+ <% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt ) %>
% }
- <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
- <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf, curuser=>$curuser ) %>
-% # pkg_status_row($cust_pkg, 'Next bill', 'bill', conf=>$conf)
- <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf, curuser=>$curuser ) %>
+ <% pkg_status_row_changed( $cust_pkg, %opt ) %>
+ <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', %opt, curuser=>$curuser ) %>
+% # pkg_status_row($cust_pkg, 'Next bill', 'bill', %opt)
+ <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', %opt, curuser=>$curuser ) %>
<TR>
<TD COLSPAN=<%$colspan%>>
<% pkg_status_row_colspan('One-time charge') %>
- <% pkg_status_row($cust_pkg, 'Billed', 'setup', conf=>$conf) %>
+ <% pkg_status_row($cust_pkg, 'Billed', 'setup', %opt) %>
% } else {
%
%>
% }
- <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf) %>
+ <% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt) %>
% }
%
% my $autosuspend = pkg_autosuspend_time( $cust_pkg );
% $cust_pkg->set('autosuspend', $autosuspend) if $autosuspend;
- <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
- <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf, curuser=>$curuser ) %>
- <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill', conf=>$conf, curuser=>$curuser ) %>
- <% pkg_status_row_if($cust_pkg, 'Will automatically suspend by', 'autosuspend', conf=>$conf) %>
- <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn', conf=>$conf, curuser=>$curuser ) %>
- <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf, curuser=>$curuser ) %>
+ <% pkg_status_row_changed( $cust_pkg, %opt ) %>
+ <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if($cust_pkg, 'Will automatically suspend by', 'autosuspend', %opt) %>
+ <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', %opt, curuser=>$curuser ) %>
% if ( $part_pkg->freq ) {
my $cust_pkg = $opt{'cust_pkg'};
my $part_pkg = $opt{'part_pkg'};
my $curuser = $FS::CurrentUser::CurrentUser;
-my $conf = new FS::Conf;
-my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
-my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
+my $colspan = $opt{'cust_pkg-display_times'} ? 8 : 4;
+my $width = $opt{'cust_pkg-display_times'} ? '38%' : '56%';
#false laziness w/edit/REAL_cust_pkg.cgi
my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until );
$html .= qq($title );
$html .= qq(</B></FONT>) if length($color);
$html .= qq(</TD>);
- $html .= pkg_datestr($cust_pkg, $field, $opt{conf}).'</TR>';
+ $html .= pkg_datestr($cust_pkg, $field, %opt).'</TR>';
$html;
}
sub pkg_status_row_changed {
my( $cust_pkg, %opt ) = @_;
return '' unless $cust_pkg->change_date;
- my $html = pkg_status_row( $cust_pkg, 'Package changed', 'change_date', conf=>$opt{'conf'} );
+ my $html = pkg_status_row( $cust_pkg, 'Package changed', 'change_date', %opt );
my $old = $cust_pkg->old_cust_pkg;
if ( $old ) {
my $part_pkg = $old->part_pkg;
}
sub pkg_datestr {
- my($cust_pkg, $field, $conf) = @_ or return '';
+ my($cust_pkg, $field, %opt) = @_ or return '';
return ' ' unless $cust_pkg->get($field);
my $format = '<TD align="left"><B>%b</B></TD>'.
'<TD align="right"><B> %o,</B></TD>'.
'<TD ALIGN="center"><B>:</B></TD>'.
'<TD ALIGN="left"><B>%M</B></TD>'.
'<TD ALIGN="left"><B> %P</B></TD>'
- if $conf->exists('cust_pkg-display_times');
+ if $opt{'cust_pkg-display_times'};
my $strip = time2str($format, $cust_pkg->get($field) );
$strip =~ s/ (\d)/$1/g;
$strip;