Fixed %%%VERSION%%% tag

[freeside.git] / httemplate / view / cust_main.cgi

diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi
index e820143..c36c9e2 100755 (executable)
--- a/httemplate/view/cust_main.cgi
+++ b/httemplate/view/cust_main.cgi
@@ -20,7 +20,7 @@ print <<END;
 .package TH { font-size: medium }
 .package TR { font-size: smaller }
 .package .pkgnum { font-size: medium }
-.package .provision { font-size: larger; color: red; font-weight: bold }
+.package .provision { font-weight: bold }
 </STYLE>
 END
 
@@ -290,7 +290,7 @@ if ( $conf->config('payby-default') ne 'HIDE' ) {
 print '</TD></TR></TABLE>';
 
 if ( defined $cust_main->dbdef_table->column('comments')
-     && $cust_main->comments )
+     && $cust_main->comments =~ /[^\s\n\r]/ )
 {
   print "<BR>Comments". &ntable("#cccccc"). "<TR><TD>".
         &ntable("#cccccc",2).
@@ -430,8 +430,8 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
 
   if ( $pkg->{cancel} ) { #status: cancelled
 
-    print '<TR><TD><FONT COLOR="#ff0000">Cancelled&nbsp;</FONT></TD><TD>'.
-          pkg_datestr($pkg,'cancel'). '</TD></TR>';
+    print '<TR><TD><FONT COLOR="#ff0000"><B>Cancelled&nbsp;</B></FONT></TD>'.
+          '<TD>'. pkg_datestr($pkg,'cancel'). '</TD></TR>';
     unless ( $pkg->{setup} ) {
       print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
     } else {
@@ -448,8 +448,8 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
   } else {
 
     if ( $pkg->{susp} ) { #status: suspended
-      print '<TR><TD><FONT COLOR="#FF9900">Suspended&nbsp;</FONT></TD><TD>'.
-            pkg_datestr($pkg,'susp'). '</TD></TR>';
+      print '<TR><TD><FONT COLOR="#FF9900"><B>Suspended</B>&nbsp;</FONT></TD>'.
+            '<TD>'. pkg_datestr($pkg,'susp'). '</TD></TR>';
       unless ( $pkg->{setup} ) {
         print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
       } else {
@@ -486,8 +486,8 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
                 '<TR><TD>Billed&nbsp;</TD><TD>'.
                 pkg_datestr($pkg,'setup'). '</TD></TR>';
         } else {
-          print '<TR><TD COLSPAN=2><FONT COLOR="#00CC00">Active</FONT>,&nbsp;'.
-                'billed&nbsp;'. freq($pkg->{freq}). '</TD></TR>'.
+          print '<TR><TD COLSPAN=2><FONT COLOR="#00CC00"><B>Active</B></FONT>'.
+                ',&nbsp;billed&nbsp;'. freq($pkg->{freq}). '</TD></TR>'.
                 '<TR><TD>Setup&nbsp;</TD><TD>'.
                 pkg_datestr($pkg, 'setup'). '</TD></TR>';
         }
@@ -835,22 +835,25 @@ return \@packages;
 sub svc_link {
 
  my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
+ return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
 
 }
 
 sub svc_label_link {
 
  my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
+ return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
 
 }
 
 sub svc_provision_link {
   my ($pkg, $svcpart) = (shift,shift) or return '';
-  return qq!<A CLASS="provision" HREF="${p1}/edit/$svcpart->{svcdb}.cgi?! .
+  ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/&nbsp;/g;
+  return qq!<A CLASS="provision" HREF="${p}edit/$svcpart->{svcdb}.cgi?! .
          qq!pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}">! .
-         qq!Provision $svcpart->{svc} (! . ($svcpart->{quantity} - $svcpart->{count}) . qq!)</A>!;
+         "Provision&nbsp;$svc_nbsp&nbsp;(".
+         ($svcpart->{quantity} - $svcpart->{count}).
+         ')</A>';
 }
 
 sub svc_unprovision_link {