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

// Merge -> revision 7875

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-03 16:16:49 +00:00
parent 6f08bcb12e
commit f2b5ee338b
38 changed files with 320 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
admin-dev/tabs/AdminImport.php
View File

@@ -1191,6 +1191,10 @@ class AdminImport extends AdminTab
$info = self::getMaskedRow($line);
self::setDefaultValues($info);
if (array_key_exists('id', $info) AND (int)($info['id']) AND Manufacturer::existsInDatabase((int)($info['id'])))
$manufacturer = new Manufacturer((int)($info['id']));
else
$manufacturer = new Manufacturer();
self::array_walk($info, array('AdminImport', 'fillInfo'), $manufacturer);
@@ -1242,9 +1246,13 @@ class AdminImport extends AdminTab
$info = self::getMaskedRow($line);
self::setDefaultValues($info);
$supplier = new Supplier();
self::array_walk($info, array('AdminImport', 'fillInfo'), $supplier);
if (array_key_exists('id', $info) AND (int)($info['id']) AND Supplier::existsInDatabase((int)($info['id'])))
$supplier = new Supplier((int)($info['id']));
else
$supplier = new Supplier();
self::array_walk($info, array('AdminImport', 'fillInfo'), $supplier);
if (($fieldError = $supplier->validateFields(UNFRIENDLY_ERROR, true)) === true AND ($langFieldError = $supplier->validateFieldsLang(UNFRIENDLY_ERROR, true)) === true)
{
$res = false;