X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=12608ee2c0cbaef16bbcd0cdd1503bbb48b183cd;hb=7fdbfcef21985e7c8455929eb0ad70c0863ac47b;hp=9bd0079afa779d072cfb16959ebc040b5c51131c;hpb=28ba028563d62f19f1cc2bd1160dd8c5d7e9d960;p=freeside.git diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html index 9bd0079af..12608ee2c 100644 --- a/httemplate/view/cust_main/packages/status.html +++ b/httemplate/view/cust_main/packages/status.html @@ -48,27 +48,36 @@ % % if ( $cust_pkg->get('susp') ) { #suspended or on hold % -% if ( $cust_pkg->order_date eq $cust_pkg->get('susp') ) { #status: 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 - - <% pkg_status_row( $cust_pkg, emt('Suspended'), 'susp', 'color'=>'FF9900', %opt ) %> -% my $cpr = $cust_pkg->last_cust_pkg_reason('susp'); +% 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_status_row_noauto( $cust_pkg, %opt ) %> + <% pkg_status_row_separate_bill( $cust_pkg, %opt ) %> + <% pkg_status_row_discount( $cust_pkg, %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 { +% 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 ) %> % } % } @@ -103,7 +112,7 @@ % } % if ( $curuser->access_right('Unsuspend customer package') ) { % if ( $cust_pkg->order_date eq $cust_pkg->get('susp') ) { #on hold - ( <% pkg_link('misc/unsusp_pkg', emt('Start bililng now'), $cust_pkg) %> ) + ( <% pkg_unhold_link($cust_pkg) %> ) % } else { ( <% pkg_unsuspend_link($cust_pkg) %> ) ( <% pkg_resume_link($cust_pkg) %> ) @@ -124,7 +133,7 @@ % if ( $change_from ) { # future change % <% pkg_status_row_colspan( $cust_pkg, emt('Waiting for package change'), '', %opt ) %> - <% pkg_status_row( $cust_pkg, + <% pkg_status_row_if( $cust_pkg, emt('Will be activated on'), 'start_date', %opt ) %> @@ -137,6 +146,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( @@ -167,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) %> @@ -184,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 ) %> @@ -217,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) %> @@ -400,6 +417,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_ @@ -487,6 +508,12 @@ 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 ) = @_; @@ -500,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 .= ' ('. @@ -579,6 +606,7 @@ sub pkg_suspend_link { 'actionlabel' => emt('Suspend'), 'color' => '#FF9900', 'cust_pkg' => shift, + 'height' => 420, ) } @@ -589,6 +617,7 @@ sub pkg_adjourn_link { 'actionlabel' => emt('Adjourn'), 'color' => '#CC6600', 'cust_pkg' => shift, + 'height' => 445, ) } @@ -615,6 +644,18 @@ 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'), @_ ); } @@ -638,6 +679,8 @@ sub pkg_uncancel_link { 'actionlabel' => emt('Un-cancel'), #'color' => #? 'cust_pkg' => shift, + 'width' => 960, + 'height' => 740, ) }