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

[+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570

Browse Source
This commit is contained in:
gRoussac
2013-12-04 17:41:10 +01:00
parent 08cb7ee566
commit 96fd3f3d32
2 changed files with 69 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+36 -26
View File
@@ -1357,6 +1357,13 @@ class AdminImportControllerCore extends AdminController
$product->id_category[] = (int)$value;
else
{
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$category_to_create->name[$default_language_id],
(isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
$category_to_create = new Category();
$category_to_create->id = (int)$value;
$category_to_create->name = AdminImportController::createMultiLangField($value);
@@ -1381,35 +1388,11 @@ class AdminImportControllerCore extends AdminController
}
else if (is_string($value) && !empty($value))
{
$category = Category::searchByName($id_lang, trim($value), true);
$category = Category::searchByPath($default_language_id, trim($value), $this, 'productImportCreateCat');
if ($category['id_category'])
$product->id_category[] = (int)$category['id_category'];
else
{
$category_to_create = new Category();
if (!Shop::isFeatureActive())
$category_to_create->id_shop_default = 1;
else
$category_to_create->id_shop_default = (int)Context::getContext()->shop->id;
$category_to_create->name = AdminImportController::createMultiLangField(trim($value));
$category_to_create->active = 1;
$category_to_create->id_parent = (int)Configuration::get('PS_HOME_CATEGORY'); // Default parent is home for unknown category to create
$category_link_rewrite = Tools::link_rewrite($category_to_create->name[$default_language_id]);
$category_to_create->link_rewrite = AdminImportController::createMultiLangField($category_link_rewrite);
if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true &&
($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add())
$product->id_category[] = (int)$category_to_create->id;
else
{
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$category_to_create->name[$default_language_id],
(isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
}
}
$this->errors[] = sprintf(Tools::displayError('%1$s cannot be saved'), trim($value));
}
}
}
@@ -1724,6 +1707,33 @@ class AdminImportControllerCore extends AdminController
$this->closeCsvFile($handle);
}
public function productImportCreateCat($default_language_id, $category_name, $id_parent_category=null)
{
$category_to_create = new Category();
if (!Shop::isFeatureActive())
$category_to_create->id_shop_default = 1;
else
$category_to_create->id_shop_default = (int)Context::getContext()->shop->id;
$category_to_create->name = AdminImportController::createMultiLangField(trim($category_name));
$category_to_create->active = 1;
$category_to_create->id_parent = (int)Configuration::get('PS_HOME_CATEGORY'); // Default parent is home for unknown category to create
$category_link_rewrite = Tools::link_rewrite($category_to_create->name[$default_language_id]);
$category_to_create->link_rewrite = AdminImportController::createMultiLangField($category_link_rewrite);
if (($field_error = $category_to_create->validateFields(UNFRIENDLY_ERROR, true)) === true &&
($lang_field_error = $category_to_create->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true && $category_to_create->add())
$product->id_category[] = (int)$category_to_create->id;
else
{
$this->errors[] = sprintf(
Tools::displayError('%1$s (ID: %2$s) cannot be saved'),
$category_to_create->name[$default_language_id],
(isset($category_to_create->id) && !empty($category_to_create->id))? $category_to_create->id : 'null'
);
$this->errors[] = ($field_error !== true ? $field_error : '').(isset($lang_field_error) && $lang_field_error !== true ? $lang_field_error : '').
Db::getInstance()->getMsgError();
}
}
public function attributeImport()
{
$default_language = Configuration::get('PS_LANG_DEFAULT');