X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Fstatus.html;h=4c612f514e9ca52dabf90c3db021b03ca2dc684e;hb=6afd5563cebcc4936f044b6cdef428e8f798f583;hp=6894a4e02a854d8020bb72a4d4e42ad1da72a6b7;hpb=ebcfdd04f1fe69028836d231238845801aa69505;p=freeside.git diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html index 6894a4e02..4c612f514 100644 --- a/httemplate/view/cust_main/packages/status.html +++ b/httemplate/view/cust_main/packages/status.html @@ -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 ) %> @@ -93,8 +111,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_unhold_link($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') @@ -111,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 ) %> @@ -124,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( @@ -154,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) %> @@ -171,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 ) %> @@ -204,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) %> @@ -247,15 +277,17 @@ % } % } -% # 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 ) { +% # 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 ) { @@ -387,6 +419,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_ @@ -474,12 +510,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; @@ -487,7 +529,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 .= ' ('. @@ -566,6 +608,7 @@ sub pkg_suspend_link { 'actionlabel' => emt('Suspend'), 'color' => '#FF9900', 'cust_pkg' => shift, + 'height' => 420, ) } @@ -576,6 +619,7 @@ sub pkg_adjourn_link { 'actionlabel' => emt('Adjourn'), 'color' => '#CC6600', 'cust_pkg' => shift, + 'height' => 445, ) } @@ -602,6 +646,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'), @_ ); } @@ -645,8 +701,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, ) }