X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=a6bd0cef455683e33a69704f32c3ae943904bd5c;hb=f058004f0670c4ffb1d334d1376ec751a43bd285;hp=c0213e90bd9902f853e8b5cb7868e8d465124f61;hpb=71c6403be78e91e34d4124da35c9d0d284ad197d;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index c0213e90b..a6bd0cef4 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -36,7 +36,7 @@
>
-% if ( $curuser->access_right('Un-cancel customer package') ) {
+% if ( $curuser->access_right('Un-cancel customer package') && ! $opt{no_links} ) {
( <% pkg_uncancel_link($cust_pkg) %> )
% }
@@ -46,21 +46,39 @@
%
% } else {
%
-% if ( $cust_pkg->get('susp') ) { #status: suspended
-% my $cpr = $cust_pkg->last_cust_pkg_reason('susp');
-
- <% pkg_status_row( $cust_pkg, emt('Suspended'), 'susp', 'color'=>'FF9900', %opt ) %>
+% if ( $cust_pkg->get('susp') ) { #suspended or on hold
+%
+% #if ( $cust_pkg->order_date eq $cust_pkg->get('susp') ) { # inconsistent with FS::cust_pkg::status
+% if ( ! $cust_pkg->setup ) { #status: on hold
+
+ <% pkg_status_row( $cust_pkg, emt('On Hold'), '', 'color'=>'7E0079', %opt ) %>
+
+% } else { #status: suspended
+% my ($cpr,$susplabel);
+% if ($cust_pkg->is_status_delay_cancel(%opt)) {
+% $cpr = $cust_pkg->last_cust_pkg_reason('expire');
+% $susplabel = 'Suspended (Cancelled)';
+% } else {
+% $cpr = $cust_pkg->last_cust_pkg_reason('susp');
+% $susplabel = 'Suspended';
+% }
+ <% pkg_status_row( $cust_pkg, emt($susplabel), 'susp', 'color'=>'FF9900', %opt ) %>
+ <% pkg_reason_row( $cust_pkg, $cpr, 'color' => 'FF9900', %opt ) %>
- <% pkg_reason_row( $cust_pkg, $cpr, 'color' => 'FF9900', %opt ) %>
+% }
<% pkg_status_row_noauto( $cust_pkg, %opt ) %>
+ <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %>
+
<% pkg_status_row_discount( $cust_pkg, %opt ) %>
-% unless ( $cust_pkg->get('setup') ) {
- <% pkg_status_row_colspan( $cust_pkg, emt('Never billed'), '', %opt ) %>
-% } else {
- <% pkg_status_row($cust_pkg, emt('Setup'), 'setup', %opt ) %>
+% if ( $cust_pkg->order_date ne $cust_pkg->get('susp') ) { # not on hold
+% if ( $cust_pkg->get('setup') ) {
+ <% pkg_status_row($cust_pkg, emt('Setup'), 'setup', %opt ) %>
+% } else {
+ <% pkg_status_row_colspan( $cust_pkg, emt('Never billed'), '', %opt ) %>
+% }
% }
<% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
@@ -76,18 +94,33 @@
<% pkg_status_row_if( $cust_pkg, emt('Next bill'), 'bill', %opt, curuser=>$curuser ) %>
% }
<% pkg_status_row_if( $cust_pkg, emt('Will resume'), 'resume', %opt, curuser=>$curuser ) %>
- <% pkg_status_row_if( $cust_pkg, emt('Expires'), 'expire', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_expire($cust_pkg, %opt, curuser=>$curuser) %>
<% pkg_status_row_if( $cust_pkg, emt('Contract ends'), 'contract_end', %opt ) %>
-% if ( !$supplemental ) {
+% if ( !$supplemental && ! $opt{no_links} && !$change_from ) {
>
+% if ( $cust_pkg->change_to_pkgnum ) {
+% # then you can modify the package change
+% if ( $curuser->access_right('Change customer package') ) {
+ ( <% pkg_change_now_link($cust_pkg) %> )
+ ( <% pkg_change_later_link($cust_pkg) %> )
+ ( <% pkg_unchange_link($cust_pkg) %> )
+
+% }
+% }
% if ( $curuser->access_right('Unsuspend customer package') ) {
- ( <% pkg_unsuspend_link($cust_pkg) %> )
- ( <% pkg_resume_link($cust_pkg) %> )
+% if ( $cust_pkg->order_date eq $cust_pkg->get('susp') ) { #on hold
+ ( <% pkg_unhold_link($cust_pkg) %> )
+% } else {
+ ( <% pkg_unsuspend_link($cust_pkg) %> )
+ ( <% pkg_resume_link($cust_pkg) %> )
+% }
% }
-% if ( $curuser->access_right('Cancel customer package immediately') ) {
+% if ( !$cust_pkg->change_to_pkgnum and
+% $curuser->access_right('Cancel customer package immediately')
+% ) {
( <% pkg_cancel_link($cust_pkg) %> )
% }
@@ -97,14 +130,24 @@
%
% } else { #status: active
%
-% unless ( $cust_pkg->get('setup') ) { #not setup
+% if ( $change_from ) { # future change
+%
+ <% pkg_status_row_colspan( $cust_pkg, emt('Waiting for package change'), '', %opt ) %>
+ <% pkg_status_row_if( $cust_pkg,
+ emt('Will be activated on'),
+ 'start_date',
+ %opt ) %>
+%
+% } elsif ( ! $cust_pkg->get('setup') ) { # not setup
%
-% unless ( $part_pkg->freq ) {
+% unless ( $part_pkg->freq ) { # one-time charge
<% pkg_status_row_colspan( $cust_pkg, emt('Not yet billed (one-time charge)'), '', %opt ) %>
<% pkg_status_row_noauto( $cust_pkg, %opt ) %>
+ <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %>
+
<% pkg_status_row_discount( $cust_pkg, %opt ) %>
<% pkg_status_row_if(
@@ -117,7 +160,7 @@
<% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
-% if (!$supplemental) {
+% if ( !$supplemental && ! $opt{no_links} ) {
|
>
@@ -135,6 +178,8 @@
<% pkg_status_row_noauto( $cust_pkg, %opt ) %>
+ <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %>
+
<% pkg_status_row_discount( $cust_pkg, %opt ) %>
<% pkg_status_row_if($cust_pkg, emt('Start billing'), 'start_date', %opt) %>
@@ -152,6 +197,8 @@
<% pkg_status_row_noauto( $cust_pkg, %opt ) %>
+ <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %>
+
<% pkg_status_row_discount( $cust_pkg, %opt ) %>
<% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %>
@@ -185,6 +232,8 @@
<% pkg_status_row_noauto( $cust_pkg, %opt ) %>
+ <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %>
+
<% pkg_status_row_discount( $cust_pkg, %opt ) %>
<% pkg_status_row($cust_pkg, emt('Setup'), 'setup', %opt) %>
@@ -193,7 +242,7 @@
% }
%
-% }
+% }
%
% if ( $opt{'cust_pkg-show_autosuspend'} ) {
% my $autosuspend = pkg_autosuspend_time( $cust_pkg );
@@ -207,29 +256,49 @@
<% 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('Will resume on'), 'resume', %opt, curuser=>$curuser ) %>
- <% pkg_status_row_if( $cust_pkg, emt('Expires'), 'expire', %opt, curuser=>$curuser ) %>
+ <% pkg_status_row_expire($cust_pkg, %opt, curuser=>$curuser) %>
<% pkg_status_row_if( $cust_pkg, emt('Contract ends'), 'contract_end', %opt ) %>
-% if ( $part_pkg->freq and !$supplemental ) {
+% if ( $part_pkg->freq and !$supplemental && ! $opt{no_links} ) {
>
-% 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('Delay suspension events') ) {
- ( <% pkg_delay_link($cust_pkg) %> )
-% }
+% # action links
+% if ( $change_from ) {
+% # nothing
+% } elsif ( $cust_pkg->change_to_pkgnum ) {
+% # then you can modify the package change
+% if ( $curuser->access_right('Change customer package') ) {
+ ( <% pkg_change_now_link($cust_pkg) %> )
+ ( <% pkg_change_later_link($cust_pkg) %> )
+ ( <% pkg_unchange_link($cust_pkg) %> )
+
+% }
+% }
+
+% # suspension actions--always available
+% 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('Delay suspension events') ) {
+ ( <% pkg_delay_link($cust_pkg) %> )
+% }
+%
+% if ( $change_from or $cust_pkg->change_to_pkgnum ) {
+% # you can't cancel the package while in this state
+% } else { # the normal case: links to cancel the package
+
% 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) %> )
% }
+% }
|
@@ -251,6 +320,7 @@ my $part_pkg = $opt{'part_pkg'};
my $curuser = $FS::CurrentUser::CurrentUser;
my $width = $opt{'cust_pkg-display_times'} ? '38%' : '56%';
my $supplemental = $opt{'supplemental'};
+my $change_from = $opt{'change_from'};
$opt{colspan} = $opt{'cust_pkg-display_times'} ? 8 : 4;
@@ -330,14 +400,45 @@ sub pkg_status_row_if {
$opt{curuser}->access_right('Suspend customer package later')
);
- $title = '( '. pkg_unexpire_link($cust_pkg). ' ) '. $title
- if ( $field eq 'expire' &&
- $opt{curuser}->access_right('Cancel customer package later')
- );
-
$cust_pkg->get($field) ? pkg_status_row($cust_pkg, $title, $field, %opt) : '';
}
+sub pkg_status_row_expire {
+ my $cust_pkg = shift;
+ my %opt = @_;
+ return unless $cust_pkg->get('expire');
+
+ my $title;
+
+ if ( $cust_pkg->get('change_to_pkg') ) {
+ if ( $cust_pkg->change_to_pkg->pkgpart != $cust_pkg->pkgpart ) {
+ $title = mt('Will change to [_1] on',
+ $cust_pkg->change_to_pkg->part_pkg->pkg);
+ } elsif ( $cust_pkg->change_to_pkg->locationnum != $cust_pkg->locationnum )
+ {
+ $title = mt('Will change location on');
+ } elsif (( $cust_pkg->change_to_pkg->quantity != $cust_pkg->quantity ) ||
+ ( $cust_pkg->change_to_pkg->contract_end != $cust_pkg->contract_end ))
+ {
+ $title = mt('Will change on');
+ } else {
+ # FS::cust_pkg->change_later should have prevented this, but
+ # just so that we can display _something_
+ $title = 'Unknown package change';
+ }
+
+ } else {
+
+ $title = emt('Expires');
+ if ( $opt{curuser}->access_right('Cancel customer package later')) {
+ $title = '( '. pkg_unexpire_link($cust_pkg). ' ) '. $title;
+ }
+
+ }
+
+ pkg_status_row( $cust_pkg, $title, 'expire', %opt );
+}
+
sub pkg_status_row_changed {
my( $cust_pkg, %opt ) = @_;
@@ -407,12 +508,18 @@ sub pkg_status_row_noauto {
pkg_status_row_colspan( $cust_pkg, emt("No automatic $what charge"), '');
}
+sub pkg_status_row_separate_bill {
+ my $cust_pkg = shift;
+ return '' unless $cust_pkg->separate_bill;
+ pkg_status_row_colspan( $cust_pkg, emt("Invoiced separately") );
+}
+
sub pkg_status_row_discount {
my( $cust_pkg, %opt ) = @_;
my $html;
- foreach my $cust_pkg_discount ( $cust_pkg->cust_pkg_discount_active ) {
+ foreach my $cust_pkg_discount (@{ $cust_pkg->{_cust_pkg_discount_active} }) {
my $discount = $cust_pkg_discount->discount;
@@ -420,7 +527,7 @@ sub pkg_status_row_discount {
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(" ([quant,_1,month,months] remaining)",$remaining);
}
$label .= ' ('.
@@ -499,6 +606,7 @@ sub pkg_suspend_link {
'actionlabel' => emt('Suspend'),
'color' => '#FF9900',
'cust_pkg' => shift,
+ 'height' => 420,
)
}
@@ -509,6 +617,7 @@ sub pkg_adjourn_link {
'actionlabel' => emt('Adjourn'),
'color' => '#CC6600',
'cust_pkg' => shift,
+ 'height' => 445,
)
}
@@ -535,9 +644,23 @@ sub pkg_resume_link {
)
}
+sub pkg_unhold_link {
+ include( '/elements/popup_link-cust_pkg.html',
+ 'action' => $p. 'misc/unhold_pkg.html?',
+ 'label' => emt('Start billing'),
+ 'actionlabel' => emt('Start billing'),
+ 'color' => '#00CC00',
+ 'width' => 510,
+ 'height' => 310,
+ 'cust_pkg' => shift,
+ )
+}
+
sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg', emt('Unsuspend now'), @_ ); }
sub pkg_unadjourn_link { pkg_link('misc/unadjourn_pkg', emt('Abort'), @_ ); }
sub pkg_unexpire_link { pkg_link('misc/unexpire_pkg', emt('Abort'), @_ ); }
+sub pkg_unchange_link { pkg_link('misc/do_not_change_pkg', emt('Abort change'), @_ ); }
+sub pkg_change_now_link { pkg_link('misc/change_pkg_now', emt('Change now'), @_ ); }
sub pkg_cancel_link {
include( '/elements/popup_link-cust_pkg.html',
@@ -569,6 +692,18 @@ sub pkg_expire_link {
)
}
+sub pkg_change_later_link {
+ my $cust_pkg = shift;
+ include( '/elements/popup_link-cust_pkg.html',
+ 'action' => $p . 'misc/change_pkg.cgi?',
+ 'label' => emt('Reschedule'),
+ 'actionlabel' => emt('Edit scheduled change for'),
+ 'cust_pkg' => $cust_pkg,
+ 'width' => 960,
+ 'height' => 490,
+ )
+}
+
sub svc_recharge_link {
include( '/elements/popup_link-cust_svc.html',
'action' => $p. 'misc/recharge_svc.html',
| |