X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=e9017745bf7f87b40d9c6d54d3f34b8629795ab3;hp=4e7462b75f68412f64ad2b08a5f5e281121a88c4;hb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;hpb=2b8ffc98529637ffddfe7cbf6b4f9b8deb90f0fa
diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index 4e7462b75..e9017745b 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -3,60 +3,95 @@
%#this should use cust_pkg->status and cust_pkg->statuscolor eventually
+% if ( $cust_pkg->order_date ) {
+ <% pkg_status_row($cust_pkg, emt('Ordered'), 'order_date', %opt ) %>
+% }
+
% 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, emt('Cancelled'), 'cancel', 'color'=>'FF0000', %opt ) %>
- <% pkg_status_row_colspan(
+ <% pkg_status_row_colspan( $cust_pkg,
( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
- 'align' => 'right', 'color' => 'ff0000', 'size' => '-2',
+ 'align'=>'right', 'color'=>'ff0000', 'size'=>'-2', 'colspan'=>$colspan,
+ %opt
)
%>
% unless ( $cust_pkg->get('setup') ) {
- <% pkg_status_row_colspan('Never billed') %>
+ <% pkg_status_row_colspan( $cust_pkg, emt('Never billed'), '', 'colspan'=>$colspan, %opt, ) %>
% } 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, emt('Setup'), 'setup', %opt ) %>
+ <% pkg_status_row_changed( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+ <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if( $cust_pkg, emt('Suspended'), 'susp', %opt, curuser=>$curuser ) %>
% }
%
-% } else {
+% if ( $part_pkg->freq ) { #?
+
+
>
% if ( $curuser->access_right('Unsuspend customer package') ) {
( <% pkg_unsuspend_link($cust_pkg) %> )
-% }
+ ( <% pkg_resume_link($cust_pkg) %> )
+% }
% if ( $curuser->access_right('Cancel customer package immediately') ) {
( <% pkg_cancel_link($cust_pkg) %> )
% }
@@ -68,9 +103,23 @@
%
% unless ( $cust_pkg->get('setup') ) { #not setup
%
-% unless ( $part_pkg->freq ) {
+% unless ( $part_pkg->freq ) {
+
+ <% pkg_status_row_colspan( $cust_pkg, emt('Not yet billed (one-time charge)'), '', 'colspan'=>$colspan, %opt ) %>
+
+ <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
- <% pkg_status_row_colspan('Not yet billed (one-time charge)') %>
+ <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+ <% pkg_status_row_if(
+ $cust_pkg,
+ ( $part_pkg->freq ? emt('Start billing') : emt('Bill on') ),
+ 'start_date',
+ %opt
+ )
+ %>
+
+ <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
>
@@ -84,7 +133,14 @@
% } else {
- <% pkg_status_row_colspan("Not yet billed ($billed_or_prepaid ". myfreq($part_pkg). ')' ) %>
+ <% pkg_status_row_colspan($cust_pkg, emt("Not yet billed ($billed_or_prepaid [_1])", myfreq($part_pkg) ), '', 'colspan'=>$colspan, %opt ) %>
+
+ <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+ <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+ <% pkg_status_row_if($cust_pkg, emt('Start billing'), 'start_date', %opt) %>
+ <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
% }
%
@@ -92,44 +148,69 @@
%
% unless ( $part_pkg->freq ) {
- <% pkg_status_row_colspan('One-time charge') %>
+ <% pkg_status_row_colspan($cust_pkg, emt('One-time charge'), '', 'colspan'=>$colspan, %opt ) %>
+
+ <% pkg_status_row($cust_pkg, emt('Billed'), 'setup', %opt) %>
+
+ <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+ <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
- <% pkg_status_row($cust_pkg, 'Billed', 'setup', conf=>$conf) %>
+ <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
% } else {
%
-% if (scalar($cust_pkg->overlimit)) {
+% my $num_cust_svc = $cust_pkg->num_cust_svc;
+% my $summarize = $opt{'cust_pkg-large_pkg_size'} > 0
+% && $opt{'cust_pkg-large_pkg_size'} <= $num_cust_svc;
+%
+% #overlimit process is expensive with many services, so skip w/summary
+% if ( !$summarize && scalar($cust_pkg->overlimit) ) {
- <% pkg_status_row_colspan(
- 'Overlimit',
+ <% pkg_status_row_colspan( $cust_pkg,
+ emt('Overlimit'),
$billed_or_prepaid. ' '. myfreq($part_pkg),
- 'color' => 'FFD000',
+ 'color'=>'FFD000', 'colspan'=>$colspan,
+ %opt
)
%>
% } else {
- <% pkg_status_row_colspan(
- 'Active',
+ <% pkg_status_row_colspan( $cust_pkg,
+ emt('Active'),
$billed_or_prepaid. ' '. myfreq($part_pkg),
- 'color' => '00CC00',
+ 'color'=>'00CC00', 'colspan'=>$colspan,
+ %opt
)
%>
% }
- <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf) %>
+ <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+ <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+ <% pkg_status_row($cust_pkg, emt('Setup'), 'setup', %opt) %>
+
+ <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
% }
%
% }
-% my $autosuspend = pkg_autosuspend_time( $cust_pkg );
-% $cust_pkg->set('autosuspend', $autosuspend) if $autosuspend;
+%
+% if ( $opt{'cust_pkg-show_autosuspend'} ) {
+% 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, 'colspan'=>$colspan ) %>
+ <% 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, emt('Will automatically suspend by'), 'autosuspend', %opt) %>
+ <% pkg_status_row_if($cust_pkg, emt('Automatic suspension delayed until'), 'dundate', %opt) %>
+ <% pkg_status_row_if( $cust_pkg, emt('Will suspend on'), 'adjourn', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if( $cust_pkg, emt('Will resume on'), 'resume', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if( $cust_pkg, emt('Expires'), 'expire', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if( $cust_pkg, emt('Contract ends'), 'contract_end', %opt ) %>
% if ( $part_pkg->freq ) {
@@ -162,7 +243,6 @@
|
-
<%init>
my %opt = @_;
@@ -171,9 +251,8 @@ my $bgcolor = $opt{'bgcolor'};
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 );
@@ -192,7 +271,7 @@ unless ( $part_pkg->is_prepaid ) {
sub myfreq {
my $part_pkg = shift;
my $freq = $part_pkg->freq_pretty;
- $freq =~ s/ / /g;
+ #$freq =~ s/ / /g;
$freq;
}
@@ -212,8 +291,15 @@ sub pkg_status_row {
$html .= qq() if length($color);
$html .= qq($title );
$html .= qq() if length($color);
+
+ if ( $opt{'pkg_balances'} && ! $cust_pkg->{_printed_balance}++ ) { #kludge
+ $html .= ' (Balance: '. $opt{'money_char'}.
+ $cust_pkg->cust_main->balance_pkgnum($cust_pkg->pkgnum).
+ ')';
+ }
+
$html .= qq();
- $html .= pkg_datestr($cust_pkg, $field, $opt{conf}).' ';
+ $html .= pkg_datestr($cust_pkg, $field, %opt). ' |
';
$html;
}
@@ -236,20 +322,79 @@ sub pkg_status_row_if {
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, emt('Package changed'), 'change_date', %opt );
+
my $old = $cust_pkg->old_cust_pkg;
if ( $old ) {
my $part_pkg = $old->part_pkg;
- my $label = 'Changed from '. $cust_pkg->change_pkgnum. ': '.
- $part_pkg->pkg. ' - '. $part_pkg->comment;
- $html .= pkg_status_row_colspan( $label, '', size=>'-1', align=>'right' );
+ $html .= pkg_status_row_colspan( $cust_pkg,
+ emt("Changed from [_1]: [_2]",
+ $cust_pkg->change_pkgnum,
+ $part_pkg->pkg_comment(nopartpkg => 1) ),
+ '',
+ 'size' => '-1',
+ 'align' => 'right',
+ 'colspan' => $opt{'colspan'},
+ );
+ }
+
+ $html;
+}
+
+sub pkg_status_row_noauto {
+ my( $cust_pkg, %opt ) = @_;
+ my $part_pkg = $opt{'part_pkg'};
+ return '' unless $cust_pkg->no_auto || $part_pkg->no_auto;
+
+ #inefficient, should be passed in
+ my $cust_main = $cust_pkg->cust_main;
+
+ return '' unless $cust_main->payby =~ /^(CARD|CHEK)$/;
+ my $what = lc(FS::payby->shortname($cust_main->payby));
+
+ pkg_status_row_colspan( $cust_pkg, emt("No automatic $what charge"), '',
+ 'colspan' => $opt{'colspan'},
+ );
+}
+
+sub pkg_status_row_discount {
+ my( $cust_pkg, %opt ) = @_;
+
+ my $html;
+
+ foreach my $cust_pkg_discount ( $cust_pkg->cust_pkg_discount_active ) {
+
+ my $discount = $cust_pkg_discount->discount;
+
+ my $label = '