[freeside-commits] freeside/httemplate/view/cust_main packages.html, 1.20.2.10, 1.20.2.11

Ivan,,, ivan at wavetail.420.am
Mon Jun 16 00:04:45 PDT 2008


Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail.420.am:/tmp/cvs-serv21800

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	packages.html 
Log Message:
missing stuff from HEAD

Index: packages.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages.html,v
retrieving revision 1.20.2.10
retrieving revision 1.20.2.11
diff -u -d -r1.20.2.10 -r1.20.2.11
--- packages.html	3 Jun 2008 21:06:39 -0000	1.20.2.10
+++ packages.html	16 Jun 2008 07:04:43 -0000	1.20.2.11
@@ -133,7 +133,7 @@
 % 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(
          ( ( $cpr && ( $cpr->date == $cust_pkg->get('cancel') ||
@@ -145,7 +145,7 @@
     %>
 
 
-    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900' ) %>
+    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', conf=>$conf ) %>
 
 %   unless ( $cust_pkg->get('setup') ) { 
 
@@ -153,10 +153,10 @@
 
 %   } 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 ) %>
 
 %   } 
 %
@@ -165,7 +165,7 @@
 %   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(
          ( ( $cpr && ( $cpr->date == $cust_pkg->susp ||
@@ -179,13 +179,13 @@
 %   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%>>
@@ -230,7 +230,7 @@
 
           <% 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 { 
 %
@@ -252,17 +252,17 @@
             %>
 %         } 
 
-          <% 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 ) { 
 
@@ -387,7 +387,7 @@
   $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;
 }
@@ -398,9 +398,9 @@
 }
 
 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;



More information about the freeside-commits mailing list