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

// Cannot import in a shop that does not exists

Browse Source
This commit is contained in:
Damien Metzger committed 2013-02-05 18:09:32 +01:00
1 parent 61265e587f
commit 2df3e7ee8b
1 file changed
+7 -2
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+7 -2
View File
@@ -1023,6 +1023,7 @@ class AdminImportControllerCore extends AdminController
$handle = $this->openCsvFile(); $handle = $this->openCsvFile();
$default_language_id = (int)Configuration::get('PS_LANG_DEFAULT'); $default_language_id = (int)Configuration::get('PS_LANG_DEFAULT');
AdminImportController::setLocale(); AdminImportController::setLocale();
$shop_ids = Shop::getCompleteListOfShopsID();
for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++) for ($current_line = 0; $line = fgetcsv($handle, MAX_LINE_SIZE, $this->separator); $current_line++)
{ {
if (Tools::getValue('convert')) if (Tools::getValue('convert'))
@@ -1298,8 +1299,12 @@ class AdminImportControllerCore extends AdminController
{ {
$shop = trim($shop); $shop = trim($shop);
if (!is_numeric($shop)) if (!is_numeric($shop))
$shop = ShopGroup::getIdByName($shop); $shop = Shop::getIdByName($shop);
$shops[] = $shop;
if (in_array($shop, $shop_ids))
$shops[] = $shop;
else
$this->addProductWarning(Tools::safeOutput($info['name']), $product->id, $this->l('Shop is not valid'));
} }
if (empty($shops)) if (empty($shops))
$shops = Shop::getContextListShopID(); $shops = Shop::getContextListShopID();