RT##29285: State field not needed for New Zealand

[freeside.git] / FS / FS / UI / Web / small_custview.pm

diff --git a/FS/FS/UI/Web/small_custview.pm b/FS/FS/UI/Web/small_custview.pm
index b98bca0..1e9ddb1 100644 (file)
--- a/FS/FS/UI/Web/small_custview.pm
+++ b/FS/FS/UI/Web/small_custview.pm
@@ -127,7 +127,9 @@ 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. '  '.
+  $html .= encode_entities($cust_main->city) . ', ' if $cust_main->city;
+  $html .= $cust_main->state. '  '.
+           $cust_main->zip. '<BR>';
            $cust_main->zip. '<BR>';
   $html .= $cust_main->country. '<BR>'
     if $cust_main->country && $cust_main->country ne $countrydefault;
@@ -156,7 +158,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 ),
   );