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

[-] FO : fixed bug #PSCFV-4347

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17607 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-09-28 13:07:52 +00:00
parent fdf7bf6aeb
commit f9e44fadfa
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCustomerPreferencesController.php
+1 -1
View File
@@ -61,7 +61,7 @@ class AdminCustomerPreferencesControllerCore extends AdminController
),
'PS_ONE_PHONE_AT_LEAST' => array(
'title' => $this->l('Phone number'),
'desc' => $this->l('If you choose this option your customer will must register at least one phone number.'),
'desc' => $this->l('If you chose yes, your customer will have to provide at least one phone number to register.'),
'validation' => 'isBool',
'cast' => 'intval',
'type' => 'bool'
controllers/front/AuthController.php
+8 -1
View File
@@ -390,8 +390,15 @@ class AuthControllerCore extends FrontController
$customer = new Customer();
$_POST['lastname'] = Tools::getValue('customer_lastname');
$_POST['firstname'] = Tools::getValue('customer_firstname');
if (Configuration::get('PS_ONE_PHONE_AT_LEAST') && !Tools::getValue('phone') && !Tools::getValue('phone_mobile') && Configuration::get('PS_REGISTRATION_PROCESS_TYPE'))
if (Configuration::get('PS_ONE_PHONE_AT_LEAST')
&& !Tools::getValue('phone')
&& !Tools::getValue('phone_mobile')
&& (Configuration::get('PS_ORDER_PROCESS_TYPE') //check if is in OPC mode
|| (Configuration::get('PS_REGISTRATION_PROCESS_TYPE') && !Configuration::get('PS_ORDER_PROCESS_TYPE')) //check if is simple registration mode and not in OPC mode)
)
$this->errors[] = Tools::displayError('You must register at least one phone number');
$this->errors = array_unique(array_merge($this->errors, $customer->validateController()));
// Check the requires fields which are settings in the BO