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

[-] FO : fixed bug #PSCFV-4702

Browse Source
This commit is contained in:
vAugagneur
2012-10-16 09:58:13 +00:00
parent f67dbd5f39
commit af8d26c1f4
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/AddressController.php
+1
View File
@@ -264,6 +264,7 @@ class AddressControllerCore extends FrontController
// Assign common vars // Assign common vars
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'onr_phone_at_least' => (int)Configuration::get('PS_ONE_PHONE_AT_LEAST'),
'ajaxurl' => _MODULE_DIR_, 'ajaxurl' => _MODULE_DIR_,
'errors' => $this->errors, 'errors' => $this->errors,
'token' => Tools::getToken(false), 'token' => Tools::getToken(false),
controllers/front/AuthController.php
+1
View File
@@ -167,6 +167,7 @@ class AuthControllerCore extends FrontController
$days = Tools::dateDays(); $days = Tools::dateDays();
$this->context->smarty->assign(array( $this->context->smarty->assign(array(
'onr_phone_at_least' => (int)Configuration::get('PS_ONE_PHONE_AT_LEAST'),
'years' => $years, 'years' => $years,
'sl_year' => (isset($selectedYears) ? $selectedYears : 0), 'sl_year' => (isset($selectedYears) ? $selectedYears : 0),
'months' => $months, 'months' => $months,
themes/default/address.tpl
+3 -1
View File
@@ -215,7 +215,9 @@ $(function(){ldelim}
<label for="other">{l s='Additional information'}</label> <label for="other">{l s='Additional information'}</label>
<textarea id="other" name="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{else}{if isset($address->other)}{$address->other}{/if}{/if}</textarea> <textarea id="other" name="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{else}{if isset($address->other)}{$address->other}{/if}{/if}</textarea>
</p> </p>
<p class="inline-infos required">{l s='You must register at least one phone number'} <sup class="required">*</sup></p> {if $onr_phone_at_least}
<p class="inline-infos required">{l s='You must register at least one phone number'} <sup class="required">*</sup></p>
{/if}
<p class="text"> <p class="text">
<label for="phone">{l s='Home phone'}</label> <label for="phone">{l s='Home phone'}</label>
<input type="text" id="phone" name="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{else}{if isset($address->phone)}{$address->phone}{/if}{/if}" /> <input type="text" id="phone" name="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{else}{if isset($address->phone)}{$address->phone}{/if}{/if}" />
themes/default/authentication.tpl
+4 -2
View File
@@ -546,13 +546,15 @@ $(function(){ldelim}
<label for="other">{l s='Additional information'}</label> <label for="other">{l s='Additional information'}</label>
<textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea> <textarea name="other" id="other" cols="26" rows="3">{if isset($smarty.post.other)}{$smarty.post.other}{/if}</textarea>
</p> </p>
<p class="inline-infos">{l s='You must register at least one phone number'}</p> {if $onr_phone_at_least}
<p class="inline-infos">{l s='You must register at least one phone number'}</p>
{/if}
<p class="text"> <p class="text">
<label for="phone">{l s='Home phone'}</label> <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}" /> <input type="text" class="text" name="phone" id="phone" value="{if isset($smarty.post.phone)}{$smarty.post.phone}{/if}" />
</p> </p>
<p class="text"> <p class="text">
<label for="phone_mobile">{l s='Mobile phone'} <sup>*</sup></label> <label for="phone_mobile">{l s='Mobile phone'} {if $onr_phone_at_least}<sup>*</sup>{/if}</label>
<input type="text" class="text" name="phone_mobile" id="phone_mobile" value="{if isset($smarty.post.phone_mobile)}{$smarty.post.phone_mobile}{/if}" /> <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>
<p class="required text" id="address_alias"> <p class="required text" id="address_alias">