% unless ( $cust_pkg->get('cancel') ) {
% my $br = 0;
@@ -119,9 +132,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 +148,157 @@ Current packages
% }
%
%
-% if ( $cust_pkg->get('cancel') ) {
-
-
-
- Cancelled |
- <% pkg_datestr($cust_pkg, 'cancel', $conf) %>
-
-
-
- <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %>
- |
-
-% unless ( $cust_pkg->get('setup') ) {
-
+% if ( $cust_pkg->get('cancel') ) { #status: cancelled
+% my $cpr = $cust_pkg->last_cust_pkg_reason('cancel');
-
- >Never billed |
-
-% } else {
+ <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000', conf=>$conf ) %>
+ <% pkg_status_row_colspan(
+ ( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
+ 'align' => 'right', 'color' => 'ff0000', 'size' => '-2',
+ )
+ %>
-
- Setup |
- <% pkg_datestr($cust_pkg, 'setup', $conf) %>
-
-% if ( $cust_pkg->get('last_bill') ) {
+% unless ( $cust_pkg->get('setup') ) {
-
- <% $last_bill_or_renewed %> |
- <% pkg_datestr($cust_pkg, 'last_bill',$conf) %>
-
-% }
-% if ( $cust_pkg->get('susp') ) {
-
-
- Suspended |
- <% pkg_datestr($cust_pkg, 'susp', $conf) %>
-
-% }
-% }
-% } else {
-% if ( $cust_pkg->get('susp') ) {
-
+ <% pkg_status_row_colspan('Never billed') %>
-
- Suspended |
- <% pkg_datestr($cust_pkg, 'susp', $conf) %>
-
-
-
- <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %>
- |
-
-% unless ( $cust_pkg->get('setup') ) {
+% } 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 ) %>
+ <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp', conf=>$conf ) %>
-
- >Never billed |
-
+% }
+%
% } else {
+%
+% 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', conf=>$conf ) %>
-
- 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(
+ ( $cpr ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
+ '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', conf=>$conf ) %>
+% }
+ <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
+ <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %>
+% # pkg_status_row($cust_pkg, 'Next bill', 'bill', conf=>$conf)
+ <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf ) %>
>
-% 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 { #status: active
+%
+% unless ( $cust_pkg->get('setup') ) { #not setup
+%
+% unless ( $part_pkg->freq ) {
-
- |
-
-% } else {
+ <% pkg_status_row_colspan('Not yet billed (one-time charge)') %>
+
+ >
+
+% if ( $curuser->access_right('Cancel customer package immediately') ) {
+ ( <% pkg_cancel_link($cust_pkg) %> )
+% }
+
+ |
+
-
- >Not yet billed (<% $billed_or_prepaid %> <% myfreq($part_pkg) %>) |
-
-% }
-% } else {
-
-% unless ( $part_pkg->freq ) {
-
-
-
- >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', conf=>$conf) %>
-
- 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', conf=>$conf) %>
- ( <% 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, conf=>$conf ) %>
+ <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %>
+ <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill', conf=>$conf ) %>
+ <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn', conf=>$conf ) %>
+ <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf ) %>
- ( <% 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) %> )
+% }
-
- |
-
-% }
-% }
+
+ |
+
+% }
+%
+% }
% }
-
@@ -368,10 +314,11 @@ Current packages
<% FS::UI::Web::svc_link($m, $part_svc, $cust_svc) %> |
<% FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc) %> |
+ <% FS::UI::Web::svc_export_links($m, $part_svc, $cust_svc) %> |
-
+ |
<% $cust_svc->overlimit ? "Overlimit: ". time2str('%b %o %Y' . ($conf->exists('cust_pkg-display_times') ? ' %l:%M %P' : ''), $cust_svc->overlimit) : '' %>
|
@@ -407,7 +354,7 @@ Current packages
% ) {
-
+ |
<% svc_provision_link($cust_pkg, $part_svc, $conf, $curuser) %>
|
@@ -444,8 +391,74 @@ my $conf = new FS::Conf;
my $curuser = $FS::CurrentUser::CurrentUser;
my $packages = get_packages($cust_main, $conf);
-%init>
-<%once>
+
+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, $opt{conf}).'
';
+
+ $html;
+}
+
+sub pkg_status_row_if {
+ my( $cust_pkg, $title, $field, %opt ) = @_;
+
+ $title = '( '. pkg_unadjourn_link($cust_pkg). ' ) '. $title
+ if ( $field eq 'adjourn' &&
+ $curuser->access_right('Suspend customer package later')
+ );
+
+ $title = '( '. pkg_unexpire_link($cust_pkg). ' ) '. $title
+ if ( $field eq 'expire' &&
+ $curuser->access_right('Cancel customer package later')
+ );
+
+ $cust_pkg->get($field) ? pkg_status_row($cust_pkg, $title, $field, %opt) : '';
+}
+
+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 $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;
+
+}
#subroutines
@@ -467,7 +480,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;
@@ -526,64 +539,80 @@ sub pkg_datestr {
$strip;
}
-sub pkg_change_link { pkg_popup_link('misc/change_pkg.cgi?dummy=value',
- 'Change package',
- 'Change',
- '',
- @_
- );
- }
-
-sub pkg_suspend_link { pkg_popup_link( 'misc/cancel_pkg.html?method=suspend',
- 'Suspend now',
- 'Suspend',
- '#FF9900',
- @_
- );
- }
-
-sub pkg_adjourn_link { pkg_popup_link( 'misc/cancel_pkg.html?method=adjourn',
- 'Suspend later',
- 'Adjourn',
- '#CC6600',
- @_
- );
- }
+sub pkg_change_link { include( '/elements/popup_link-cust_pkg.html',
+ { 'action' => $p. 'misc/change_pkg.cgi?dummy=value',
+ 'label' => 'Change package',
+ 'actionlabel' => 'Change',
+ 'cust_pkg' => shift,
+ }
+ )
+ }
+
+sub pkg_suspend_link { include( '/elements/popup_link-cust_pkg.html',
+ { 'action' => $p. 'misc/cancel_pkg.html?method=suspend',
+ 'label' => 'Suspend now',
+ 'actionlabel' => 'Suspend',
+ 'color' => '#FF9900',
+ 'cust_pkg' => shift,
+ }
+ )
+ }
+
+
+sub pkg_adjourn_link { include( '/elements/popup_link-cust_pkg.html',
+ { 'action' => $p. 'misc/cancel_pkg.html?method=adjourn',
+ 'label' => 'Suspend later',
+ 'actionlabel' => 'Adjourn',
+ 'color' => '#CC6600',
+ 'cust_pkg' => shift,
+ }
+ )
+ }
sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg', 'Unsuspend', @_ ); }
-sub pkg_expire_link { pkg_link('misc/expire_pkg', 'Cancel later', @_ ); }
sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', 'Edit dates', @_ ); }
-
-sub pkg_cancel_link { pkg_popup_link( 'misc/cancel_pkg.html?method=cancel',
- 'Cancel now',
- 'Cancel',
- '#ff0000',
- @_
- );
- }
-
-sub pkg_expire_link { pkg_popup_link( 'misc/cancel_pkg.html?method=expire',
- 'Cancel later',
- 'Expire', #"Cancel package $num later"
- '#CC0000',
- @_
- );
- }
-
-sub svc_recharge_link { svc_popup_link( 'misc/recharge_svc.html',
- 'Recharge',
- 'Recharge',
- '#333399',
- @_
- );
- }
-
-sub order_pkg_link { cust_popup_link( 'misc/order_pkg.html',
- 'Order new package',
- 'Order new package',
- '#333399',
- @_
- );
+sub pkg_unadjourn_link { pkg_link('misc/unadjourn_pkg', 'Abort', @_ ); }
+sub pkg_unexpire_link { pkg_link('misc/unexpire_pkg', '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',
+ 'color' => '#ff0000',
+ 'cust_pkg' => shift,
+ }
+ )
+ }
+
+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"
+ 'color' => '#CC0000',
+ 'cust_pkg' => shift,
+ }
+ )
+ }
+
+sub svc_recharge_link { include( '/elements/popup_link-cust_svc.html',
+ { 'action' => $p. 'misc/recharge_svc.html',
+ 'label' => 'Recharge',
+ 'actionlabel' => 'Recharge',
+ 'color' => '#333399',
+ 'cust_svc' => shift,
+ }
+ )
+ }
+
+sub order_pkg_link { include( '/elements/popup_link-cust_main.html',
+ { 'action' => $p. 'misc/order_pkg.html',
+ 'label' => 'Order new package',
+ 'actionlabel' => 'Order new package',
+ 'color' => '#333399',
+ 'cust_main' => shift,
+ 'closetext' => 'Close',
+ }
+ )
}
sub pkg_event_link {
@@ -599,41 +628,13 @@ sub pkg_link {
qq!$label!;
}
-sub pkg_popup_link {
- my($action, $label, $actionlabel, $color, $cust_pkg) = @_;
- $action .= '&pkgnum='. $cust_pkg->pkgnum;
- $actionlabel .= ' package '. $cust_pkg->pkgnum;
- popup_link($action, $label, $actionlabel, $color, 768);
-}
-
-sub svc_popup_link {
- my($action, $label, $actionlabel, $color, $cust_svc) = @_;
- $action .= '?svcnum='. $cust_svc->svcnum;
- $actionlabel .= ' service '. $cust_svc->svcnum;
- popup_link($action, $label, $actionlabel, $color);
-}
-
-sub cust_popup_link {
- my($action, $label, $actionlabel, $color, $cust_main) = @_;
- $action .= '?'. $cust_main->custnum;
- popup_link($action, $label, $actionlabel, $color);
-}
-
-sub popup_link {
- my($action, $label, $actionlabel, $color, $width) = @_;
- $color ||= '#333399';
- $width ||= 540;
- qq!$label!;
-}
-
sub pkg_customize_link {
my $cust_pkg = shift or return '';
my $custnum = $cust_pkg->custnum;
qq!part_pkg->pkgpart. ';'.
"pkgnum=". $cust_pkg->pkgnum.
qq!">Customize!;
}
-%once>
+%init>