X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=6894a4e02a854d8020bb72a4d4e42ad1da72a6b7;hb=91dbe4c3834f38d428367d9a1e2c6cf9ea9d84a4;hp=ed360cca43f47e4585f911885c62e7e92e3195ee;hpb=05eb6fd62056682d8760b85ced91dabd33357a3b;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index ed360cca4..6894a4e02 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -76,18 +76,29 @@
<% 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 && ! $opt{no_links} ) {
+% 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 ( $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,9 +108,17 @@
%
% } 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( $cust_pkg,
+ emt('Will be activated on'),
+ 'start_date',
+ %opt ) %>
%
-% unless ( $part_pkg->freq ) {
+% } elsif ( ! $cust_pkg->get('setup') ) { # not setup
+%
+% unless ( $part_pkg->freq ) { # one-time charge
<% pkg_status_row_colspan( $cust_pkg, emt('Not yet billed (one-time charge)'), '', %opt ) %>
@@ -193,7 +212,7 @@
% }
%
-% }
+% }
%
% if ( $opt{'cust_pkg-show_autosuspend'} ) {
% my $autosuspend = pkg_autosuspend_time( $cust_pkg );
@@ -207,7 +226,7 @@
<% 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 && ! $opt{no_links} ) {
@@ -215,21 +234,41 @@
|
>
-% 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 +290,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 +370,41 @@ 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');
+ } 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 ) = @_;
@@ -538,6 +605,8 @@ sub pkg_resume_link {
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 +638,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' => 763,
+ 'height' => 480,
+ )
+}
+
sub svc_recharge_link {
include( '/elements/popup_link-cust_svc.html',
'action' => $p. 'misc/recharge_svc.html',