diff --git a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl index 181508404..223545e2d 100644 --- a/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl @@ -227,6 +227,10 @@ $(".import_products_categories, label[for=regenerate], #regenerate").show(); else $(".import_products_categories, label[for=regenerate], #regenerate").hide(); + if ($("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6) + $("label[for=regenerate], #regenerate").show() + else + $("label[for=regenerate], #regenerate").hide(); if ($("#entity > option:selected").val() == 0 || $("#entity > option:selected").val() == 1 || $("#entity > option:selected").val() == 3 || $("#entity > option:selected").val() == 5 || $("#entity > option:selected").val() == 6 || $("#entity > option:selected").val() == 7) $("label[for=forceIDs], #forceIDs").show(); else diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index ec8c31c92..de6ef7545 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -382,6 +382,7 @@ class AdminImportControllerCore extends AdminController 'meta_title' => array('label' => $this->l('Meta title')), 'meta_keywords' => array('label' => $this->l('Meta keywords')), 'meta_description' => array('label' => $this->l('Meta description')), + 'image' => array('label' => $this->l('Image URL')), 'shop' => array( 'label' => $this->l('ID / Name of group 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.'), @@ -882,6 +883,12 @@ class AdminImportControllerCore extends AdminController case 'categories': $path = _PS_CAT_IMG_DIR_.(int)$id_entity; break; + case 'manufacturers': + $path = _PS_MANU_IMG_DIR_.(int)$id_entity; + break; + case 'suppliers': + $path = _PS_SUPP_IMG_DIR_.(int)$id_entity; + break; } $url = str_replace(' ', '%20', trim($url)); @@ -2370,6 +2377,11 @@ class AdminImportControllerCore extends AdminController if (!$res) $res = $manufacturer->add(); + //copying images of manufacturer + if (isset($manufacturer->image) && !empty($manufacturer->image)) + if (!AdminImportController::copyImg($manufacturer->id, null, $manufacturer->image, 'manufacturers', !Tools::getValue('regenerate'))) + $this->warnings[] = $manufacturer->image.' '.Tools::displayError('cannot be copied.'); + if ($res) { // Associate supplier to group shop @@ -2443,6 +2455,11 @@ class AdminImportControllerCore extends AdminController if (!$res) $res = $supplier->add(); + //copying images of suppliers + if (isset($supplier->image) && !empty($supplier->image)) + if (!AdminImportController::copyImg($supplier->id, null, $supplier->image, 'suppliers', !Tools::getValue('regenerate'))) + $this->warnings[] = $supplier->image.' '.Tools::displayError('cannot be copied.'); + if (!$res) $this->errors[] = Db::getInstance()->getMsgError().' '.sprintf( Tools::displayError('%1$s (ID: %2$s) cannot be saved'), @@ -3100,4 +3117,4 @@ class AdminImportControllerCore extends AdminController } } } -?> \ No newline at end of file +?> diff --git a/docs/csv_import/manufacturers_import.csv b/docs/csv_import/manufacturers_import.csv index 6c8ea7cd0..2e4ef5d24 100644 --- a/docs/csv_import/manufacturers_import.csv +++ b/docs/csv_import/manufacturers_import.csv @@ -1,3 +1,3 @@ -id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description -1;1;Apple Computer, Inc;;;;; -2;1;Shure Incorporated;;;;; \ No newline at end of file +id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description;Image URL +1;1;Apple Computer, Inc;;;;;http://youdomain.com/img.jpg +2;1;Shure Incorporated;;;;;http://youdomain.com/img.jpg diff --git a/docs/csv_import/suppliers_import.csv b/docs/csv_import/suppliers_import.csv index db319c908..c02561686 100644 --- a/docs/csv_import/suppliers_import.csv +++ b/docs/csv_import/suppliers_import.csv @@ -1,3 +1,3 @@ -id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description -1;1;Applestore;;;;; -2;1;Shure Online Store;;;;; \ No newline at end of file +id;Active (0/1);Name*;Description;Short description;Meta-title;Meta-keywords;Meta-description;Image URL +1;1;Applestore;;;;;http://youdomain.com/img.jpg +2;1;Shure Online Store;;;;;http://youdomain.com/img.jpg