diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2015-06-30 03:24:08 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2015-07-02 00:26:11 -0500 |
| commit | 7a7cbbf2d1afbbfb90c409b98ffa579e61dd865b (patch) | |
| tree | 8ce86143cc537a7d4cc19dc485e39704cb233356 /FS/FS/UI | |
| parent | efcf47213599cf4da16c390dccdf26b2473edaf3 (diff) | |
RT#29285: State field not needed for New Zealand
Diffstat (limited to 'FS/FS/UI')
| -rw-r--r-- | FS/FS/UI/Web/small_custview.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/FS/FS/UI/Web/small_custview.pm b/FS/FS/UI/Web/small_custview.pm index 72af03e..329e5f7 100644 --- a/FS/FS/UI/Web/small_custview.pm +++ b/FS/FS/UI/Web/small_custview.pm @@ -129,7 +129,8 @@ 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>'; $html .= $cust_main->country. '<BR>' if $cust_main->country && $cust_main->country ne $countrydefault; @@ -162,7 +163,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 ), ); |