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

// #PSCFV-3619

Browse Source
This commit is contained in:
dMetzger
2012-08-17 15:14:19 +00:00
parent 5c2a12197c
commit ab6ed78d16
1 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStoresController.php
+23 -21
View File
@@ -515,28 +515,30 @@ class AdminStoresControllerCore extends AdminController
protected function _buildOrderedFieldsShop($formFields) protected function _buildOrderedFieldsShop($formFields)
{ {
$associatedOrderKey = array( // You cannot do that, because the fields must be sorted for the country you've selected.
'PS_SHOP_NAME' => 'company', // Simple example: the current country is France, where we don't display the state. You choose "US" as a country in the form. The state is not dsplayed at the right place...
'PS_SHOP_ADDR1' => 'address1',
'PS_SHOP_ADDR2' => 'address2', // $associatedOrderKey = array(
'PS_SHOP_CITY' => 'city', // 'PS_SHOP_NAME' => 'company',
'PS_SHOP_STATE_ID' => 'State:name', // 'PS_SHOP_ADDR1' => 'address1',
'PS_SHOP_CODE' => 'postcode', // 'PS_SHOP_ADDR2' => 'address2',
'PS_SHOP_COUNTRY_ID' => 'Country:name', // 'PS_SHOP_CITY' => 'city',
'PS_SHOP_PHONE' => 'phone'); // 'PS_SHOP_STATE_ID' => 'State:name',
// 'PS_SHOP_CODE' => 'postcode',
$fields = array(); // 'PS_SHOP_COUNTRY_ID' => 'Country:name',
$orderedFields = AddressFormat::getOrderedAddressFields(Configuration::get('PS_SHOP_COUNTRY_ID'), false, true); // 'PS_SHOP_PHONE' => 'phone');
// $fields = array();
foreach ($orderedFields as $lineFields) // $orderedFields = AddressFormat::getOrderedAddressFields(Configuration::get('PS_SHOP_COUNTRY_ID'), false, true);
if (($patterns = explode(' ', $lineFields))) // foreach ($orderedFields as $lineFields)
foreach ($patterns as $pattern) // if (($patterns = explode(' ', $lineFields)))
if (($key = array_search($pattern, $associatedOrderKey))) // foreach ($patterns as $pattern)
$fields[$key] = $formFields[$key]; // if (($key = array_search($pattern, $associatedOrderKey)))
foreach ($formFields as $key => $value) // $fields[$key] = $formFields[$key];
if (!isset($fields[$key])) // foreach ($formFields as $key => $value)
$fields[$key] = $formFields[$key]; // if (!isset($fields[$key]))
// $fields[$key] = $formFields[$key];
$fields = $formFields;
$this->fields_options['contact'] = array( $this->fields_options['contact'] = array(
'title' => $this->l('Contact details'), 'title' => $this->l('Contact details'),
'icon' => 'tab-contact', 'icon' => 'tab-contact',