X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=fefeeef84402f8b138dff20005ebb214164ed1ae;hp=c0213e90bd9902f853e8b5cb7868e8d465124f61;hb=82e41e360194691a3585bbcebde481c2b20b37c4;hpb=1daf1a670d3cdfb307271fb7c7c98c83fb1fb464 diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html index c0213e90b..fefeeef84 100644 --- a/httemplate/view/cust_main/packages/status.html +++ b/httemplate/view/cust_main/packages/status.html @@ -31,37 +31,43 @@ % } % -% if ( $part_pkg->freq && !$supplemental && !$cust_pkg->change_custnum ) { #? - - - > - -% if ( $curuser->access_right('Un-cancel customer package') ) { - ( <% pkg_uncancel_link($cust_pkg) %> ) -% } - - - -% } % -% } 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 ) %> -% } +% 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,35 +82,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 ) { - - > - -% 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') ) { - ( <% pkg_cancel_link($cust_pkg) %> ) -% } - - - -% } -% % } 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 ) %> % -% 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 ) %> <% 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,24 +117,14 @@ <% pkg_status_row_if($cust_pkg, emt('Un-cancelled'), 'uncancel', %opt ) %> -% if (!$supplemental) { - - > - -% if ( $curuser->access_right('Cancel customer package immediately') ) { - ( <% pkg_cancel_link($cust_pkg) %> ) -% } - - - -% } - -% } else { +% } else { # recurring package, not yet billed <% pkg_status_row_colspan($cust_pkg, emt("Not yet billed ($billed_or_prepaid [_1])", myfreq($part_pkg) ), '', %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($cust_pkg, emt('Start billing'), 'start_date', %opt) %> @@ -152,11 +142,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 @@ -185,6 +177,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 +187,7 @@ % } % -% } +% } % % if ( $opt{'cust_pkg-show_autosuspend'} ) { % my $autosuspend = pkg_autosuspend_time( $cust_pkg ); @@ -207,35 +201,10 @@ <% 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 ( $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('Cancel customer package immediately') ) { - ( <% pkg_cancel_link($cust_pkg) %> ) -% } -% if ( $curuser->access_right('Cancel customer package later') ) { - ( <% pkg_expire_link($cust_pkg) %> ) -% } - - - - -% } -% + % } % } @@ -251,6 +220,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,33 +300,67 @@ 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 ) = @_; return '' unless $cust_pkg->change_date; my $html = - pkg_status_row( $cust_pkg, emt('Package changed'), 'change_date', %opt ); + pkg_status_row( $cust_pkg, emt('Changed'), 'change_date', %opt ); 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; @@ -395,16 +399,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 { @@ -412,21 +417,35 @@ sub pkg_status_row_discount { my $html; - foreach my $cust_pkg_discount ( $cust_pkg->cust_pkg_discount_active ) { + if ( $cust_pkg->waive_setup ) { + my $label = '' . + emt('Setup fee waived') . + ''; + $html .= pkg_status_row_colspan( $cust_pkg, $label, '', %opt ); + } + + foreach my $cust_pkg_discount (@{ $cust_pkg->{_cust_pkg_discount_active} }) { my $discount = $cust_pkg_discount->discount; - my $label = ''.emt('Discount').': '. $discount->description; - if ( $discount->months ) { + my $label = ''; + if ( $cust_pkg_discount->setuprecur eq 'setup' ) { + $label .= emt('Setup Discount'); + } else { + $label .= emt('Recurring Discount'); + } + $label .= ': '. $discount->description; + if ( $discount->months > 0 and $cust_pkg_discount->months_used > 0 ) { 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 .= ''; - $label .= ' ('. - ''.emt('remove discount').')'; + #$label .= ' ('. + # ''.emt('remove discount').')'; $html .= pkg_status_row_colspan( $cust_pkg, $label, '', %opt ); @@ -492,83 +511,9 @@ sub pkg_datestr { $strip; } -sub pkg_suspend_link { - include( '/elements/popup_link-cust_pkg.html', - 'action' => $p. 'misc/cancel_pkg.html?method=suspend', - 'label' => emt('Suspend now'), - 'actionlabel' => emt('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' => emt('Suspend later'), - 'actionlabel' => emt('Adjourn'), - 'color' => '#CC6600', - 'cust_pkg' => shift, - ) -} - -sub pkg_delay_link { - my($cust_pkg) = shift; - include( '/elements/popup_link-cust_pkg.html', - 'action' => $p. 'misc/delay_susp_pkg.html', - 'label' => ( $cust_pkg->dundate - ? emt('Edit suspension delay') - : emt('Delay suspend') - ), - 'actionlabel' => emt('Delay suspend for'), - 'cust_pkg' => $cust_pkg, - ) -} - -sub pkg_resume_link { - include( '/elements/popup_link-cust_pkg.html', - 'action' => $p. 'misc/cancel_pkg.html?method=resume', - 'label' => emt('Unsuspend later'), - 'actionlabel' => emt('Resume'), - 'color' => '#00CC00', - '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_cancel_link { - include( '/elements/popup_link-cust_pkg.html', - 'action' => $p. 'misc/cancel_pkg.html?method=cancel', - 'label' => emt('Cancel now'), - 'actionlabel' => emt('Cancel'), - 'color' => '#ff0000', - 'cust_pkg' => shift, - ) -} - -sub pkg_uncancel_link { - include( '/elements/popup_link-cust_pkg.html', - 'action' => $p. 'misc/cancel_pkg.html?method=uncancel', - 'label' => emt('Un-cancel'), - 'actionlabel' => emt('Un-cancel'), - #'color' => #? - 'cust_pkg' => shift, - ) -} - -sub pkg_expire_link { - include( '/elements/popup_link-cust_pkg.html', - 'action' => $p. 'misc/cancel_pkg.html?method=expire', - 'label' => emt('Cancel later'), - 'actionlabel' => emt('Expire'), - 'color' => '#CC0000', - 'cust_pkg' => shift, - ) -} - sub svc_recharge_link { include( '/elements/popup_link-cust_svc.html', 'action' => $p. 'misc/recharge_svc.html',