X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FUI%2FWeb%2Fsmall_custview.pm;h=d7cede62a5571f164106fc845e8f224b0621d5ce;hb=d353c1f9bbfee93e96219851af27a78f56837c50;hp=ae0a4211bda1b46b4686948590429e0e019fb701;hpb=ef644359f646efb69ecb4c74d55fee05107dad11;p=freeside.git
diff --git a/FS/FS/UI/Web/small_custview.pm b/FS/FS/UI/Web/small_custview.pm
index ae0a4211b..d7cede62a 100644
--- a/FS/FS/UI/Web/small_custview.pm
+++ b/FS/FS/UI/Web/small_custview.pm
@@ -31,12 +31,12 @@ sub small_custview {
my $html = '
';
- $html = qq!View
'
+ $html = qq!'
if $url;
$html .= 'Customer #'. $cust_main->display_custnum. ''.
' -
'.
- ucfirst($cust_main->status). '';
+ $cust_main->status_label. '';
my @part_tag = $cust_main->part_tag;
if ( @part_tag ) {
@@ -62,11 +62,18 @@ sub small_custview {
encode_entities($cust_main->first). '
';
$html .= encode_entities($cust_main->company). '
' if $cust_main->company;
- $html .= encode_entities($cust_main->address1). '
';
- $html .= encode_entities($cust_main->address2). '
' if $cust_main->address2;
- $html .= encode_entities($cust_main->city). ', '. $cust_main->state. ' '. $cust_main->zip. '
';
- $html .= $cust_main->country. '
'
- if $cust_main->country && $cust_main->country ne $countrydefault;
+
+ if ( $cust_main->bill_locationnum ) {
+
+ $html .= encode_entities($cust_main->address1). '
';
+ $html .= encode_entities($cust_main->address2). '
'
+ if $cust_main->address2;
+ $html .= encode_entities($cust_main->city). ', '. $cust_main->state. ' '.
+ $cust_main->zip. '
';
+ $html .= $cust_main->country. '
'
+ if $cust_main->country && $cust_main->country ne $countrydefault;
+
+ }
$html .= '
| ';
if ( $cust_main->daytime && $cust_main->night ) {
@@ -83,23 +90,27 @@ sub small_custview {
$html .= ' |
';
- my $ship = $cust_main->ship_location;
+ if ( $cust_main->ship_locationnum ) {
- $html .= '
'. ntable("#cccccc",2).
- ' | Service Address | ';
- $html .= join(' ',
- 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 ),
- );
+ my $ship = $cust_main->ship_location;
- # ship phone numbers no longer exist...
+ $html .= ' | '. ntable("#cccccc",2).
+ ' |
Service Address | ';
+ $html .= join(' ',
+ 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 .= ' |
';
+ # ship phone numbers no longer exist...
+
+ $html .= '';
+
+ }
$html .= '';