From 8061fe8f89dbcf531b53f4c54bd2a14aade0fd43 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 16 Jul 2012 16:01:32 +0000 Subject: [PATCH] //small import fix --- controllers/admin/AdminImportController.php | 33 ++++++++++++--------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 3c55907b7..28ae490b8 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -1687,6 +1687,7 @@ class AdminImportControllerCore extends AdminController public function customerImport() { + $customer_exist = false; $this->receiveTab(); $handle = $this->openCsvFile(); AdminImportController::setLocale(); @@ -1771,13 +1772,15 @@ class AdminImportControllerCore extends AdminController { unset($customer->id); $res &= $customer->add(); - $customer->addGroups($customer_groups); - foreach ($addresses as $address) - { - $address['id_customer'] = $customer->id; - unset($address['country'], $address['state'], $address['state_iso'], $address['id_address'] ); - Db::getInstance()->insert('address', $address); - } + if (isset($customer_groups)) + $customer->addGroups($customer_groups); + if (isset($addresses)) + foreach ($addresses as $address) + { + $address['id_customer'] = $customer->id; + unset($address['country'], $address['state'], $address['state_iso'], $address['id_address'] ); + Db::getInstance()->insert('address', $address); + } } } } @@ -1794,13 +1797,15 @@ class AdminImportControllerCore extends AdminController { unset($customer->id); $res &= $customer->add(); - $customer->addGroups($customer_groups); - foreach ($addresses as $address) - { - $address['id_customer'] = $customer->id; - unset($address['country'], $address['state'], $address['state_iso'], $address['id_address']); - Db::getInstance()->insert('address', $address); - } + if (isset($customer_groups)) + $customer->addGroups($customer_groups); + if (isset($addresses)) + foreach ($addresses as $address) + { + $address['id_customer'] = $customer->id; + unset($address['country'], $address['state'], $address['state_iso'], $address['id_address']); + Db::getInstance()->insert('address', $address); + } } }