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

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13393 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-02-16 14:13:04 +00:00
parent b0590e342e
commit 5b942b7993
8 changed files with 48 additions and 23 deletions
@@ -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>