[freeside-commits] freeside/httemplate/view/cust_main/packages services.html, 1.6.2.1, 1.6.2.2

[Mark Wells]

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

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	services.html 
Log Message:
fix large package display with multiple svcparts, #9821

Index: services.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages/services.html,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -w -d -r1.6.2.1 -r1.6.2.2
--- services.html	17 Apr 2011 03:28:12 -0000	1.6.2.1
+++ services.html	19 Jun 2011 05:05:14 -0000	1.6.2.2
@@ -13,18 +13,25 @@
 %  #foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
 %  foreach my $part_svc ( $cust_pkg->part_svc ) {
 
+%    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'} <= $cust_pkg->num_svcs ) {
+%         $opt{'cust_pkg-large_pkg_size'} <= $num_cust_svc ) {
 %      # summarize
       <TR>
-        <TD ALIGN="center" VALIGN="top">
+        <TD ALIGN="right" VALIGN="top">
 %       my $href="${p}search/cust_pkg_svc.html?svcpart=".$part_svc->svcpart.
 %          ";pkgnum=".$cust_pkg->pkgnum;
-        <A HREF="<% $href %>"><% $part_svc->svc %></A>&nbsp;
-        <A HREF="<% $href %>"><B>(view all <% $cust_pkg->num_svcs %>)</B></A>
+        <A HREF="<% $href %>"><% $part_svc->svc %></A></TD>
+        <TD ALIGN="left" VALIGN="top">
+        <A HREF="<% $href %>"><B>(view all <% $num_cust_svc %>)</B></A>
+        </TD>
+      </TR>
 %     my $hint = $hints{$part_svc->svcdb};
 %     if ( $hint ) {
-        <BR>
+      <TR>
+        <TD></TD>
+        <TD ALIGN="left" VALIGN="top">
         <FORM name="svcpart<%$part_svc->svcpart%>_search" STYLE="display:inline"
         ACTION="<%$p%>search/cust_pkg_svc.html" METHOD="GET">
         <INPUT TYPE="hidden" NAME="svcpart" VALUE="<%$part_svc->svcpart%>">
@@ -32,9 +39,9 @@
         <INPUT TYPE="text" NAME="search_svc"
         onfocus="clearhint_search_cust_svc(this, '<%$hint%>')" VALUE="<%$hint%>">
         <INPUT TYPE="submit" VALUE="Search"></FORM>
-%     } #$hint
         </TD>
       </TR>
+%     } #$hint
 %    }
 %    else {
 %      foreach my $cust_svc ( @{ $part_svc->cust_pkg_svc } ) {