ice_import - Version 1.7.14

Version Notes

Bugfix:
- Minor bug fixing.

Download this release

Release Info

Developer IceShop
Extension ice_import
Version 1.7.14
Comparing to
See all releases


Code changes from version 1.7.13 to 1.7.14

Files changed (6) hide show
  1. app/code/community/ICEshop/Iceimport/Model/Convert/Adapter/Product.php +4 -56
  2. app/code/community/ICEshop/Iceimport/Model/System/Config/Iceshoplink.php +1 -1
  3. app/code/community/ICEshop/Iceimport/etc/config.xml +1 -1
  4. app/code/community/ICEshop/Iceimport/sql/iceimport_setup/{mysql4-install-1.7.13 → mysql4-install-1.7.14.php} +0 -0
  5. js/ICEshop/Iceimport/script.js +1 -1
  6. package.xml +6 -9
app/code/community/ICEshop/Iceimport/Model/Convert/Adapter/Product.php CHANGED
@@ -367,7 +367,6 @@ class ICEshop_Iceimport_Model_Convert_Adapter_Product extends Mage_Catalog_Model
367
  $this->_connRes->query("INSERT INTO {$this->_tablePrefix}iceshop_iceimport_imported_product_ids (product_id, product_sku) VALUES (:prod_id, :sku) ON DUPLICATE KEY UPDATE product_sku = :sku", array(':prod_id' => $productId, ':sku' => $sku));
368
  } else {
369
  if ($this->_getRefreshSetting('import_new_products') == 0) {
370
- // $session->setData("counter", (int)--$counter);
371
  $session->setData("skipped_counter", (int)++$skipped_counter);
372
  return true;
373
  }
@@ -421,11 +420,7 @@ class ICEshop_Iceimport_Model_Convert_Adapter_Product extends Mage_Catalog_Model
421
  $DB_logger = Mage::helper('iceimport/db');
422
  $this->deleteOldProducts($DB_logger);
423
 
424
- // $session->unsetData('import_total');
425
- // $session->unsetData('counter');
426
-
427
  $DB_logger->insertLogEntry('error' . md5(microtime(true)), 'New products skipped while export according to Iceimport settings: ' . $skipped_counter, 'stat');
428
- // $session->unsetData('skipped_counter');
429
 
430
  $date = date('m/d/Y H:i:s');
431
  $DB_logger->insertLogEntry('iceimport_import_ended', $date);
@@ -508,7 +503,6 @@ class ICEshop_Iceimport_Model_Convert_Adapter_Product extends Mage_Catalog_Model
508
  VALUES (@product_entity_type_id, @attribute_set_id, 'simple', :sku, NOW());
509
  SELECT @product_id := LAST_INSERT_ID();";
510
  $this->_connRes->query($coreSaveProduct, array(':sku' => $sku));
511
- // get product ID
512
  $prodFetch = $this->_connRes->fetchRow("SELECT @product_id AS prod_id");
513
  $productId = $prodFetch['prod_id'];
514
  $newProduct = TRUE;
@@ -592,8 +586,8 @@ class ICEshop_Iceimport_Model_Convert_Adapter_Product extends Mage_Catalog_Model
592
  $value = $option_id;
593
  }
594
  $attributesInit .= "SELECT @product_entity_type_id := `entity_type_id`
595
- FROM `{$this->_tablePrefix}eav_attribute`
596
- WHERE `attribute_code` = '{$attribute}';";
597
  $attributesInit .= "SELECT @{$attribute}_id := `attribute_id`
598
  FROM `{$this->_tablePrefix}eav_attribute`
599
  WHERE `attribute_code` = '{$attribute}'
@@ -1093,7 +1087,7 @@ class ICEshop_Iceimport_Model_Convert_Adapter_Product extends Mage_Catalog_Model
1093
  $categoryId = $this->_connRes->fetchRow(
1094
  "SELECT entity_id
1095
  FROM `{$this->_tablePrefix}catalog_category_entity_varchar`
1096
- WHERE `value` REGEXP '[[:<:]]".$unspsc."[[:>:]]'
1097
  AND attribute_id = @unspsc_id"
1098
  );
1099
  return ($categoryId['entity_id']) ? $categoryId['entity_id'] : null;
@@ -1211,49 +1205,6 @@ class ICEshop_Iceimport_Model_Convert_Adapter_Product extends Mage_Catalog_Model
1211
  unset($importData[$attribute]);
1212
 
1213
  }
1214
- // skip some attributes
1215
- /** if ($attribute == 'type' ||
1216
- $attribute == 'supplier_product_code' ||
1217
- $attribute == 'supplier' ||
1218
- $attribute == 'leader_categories' ||
1219
- $attribute == 'leader_store' ||
1220
- $attribute == 'sprice' ||
1221
- $attribute == 'euprice' ||
1222
- $attribute == 'icecat_product_id' ||
1223
- $attribute == 'icecat_category_id' ||
1224
- $attribute == 'icecat_vendor_id' ||
1225
- $attribute == 'icecat_quality' ||
1226
- $attribute == 'icecat_url' ||
1227
- $attribute == 'icecat_thumbnail_img' ||
1228
- $attribute == 'icecat_low_res_img' ||
1229
- $attribute == 'icecat_high_res_img' ||
1230
- $attribute == 'tax1' ||
1231
- $attribute == 'tax2' ||
1232
- $attribute == 'tax3' ||
1233
- $attribute == 'tax4' ||
1234
- $attribute == 'min_quantity' ||
1235
- $attribute == 'loms' ||
1236
- $attribute == 'image_label' ||
1237
- $attribute == 'links_title' ||
1238
- $attribute == 'small_image_label' ||
1239
- $attribute == 'tax_rate' ||
1240
- $attribute == 'gallery' ||
1241
- $attribute == 'weight_type' ||
1242
- $attribute == 'sku_type' ||
1243
- $attribute == 'manage_stock' ||
1244
- $attribute == 'minimal_price' ||
1245
- $attribute == 'required_options' ||
1246
- $attribute == 'samples_title' ||
1247
- $attribute == 'shipment_type' ||
1248
- $attribute == 'url_path' ||
1249
- $attribute == 'recurring_profile' ||
1250
- $attribute == 'product_keys'
1251
- ) {
1252
-
1253
- unset($importData[$attribute]);
1254
-
1255
- } */
1256
-
1257
  }
1258
 
1259
  // map default attributes
@@ -1345,9 +1296,7 @@ class ICEshop_Iceimport_Model_Convert_Adapter_Product extends Mage_Catalog_Model
1345
  'status',
1346
  'visibility',
1347
  'tax_class_id',
1348
- 'color',
1349
- 'price_view',
1350
- 'manufacturer'
1351
  ),
1352
  'text' => array(
1353
  'recurring_profile',
@@ -1358,7 +1307,6 @@ class ICEshop_Iceimport_Model_Convert_Adapter_Product extends Mage_Catalog_Model
1358
  'total_supplier_stock'
1359
  ),
1360
  'decimal' => array(
1361
- 'cost',
1362
  'group_price',
1363
  'weight',
1364
  'special_price',
367
  $this->_connRes->query("INSERT INTO {$this->_tablePrefix}iceshop_iceimport_imported_product_ids (product_id, product_sku) VALUES (:prod_id, :sku) ON DUPLICATE KEY UPDATE product_sku = :sku", array(':prod_id' => $productId, ':sku' => $sku));
368
  } else {
369
  if ($this->_getRefreshSetting('import_new_products') == 0) {
 
370
  $session->setData("skipped_counter", (int)++$skipped_counter);
371
  return true;
372
  }
420
  $DB_logger = Mage::helper('iceimport/db');
421
  $this->deleteOldProducts($DB_logger);
422
 
 
 
 
423
  $DB_logger->insertLogEntry('error' . md5(microtime(true)), 'New products skipped while export according to Iceimport settings: ' . $skipped_counter, 'stat');
 
424
 
425
  $date = date('m/d/Y H:i:s');
426
  $DB_logger->insertLogEntry('iceimport_import_ended', $date);
503
  VALUES (@product_entity_type_id, @attribute_set_id, 'simple', :sku, NOW());
504
  SELECT @product_id := LAST_INSERT_ID();";
505
  $this->_connRes->query($coreSaveProduct, array(':sku' => $sku));
 
506
  $prodFetch = $this->_connRes->fetchRow("SELECT @product_id AS prod_id");
507
  $productId = $prodFetch['prod_id'];
508
  $newProduct = TRUE;
586
  $value = $option_id;
587
  }
588
  $attributesInit .= "SELECT @product_entity_type_id := `entity_type_id`
589
+ FROM `{$this->_tablePrefix}eav_entity_type`
590
+ WHERE entity_type_code = 'catalog_product';";
591
  $attributesInit .= "SELECT @{$attribute}_id := `attribute_id`
592
  FROM `{$this->_tablePrefix}eav_attribute`
593
  WHERE `attribute_code` = '{$attribute}'
1087
  $categoryId = $this->_connRes->fetchRow(
1088
  "SELECT entity_id
1089
  FROM `{$this->_tablePrefix}catalog_category_entity_varchar`
1090
+ WHERE `value` REGEXP '[[:<:]]".addslashes($unspsc)."[[:>:]]'
1091
  AND attribute_id = @unspsc_id"
1092
  );
1093
  return ($categoryId['entity_id']) ? $categoryId['entity_id'] : null;
1205
  unset($importData[$attribute]);
1206
 
1207
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1208
  }
1209
 
1210
  // map default attributes
1296
  'status',
1297
  'visibility',
1298
  'tax_class_id',
1299
+ 'price_view'
 
 
1300
  ),
1301
  'text' => array(
1302
  'recurring_profile',
1307
  'total_supplier_stock'
1308
  ),
1309
  'decimal' => array(
 
1310
  'group_price',
1311
  'weight',
1312
  'special_price',
app/code/community/ICEshop/Iceimport/Model/System/Config/Iceshoplink.php CHANGED
@@ -5,7 +5,7 @@ class ICEshop_Iceimport_Model_System_Config_Iceshoplink
5
  public function toOptionArray()
6
  {
7
  return array(
8
- 0 => base64_encode('http://www.iceshop.nl/contact/')
9
  );
10
  }
11
  }
5
  public function toOptionArray()
6
  {
7
  return array(
8
+ 0 => base64_encode('http://www.iceshop.biz/contact/')
9
  );
10
  }
11
  }
app/code/community/ICEshop/Iceimport/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <ICEshop_Iceimport>
5
- <version>1.7.13</version>
6
  </ICEshop_Iceimport>
7
  </modules>
8
  <admin>
2
  <config>
3
  <modules>
4
  <ICEshop_Iceimport>
5
+ <version>1.7.14</version>
6
  </ICEshop_Iceimport>
7
  </modules>
8
  <admin>
app/code/community/ICEshop/Iceimport/sql/iceimport_setup/{mysql4-install-1.7.13 → mysql4-install-1.7.14.php} RENAMED
File without changes
js/ICEshop/Iceimport/script.js CHANGED
@@ -2,7 +2,7 @@
2
  jQuery.noConflict();
3
 
4
  //script which starts after page is loaded
5
- jQuery(document).ready(function () {
6
 
7
  jQuery('div#content').on('click', 'a.section-toggler-iceimport', function(e){
8
  toggleIceimportFieldset(this);
2
  jQuery.noConflict();
3
 
4
  //script which starts after page is loaded
5
+ jQuery(document).ready(function ( jQuery ) {
6
 
7
  jQuery('div#content').on('click', 'a.section-toggler-iceimport', function(e){
8
  toggleIceimportFieldset(this);
package.xml CHANGED
@@ -1,22 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ice_import</name>
4
- <version>1.7.13</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v.3</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Import categories &amp; productsr</summary>
10
  <description>This extension can use to import products with categories, multiple images and custom options from CSV file.</description>
11
- <notes>Improvements:&#xD;
12
- - Added import errors indication.&#xD;
13
- - Added grid for not imported images.&#xD;
14
- - Added method to run only images import.&#xD;
15
- - Added statistics import images.</notes>
16
  <authors><author><name>IceShop</name><user>IceShop</user><email>support@iceshop.nl</email></author></authors>
17
- <date>2015-04-29</date>
18
- <time>12:54:45</time>
19
- <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="ICEshop_Iceimport.xml" hash="566089f8d3a54436ae62ebd4c5124293"/></dir><dir name="template"><dir name="iceshop"><dir name="iceimport"><file name="notifications.phtml" hash="3d9336ffcd90d11a34271d01b0b7fa9e"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="ICEshop"><dir name="Iceimport"><dir name="Block"><dir name="Adminhtml"><dir name="Images"><dir name="List"><file name="Grid.php" hash="93aec656c6751a65cfefc2f8ebf473b7"/></dir></dir><file name="Notifications.php" hash="4355538a30333b5c61cfe1550ae0129b"/><dir name="System"><dir name="Config"><dir name="Form"><file name="Button.php" hash="056987a5987c129ccaeff6c04df8678d"/><file name="Exportall.php" hash="c329655e2fc2d0983688699adc400976"/><file name="Updatebutton.php" hash="8400ab44d28d6bf95ddca6dd5a0bd73c"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="fd9775a248481ddd683926452affb9ff"/><file name="Db.php" hash="564941a7ee03c28f46d282681c0c7c10"/><file name="Format.php" hash="5c56ce9db24076c52b198325fb637758"/><dir name="System"><file name="System.php" hash="ff58fc97338b95e165de85ef640147de"/><file name="Systemcheck.php" hash="e87560c1f4b5de926b0b1aa3f60411b3"/></dir></dir><dir name="Model"><dir name="Convert"><dir name="Adapter"><file name="Product.php" hash="9281722241e6c4a8e3ec45a0383896c8"/></dir></dir><dir name="Dataflow"><dir name="Batch"><file name="Import.php" hash="52c0ed7367b2200a17a48103e953ae58"/></dir><dir name="Convert"><dir name="Parser"><file name="Csv.php" hash="052c8c5a800ab4a11c7ca60a45fd81ba"/></dir></dir></dir><file name="Observer.php" hash="64d712737e4d535d39d79127e2d02fb7"/><dir name="System"><dir name="Config"><file name="Checksystem.php" hash="260200dc8cecfa718b32fa47468282df"/><file name="Defaulttax.php" hash="898bf21060622bf8dc96469eb018c463"/><file name="Iceshoplink.php" hash="e77e62b0c00e2569ea5fdb0fb91ff90a"/><file name="Yesno.php" hash="59e349561a36e02f44b47301fce99ef5"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="IceimagesController.php" hash="b43840720cb8fca823addc60402047ae"/><file name="IceimportController.php" hash="c36e98a83d726dbda41182af26f987a9"/><file name="IceimportimagesController.php" hash="441910744c4e8fb4e509caf5cc845a72"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="2990ebf927b0476b7702731ad2979682"/><file name="config.xml" hash="20f10a52c443ee09685a85d53d58e7a0"/><file name="system.xml" hash="7d9ca6cae327ed02bebebaa54c686439"/></dir><dir name="sql"><dir name="iceimport_setup"><file name="mysql4-install-1.7.13" hash="e5b8e89aea9a674f0cd25718d5d62a1c"/><file name="mysql4-upgrade-0.1.0-1.7.0.php" hash="ff0682cde32b4f694bf1bed2c55a97f6"/><file name="mysql4-upgrade-1.4.0-1.7.0.php" hash="ff0682cde32b4f694bf1bed2c55a97f6"/><file name="mysql4-upgrade-1.5.0-1.7.0.php" hash="b51e20fdab764b90c6fd81551d9e368f"/><file name="mysql4-upgrade-1.6.0-1.7.0.php" hash="b51e20fdab764b90c6fd81551d9e368f"/><file name="mysql4-upgrade-1.6.0-1.7.5.php" hash="73e2587c366b1d3940d08e2a65dcc253"/><file name="mysql4-upgrade-1.7.5-1.7.9.php" hash="73e2587c366b1d3940d08e2a65dcc253"/><file name="mysql4-upgrade-1.7.6-1.7.9.php" hash="73e2587c366b1d3940d08e2a65dcc253"/><file name="mysql4-upgrade-1.7.9-1.7.13" hash="e5b8e89aea9a674f0cd25718d5d62a1c"/><file name="uninstall-old-version.php" hash="4269e8547005958b044946d5e2d670e9"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="ICEshop"><dir name="Iceimport"><file name="jquery-1.11.1.min.js" hash="056fd2a776eae867b7e2b5ddcb754d78"/><file name="script.js" hash="dabaaf1b4924cb8a2fd4e14de93f74e6"/></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="iceshop"><dir name="iceimport"><dir name="images"><file name="iceshop_logo_small_16px.png" hash="4ef632b4b89a047789307b301b9dfb6e"/></dir><file name="styles.css" hash="0136e37ac22d82753fafec8294bc8555"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ICEshop_Iceimport.xml" hash="b94f339b79303bf7e78ba89290c66ada"/></dir></target></contents>
20
  <compatible/>
21
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
22
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ice_import</name>
4
+ <version>1.7.14</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v.3</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Import categories &amp; productsr</summary>
10
  <description>This extension can use to import products with categories, multiple images and custom options from CSV file.</description>
11
+ <notes>Bugfix:&#xD;
12
+ - Minor bug fixing.</notes>
 
 
 
13
  <authors><author><name>IceShop</name><user>IceShop</user><email>support@iceshop.nl</email></author></authors>
14
+ <date>2015-05-12</date>
15
+ <time>15:42:06</time>
16
+ <contents><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="ICEshop_Iceimport.xml" hash="566089f8d3a54436ae62ebd4c5124293"/></dir><dir name="template"><dir name="iceshop"><dir name="iceimport"><file name="notifications.phtml" hash="3d9336ffcd90d11a34271d01b0b7fa9e"/></dir></dir></dir></dir></dir></dir></target><target name="magecommunity"><dir name="ICEshop"><dir name="Iceimport"><dir name="Block"><dir name="Adminhtml"><dir name="Images"><dir name="List"><file name="Grid.php" hash="93aec656c6751a65cfefc2f8ebf473b7"/></dir></dir><file name="Notifications.php" hash="4355538a30333b5c61cfe1550ae0129b"/><dir name="System"><dir name="Config"><dir name="Form"><file name="Button.php" hash="056987a5987c129ccaeff6c04df8678d"/><file name="Exportall.php" hash="c329655e2fc2d0983688699adc400976"/><file name="Updatebutton.php" hash="8400ab44d28d6bf95ddca6dd5a0bd73c"/></dir></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="fd9775a248481ddd683926452affb9ff"/><file name="Db.php" hash="564941a7ee03c28f46d282681c0c7c10"/><file name="Format.php" hash="5c56ce9db24076c52b198325fb637758"/><dir name="System"><file name="System.php" hash="ff58fc97338b95e165de85ef640147de"/><file name="Systemcheck.php" hash="e87560c1f4b5de926b0b1aa3f60411b3"/></dir></dir><dir name="Model"><dir name="Convert"><dir name="Adapter"><file name="Product.php" hash="647c3019a16f7d964d2475bb5736f601"/></dir></dir><dir name="Dataflow"><dir name="Batch"><file name="Import.php" hash="52c0ed7367b2200a17a48103e953ae58"/></dir><dir name="Convert"><dir name="Parser"><file name="Csv.php" hash="052c8c5a800ab4a11c7ca60a45fd81ba"/></dir></dir></dir><file name="Observer.php" hash="64d712737e4d535d39d79127e2d02fb7"/><dir name="System"><dir name="Config"><file name="Checksystem.php" hash="260200dc8cecfa718b32fa47468282df"/><file name="Defaulttax.php" hash="898bf21060622bf8dc96469eb018c463"/><file name="Iceshoplink.php" hash="bae43572fcb4fddf9e0961f8da5e7f1b"/><file name="Yesno.php" hash="59e349561a36e02f44b47301fce99ef5"/></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="IceimagesController.php" hash="b43840720cb8fca823addc60402047ae"/><file name="IceimportController.php" hash="c36e98a83d726dbda41182af26f987a9"/><file name="IceimportimagesController.php" hash="441910744c4e8fb4e509caf5cc845a72"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="2990ebf927b0476b7702731ad2979682"/><file name="config.xml" hash="2afa4808dc97d82b54d626417d72edfe"/><file name="system.xml" hash="7d9ca6cae327ed02bebebaa54c686439"/></dir><dir name="sql"><dir name="iceimport_setup"><file name="mysql4-install-1.7.14.php" hash="e5b8e89aea9a674f0cd25718d5d62a1c"/><file name="mysql4-upgrade-0.1.0-1.7.0.php" hash="ff0682cde32b4f694bf1bed2c55a97f6"/><file name="mysql4-upgrade-1.4.0-1.7.0.php" hash="ff0682cde32b4f694bf1bed2c55a97f6"/><file name="mysql4-upgrade-1.5.0-1.7.0.php" hash="b51e20fdab764b90c6fd81551d9e368f"/><file name="mysql4-upgrade-1.6.0-1.7.0.php" hash="b51e20fdab764b90c6fd81551d9e368f"/><file name="mysql4-upgrade-1.6.0-1.7.5.php" hash="73e2587c366b1d3940d08e2a65dcc253"/><file name="mysql4-upgrade-1.7.5-1.7.9.php" hash="73e2587c366b1d3940d08e2a65dcc253"/><file name="mysql4-upgrade-1.7.6-1.7.9.php" hash="73e2587c366b1d3940d08e2a65dcc253"/><file name="mysql4-upgrade-1.7.9-1.7.13" hash="e5b8e89aea9a674f0cd25718d5d62a1c"/><file name="uninstall-old-version.php" hash="4269e8547005958b044946d5e2d670e9"/></dir></dir></dir></dir></target><target name="mage"><dir name="js"><dir name="ICEshop"><dir name="Iceimport"><file name="jquery-1.11.1.min.js" hash="056fd2a776eae867b7e2b5ddcb754d78"/><file name="script.js" hash="1babf805c21c1e344b1fd8e7387b327e"/></dir></dir></dir><dir name="skin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="iceshop"><dir name="iceimport"><dir name="images"><file name="iceshop_logo_small_16px.png" hash="4ef632b4b89a047789307b301b9dfb6e"/></dir><file name="styles.css" hash="0136e37ac22d82753fafec8294bc8555"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ICEshop_Iceimport.xml" hash="b94f339b79303bf7e78ba89290c66ada"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>