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

[*] BO : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/891 1/2

Browse Source
This commit is contained in:
gRoussac committed 2013-10-29 19:07:31 +01:00
1 parent c98b5e0c78
commit 26b4fbf883
1 file changed
+9 -1
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+9 -1
View File
@@ -306,7 +306,8 @@ class AdminImportControllerCore extends AdminController
'firstname' => array('label' => $this->l('First Name *')), 'firstname' => array('label' => $this->l('First Name *')),
'newsletter' => array('label' => $this->l('Newsletter (0/1)')), 'newsletter' => array('label' => $this->l('Newsletter (0/1)')),
'optin' => array('label' => $this->l('Opt-in (0/1)')), 'optin' => array('label' => $this->l('Opt-in (0/1)')),
'group' => array('label' => $this->l('Group Name')), 'group' => array('label' => $this->l('Groups (x,y,z...)')),
'id_default_group' => array('label' => $this->l('Default group ID')),
'id_shop' => array( 'id_shop' => array(
'label' => $this->l('ID / Name of shop'), 'label' => $this->l('ID / Name of shop'),
'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'), 'help' => $this->l('Ignore this field if you don\'t use the Multistore tool. If you leave this field empty, the default shop will be used.'),
@@ -1999,6 +2000,13 @@ class AdminImportControllerCore extends AdminController
if(empty($group)) if(empty($group))
continue; continue;
$id_group = false; $id_group = false;
if (is_numeric($group) && $group)
{
$myGroup = new Group((int)$group);
if (Validate::isLoadedObject($myGroup))
$customer_groups[] = (int)$group;
continue;
}
$myGroup = Group::searchByName($id_lang, $group); $myGroup = Group::searchByName($id_lang, $group);
if (isset($myGroup['id_group']) && $myGroup['id_group']) if (isset($myGroup['id_group']) && $myGroup['id_group'])
$id_group = (int)$myGroup['id_group']; $id_group = (int)$myGroup['id_group'];