X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=7834941676116a307f9441cd0d9557e5f13d1c02;hb=63cc857641a92d0c79635ce907c36f15e308b986;hp=b51c0249471bc6000284fd832c13cc9755889e8a;hpb=5ea49c83c4a5b71a1e7baf2b6a75fe50816fdce5;p=freeside.git

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index b51c02494..783494167 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -145,36 +145,47 @@ Current packages
 %
 %
 % if ( $cust_pkg->get('cancel') ) { #status: cancelled
+%   my $cpr = $cust_pkg->last_cust_pkg_reason;
 
-    <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000' ) %>
+    <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000', conf=>$conf ) %>
 
     <% pkg_status_row_colspan(
-         ( $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' ), '',
+         ( ( $cpr && ( $cpr->date == $cust_pkg->get('cancel') ||
+                       $cpr->date == $cust_pkg->expire
+                     )
+           ) ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
          'align' => 'right', 'color' => 'ff0000', 'size' => '-2',
        )
     %>
 
+
+    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', conf=>$conf ) %>
+
 %   unless ( $cust_pkg->get('setup') ) { 
 
         <% pkg_status_row_colspan('Never billed') %>
 
 %   } else { 
 
-       <% pkg_status_row( $cust_pkg, 'Setup', 'setup' ) %>
-       <% pkg_status_row_changed( $cust_pkg ) %>
-       <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill' ) %>
-       <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp' ) %>
+       <% pkg_status_row( $cust_pkg, 'Setup', 'setup', conf=>$conf ) %>
+       <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
+       <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %>
+       <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp', conf=>$conf ) %>
 
 %   } 
 %
 % } else { 
 %
 %   if ( $cust_pkg->get('susp') ) { #status: suspended
+%     my $cpr = $cust_pkg->last_cust_pkg_reason;
 
-    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900' ) %>
+    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', conf=>$conf ) %>
 
     <% pkg_status_row_colspan(
-         ( $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' ), '',
+         ( ( $cpr && ( $cpr->date == $cust_pkg->susp ||
+                       $cpr->date == $cust_pkg->adjourn
+                     )
+           ) ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
          'align' => 'right', 'color' => 'FF9900', 'size' => '-2',
        )
     %>
@@ -182,13 +193,13 @@ Current packages
 %   unless ( $cust_pkg->get('setup') ) { 
       <% pkg_status_row_colspan('Never billed') %>
 %   } else { 
-      <% pkg_status_row($cust_pkg, 'Setup', 'setup' ) %>
+      <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf ) %>
 %   } 
 
-    <% pkg_status_row_changed( $cust_pkg ) %>
-    <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill' ) %>
-%   # pkg_status_row($cust_pkg, 'Next bill', 'bill')
-    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire' ) %>
+    <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
+    <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %>
+%   # pkg_status_row($cust_pkg, 'Next bill', 'bill', conf=>$conf)
+    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf ) %>
 
     <TR>
       <TD COLSPAN=<%$colspan%>>
@@ -233,7 +244,7 @@ Current packages
 
           <% pkg_status_row_colspan('One-time&nbsp;charge') %>
 
-          <% pkg_status_row($cust_pkg, 'Billed', 'setup') %>
+          <% pkg_status_row($cust_pkg, 'Billed', 'setup', conf=>$conf) %>
 
 %       } else { 
 %
@@ -255,17 +266,17 @@ Current packages
             %>
 %         } 
 
-          <% pkg_status_row($cust_pkg, 'Setup', 'setup') %>
+          <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf) %>
 
 %       } 
 %
 %     } 
 
-      <% pkg_status_row_changed( $cust_pkg ) %>
-      <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill' ) %>
-      <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill' ) %>
-      <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn' ) %>
-      <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire' ) %>
+      <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
+      <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %>
+      <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill', conf=>$conf ) %>
+      <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn', conf=>$conf ) %>
+      <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf ) %>
 
 %     if ( $part_pkg->freq ) { 
 
@@ -399,7 +410,7 @@ sub pkg_status_row {
   $html   .= qq($title&nbsp;);
   $html   .= qq(</B></FONT>) if length($color);
   $html   .= qq(</TD>);
-  $html   .= pkg_datestr($cust_pkg, $field, $conf).'</TR>';
+  $html   .= pkg_datestr($cust_pkg, $field, $opt{conf}).'</TR>';
 
   $html;
 }
@@ -410,9 +421,9 @@ sub pkg_status_row_if {
 }
 
 sub pkg_status_row_changed {
-  my($cust_pkg) = @_;
+  my( $cust_pkg, %opt ) = @_;
   return '' unless $cust_pkg->change_date;
-  my $html = pkg_status_row( $cust_pkg, 'Package&nbsp;changed', 'change_date' );
+  my $html = pkg_status_row( $cust_pkg, 'Package&nbsp;changed', 'change_date', conf=>$opt{'conf'} );
   my $old = $cust_pkg->old_cust_pkg;
   if ( $old ) {
     my $part_pkg = $old->part_pkg;
@@ -590,7 +601,8 @@ sub order_pkg_link { include( '/elements/popup_link-cust_main.html',
                                 'label'       => 'Order&nbsp;new&nbsp;package',
                                 'actionlabel' => 'Order new package',
                                 'color'       => '#333399',
-                                'cust_svc'    => shift,
+                                'cust_main'   => shift,
+                                'closetext'   => 'Close',
                               }
                             )
                    }