[-] BO : #PSTEST-769 - The default country must be pre-selected on address list

admin-dev/themes/default/template/helpers/form/form.tpl

@@ -171,20 +171,44 @@
 													<option value="{$option->$input.options.id}"
 														{if isset($input.multiple)}
 															{foreach $fields_value[$input.name] as $field_value}
-																{if $field_value == $option->$input.options.id}selected="selected"{/if}
+																{if $field_value == $option->$input.options.id
+																	|| empty($field_value) 
+																	&& isset($input.options.preselect_country)
+																	&& isset($input.options.preselect_country)
+																	&& $option->$input.options.id == $default_country}
+																	selected="selected"
+																{/if}
 															{/foreach}
 														{else}
-															{if $fields_value[$input.name] == $option->$input.options.id}selected="selected"{/if}
+															{if $fields_value[$input.name] == $option->$input.options.id
+																|| empty($fields_value[$input.name]) 
+																&& isset($input.options.preselect_country)
+																&& isset($input.options.preselect_country)
+																&& $option->$input.options.id == $default_country}}
+																selected="selected"
+															{/if}
 														{/if}
 													>{$option->$input.options.name}</option>
 												{else}
 													<option value="{$option[$input.options.id]}"
 														{if isset($input.multiple)}
 															{foreach $fields_value[$input.name] as $field_value}
-																{if $field_value == $option[$input.options.id]}selected="selected"{/if}
+																{if $field_value == $option[$input.options.id]
+																	|| empty($field_value)
+																	&& isset($input.options.preselect_country)
+																	&& isset($input.options.preselect_country)
+																	&& $option[$input.options.id] == $default_country}}
+																	selected="selected"
+																{/if}
 															{/foreach}
 														{else}
-															{if $fields_value[$input.name] == $option[$input.options.id]}selected="selected"{/if}
+															{if $fields_value[$input.name] == $option[$input.options.id]
+																|| empty($fields_value[$input.name])
+																&& isset($input.options.preselect_country)
+																&& isset($input.options.preselect_country)
+																&& $option[$input.options.id] == $default_country}}
+																selected="selected"
+															{/if}
 														{/if}
 													>{$option[$input.options.name]}</option>
 

classes/helper/HelperForm.php

@@ -160,6 +160,7 @@ class HelperFormCore extends Helper
 			'form_id' => $this->id,
 			'fields' => $this->fields_form,
 			'fields_value' => $this->fields_value,
+			'default_country' => (int)(Configuration::get('PS_SHOP_COUNTRY_ID') ? Configuration::get('PS_SHOP_COUNTRY_ID') : Configuration::get('PS_COUNTRY_DEFAULT')),
 			'required_fields' => $this->getFieldsRequired(),
 			'vat_number' => file_exists(_PS_MODULE_DIR_.'vatnumber/ajax.php'),
 			'module_dir' => _MODULE_DIR_,

controllers/admin/AdminAddressesController.php

@@ -257,7 +257,8 @@ class AdminAddressesControllerCore extends AdminController
 					'options' => array(
 						'query' => Country::getCountries($this->context->language->id),
 						'id' => 'id_country',
-						'name' => 'name'
+						'name' => 'name',
+						'preselect_country' => true,
 					)
 				);
 				$temp_fields[] = array(

controllers/admin/AdminManufacturersController.php

@@ -460,7 +460,8 @@ class AdminManufacturersControllerCore extends AdminController
 			'options' => array(
 				'query' => Country::getCountries($this->context->language->id),
 				'id' => 'id_country',
-				'name' => 'name'
+				'name' => 'name',
+				'preselect_country' => true,
 			)
 		);
 		$form['input'][] = array(

controllers/admin/AdminStatesController.php

@@ -127,7 +127,8 @@ class AdminStatesControllerCore extends AdminController
 					'options' => array(
 						'query' => Country::getCountries($this->context->language->id, false, true),
 						'id' => 'id_country',
-						'name' => 'name'
+						'name' => 'name',
+						'preselect_country' => true,
 					),
 					'desc' => $this->l('Country where state, region or city is located')
 				),

controllers/admin/AdminStoresController.php

@@ -183,7 +183,8 @@ class AdminStoresControllerCore extends AdminController
 					'options' => array(
 						'query' => Country::getCountries($this->context->language->id),
 						'id' => 'id_country',
-						'name' => 'name'
+						'name' => 'name',
+						'preselect_country' => true,
 					)
 				),
 				array(

controllers/admin/AdminSuppliersController.php

@@ -141,7 +141,8 @@ class AdminSuppliersControllerCore extends AdminController
 					'options' => array(
 						'query' => Country::getCountries($this->context->language->id, false),
 						'id' => 'id_country',
-						'name' => 'name'
+						'name' => 'name',
+						'preselect_country' => true,
 					),
 					'desc' => $this->l('Country where the state, region or city is located')
 				),

controllers/admin/AdminWarehousesController.php

@@ -137,12 +137,6 @@ class AdminWarehousesControllerCore extends AdminController
 		$query->where('active = 1');
 		$employees_array = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($query);
 
-		// sets countries
-		$countries = Country::getCountries($this->context->language->id, false);
-		$id_default_country = Configuration::get('PS_SHOP_COUNTRY_ID');
-		if (isset($countries[$id_default_country]))
-			$countries = array($id_default_country => $countries[$id_default_country]) + $countries;
-
 		// sets the title of the toolbar
 		$this->toolbar_title = $this->l('Stock : Warehouse management');
 
@@ -222,9 +216,10 @@ class AdminWarehousesControllerCore extends AdminController
 					'name' => 'id_country',
 					'required' => true,
 					'options' => array(
-						'query' => $countries,
+						'query' => Country::getCountries($this->context->language->id, false),
 						'id' => 'id_country',
-						'name' => 'name'
+						'name' => 'name',
+						'preselect_country' => true,
 					),
 					'desc' => $this->l('Country where the state, region or city is located')
 				),