X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=a6868434b680d586884f06ea26ff5a87fe91fd34;hb=624b2d44625f69d71175c3348cae635d580c890b;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..a6868434b 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,19 @@
<% 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,
)
%>
+ <% 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('Never billed', '', 'colspan'=>$colspan ) %>
+ <% pkg_status_row_colspan( $cust_pkg, 'Never billed', '', 'colspan'=>$colspan, %opt ) %>
% } else {
<% pkg_status_row($cust_pkg, 'Setup', 'setup', %opt ) %>
% }
@@ -68,11 +74,21 @@
%
% unless ( $cust_pkg->get('setup') ) { #not setup
%
-% unless ( $part_pkg->freq ) {
+% 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_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' ),
+ 'start_date',
+ %opt
+ )
+ %>
>
@@ -86,7 +102,11 @@
% } 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_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) %>
@@ -96,30 +116,40 @@
%
% 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) %>
+ <% pkg_status_row_noauto( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
+ <% pkg_status_row_discount( $cust_pkg, %opt, 'colspan'=>$colspan ) %>
+
% } else {
%
% 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
)
%>
% }
+ <% 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) %>
% }
@@ -169,7 +199,6 @@
|
-
<%init>
my %opt = @_;
@@ -218,8 +247,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,18 +289,67 @@ 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'},
+ #%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, "No automatic $what charge", '',
+ 'colspan' => $opt{'colspan'},
+ #%opt,
+ );
+}
+
+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 = 'Discount: '. $discount->description;
+ if ( $discount->months ) {
+ my $remaining = $discount->months - $cust_pkg_discount->months_used;
+ $remaining = sprintf('%.2f', $remaining) if $remaining =~ /\./;
+ $label .= " ($remaining months remaining)"
+ }
+
+ $label .= ' ('.
+ 'remove discount)';
+
+ $html .= pkg_status_row_colspan( $cust_pkg, $label, '',
+ 'colspan' => $opt{'colspan'},
+ #%opt,
);
+
}
$html;
}
sub pkg_status_row_colspan {
- my($title, $addl, %opt) = @_;
+ my($cust_pkg, $title, $addl, %opt) = @_;
my $colspan = $opt{'colspan'};
@@ -279,6 +364,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;