X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=e982220be068ce48794ddec15633b41dff01c87c;hb=806c6d4a749b1855e5aff96c45d60fb8b83ef364;hp=40d6438f315700831ce35c5b992ce3cb25e3b387;hpb=2d5f9e43a60773a9b079e96c330cb9e0e089800a;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index 40d6438f3..e982220be 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -3,10 +3,14 @@
%#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', %opt ) %>
+ <% pkg_status_row($cust_pkg, emt('Cancelled'), 'cancel', 'color'=>'FF0000', %opt ) %>
<% pkg_status_row_colspan( $cust_pkg,
( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
@@ -17,14 +21,14 @@
% unless ( $cust_pkg->get('setup') ) {
- <% pkg_status_row_colspan( $cust_pkg, 'Never billed', '', 'colspan'=>$colspan, %opt, ) %>
+ <% pkg_status_row_colspan( $cust_pkg, emt('Never billed'), '', 'colspan'=>$colspan, %opt, ) %>
% } else {
- <% pkg_status_row( $cust_pkg, 'Setup', 'setup', %opt ) %>
+ <% 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, 'Suspended', 'susp', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if( $cust_pkg, emt('Suspended'), 'susp', %opt, curuser=>$curuser ) %>
% }
%
@@ -33,7 +37,7 @@
% 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', %opt ) %>
+ <% pkg_status_row( $cust_pkg, emt('Suspended'), 'susp', 'color'=>'FF9900', %opt ) %>
<% pkg_status_row_colspan( $cust_pkg,
( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
@@ -42,18 +46,23 @@
)
%>
+ <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
<% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
% unless ( $cust_pkg->get('setup') ) {
- <% pkg_status_row_colspan( $cust_pkg, 'Never billed', '', 'colspan'=>$colspan, %opt ) %>
+ <% pkg_status_row_colspan( $cust_pkg, emt('Never billed'), '', 'colspan'=>$colspan, %opt ) %>
% } else {
- <% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt ) %>
+ <% 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($cust_pkg, 'Next bill', 'bill', %opt)
- <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', %opt, curuser=>$curuser ) %>
+% if ( $part_pkg->option('suspend_bill', 1) ) {
+ <% pkg_status_row_if( $cust_pkg, emt('Next bill'), 'bill', %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 ) %>
>
@@ -74,13 +83,15 @@
%
% unless ( $part_pkg->freq ) {
- <% pkg_status_row_colspan( $cust_pkg, 'Not yet billed (one-time charge)', '', 'colspan'=>$colspan, %opt ) %>
+ <% pkg_status_row_colspan( $cust_pkg, emt('Not yet billed (one-time charge)'), '', 'colspan'=>$colspan, %opt ) %>
- <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+ <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+ <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
<% pkg_status_row_if(
$cust_pkg,
- ( $part_pkg->freq ? 'Start billing' : 'Bill on' ),
+ ( $part_pkg->freq ? emt('Start billing') : emt('Bill on') ),
'start_date',
%opt
)
@@ -98,11 +109,13 @@
% } else {
- <% pkg_status_row_colspan($cust_pkg, "Not yet billed ($billed_or_prepaid ". myfreq($part_pkg). ')', '', 'colspan'=>$colspan, %opt ) %>
+ <% 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, 'Start billing', 'start_date', %opt) %>
+ <% pkg_status_row_if($cust_pkg, emt('Start billing'), 'start_date', %opt) %>
% }
%
@@ -110,18 +123,25 @@
%
% unless ( $part_pkg->freq ) {
- <% pkg_status_row_colspan($cust_pkg, 'One-time charge', '', 'colspan'=>$colspan, %opt ) %>
+ <% pkg_status_row_colspan($cust_pkg, emt('One-time charge'), '', 'colspan'=>$colspan, %opt ) %>
- <% pkg_status_row($cust_pkg, 'Billed', 'setup', %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 ) %>
% } 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( $cust_pkg,
- 'Overlimit',
+ emt('Overlimit'),
$billed_or_prepaid. ' '. myfreq($part_pkg),
'color'=>'FFD000', 'colspan'=>$colspan,
%opt
@@ -130,7 +150,7 @@
% } else {
<% pkg_status_row_colspan( $cust_pkg,
- 'Active',
+ emt('Active'),
$billed_or_prepaid. ' '. myfreq($part_pkg),
'color'=>'00CC00', 'colspan'=>$colspan,
%opt
@@ -138,9 +158,11 @@
%>
% }
+ <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
<% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
- <% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt) %>
+ <% pkg_status_row($cust_pkg, emt('Setup'), 'setup', %opt) %>
% }
%
@@ -154,9 +176,11 @@
<% 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, '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 ) %>
+ <% 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('Expires'), 'expire', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_if( $cust_pkg, emt('Contract ends'), 'contract_end', %opt ) %>
% if ( $part_pkg->freq ) {
@@ -272,24 +296,41 @@ sub pkg_status_row_changed {
return '' unless $cust_pkg->change_date;
my $html =
- pkg_status_row( $cust_pkg, 'Package changed', 'change_date', %opt );
+ 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_comment(nopartpkg => 1);
- $html .= pkg_status_row_colspan( $cust_pkg, $label, '',
+ $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'},
- #%opt,
);
}
$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 ) = @_;
@@ -299,14 +340,20 @@ sub pkg_status_row_discount {
my $discount = $cust_pkg_discount->discount;
- my $label = 'Discount: '. $discount->description;
- $label .= ' ('. ( $discount->months - $cust_pkg_discount->months_used ).
- ' months remaining)'
- if $discount->months;
+ my $label = ''.emt('Discount').': '. $discount->description;
+ if ( $discount->months ) {
+ my $remaining = $discount->months - $cust_pkg_discount->months_used;
+ $remaining = sprintf('%.2f', $remaining) if $remaining =~ /\./;
+ $label .= emt("([_1] months remaining)",$remaining);
+ }
+
+ $label .= ' ('.
+ ''.emt('remove discount').')';
$html .= pkg_status_row_colspan( $cust_pkg, $label, '',
'colspan' => $opt{'colspan'},
- #%opt,
);
}
@@ -363,8 +410,8 @@ sub pkg_datestr {
sub pkg_suspend_link {
include( '/elements/popup_link-cust_pkg.html',
'action' => $p. 'misc/cancel_pkg.html?method=suspend',
- 'label' => 'Suspend now',
- 'actionlabel' => 'Suspend',
+ 'label' => emt('Suspend now'),
+ 'actionlabel' => emt('Suspend'),
'color' => '#FF9900',
'cust_pkg' => shift,
)
@@ -373,31 +420,35 @@ sub pkg_suspend_link {
sub pkg_adjourn_link {
include( '/elements/popup_link-cust_pkg.html',
'action' => $p. 'misc/cancel_pkg.html?method=adjourn',
- 'label' => 'Suspend later',
- 'actionlabel' => 'Adjourn',
+ 'label' => emt('Suspend later'),
+ 'actionlabel' => emt('Adjourn'),
'color' => '#CC6600',
'cust_pkg' => shift,
)
}
sub pkg_delay_link {
+ my($cust_pkg) = shift;
include( '/elements/popup_link-cust_pkg.html',
'action' => $p. 'misc/delay_susp_pkg.html',
- 'label' => 'Delay suspend',
- 'actionlabel' => 'Delay suspend for',
- 'cust_pkg' => shift,
+ 'label' => ( $cust_pkg->dundate
+ ? emt('Edit suspension delay')
+ : emt('Delay suspend')
+ ),
+ 'actionlabel' => emt('Delay suspend for'),
+ 'cust_pkg' => $cust_pkg,
)
}
-sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg', 'Unsuspend', @_ ); }
-sub pkg_unadjourn_link { pkg_link('misc/unadjourn_pkg', 'Abort', @_ ); }
-sub pkg_unexpire_link { pkg_link('misc/unexpire_pkg', 'Abort', @_ ); }
+sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg', emt('Unsuspend'), @_ ); }
+sub pkg_unadjourn_link { pkg_link('misc/unadjourn_pkg', emt('Abort'), @_ ); }
+sub pkg_unexpire_link { pkg_link('misc/unexpire_pkg', emt('Abort'), @_ ); }
sub pkg_cancel_link {
include( '/elements/popup_link-cust_pkg.html',
'action' => $p. 'misc/cancel_pkg.html?method=cancel',
- 'label' => 'Cancel now',
- 'actionlabel' => 'Cancel',
+ 'label' => emt('Cancel now'),
+ 'actionlabel' => emt('Cancel'),
'color' => '#ff0000',
'cust_pkg' => shift,
)
@@ -406,8 +457,8 @@ sub pkg_cancel_link {
sub pkg_expire_link {
include( '/elements/popup_link-cust_pkg.html',
'action' => $p. 'misc/cancel_pkg.html?method=expire',
- 'label' => 'Cancel later',
- 'actionlabel' => 'Expire', #"Cancel package $num later"
+ 'label' => emt('Cancel later'),
+ 'actionlabel' => emt('Expire'),
'color' => '#CC0000',
'cust_pkg' => shift,
)
@@ -416,8 +467,8 @@ sub pkg_expire_link {
sub svc_recharge_link {
include( '/elements/popup_link-cust_svc.html',
'action' => $p. 'misc/recharge_svc.html',
- 'label' => 'Recharge',
- 'actionlabel' => 'Recharge',
+ 'label' => emt('Recharge'),
+ 'actionlabel' => emt('Recharge'),
'color' => '#333399',
'cust_svc' => shift,
)
|