// little fix

This commit is contained in:
vChabot
2011-10-05 15:45:01 +00:00
parent f554933804
commit 7a53ec6a55
+152 -160
View File
@@ -342,133 +342,115 @@ $(function(){ldelim}
{foreach from=$days item=day} {foreach from=$days item=day}
<option value="{$day|escape:'htmlall':'UTF-8'}" {if ($sl_day == $day)} selected="selected"{/if}>{$day|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option> <option value="{$day|escape:'htmlall':'UTF-8'}" {if ($sl_day == $day)} selected="selected"{/if}>{$day|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
{/foreach} {/foreach}
</p> </select>
<p class="select"> {*
<span>{l s='Date of Birth'}</span> {l s='January'}
<select id="days" name="days"> {l s='February'}
<option value="">-</option> {l s='March'}
{foreach from=$days item=day} {l s='April'}
<option value="{$day|escape:'htmlall':'UTF-8'}" {if ($sl_day == $day)} selected="selected"{/if}>{$day|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option> {l s='May'}
{/foreach} {l s='June'}
</select> {l s='July'}
{* {l s='August'}
{l s='January'} {l s='September'}
{l s='February'} {l s='October'}
{l s='March'} {l s='November'}
{l s='April'} {l s='December'}
{l s='May'} *}
{l s='June'} <select id="months" name="months">
{l s='July'} <option value="">-</option>
{l s='August'} {foreach from=$months key=k item=month}
{l s='September'} <option value="{$k|escape:'htmlall':'UTF-8'}" {if ($sl_month == $k)} selected="selected"{/if}>{l s="$month"}&nbsp;</option>
{l s='October'} {/foreach}
{l s='November'} </select>
{l s='December'} <select id="years" name="years">
*} <option value="">-</option>
<select id="months" name="months"> {foreach from=$years item=year}
<option value="">-</option> <option value="{$year|escape:'htmlall':'UTF-8'}" {if ($sl_year == $year)} selected="selected"{/if}>{$year|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option>
{foreach from=$months key=k item=month} {/foreach}
<option value="{$k|escape:'htmlall':'UTF-8'}" {if ($sl_month == $k)} selected="selected"{/if}>{l s="$month"}&nbsp;</option> </select>
{/foreach} </p>
</select> {if isset($newsletter) && $newsletter}
<select id="years" name="years"> <p class="checkbox" >
<option value="">-</option> <input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) AND $smarty.post.newsletter == 1} checked="checked"{/if} />
{foreach from=$years item=year} <label for="newsletter">{l s='Sign up for our newsletter'}</label>
<option value="{$year|escape:'htmlall':'UTF-8'}" {if ($sl_year == $year)} selected="selected"{/if}>{$year|escape:'htmlall':'UTF-8'}&nbsp;&nbsp;</option> </p>
{/foreach} <p class="checkbox" >
</select> <input type="checkbox"name="optin" id="optin" value="1" {if isset($smarty.post.optin) AND $smarty.post.optin == 1} checked="checked"{/if} />
</p> <label for="optin">{l s='Receive special offers from our partners'}</label>
{if isset($newsletter) && $newsletter} </p>
<p class="checkbox" > {/if}
<input type="checkbox" name="newsletter" id="newsletter" value="1" {if isset($smarty.post.newsletter) AND $smarty.post.newsletter == 1} checked="checked"{/if} /> </fieldset>
<label for="newsletter">{l s='Sign up for our newsletter'}</label> {if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE}
</p> <fieldset class="account_creation">
<p class="checkbox" > <h3>{l s='Your address'}</h3>
<input type="checkbox"name="optin" id="optin" value="1" {if isset($smarty.post.optin) AND $smarty.post.optin == 1} checked="checked"{/if} /> {foreach from=$dlv_all_fields item=field_name}
<label for="optin">{l s='Receive special offers from our partners'}</label> {if $field_name eq "company"}
</p> <p class="text">
{/if} <label for="company">{l s='Company'}</label>
</fieldset> <input type="text" class="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" />
{if isset($PS_REGISTRATION_PROCESS_TYPE) && $PS_REGISTRATION_PROCESS_TYPE} </p>
<fieldset class="account_creation"> {elseif $field_name eq "vat_number"}
<h3>{l s='Your address'}</h3> <div id="vat_number" style="display:none;">
{foreach from=$dlv_all_fields item=field_name}
{if $field_name eq "company"}
<p class="text"> <p class="text">
<label for="company">{l s='Company'}</label> <label for="vat_number">{l s='VAT number'}</label>
<input type="text" class="text" id="company" name="company" value="{if isset($smarty.post.company)}{$smarty.post.company}{/if}" /> <input type="text" class="text" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{/if}" />
</p> </p>
{elseif $field_name eq "vat_number"} </div>
<div id="vat_number" style="display:none;"> {elseif $field_name eq "firstname"}
<p class="text"> <p class="required text">
<label for="vat_number">{l s='VAT number'}</label> <label for="firstname">{l s='First name'}</label>
<input type="text" class="text" name="vat_number" value="{if isset($smarty.post.vat_number)}{$smarty.post.vat_number}{/if}" /> <input type="text" class="text" id="firstname" name="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}" />
</p> <sup>*</sup>
</div> </p>
{elseif $field_name eq "firstname"} {elseif $field_name eq "lastname"}
<p class="required text"> <p class="required text">
<label for="firstname">{l s='First name'}</label> <label for="lastname">{l s='Last name'}</label>
<input type="text" class="text" id="firstname" name="firstname" value="{if isset($smarty.post.firstname)}{$smarty.post.firstname}{/if}" /> <input type="text" class="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}" />
<sup>*</sup> <sup>*</sup>
</p> </p>
{elseif $field_name eq "lastname"} {elseif $field_name eq "address1"}
<p class="required text"> <p class="required text">
<label for="lastname">{l s='Last name'}</label> <label for="address1">{l s='Address'}</label>
<input type="text" class="text" id="lastname" name="lastname" value="{if isset($smarty.post.lastname)}{$smarty.post.lastname}{/if}" /> <input type="text" class="text" name="address1" id="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{/if}" />
<sup>*</sup> <sup>*</sup>
</p> <span class="inline-infos">{l s='Street address, P.O. box, company name, c/o'}</span>
{elseif $field_name eq "address1"} </p>
<p class="required text"> {elseif $field_name eq "address2"}
<label for="address1">{l s='Address'}</label> <p class="text">
<input type="text" class="text" name="address1" id="address1" value="{if isset($smarty.post.address1)}{$smarty.post.address1}{/if}" /> <label for="address2">{l s='Address (Line 2)'}</label>
<sup>*</sup> <input type="text" class="text" name="address2" id="address2" value="{if isset($smarty.post.address2)}{$smarty.post.address2}{/if}" />
<span class="inline-infos">{l s='Street address, P.O. box, company name, c/o'}</span> <span class="inline-infos">{l s='Apartment, suite, unit, building, floor, etc.'}</span>
</p> </p>
{elseif $field_name eq "address2"} {elseif $field_name eq "postcode"}
<p class="text"> <p class="required postcode text">
<label for="address2">{l s='Address (Line 2)'}</label> <label for="postcode">{l s='Zip / Postal Code'}</label>
<input type="text" class="text" name="address2" id="address2" value="{if isset($smarty.post.address2)}{$smarty.post.address2}{/if}" /> <input type="text" class="text" name="postcode" id="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" />
<span class="inline-infos">{l s='Apartment, suite, unit, building, floor, etc.'}</span> <sup>*</sup>
</p> </p>
{elseif $field_name eq "postcode"} {elseif $field_name eq "city"}
<p class="required postcode text"> <p class="required text">
<label for="postcode">{l s='Zip / Postal Code'}</label> <label for="city">{l s='City'}</label>
<input type="text" class="text" name="postcode" id="postcode" value="{if isset($smarty.post.postcode)}{$smarty.post.postcode}{/if}" onkeyup="$('#postcode').val($('#postcode').val().toUpperCase());" /> <input type="text" class="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" />
<sup>*</sup> <sup>*</sup>
</p> </p>
{elseif $field_name eq "city"} <!--
<p class="required text"> if customer hasn't update his layout address, country has to be verified
<label for="city">{l s='City'}</label> but it's deprecated
<input type="text" class="text" name="city" id="city" value="{if isset($smarty.post.city)}{$smarty.post.city}{/if}" /> -->
<sup>*</sup> {elseif $field_name eq "Country:name" || $field_name eq "country"}
</p> <p class="required select">
<!-- <label for="id_country">{l s='Country'}</label>
if customer hasn't update his layout address, country has to be verified <select name="id_country" id="id_country">
but it's deprecated <option value="">-</option>
--> {foreach from=$countries item=v}
{elseif $field_name eq "Country:name" || $field_name eq "country"} <option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option>
<p class="required select"> {/foreach}
<label for="id_country">{l s='Country'}</label> </select>
<select name="id_country" id="id_country"> <sup>*</sup>
<option value="">-</option> </p>
{foreach from=$countries item=v} {elseif $field_name eq "State:name" || $field_name eq 'state'}
<option value="{$v.id_country}" {if ($sl_country == $v.id_country)} selected="selected"{/if}>{$v.name|escape:'htmlall':'UTF-8'}</option> {assign var='stateExist' value=true}
{/foreach}
</select>
<sup>*</sup>
</p>
{elseif $field_name eq "State:name" || $field_name eq 'state'}
{assign var='stateExist' value=true}
<p class="required id_state select">
<label for="id_state">{l s='State'}</label>
<select name="id_state" id="id_state">
<option value="">-</option>
</select>
<sup>*</sup>
</p>
{/if}
{/foreach}
{if $stateExist eq false}
<p class="required id_state select"> <p class="required id_state select">
<label for="id_state">{l s='State'}</label> <label for="id_state">{l s='State'}</label>
<select name="id_state" id="id_state"> <select name="id_state" id="id_state">
@@ -477,44 +459,54 @@ $(function(){ldelim}
<sup>*</sup> <sup>*</sup>
</p> </p>
{/if} {/if}
<p class="textarea"> {/foreach}
<label for="other">{l s='Additional information'}</label> {if $stateExist eq false}
<textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea> <p class="required id_state select">
</p> <label for="id_state">{l s='State'}</label>
<p style="margin-left:50px;">{l s='You must register at least one phone number'} <sup style="color:red;">*</sup></p> <select name="id_state" id="id_state">
<p class="text"> <option value="">-</option>
<label for="phone">{l s='Home phone'}</label> </select>
<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}" />
</p>
<p class="text">
<label for="phone_mobile">{l s='Mobile phone'}</label>
<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" />
</p>
<p class="required text" id="address_alias">
<label for="alias">{l s='Assign an address title for future reference'} </label>
<input type="text" class="text" name="alias" id="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else}{l s='My address'}{/if}" />
<sup>*</sup> <sup>*</sup>
</p> </p>
</fieldset>
<fieldset class="account_creation dni">
<h3>{l s='Tax identification'}</h3>
<p class="required text">
<label for="dni">{l s='Identification number'}</label>
<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
<span class="form_info">{l s='DNI / NIF / NIE'}</span>
<sup>*</sup>
</p>
</fieldset>
{/if} {/if}
{$HOOK_CREATE_ACCOUNT_FORM} <p class="textarea">
<p class="cart_navigation required submit"> <label for="other">{l s='Additional information'}</label>
<input type="hidden" name="email_create" value="1" /> <textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea>
<input type="hidden" name="is_new_customer" value="1" />
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
<input type="submit" name="submitAccount" id="submitAccount" value="{l s='Register'}" class="exclusive" />
<span><sup>*</sup>{l s='Required field'}</span>
</p> </p>
<p style="margin-left:50px;">{l s='You must register at least one phone number'} <sup style="color:red;">*</sup></p>
<p class="text">
<label for="phone">{l s='Home phone'}</label>
<input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}" />
</p>
<p class="text">
<label for="phone_mobile">{l s='Mobile phone'}</label>
<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" />
</p>
<p class="required text" id="address_alias">
<label for="alias">{l s='Assign an address title for future reference'} </label>
<input type="text" class="text" name="alias" id="alias" value="{if isset($smarty.post.alias)}{$smarty.post.alias}{else}{l s='My address'}{/if}" />
<sup>*</sup>
</p>
</fieldset>
<fieldset class="account_creation dni">
<h3>{l s='Tax identification'}</h3>
<p class="required text">
<label for="dni">{l s='Identification number'}</label>
<input type="text" class="text" name="dni" id="dni" value="{if isset($smarty.post.dni)}{$smarty.post.dni}{/if}" />
<span class="form_info">{l s='DNI / NIF / NIE'}</span>
<sup>*</sup>
</p>
</fieldset>
{/if}
{$HOOK_CREATE_ACCOUNT_FORM}
<p class="cart_navigation required submit">
<input type="hidden" name="email_create" value="1" />
<input type="hidden" name="is_new_customer" value="1" />
{if isset($back)}<input type="hidden" class="hidden" name="back" value="{$back|escape:'htmlall':'UTF-8'}" />{/if}
<input type="submit" name="submitAccount" id="submitAccount" value="{l s='Register'}" class="exclusive" />
<span><sup>*</sup>{l s='Required field'}</span>
</p>
</form> </form>
{/if} {/if}