X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=7e125f72e03947c89d7c018befc10d5660fd0673;hb=98f6d91ec7eaa907204afbfeb90ede1e3bff656d;hp=6894a4e02a854d8020bb72a4d4e42ad1da72a6b7;hpb=91dbe4c3834f38d428367d9a1e2c6cf9ea9d84a4;p=freeside.git diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html index 6894a4e02..7e125f72e 100644 --- a/httemplate/view/cust_main/packages/status.html +++ b/httemplate/view/cust_main/packages/status.html @@ -44,24 +44,42 @@ % } % -% } else { +% } else { # not canceled % -% 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 ) %> -% } +% unless ( $cust_pkg->order_date eq $cust_pkg->get('susp') ) { #on hold +% 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 ) %> +% } +% } <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %> @@ -79,7 +97,10 @@ <% 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} && !$change_from ) { +% # Status changes for suspended packages: can unsuspend, future-unsuspend, +% # or future-change. If this package is a future change or is supplemental +% # disable them all. +% if ( !$supplemental && ! $opt{no_links} && !$change_from ) { > @@ -93,8 +114,12 @@ % } % } % 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_link('misc/unsusp_pkg', emt('Start billing now'), $cust_pkg) %> ) +% } else { + ( <% pkg_unsuspend_link($cust_pkg) %> ) + ( <% pkg_resume_link($cust_pkg) %> ) +% } % } % if ( !$cust_pkg->change_to_pkgnum and % $curuser->access_right('Cancel customer package immediately') @@ -124,6 +149,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( @@ -154,6 +181,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) %> @@ -171,11 +200,13 @@ <% 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 ) %> -% } else { +% } else { # recurring package % % my $num_cust_svc = $cust_pkg->num_cust_svc; % my $summarize = $opt{'cust_pkg-large_pkg_size'} > 0 @@ -204,6 +235,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) %> @@ -229,7 +262,11 @@ <% 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} ) { +% # Status changes for active recurring packages. If it has a future +% # package change scheduled, let that be modified. If it's supplemental, +% # then that's the only allowed action. Otherwise allow suspend, future +% # suspend, do-not-suspend, and immediate and future cancel. +% if ( $part_pkg->freq and ! $opt{no_links} ) { > @@ -247,27 +284,29 @@ % } % } +% if ( !$supplemental ) { % # 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 ( $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 ( $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) %> ) +% } % } -% if ( $curuser->access_right('Cancel customer package later') ) { - ( <% pkg_expire_link($cust_pkg) %> ) -% } % } @@ -387,6 +426,10 @@ sub pkg_status_row_expire { } 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_ @@ -416,14 +459,16 @@ sub pkg_status_row_changed { my $old = $cust_pkg->old_cust_pkg; if ( $old ) { my $part_pkg = $old->part_pkg; - $html .= pkg_status_row_colspan( $cust_pkg, - emt("Changed from [_1]: [_2]", - $cust_pkg->change_pkgnum, - $part_pkg->pkg_comment(nopartpkg => 1) ), - '', - 'size' => '-1', - 'align' => 'right', - ); + $html .= pkg_status_row_colspan( + $cust_pkg, + emt("Changed from [_1]: [_2]", + $cust_pkg->change_pkgnum, + $part_pkg->pkg_comment(cust_pkg=>$old, nopartpkg=>1) + ), + '', + 'size' => '-1', + 'align' => 'right', + ); } $html; @@ -462,16 +507,17 @@ sub pkg_status_row_detached { 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_pkg->no_auto || $opt{'part_pkg'}->no_auto ) + && $opt{'has_cust_payby_auto'}; - return '' unless $cust_main->payby =~ /^(CARD|CHEK)$/; - my $what = lc(FS::payby->shortname($cust_main->payby)); + pkg_status_row_colspan( $cust_pkg, emt("No automatic charge"), ''); +} - 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 { @@ -479,7 +525,7 @@ sub pkg_status_row_discount { 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; @@ -566,6 +612,7 @@ sub pkg_suspend_link { 'actionlabel' => emt('Suspend'), 'color' => '#FF9900', 'cust_pkg' => shift, + 'height' => 420, ) } @@ -576,6 +623,7 @@ sub pkg_adjourn_link { 'actionlabel' => emt('Adjourn'), 'color' => '#CC6600', 'cust_pkg' => shift, + 'height' => 445, ) } @@ -645,8 +693,8 @@ sub pkg_change_later_link { 'label' => emt('Reschedule'), 'actionlabel' => emt('Edit scheduled change for'), 'cust_pkg' => $cust_pkg, - 'width' => 763, - 'height' => 480, + 'width' => 960, + 'height' => 490, ) }