X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=6667a554dc5086df315c5ab8d89598d30a19a1c9;hb=4e70896aa834fe3cdd6c5dba9b0a186c572e1886;hp=6daff50316ebd074d7b8c9d50b2e77e7b7b13025;hpb=0376f47e1ec2ec9b8702a0e6c5146af9c66beb5e;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index 6daff5031..6667a554d 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -8,15 +8,16 @@
<% pkg_status_row($cust_pkg, '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', 'colspan'=>$colspan,
+ %opt
)
%>
% unless ( $cust_pkg->get('setup') ) {
- <% pkg_status_row_colspan('Never billed', '', 'colspan'=>$colspan, ) %>
+ <% pkg_status_row_colspan( $cust_pkg, 'Never billed', '', 'colspan'=>$colspan, %opt, ) %>
% } else {
@@ -34,14 +35,15 @@
<% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', %opt ) %>
- <% pkg_status_row_colspan(
+ <% pkg_status_row_colspan( $cust_pkg,
( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
'align'=>'right', 'color'=>'FF9900', 'size'=>'-2', 'colspan'=>$colspan,
+ %opt,
)
%>
% unless ( $cust_pkg->get('setup') ) {
- <% pkg_status_row_colspan('Never billed', '', 'colspan'=>$colspan ) %>
+ <% pkg_status_row_colspan( $cust_pkg, 'Never billed', '', 'colspan'=>$colspan, %opt ) %>
% } else {
<% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt ) %>
% }
@@ -70,9 +72,15 @@
%
% unless ( $part_pkg->freq ) {
- <% pkg_status_row_colspan('Not yet billed (one-time charge)', '', 'colspan'=>$colspan, ) %>
+ <% pkg_status_row_colspan( $cust_pkg, 'Not yet billed (one-time charge)', '', 'colspan'=>$colspan, %opt ) %>
- <% pkg_status_row_if($cust_pkg, 'Start billing', 'start_date', %opt) %>
+ <% pkg_status_row_if(
+ $cust_pkg,
+ ( $part_pkg->freq ? 'Start billing' : 'Bill on' ),
+ 'start_date',
+ %opt
+ )
+ %>
>
@@ -86,7 +94,7 @@
% } else {
- <% pkg_status_row_colspan("Not yet billed ($billed_or_prepaid ". myfreq($part_pkg). ')', '', 'colspan'=>$colspan ) %>
+ <% pkg_status_row_colspan($cust_pkg, "Not yet billed ($billed_or_prepaid ". myfreq($part_pkg). ')', '', 'colspan'=>$colspan, %opt ) %>
<% pkg_status_row_if($cust_pkg, 'Start billing', 'start_date', %opt) %>
@@ -96,7 +104,7 @@
%
% unless ( $part_pkg->freq ) {
- <% pkg_status_row_colspan('One-time charge', '', 'colspan'=>$colspan, ) %>
+ <% pkg_status_row_colspan($cust_pkg, 'One-time charge', '', 'colspan'=>$colspan, %opt ) %>
<% pkg_status_row($cust_pkg, 'Billed', 'setup', %opt) %>
@@ -104,18 +112,20 @@
%
% if (scalar($cust_pkg->overlimit)) {
- <% pkg_status_row_colspan(
+ <% pkg_status_row_colspan( $cust_pkg,
'Overlimit',
$billed_or_prepaid. ' '. myfreq($part_pkg),
'color'=>'FFD000', 'colspan'=>$colspan,
+ %opt
)
%>
% } else {
- <% pkg_status_row_colspan(
+ <% pkg_status_row_colspan( $cust_pkg,
'Active',
$billed_or_prepaid. ' '. myfreq($part_pkg),
'color'=>'00CC00', 'colspan'=>$colspan,
+ %opt
)
%>
% }
@@ -169,7 +179,6 @@
|
-
<%init>
my %opt = @_;
@@ -218,8 +227,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).'
';
+ $html .= pkg_datestr($cust_pkg, $field, %opt). '';
$html;
}
@@ -253,7 +269,7 @@ sub pkg_status_row_changed {
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( $label, '',
+ $html .= pkg_status_row_colspan( $cust_pkg, $label, '',
'size' => '-1',
'align' => 'right',
'colspan' => $opt{'colspan'},
@@ -264,7 +280,7 @@ sub pkg_status_row_changed {
}
sub pkg_status_row_colspan {
- my($title, $addl, %opt) = @_;
+ my($cust_pkg, $title, $addl, %opt) = @_;
my $colspan = $opt{'colspan'};
@@ -279,6 +295,13 @@ sub pkg_status_row_colspan {
$html .= qq() if $color && !$size;
$html .= qq() if length($color) || $size;
$html .= ", $addl" if length($addl);
+
+ 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;