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

[-] FO : Fix #PSCFV-5544 same alias is no more rejected in OPC

Browse Source
This commit is contained in:
gRoussac
2013-01-07 16:54:42 +01:00
parent a0a5aa929d
commit 6a7795a92f
3 changed files with 68 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/front/AddressController.php
+10 -5
View File
@@ -174,16 +174,21 @@ class AddressControllerCore extends FrontController
$address->dni = null;
}
// Check if the alias exists
if (!$this->context->customer->is_guest && !empty($_POST['alias'])
&& (int)$this->context->customer->id > 0
&& Db::getInstance()->getValue('
if (!$this->context->customer->is_guest && !empty($_POST['alias']) && (int)$this->context->customer->id > 0)
{
$id_address = Tools::getValue('id_address');
if(Configuration::get('PS_ORDER_PROCESS_TYPE') && (int)Tools::getValue('opc_id_address_'.Tools::getValue('type')) > 0)
$id_address = Tools::getValue('opc_id_address_'.Tools::getValue('type'));
if (Db::getInstance()->getValue('
SELECT count(*)
FROM '._DB_PREFIX_.'address
WHERE `alias` = \''.pSql($_POST['alias']).'\'
AND id_address != '.(int)Tools::getValue('id_address').'
AND id_address != '.(int)$id_address.'
AND id_customer = '.(int)$this->context->customer->id.'
AND deleted = 0') > 0)
$this->errors[] = sprintf(Tools::displayError('The alias "%s" is already used, please chose another one.'), Tools::safeOutput($_POST['alias']));
$this->errors[] = sprintf(Tools::displayError('The alias "%s" is already used, please chose another one.'), Tools::safeOutput($_POST['alias']));
}
// Check the requires fields which are settings in the BO
$this->errors = array_merge($this->errors, $address->validateFieldsRequiredDatabase());