Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2025-05-24 02:14:03 -04:00
Code Actions Packages Releases Activity

Fixed #405 - Multitple addresses on the same account resolving to the same address

Browse Source
This commit is contained in:
Jon Ziebell 2024-01-16 07:01:48 -05:00
parent 69475d4526
commit c3e38fe201
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/address.php
View File

@ -77,7 +77,7 @@ class address extends cora\crud {
); );
} }
$key = $this->generate_key($normalized); $key = $this->generate_key($normalized, $country);
$existing_address = $this->get([ $existing_address = $this->get([
'key' => $key 'key' => $key
]); ]);
@ -124,16 +124,32 @@ class address extends cora\crud {
* house, I need to store that as a new address or the actual address will * house, I need to store that as a new address or the actual address will
* be incorrect. * be incorrect.
* *
* Update 2024-01-16: The DPBC was removed from the Smarty API around
* 2023-12-11. Emailed Smarty and they said it was a bug that it was ever
* included in my plan. Updated this to use DPBC when present for old cached
* API responses, then fall back to the simple address string.
*
* @link https://smartystreets.com/docs/addresses-have-unique-identifier * @link https://smartystreets.com/docs/addresses-have-unique-identifier
* *
* @param string $normalized Normalized address as returned from * @param string $normalized Normalized address as returned from
* SmartyStreets * SmartyStreets
* @param string $country ISO 3 country code
* *
* @return string * @return string
*/ */
private function generate_key($normalized) { private function generate_key($normalized, $country) {
if($country === 'USA') {
if(isset($normalized['delivery_point_barcode']) === true) { if(isset($normalized['delivery_point_barcode']) === true) {
return sha1($normalized['delivery_point_barcode']); $string = $normalized['delivery_point_barcode'];
} else {
$string = '';
if(isset($normalized['delivery_line_1']) === true) {
$string .= $normalized['delivery_line_1'];
}
if(isset($normalized['last_line']) === true) {
$string .= $normalized['last_line'];
}
}
} else { } else {
$string = ''; $string = '';
if(isset($normalized['address1']) === true) { if(isset($normalized['address1']) === true) {
@ -145,8 +161,9 @@ class address extends cora\crud {
if(isset($normalized['address3']) === true) { if(isset($normalized['address3']) === true) {
$string .= $normalized['address3']; $string .= $normalized['address3'];
} }
return sha1($string);
} }
return sha1($string);
} }
} }