merging RT 4.0.6

[freeside.git] / httemplate / view / cust_main / packages / services.html

diff --git a/httemplate/view/cust_main/packages/services.html b/httemplate/view/cust_main/packages/services.html
index 8f3a028..c0a56d0 100644 (file)
--- a/httemplate/view/cust_main/packages/services.html
+++ b/httemplate/view/cust_main/packages/services.html
@@ -3,20 +3,23 @@
 % ###
 
   <TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
-    <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
+    <TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=2 WIDTH="100%">
     <SCRIPT TYPE="text/javascript">
 function clearhint_search_cust_svc(obj, str) {
   if (obj.value == str) obj.value = '';
 }
     </SCRIPT>
 
-%  foreach my $part_svc ( $cust_pkg->part_svc ) {
+%  foreach my $part_svc ( $cust_pkg->part_svc(
+%                           'summarize_size' => $opt{'cust_pkg-large_pkg_size'}
+%                       ) )
+%  {
 
 %    my $num_cust_svc = $cust_pkg->num_cust_svc( $part_svc->svcpart );
 
 %    if ( $opt{'cust_pkg-large_pkg_size'} > 0 and
-%         $opt{'cust_pkg-large_pkg_size'} <= $num_cust_svc ) {
-%      # summarize
+%         $opt{'cust_pkg-large_pkg_size'} <= $num_cust_svc ) { # summarize
+%
       <TR>
         <TD ALIGN="right" VALIGN="top">
 %       my $href="${p}search/cust_pkg_svc.html?svcpart=".$part_svc->svcpart.
@@ -42,8 +45,9 @@ function clearhint_search_cust_svc(obj, str) {
         </TD>
       </TR>
 %     } #$hint
-%    }
-%    else { # don't summarize
+%
+%    } else { # don't summarize
+%
 %      foreach my $cust_svc ( @{ $part_svc->cust_pkg_svc } ) {
 %        if ( $cust_pkg->getfield('cancel') > 0 ) {
       <& /elements/tr-cust_svc_cancel.html,
@@ -74,7 +78,7 @@ function clearhint_search_cust_svc(obj, str) {
 %        if ( $curuser->access_right('Bulk provision customer service') 
 %               && $part_svc->svcdb eq 'svc_phone' ) {
 %          if ( $part_svc->num_avail > 5 ) {
-%             $opt{'bulk'} = 1;
+%             local $opt{'bulk'} = 1;
               <BR><% svc_provision_link($cust_pkg, $part_svc, \%opt, $curuser) %>
 %           }
 %           #XXX if there's orders for this customer {