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

[-] BO : fix #PSCFV-4216

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17648 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
lLefevre
2012-10-01 14:19:39 +00:00
parent 99decb70f1
commit b7fec2c3e5
3 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+26
View File
@@ -308,6 +308,7 @@ class AdminImportControllerCore extends AdminController
'alias' => array('label' => $this->l('Alias *')),
'active' => array('label' => $this->l('Active (0/1)')),
'customer_email' => array('label' => $this->l('Customer e-mail')),
'id_customer' => array('label' => $this->l('Customer ID')),
'manufacturer' => array('label' => $this->l('Manufacturer')),
'supplier' => array('label' => $this->l('Supplier')),
'company' => array('label' => $this->l('Company')),
@@ -1972,6 +1973,31 @@ class AdminImportControllerCore extends AdminController
continue;
}
}
elseif (isset($address->id_customer) && !empty($address->id_customer))
{
if (Customer::customerIdExistsStatic((int)$address->id_customer))
{
$customer = new Customer((int)$address->id_customer);
// a customer could exists in different shop
$customer_list = Customer::getCustomersByEmail($customer->email);
if (count($customer_list) == 0)
$this->errors[] = sprintf(
Tools::displayError('%1$s does not exist in database %2$s (ID: %3$s) cannot be saved'),
Db::getInstance()->getMsgError(),
$customer->email,
(int)$address->customer_id
);
}
else
$this->errors[] = sprintf(Tools::displayError('The customer ID n.%d does not exist in database (ID: %d) cannot be saved'), $address->customer_id);
}
else
{
$customer_list = array();
$address->id_customer = 0;
}
if (isset($address->manufacturer) && is_numeric($address->manufacturer) && Manufacturer::manufacturerExists((int)$address->manufacturer))
$address->id_manufacturer = (int)$address->manufacturer;