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

// Merge -> revision 7906

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7909 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-05 13:26:44 +00:00
parent e4825ac555
commit 239f92eaf1
55 changed files with 174 additions and 1296 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminImport.php
+4 -4
View File
@@ -605,7 +605,7 @@ class AdminImport extends AdminTab
if (Tools::getValue('convert'))
$line = $this->utf8_encode_array($line);
$info = self::getMaskedRow($line);
if (array_key_exists('id', $info) AND (int)($info['id']) AND Product::existsInDatabase((int)($info['id'])))
if (array_key_exists('id', $info) AND (int)($info['id']) AND Product::existsInDatabase((int)($info['id']), 'product'))
{
$product = new Product((int)($info['id']));
$categoryData = Product::getProductCategories((int)($product->id));
@@ -753,7 +753,7 @@ class AdminImport extends AdminTab
$product->quantity = 0;
// If id product AND id product already in base, trying to update
if ($product->id AND Product::existsInDatabase((int)($product->id)))
if ($product->id AND Product::existsInDatabase((int)($product->id), 'product'))
{
$datas = Db::getInstance()->getRow('SELECT `date_add` FROM `'._DB_PREFIX_.'product` WHERE `id_product` = '.(int)($product->id));
@@ -1192,7 +1192,7 @@ class AdminImport extends AdminTab
self::setDefaultValues($info);
if (array_key_exists('id', $info) AND (int)($info['id']) AND Manufacturer::existsInDatabase((int)($info['id'])))
if (array_key_exists('id', $info) AND (int)($info['id']) AND Manufacturer::existsInDatabase((int)($info['id']), 'manufacturer'))
$manufacturer = new Manufacturer((int)($info['id']));
else
$manufacturer = new Manufacturer();
@@ -1247,7 +1247,7 @@ class AdminImport extends AdminTab
self::setDefaultValues($info);
if (array_key_exists('id', $info) AND (int)($info['id']) AND Supplier::existsInDatabase((int)($info['id'])))
if (array_key_exists('id', $info) AND (int)($info['id']) AND Supplier::existsInDatabase((int)($info['id']), 'supplier'))
$supplier = new Supplier((int)($info['id']));
else
$supplier = new Supplier();