diff --git a/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl index 73644d5b8..dbb03e0bd 100644 --- a/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/shop/helpers/form/form.tpl @@ -57,7 +57,7 @@ }, function(res) { - $('#categories-treeview').parent().html(res); + $('#categories-tree').parent().parent().html(res); } ); }); diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 69aebd564..34ef4b96e 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2479,6 +2479,11 @@ class AdminProductsControllerCore extends AdminController 'class' => 'toolbar-new' ); } + else + $this->toolbar_btn['import'] = array( + 'href' => $this->context->link->getAdminLink('AdminImport', true).'&import_type=products', + 'desc' => $this->l('Import') + ); $this->context->smarty->assign('toolbar_scroll', 1); $this->context->smarty->assign('show_toolbar', 1); diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 1fcea5901..7481cd218 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -203,8 +203,9 @@ class AdminShopControllerCore extends AdminController $children = Category::getChildren($root_category['id_category'], $this->context->language->id); foreach ($children as $child) $selected_cat[] = $child['id_category']; - $helper = new Helper(); - $this->content = $helper->renderCategoryTree($root_category, $selected_cat); + + $helper = new HelperTreeCategories('categories-tree', null, $root_category['id_category']); + $this->content = $helper->setSelectedCategories($selected_cat)->setUseSearch(true)->setUseCheckBox(true)->render(); } parent::displayAjax(); } diff --git a/docs/csv_import/suppliers_import.csv b/docs/csv_import/suppliers_import.csv index e69397b22..e833edf36 100644 --- a/docs/csv_import/suppliers_import.csv +++ b/docs/csv_import/suppliers_import.csv @@ -1,4 +1,4 @@ -ID;Active (0/1);Name *;Description;Short description;Meta title;Meta keywords;Meta description -1;1;Applestore;
The Apple Store is a chain of retail stores owned and operated by Apple Inc., dealing in computers and consumer electronics. The stores sell Macintosh personal computers, software, iPods, iPads, iPhones, third-party accessories, and other consumer electronics such as Apple TV. Some high profile stores feature a Theatre for presentations and workshops and a Studio for training with Apple products; all stores offer a Genius Bar for technical support and repairs, as well as free workshops available to the public. Under the leadership of Ron Johnson, the former Senior Vice President of Retail Operations, the Apple Stores have, according to an article in the New York Times, been responsible for "[turning] the boring computer sales floor into a sleek playroom filled with gadgets".
;;Meta title-Applestore;Meta keywords-Applestore;Meta description-Applestore -2;1;Shure Online Store;- No description -
;;Meta title-Shure Online Store;Meta keywords-Shure Online Store;Meta description-Shure Online Store -3;1;Nippon Electronic Import;- No description -
;;Meta title-Nippon Electronic Import;Meta keywords-Nippon Electronic Import;Meta description-Nippon Electronic Import +ID;Active (0/1);Name *;Description;Short description;Meta title;Meta keywords;Meta description;Image URL +1;1;Applestore;The Apple Store is a chain of retail stores owned and operated by Apple Inc., dealing in computers and consumer electronics. The stores sell Macintosh personal computers, software, iPods, iPads, iPhones, third-party accessories, and other consumer electronics such as Apple TV. Some high profile stores feature a Theatre for presentations and workshops and a Studio for training with Apple products; all stores offer a Genius Bar for technical support and repairs, as well as free workshops available to the public. Under the leadership of Ron Johnson, the former Senior Vice President of Retail Operations, the Apple Stores have, according to an article in the New York Times, been responsible for "[turning] the boring computer sales floor into a sleek playroom filled with gadgets".
;Meta title-Applestore;Meta keywords-Applestore;Meta description-Applestore;http://localhost/prestashop/img/su/Pic-of-this-supplier.jpg +2;1;Shure Online Store;- No description -
;- No description -
;Meta title-Shure Online Store;Meta keywords-Shure Online Store;Meta description-Shure Online Store;http://localhost/prestashop/img/su/Pic-of-this-supplier-2.jpg +3;1;Nippon Electronic Import;- No description -
;- No description -
;Meta title-Nippon Electronic Import;Meta keywords-Nippon Electronic Import;Meta description-Nippon Electronic Import;http://localhost/prestashop/img/su/Pic-of-this-supplier-3.jpg