X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb%2Fsmall_custview.pm;h=d7cede62a5571f164106fc845e8f224b0621d5ce;hb=52a824f9b11ca266be10c76894eaf6607344c8d0;hp=2c42a6b4690b5dda1638b778f8b37eeb4fea5471;hpb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;p=freeside.git

diff --git a/FS/FS/UI/Web/small_custview.pm b/FS/FS/UI/Web/small_custview.pm
index 2c42a6b46..d7cede62a 100644
--- a/FS/FS/UI/Web/small_custview.pm
+++ b/FS/FS/UI/Web/small_custview.pm
@@ -29,14 +29,14 @@ sub small_custview {
                   : qsearchs('cust_main', { 'custnum' => $arg } )
     or die "unknown custnum $arg";
 
-  my $html = '<DIV ID="fs_small_custview">';
+  my $html = '<DIV ID="fs_small_custview" CLASS="small_custview">';
   
-  $html = qq!View <A HREF="$url?! . $cust_main->custnum . '">'
+  $html = qq!<A HREF="$url?! . $cust_main->custnum . '">'
     if $url;
 
   $html .= 'Customer #<B>'. $cust_main->display_custnum. '</B></A>'.
     ' - <B><FONT COLOR="#'. $cust_main->statuscolor. '">'.
-    ucfirst($cust_main->status). '</FONT></B>';
+    $cust_main->status_label. '</FONT></B>';
 
   my @part_tag = $cust_main->part_tag;
   if ( @part_tag ) {
@@ -58,14 +58,22 @@ sub small_custview {
   $html .=
     ntable('#e8e8e8'). '<TR><TD VALIGN="top">'. ntable("#cccccc",2).
     '<TR><TD ALIGN="right" VALIGN="top">Billing<BR>Address</TD><TD BGCOLOR="#ffffff">'.
-    $cust_main->getfield('last'). ', '. $cust_main->first. '<BR>';
+    encode_entities($cust_main->getfield('last')). ', '.
+    encode_entities($cust_main->first). '<BR>';
 
-  $html .= $cust_main->company. '<BR>' if $cust_main->company;
-  $html .= $cust_main->address1. '<BR>';
-  $html .= $cust_main->address2. '<BR>' if $cust_main->address2;
-  $html .= $cust_main->city. ', '. $cust_main->state. '  '. $cust_main->zip. '<BR>';
-  $html .= $cust_main->country. '<BR>'
-    if $cust_main->country && $cust_main->country ne $countrydefault;
+  $html .= encode_entities($cust_main->company). '<BR>' if $cust_main->company;
+
+  if ( $cust_main->bill_locationnum ) {
+
+    $html .= encode_entities($cust_main->address1). '<BR>';
+    $html .= encode_entities($cust_main->address2). '<BR>'
+      if $cust_main->address2;
+    $html .= encode_entities($cust_main->city). ', '. $cust_main->state. '  '.
+             $cust_main->zip. '<BR>';
+    $html .= $cust_main->country. '<BR>'
+      if $cust_main->country && $cust_main->country ne $countrydefault;
+
+  }
 
   $html .= '</TD></TR><TR><TD></TD><TD BGCOLOR="#ffffff">';
   if ( $cust_main->daytime && $cust_main->night ) {
@@ -82,23 +90,27 @@ sub small_custview {
 
   $html .= '</TD></TR></TABLE></TD>';
 
-  my $ship = $cust_main->ship_location;
+  if ( $cust_main->ship_locationnum ) {
 
-  $html .= '<TD VALIGN="top">'. ntable("#cccccc",2).
-    '<TR><TD ALIGN="right" VALIGN="top">Service<BR>Address</TD><TD BGCOLOR="#ffffff">';
-  $html .= join('<BR>', 
-    grep $_,
-      $cust_main->contact,
-      $cust_main->company,
-      $ship->address1,
-      $ship->address2,
-      ($ship->city . ', ' . $ship->state . '  ' . $ship->zip),
-      ($ship->country eq $countrydefault ? '' : $ship->country ),
-  );
+    my $ship = $cust_main->ship_location;
 
-  # ship phone numbers no longer exist...
+    $html .= '<TD VALIGN="top">'. ntable("#cccccc",2).
+      '<TR><TD ALIGN="right" VALIGN="top">Service<BR>Address</TD><TD BGCOLOR="#ffffff">';
+    $html .= join('<BR>', 
+      map encode_entities($_), grep $_,
+        $cust_main->contact,
+        $cust_main->company,
+        $ship->address1,
+        $ship->address2,
+        ($ship->city . ', ' . $ship->state . '  ' . $ship->zip),
+        ($ship->country eq $countrydefault ? '' : $ship->country ),
+    );
 
-  $html .= '</TD></TR></TABLE></TD>';
+    # ship phone numbers no longer exist...
+
+    $html .= '</TD></TR></TABLE></TD>';
+
+  }
 
   $html .= '</TR></TABLE>';