From: ivan <ivan>
Date: Thu, 10 Jul 2008 18:48:04 +0000 (+0000)
Subject: fix variable scoping issues preventing customer view page from coing up
X-Git-Tag: root_of_webpay_support~488
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2cfd6eb763ac6f674c0bec79d6b585b8f093c10e

fix variable scoping issues preventing customer view page from coing up
---

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 014f64d16..d8e8130c2 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -167,8 +167,8 @@ Current packages
 
        <% 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 ) %>
+       <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf, curuser=>$curuser ) %>
+       <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp', conf=>$conf, curuser=>$curuser ) %>
 
 %   } 
 %
@@ -192,9 +192,9 @@ Current packages
 %   } 
 
     <% 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, $last_bill_or_renewed, 'last_bill', conf=>$conf, curuser=>$curuser ) %>
 %   # pkg_status_row($cust_pkg, 'Next bill', 'bill', conf=>$conf)
-    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf ) %>
+    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf, curuser=>$curuser ) %>
 
     <TR>
       <TD COLSPAN=<%$colspan%>>
@@ -268,10 +268,10 @@ Current packages
 %     } 
 
       <% 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 ) %>
+      <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf, curuser=>$curuser ) %>
+      <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill', conf=>$conf, curuser=>$curuser ) %>
+      <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn', conf=>$conf, curuser=>$curuser ) %>
+      <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf, curuser=>$curuser ) %>
 
 %     if ( $part_pkg->freq ) { 
 
@@ -415,12 +415,12 @@ sub pkg_status_row_if {
   
   $title = '<FONT SIZE=-1>(&nbsp;'. pkg_unadjourn_link($cust_pkg). '&nbsp;)&nbsp;</FONT>'. $title
     if ( $field eq 'adjourn' &&
-         $curuser->access_right('Suspend customer package later')
+         $opt{curuser}->access_right('Suspend customer package later')
        );
 
   $title = '<FONT SIZE=-1>(&nbsp;'. pkg_unexpire_link($cust_pkg). '&nbsp;)&nbsp;</FONT>'. $title
     if ( $field eq 'expire' &&
-         $curuser->access_right('Cancel customer package later')
+         $opt{curuser}->access_right('Cancel customer package later')
        );
 
   $cust_pkg->get($field) ? pkg_status_row($cust_pkg, $title, $field, %opt) : '';