RetailCRM-Mirror/woocommerce-module
1
0
Fork 0
mirror of synced 2025-04-06 07:13:33 +03:00
Code Issues Projects Releases Wiki Activity

fix for region

Browse source
This commit is contained in:
Pavel 2020-06-18 11:09:07 +03:00
parent 61ae452aec
commit 53cf3a3d79
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/include/abstracts/class-wc-retailcrm-abstracts-address.php
View file

@ -27,4 +27,26 @@ abstract class WC_Retailcrm_Abstracts_Address extends WC_Retailcrm_Abstracts_Dat
'text' => '',
);
}
/**
* Returns state name by it's code
*
* @param string $countryCode
* @param string $stateCode
*
* @return string
*/
protected function get_state_name($countryCode, $stateCode)
{
if (preg_match('/^[A-Z\-0-9]{0,5}$/', $stateCode) && !is_null($countryCode)) {
$countriesProvider = new WC_Countries();
$states = $countriesProvider->get_states($countryCode);
if (!empty($states) && array_key_exists($stateCode, $states)) {
return (string) $states[$stateCode];
}
}
return $stateCode;
}
}

3
src/include/class-wc-retailcrm-history.php
View file

@ -628,7 +628,8 @@ if ( ! class_exists( 'WC_Retailcrm_History' ) ) :
}
if (!empty($arItemsOld)) {
$result = end(array_diff($arItemsNew, $arItemsOld));
$diff = array_diff($arItemsNew, $arItemsOld);
$result = end($diff);
} else {
$result = end($arItemsNew);
}

2
src/include/customer/class-wc-retailcrm-customer-address.php
View file

@ -26,7 +26,7 @@ class WC_Retailcrm_Customer_Address extends WC_Retailcrm_Abstracts_Address
$data = array(
'index' => $customer->get_billing_postcode(),
'countryIso' => $customer->get_billing_country(),
'region' => $customer->get_billing_state(),
'region' => $this->get_state_name($customer->get_billing_country(), $customer->get_billing_state()),
'city' => $customer->get_billing_city(),
'text' => $customer->get_billing_address_1() . ', ' . $customer->get_billing_address_2()
);

2
src/include/order/class-wc-retailcrm-order-address.php
View file

@ -26,7 +26,7 @@ class WC_Retailcrm_Order_Address extends WC_Retailcrm_Abstracts_Address
$data = array(
'index' => $address['postcode'],
'city' => $address['city'],
'region' => $address['state']
'region' => $this->get_state_name($address['country'], $address['state'])
);
$this->set_data_fields($data);