From: ivan <ivan>
Date: Sun, 22 Mar 2009 02:47:36 +0000 (+0000)
Subject: fix usps address standardization when the zip returned has no zip+4, RT#4882
X-Git-Tag: freeside_1_9_1^2~577
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=1613980c5c93d0bdf8699d44ff22ecf828abf122;p=freeside.git

fix usps address standardization when the zip returned has no zip+4, RT#4882
---

diff --git a/httemplate/misc/xmlhttp-cust_main-address_standardize.html b/httemplate/misc/xmlhttp-cust_main-address_standardize.html
index 72fa4a464..3b9e142f5 100644
--- a/httemplate/misc/xmlhttp-cust_main-address_standardize.html
+++ b/httemplate/misc/xmlhttp-cust_main-address_standardize.html
@@ -50,6 +50,9 @@ if ( $sub eq 'address_standardize' ) {
 
       unless ( $verifier->is_error ) {
 
+        my $zip = $hash->{Zip5};
+        $zip .= '-'. $hash->{Zip4} if $hash->{Zip4} =~ /\d/;
+
         $return = {
           %$return,
           "new_$pre".'company'  => $hash->{FirmName},
@@ -57,7 +60,7 @@ if ( $sub eq 'address_standardize' ) {
           "new_$pre".'address2' => $hash->{Address1},
           "new_$pre".'city'     => $hash->{City},
           "new_$pre".'state'    => $hash->{State},
-          "new_$pre".'zip'      => $hash->{Zip5}. '-'. $hash->{Zip4},
+          "new_$pre".'zip'      => $zip,
         };
 
         my @fields = (qw( company address1 address2 city state zip )); #hmm