X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=167c625eb0916115d80b3e7e5b50b2cc0c124e14;hb=550c31c6cc2616461ec0f6cfd36f1b0a244a4bd1;hp=7cb869fe2d699e95a11462f43ad88c6ee2210cae;hpb=51055278448998492df09d0ecd8fbd5b000ee688;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 7cb869fe2..167c625eb 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -119,9 +119,8 @@ Current packages
% }
%
% #this should use cust_pkg->status and cust_pkg->statuscolor eventually
-%
-% my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
-% my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
+% #my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
+% #my $width = $conf->exists('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 );
@@ -136,223 +135,155 @@ Current packages
% }
%
%
-% if ( $cust_pkg->get('cancel') ) {
-
+% if ( $cust_pkg->get('cancel') ) { #status: cancelled
-
- Cancelled |
- <% pkg_datestr($cust_pkg, 'cancel', $conf) %>
-
-
-
- <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %>
- |
-
-% unless ( $cust_pkg->get('setup') ) {
+ <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000' ) %>
+ <% pkg_status_row_colspan(
+ ( $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' ), '',
+ 'align' => 'right', 'color' => 'ff0000', 'size' => '-2',
+ )
+ %>
-
- >Never billed |
-
-% } else {
+% unless ( $cust_pkg->get('setup') ) {
+ <% pkg_status_row_colspan('Never billed') %>
-
- Setup |
- <% pkg_datestr($cust_pkg, 'setup', $conf) %>
-
-% if ( $cust_pkg->get('last_bill') ) {
-
-
- <% $last_bill_or_renewed %> |
- <% pkg_datestr($cust_pkg, 'last_bill',$conf) %>
-
-% }
-% if ( $cust_pkg->get('susp') ) {
+% } else {
-
- Suspended |
- <% pkg_datestr($cust_pkg, 'susp', $conf) %>
-
-% }
-% }
-% } else {
-% if ( $cust_pkg->get('susp') ) {
-
+ <% pkg_status_row( $cust_pkg, 'Setup', 'setup' ) %>
+ <% pkg_status_row_changed( $cust_pkg ) %>
+ <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill' ) %>
+ <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp' ) %>
-
- Suspended |
- <% pkg_datestr($cust_pkg, 'susp', $conf) %>
-
-
-
- <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %>
- |
-
-% unless ( $cust_pkg->get('setup') ) {
-
-
-
- >Never billed |
-
+% }
+%
% } else {
+%
+% if ( $cust_pkg->get('susp') ) { #status: suspended
+ <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900' ) %>
-
- Setup |
- <% pkg_datestr($cust_pkg, 'setup', $conf) %>
-
-% }
-% if ( $cust_pkg->get('last_bill') ) {
-
-
- <% $last_bill_or_renewed %> |
- <% pkg_datestr($cust_pkg, 'last_bill', $conf) %>
-
-% }
-
-
-
-% if ( $cust_pkg->get('expire') ) {
+ <% pkg_status_row_colspan(
+ ( $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' ), '',
+ 'align' => 'right', 'color' => 'FF9900', 'size' => '-2',
+ )
+ %>
-
- Expires |
- <% pkg_datestr($cust_pkg, 'expire', $conf) %>
-
-% }
+% unless ( $cust_pkg->get('setup') ) {
+ <% pkg_status_row_colspan('Never billed') %>
+% } else {
+ <% pkg_status_row($cust_pkg, 'Setup', 'setup' ) %>
+% }
+ <% pkg_status_row_changed( $cust_pkg ) %>
+ <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill' ) %>
+% # pkg_status_row($cust_pkg, 'Next bill', 'bill')
+ <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire' ) %>
>
-% if ( $curuser->access_right('Unsuspend customer package') ) {
-
+% if ( $curuser->access_right('Unsuspend customer package') ) {
( <% pkg_unsuspend_link($cust_pkg) %> )
-% }
-% if ( $curuser->access_right('Cancel customer package immediately') ) {
-
+% }
+% if ( $curuser->access_right('Cancel customer package immediately') ) {
( <% pkg_cancel_link($cust_pkg) %> )
-% }
-
+% }
|
-% } else {
-
-% unless ( $cust_pkg->get('setup') ) {
-
-% unless ( $part_pkg->freq ) {
-
-
-
- >Not yet billed (one-time charge) |
-
-
-
- >
-
-% if ( $curuser->access_right('Cancel customer package immediately') ) {
-
- ( <% pkg_cancel_link($cust_pkg) %> )
-% }
-
-
- |
-
-% } else {
+% } else { #status: active
+%
+% unless ( $cust_pkg->get('setup') ) { #not setup
+%
+% unless ( $part_pkg->freq ) {
-
- >Not yet billed (<% $billed_or_prepaid %> <% myfreq($part_pkg) %>) |
-
-% }
-% } else {
-
-% unless ( $part_pkg->freq ) {
+ <% pkg_status_row_colspan('Not yet billed (one-time charge)') %>
+
+ >
+
+% if ( $curuser->access_right('Cancel customer package immediately') ) {
+ ( <% pkg_cancel_link($cust_pkg) %> )
+% }
+
+ |
+
-
- >One-time charge |
-
+% } else {
-
- Billed |
- <% pkg_datestr($cust_pkg, 'setup', $conf) %>
-
-% } else {
-% if (scalar($cust_pkg->overlimit)) {
-
- >Overlimit, <% $billed_or_prepaid %> <% myfreq($part_pkg) %> |
-
-%}else{
-
- >Active, <% $billed_or_prepaid %> <% myfreq($part_pkg) %> |
-
-% }
-
- Setup |
- <% pkg_datestr($cust_pkg, 'setup', $conf) %>
-
-% }
-% }
-% if ( $cust_pkg->get('last_bill') ) {
+ <% pkg_status_row_colspan("Not yet billed ($billed_or_prepaid ". myfreq($part_pkg). ')' ) %>
-
- <% $last_bill_or_renewed %> |
- <% pkg_datestr($cust_pkg, 'last_bill', $conf) %>
-
-% }
-% if ( $cust_pkg->get('bill') ) { #next bill
+% }
+%
+% } else { #setup
+%
+% unless ( $part_pkg->freq ) {
-
- <% $next_bill_or_prepaid_until %> |
- <% pkg_datestr($cust_pkg, 'bill', $conf) %>
-
-% }
-% if ( $cust_pkg->get('adjourn') ) {
+ <% pkg_status_row_colspan('One-time charge') %>
-
- Adjourns |
- <% pkg_datestr($cust_pkg, 'adjourn', $conf) %>
-
-% }
-% if ( $cust_pkg->get('expire') ) {
+ <% pkg_status_row($cust_pkg, 'Billed', 'setup') %>
-
- Expires |
- <% pkg_datestr($cust_pkg, 'expire', $conf) %>
-
-% }
-% if ( $part_pkg->freq ) {
+% } else {
+%
+% if (scalar($cust_pkg->overlimit)) {
+
+ <% pkg_status_row_colspan(
+ 'Overlimit',
+ $billed_or_prepaid. ' '. myfreq($part_pkg),
+ 'color' => 'FFD000',
+ )
+ %>
+
+% } else {
+ <% pkg_status_row_colspan(
+ 'Active',
+ $billed_or_prepaid. ' '. myfreq($part_pkg),
+ 'color' => '00CC00',
+ )
+ %>
+% }
-
- >
-
-% if ( $curuser->access_right('Suspend customer package') ) {
+ <% pkg_status_row($cust_pkg, 'Setup', 'setup') %>
- ( <% pkg_suspend_link($cust_pkg) %> )
-% }
-% if ( $curuser->access_right('Suspend customer package later') ) {
+% }
+%
+% }
- ( <% pkg_adjourn_link($cust_pkg) %> )
-% }
-% if ( $curuser->access_right('Cancel customer package immediately') ) {
+ <% pkg_status_row_changed( $cust_pkg ) %>
+ <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill' ) %>
+ <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill' ) %>
+ <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn' ) %>
+ <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire' ) %>
- ( <% pkg_cancel_link($cust_pkg) %> )
-% }
-% if ( $curuser->access_right('Cancel customer package later') ) {
+% if ( $part_pkg->freq ) {
- ( <% pkg_expire_link($cust_pkg) %> )
-% }
+
+ >
+
+% if ( $curuser->access_right('Suspend customer package') ) {
+ ( <% pkg_suspend_link($cust_pkg) %> )
+% }
+% if ( $curuser->access_right('Suspend customer package later') ) {
+ ( <% pkg_adjourn_link($cust_pkg) %> )
+% }
+% if ( $curuser->access_right('Cancel customer package immediately') ) {
+ ( <% pkg_cancel_link($cust_pkg) %> )
+% }
+% if ( $curuser->access_right('Cancel customer package later') ) {
+ ( <% pkg_expire_link($cust_pkg) %> )
+% }
-
- |
-
-% }
-% }
+
+ |
+
+% }
+%
+% }
% }
-
@@ -444,6 +375,64 @@ my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
my $packages = get_packages($cust_main, $conf);
+
+my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
+my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
+
+sub pkg_status_row {
+ my( $cust_pkg, $title, $field, %opt ) = @_;
+
+ my $color = $opt{'color'};
+
+ my $html = qq();
+ $html .= qq() if length($color);
+ $html .= qq($title );
+ $html .= qq() if length($color);
+ $html .= qq( | );
+ $html .= pkg_datestr($cust_pkg, $field, $conf).'
';
+
+ $html;
+}
+
+sub pkg_status_row_if {
+ my( $cust_pkg, $title, $field, %opt ) = @_;
+ $cust_pkg->get($field) ? pkg_status_row(@_) : '';
+}
+
+sub pkg_status_row_changed {
+ my($cust_pkg) = @_;
+ return '' unless $cust_pkg->change_date;
+ my $html = pkg_status_row( $cust_pkg, 'Package changed', 'change_date' );
+ 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;
+}
+
+sub pkg_status_row_colspan {
+ my($title, $addl, %opt) = @_;
+
+ my $align = $opt{'align'} ? 'ALIGN="'. $opt{'align'}.'"' : '';
+ my $color = $opt{'color'} ? 'COLOR="#'.$opt{'color'}.'"' : '';
+ my $size = $opt{'size'} ? 'SIZE="'. $opt{'size'}. '"' : '';
+
+ my $html = qq();
+ $html .= qq() if length($color) || $size;
+ $html .= qq() if $color && !$size;
+ $html .= $title;
+ $html .= qq() if $color && !$size;
+ $html .= qq() if length($color) || $size;
+ $html .= ", $addl" if length($addl);
+ $html .= qq( |
);
+
+ $html;
+
+}
+
%init>
<%once>
@@ -467,7 +456,7 @@ sub get_packages {
[ $cust_main->$method() ];
}
-
+
sub svc_provision_link {
my ($cust_pkg, $part_svc, $conf, $curuser) = @_;
( my $svc_nbsp = $part_svc->svc ) =~ s/\s+/ /g;