dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// merge 1.4 => 6117

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
fBrignoli
2011-04-29 09:09:38 +00:00
parent e60a8b9203
commit 56099fa735
29 changed files with 199 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AddressFormat.php
+25 -6
View File
@@ -60,6 +60,8 @@ class AddressFormatCore extends ObjectModel
$out = true;
$addr_f_validate = Address::getFieldsValidate();
$addr_f_validate['state_iso'] = 1; // adding state iso code into allowed fields
$fields_format = explode("\n", $this->format);
foreach($fields_format as $field_line)
{
@@ -73,20 +75,30 @@ class AddressFormatCore extends ObjectModel
}
return $out;
}
/**
* Returns address format fields in array by country
*
* @param Integer PS_COUNTRY.id
* @param Integer PS_COUNTRY.id if null using default country
* @return Array String field address format
*/
public static function getOrderedAddressFields($id_country)
public static function getOrderedAddressFields($id_country = 0, $split_all = false)
{
$out = array();
$field_set = explode("\n", self::getAddressCountryFormat($id_country));
foreach ($field_set as $field_item)
{
$out[] = trim($field_item);
// $field_item = trim($field_item);
if ($split_all)
{
foreach(explode(' ',$field_item) as $word_item)
$out[] = trim($word_item);
}
else
$out[] = trim($field_item);
}
return $out;
}
@@ -97,9 +109,16 @@ class AddressFormatCore extends ObjectModel
* @param Integer PS_COUNTRY.id
* @return String field address format
*/
public static function getAddressCountryFormat($id_country)
public static function getAddressCountryFormat($id_country = 0)
{
$out = '';
$out = '';
$id_country = (int) $id_country;
if ($id_country <= 0)
{
$selectedCountry = (int)(Configuration::get('PS_COUNTRY_DEFAULT'));
}
$tmp_obj = new AddressFormat();
$tmp_obj->id_country = $id_country;
$out = $tmp_obj->getFormat($tmp_obj->id_country);
@@ -131,7 +150,7 @@ class AddressFormatCore extends ObjectModel
FROM `'._DB_PREFIX_.$this->table.'`
WHERE `id_country` = '.(int)($id_country));
return isset($result['format']) ? $result['format'] : false;
return isset($result['format']) ? trim($result['format']) : '';
}
}