X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb%2Fsmall_custview.pm;h=85bee7dadd8642f64826136a5a763c03bfe8fd02;hp=72af03ea429fd19ba4f0ecb266fa9cf59419da11;hb=8b7aa84ac466a5094f54fba06e80bab45599bb8d;hpb=43f8c4ca0668a417b86e1ef8d1c15b25097bc8a4

diff --git a/FS/FS/UI/Web/small_custview.pm b/FS/FS/UI/Web/small_custview.pm
index 72af03ea4..85bee7dad 100644
--- a/FS/FS/UI/Web/small_custview.pm
+++ b/FS/FS/UI/Web/small_custview.pm
@@ -95,8 +95,12 @@ sub small_custview {
   $html = qq!<A HREF="$url?! . $cust_main->custnum . '">'
     if $url;
 
+  if ( $FS::CurrentUser::CurrentUser->num_agents ) {
+    $html .= encode_entities($cust_main->agent->agent). ' ';
+  }
+
   $html .= 'Customer #<B>'. $cust_main->display_custnum.
-           ': '. encode_entities($cust_main->name). '</B></A>';
+           '</B>: <B>'. encode_entities($cust_main->name). '</B></A>'.
            ' - <B><FONT COLOR="#'. $cust_main->statuscolor. '">'.
            $cust_main->status_label. '</FONT></B>';
 
@@ -129,24 +133,34 @@ sub small_custview {
     $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>'
+    $html .= encode_entities($cust_main->city) . ', ' if $cust_main->city;
+    $html .= encode_entities($cust_main->state). '  '.
+             encode_entities($cust_main->zip). '<BR>';
+    $html .= encode_entities($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 ) {
-    $html .= ( FS::Msgcat::_gettext('daytime') || 'Day' ).
-             ' '. $cust_main->daytime.
-             '<BR>'. ( FS::Msgcat::_gettext('night') || 'Night' ).
-             ' '. $cust_main->night;
-  } elsif ( $cust_main->daytime || $cust_main->night ) {
-    $html .= $cust_main->daytime || $cust_main->night;
+
+  my $num_numbers = 0;
+  $num_numbers++ foreach grep $cust_main->$_(), qw( daytime night mobile );
+  if ( $num_numbers > 1 ) {
+    $html .= ucfirst( FS::Msgcat::_gettext('daytime') ).
+             ' '. $cust_main->daytime. '<BR>'
+      if $cust_main->daytime;
+    $html .= ucfirst( FS::Msgcat::_gettext('night') ).
+             ' '. $cust_main->night. '<BR>'
+      if $cust_main->night;
+    $html .= ucfirst( FS::Msgcat::_gettext('mobile') ).
+             ' '. $cust_main->mobile. '<BR>'
+      if $cust_main->night;
+  } elsif ( $num_numbers ) { # == 1 ) {
+    $html .= ( $cust_main->daytime || $cust_main->night || $cust_main->mobile ).
+             '<BR>';
   }
   if ( $cust_main->fax ) {
-    $html .= '<BR>Fax '. $cust_main->fax;
+    $html .= 'Fax '. $cust_main->fax;
   }
 
   $html .= '</TD></TR></TABLE></TD>';
@@ -162,7 +176,7 @@ sub small_custview {
         $cust_main->ship_company,
         $ship->address1,
         $ship->address2,
-        ($ship->city . ', ' . $ship->state . '  ' . $ship->zip),
+        (($ship->city ? $ship->city . ', ' : '') . $ship->state . '  ' . $ship->zip),
         ($ship->country eq $countrydefault ? '' : $ship->country ),
     );