DataFeedWatch_Connector - Version 0.3.3

Version Notes

DataFeedWatch - Release version 0.3.3

Download this release

Release Info

Developer WordWatch
Extension DataFeedWatch_Connector
Version 0.3.3
Comparing to
See all releases


Code changes from version 0.3.2 to 0.3.3

Files changed (7) hide show
  1. app/code/community/DataFeedWatch/Connector/Helper/Data.php +6 -0
  2. app/code/community/DataFeedWatch/Connector/Helper/Registry.php +1 -1
  3. app/code/community/DataFeedWatch/Connector/Model/Product.php +1 -2
  4. app/code/community/DataFeedWatch/Connector/etc/config.xml +1 -1
  5. app/code/community/DataFeedWatch/Connector/sql/datafeedwatch_connector_setup/upgrade-0.2.40-0.2.50.php +0 -36
  6. app/code/community/DataFeedWatch/Connector/sql/datafeedwatch_connector_setup/upgrade-0.3.0-0.3.1.php +36 -0
  7. package.xml +5 -5
app/code/community/DataFeedWatch/Connector/Helper/Data.php CHANGED
@@ -200,12 +200,18 @@ class DataFeedWatch_Connector_Helper_Data
200
  'special_from_date',
201
  'special_to_date',
202
  'updated_at',
 
 
 
 
 
203
  );
204
 
205
  $inheritanceData = array(
206
  'updated_at' => DataFeedWatch_Connector_Model_System_Config_Source_Inheritance::PARENT_OPTION_ID,
207
  'ignore_datafeedwatch' => DataFeedWatch_Connector_Model_System_Config_Source_Inheritance::CHILD_OPTION_ID,
208
  'dfw_parent_ids' => DataFeedWatch_Connector_Model_System_Config_Source_Inheritance::CHILD_OPTION_ID,
 
209
  );
210
 
211
  $catalogAttributes = Mage::getResourceModel('catalog/product_attribute_collection');
200
  'special_from_date',
201
  'special_to_date',
202
  'updated_at',
203
+ 'color',
204
+ 'size',
205
+ 'gender',
206
+ 'manufacturer',
207
+ 'material',
208
  );
209
 
210
  $inheritanceData = array(
211
  'updated_at' => DataFeedWatch_Connector_Model_System_Config_Source_Inheritance::PARENT_OPTION_ID,
212
  'ignore_datafeedwatch' => DataFeedWatch_Connector_Model_System_Config_Source_Inheritance::CHILD_OPTION_ID,
213
  'dfw_parent_ids' => DataFeedWatch_Connector_Model_System_Config_Source_Inheritance::CHILD_OPTION_ID,
214
+ 'status' => DataFeedWatch_Connector_Model_System_Config_Source_Inheritance::CHILD_THEN_PARENT_OPTION_ID,
215
  );
216
 
217
  $catalogAttributes = Mage::getResourceModel('catalog/product_attribute_collection');
app/code/community/DataFeedWatch/Connector/Helper/Registry.php CHANGED
@@ -36,7 +36,7 @@ class DataFeedWatch_Connector_Helper_Registry
36
  $categories = Mage::getResourceModel('catalog/category_collection')
37
  ->addNameToResult()
38
  ->setStoreId($storeId)
39
- ->addFieldToFilter('level', array('gt' => 0))
40
  ->getItems();
41
 
42
  Mage::register(self::ALL_CATEGORIES_ARRAY_KEY, $categories);
36
  $categories = Mage::getResourceModel('catalog/category_collection')
37
  ->addNameToResult()
38
  ->setStoreId($storeId)
39
+ ->addFieldToFilter('level', array('gt' => 1))
40
  ->getItems();
41
 
42
  Mage::register(self::ALL_CATEGORIES_ARRAY_KEY, $categories);
app/code/community/DataFeedWatch/Connector/Model/Product.php CHANGED
@@ -41,7 +41,7 @@ class DataFeedWatch_Connector_Model_Product
41
  $this->importData['image_url'] = $this->getBaseImageUrl();
42
  $this->importData['product_url'] = $this->getProductUrl();
43
  $this->importData['product_url_rewritten'] = $this->getProductUrlRewritten();
44
-
45
  $this->getCategoryPathToImport();
46
  $this->setDataToImport($this->getCategoriesNameToImport(false));
47
 
@@ -105,7 +105,6 @@ class DataFeedWatch_Connector_Model_Product
105
  $attributeCollection = Mage::registry(DataFeedWatch_Connector_Helper_Registry::ALL_IMPORTABLE_ATTRIBUTES_KEY);
106
  foreach ($attributeCollection as $attribute) {
107
  $attributeCode = $attribute->getAttributeCode();
108
- $data = $this->getData($attributeCode);
109
  if (empty($attributeCode) || !in_array($attributeCode, $productAttributes)) {
110
  continue;
111
  }
41
  $this->importData['image_url'] = $this->getBaseImageUrl();
42
  $this->importData['product_url'] = $this->getProductUrl();
43
  $this->importData['product_url_rewritten'] = $this->getProductUrlRewritten();
44
+ $this->importData['is_in_stock'] = (int) $this->getIsInStock();
45
  $this->getCategoryPathToImport();
46
  $this->setDataToImport($this->getCategoriesNameToImport(false));
47
 
105
  $attributeCollection = Mage::registry(DataFeedWatch_Connector_Helper_Registry::ALL_IMPORTABLE_ATTRIBUTES_KEY);
106
  foreach ($attributeCollection as $attribute) {
107
  $attributeCode = $attribute->getAttributeCode();
 
108
  if (empty($attributeCode) || !in_array($attributeCode, $productAttributes)) {
109
  continue;
110
  }
app/code/community/DataFeedWatch/Connector/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <DataFeedWatch_Connector>
5
- <version>0.3.2</version>
6
  </DataFeedWatch_Connector>
7
  </modules>
8
 
2
  <config>
3
  <modules>
4
  <DataFeedWatch_Connector>
5
+ <version>0.3.3</version>
6
  </DataFeedWatch_Connector>
7
  </modules>
8
 
app/code/community/DataFeedWatch/Connector/sql/datafeedwatch_connector_setup/upgrade-0.2.40-0.2.50.php CHANGED
@@ -1,41 +1,5 @@
1
  <?php
2
  /* @var Mage_Core_Model_Resource_Setup $installer */
3
  $installer = $this;
4
- /** @var Magento_Db_Adapter_Pdo_Mysql $connection */
5
- $connection = $installer->getConnection();
6
-
7
- /** @var string $table */
8
- $table = $installer->getTable('datafeedwatch_connector/updated_products');
9
-
10
- if (!$installer->tableExists(($table))) {
11
- $installer->startSetup();
12
- $updatedProductsTable = $connection->newTable($table)
13
- ->addColumn('product_id', Varien_Db_Ddl_Table::TYPE_INTEGER, null, array(
14
- 'identity' => true,
15
- 'unsigned' => true,
16
- 'nullable' => false,
17
- 'primary' => true,
18
- ), 'Product ID')
19
- ->addColumn('updated_at', Varien_Db_Ddl_Table::TYPE_TIMESTAMP, null, array(
20
- 'nullable' => true,
21
- ), 'Updated At')
22
- ->setComment('Updated Products Table');
23
- $connection->createTable($updatedProductsTable);
24
-
25
- $installer->endSetup();
26
- }
27
-
28
- /** @var string $table */
29
- $table = $installer->getTable('datafeedwatch_catalog_attribute_info');
30
-
31
- if ($connection->tableColumnExists($installer->getTable('api/user'), 'dfw_connect_hash')) {
32
- $installer->startSetup();
33
- $connection->dropColumn($installer->getTable('api/user'), 'dfw_connect_hash');
34
- $installer->endSetup();
35
- }
36
  $installer->startSetup();
37
- $connection->dropTable($installer->getTable('datafeedwatch_catalogrule_info'));
38
- $installer->endSetup();
39
- $installer->startSetup();
40
- $connection->dropTable($installer->getTable('datafeedwatch_salesrule_info'));
41
  $installer->endSetup();
1
  <?php
2
  /* @var Mage_Core_Model_Resource_Setup $installer */
3
  $installer = $this;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
4
  $installer->startSetup();
 
 
 
 
5
  $installer->endSetup();
app/code/community/DataFeedWatch/Connector/sql/datafeedwatch_connector_setup/upgrade-0.3.0-0.3.1.php CHANGED
@@ -3,6 +3,42 @@
3
  $installer = $this;
4
  /** @var Magento_Db_Adapter_Pdo_Mysql|Varien_Db_Adapter_Pdo_Mysql $connection */
5
  $connection = $installer->getConnection();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
6
  /** @var string $table */
7
  $table = $installer->getTable('datafeedwatch_catalog_attribute_info');
8
  /** @var string $catalogTable */
3
  $installer = $this;
4
  /** @var Magento_Db_Adapter_Pdo_Mysql|Varien_Db_Adapter_Pdo_Mysql $connection */
5
  $connection = $installer->getConnection();
6
+ /** @var string $table */
7
+ $table = $installer->getTable('datafeedwatch_connector/updated_products');
8
+
9
+ if (!$installer->tableExists(($table))) {
10
+ $installer->startSetup();
11
+ $updatedProductsTable = $connection->newTable($table)
12
+ ->addColumn('product_id', Varien_Db_Ddl_Table::TYPE_INTEGER, null, array(
13
+ 'identity' => true,
14
+ 'unsigned' => true,
15
+ 'nullable' => false,
16
+ 'primary' => true,
17
+ ), 'Product ID')
18
+ ->addColumn('updated_at', Varien_Db_Ddl_Table::TYPE_TIMESTAMP, null, array(
19
+ 'nullable' => true,
20
+ ), 'Updated At')
21
+ ->setComment('Updated Products Table');
22
+ $connection->createTable($updatedProductsTable);
23
+
24
+ $installer->endSetup();
25
+ }
26
+
27
+ /** @var string $table */
28
+ $table = $installer->getTable('datafeedwatch_catalog_attribute_info');
29
+
30
+ if ($connection->tableColumnExists($installer->getTable('api/user'), 'dfw_connect_hash')) {
31
+ $installer->startSetup();
32
+ $connection->dropColumn($installer->getTable('api/user'), 'dfw_connect_hash');
33
+ $installer->endSetup();
34
+ }
35
+ $installer->startSetup();
36
+ $connection->dropTable($installer->getTable('datafeedwatch_catalogrule_info'));
37
+ $installer->endSetup();
38
+ $installer->startSetup();
39
+ $connection->dropTable($installer->getTable('datafeedwatch_salesrule_info'));
40
+ $installer->endSetup();
41
+
42
  /** @var string $table */
43
  $table = $installer->getTable('datafeedwatch_catalog_attribute_info');
44
  /** @var string $catalogTable */
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DataFeedWatch_Connector</name>
4
- <version>0.3.2</version>
5
  <stability>stable</stability>
6
  <license uri="https://opensource.org/licenses/OSL-3.0">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>DataFeedWatch extension for Magento</summary>
10
  <description>DataFeedWatch enables Magento shops to optimize their product datafeed for Google Shopping and other channels</description>
11
- <notes>DataFeedWatch - Release version 0.3.2</notes>
12
  <authors><author><name>DataFeedWatch</name><user>WordWatch</user><email>support@datafeedwatch.com</email></author></authors>
13
- <date>2016-06-13</date>
14
- <time>08:41:11</time>
15
- <contents><target name="mageetc"><dir name="modules"><file name="DataFeedWatch_Connector.xml" hash="df95373d268ebdc76ce48357f220dc15"/></dir></target><target name="magecommunity"><dir name="DataFeedWatch"><dir name="Connector"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Button"><file name="Add.php" hash="a658851b480f5a475257be5eef217c16"/><file name="Extort.php" hash="cdf82e240841d96c15d59151571ee79c"/><file name="Open.php" hash="bc9605ba4852057019abc030db0a05a7"/><file name="Refresh.php" hash="913e50a9fb9f86f4c331e65c24e27218"/><file name="Restore.php" hash="571fe89a4514999cee65b65136894a9c"/></dir><dir name="Grid"><file name="Inheritance.php" hash="39f73b43227bc34df5cead15ddc251da"/></dir></dir><dir name="Grid"><dir name="Items"><file name="Row.php" hash="18e05a8d2c7898693256dd07507f94fd"/></dir><file name="Items.php" hash="a01a38ff3e3ae2e998441e1b8797e1d0"/><file name="Pager.php" hash="9ae5979b8e1ce7eafa6b2e7e429b8247"/></dir><file name="Grid.php" hash="3c4a5eefc0ae7e9638c119433bb93f0f"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="4d50db3e47a6107815e888e74a232bd3"/><file name="Registry.php" hash="514c4be14a4203dd568a2b77df83900b"/></dir><dir name="Model"><dir name="Api"><file name="User.php" hash="2d7fc0477d68f2e9f4febf0e43879a69"/></dir><file name="Api.php" hash="f07b325d90defc0d30450fbb0bbfd75b"/><file name="Cron.php" hash="2c85e3d5809b25fe6dd14a80991197d1"/><file name="Observer.php" hash="38a65f7aa9d70182a3d1bcd8287ce44c"/><file name="Product.php" hash="b35d3506ca6cc2025a5013e9c2f3cad4"/><dir name="Resource"><dir name="Product"><dir name="Collection"><file name="Db.php" hash="2a417751e524398f90b99cc7556ff182"/></dir><file name="Collection.php" hash="ce250ddc545aba36d9f2afd2ae319da2"/></dir><file name="Product.php" hash="746a8bde3cc3ce8d594ab8d35a78859c"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Inheritance.php" hash="9b8934ffc1943a2557bc1078fd44ad0c"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="DatafeedwatchController.php" hash="f3d364f4d0b3aa64478bdd783f807b95"/></dir></dir><dir name="data"><dir name="datafeedwatch_connector_setup"><file name="data-upgrade-0.2.40-0.2.50.php" hash="f999c30c7f3031e1ead8f83a966c1bb7"/><file name="data-upgrade-0.3.0-0.3.1.php" hash="7a242695a5c78801d84d81b1da99f18c"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="0054cf5d1bd7b9bc001c84b5fc8f72c6"/><file name="api.xml" hash="780b354b3fe3e807d16602cbe0a27c5c"/><file name="config.xml" hash="ded6483d3aeacf03585d71f73743992e"/><file name="system.xml" hash="35d85a2485f6e8eb63bfc0298bc53470"/></dir><dir name="sql"><dir name="datafeedwatch_connector_setup"><file name="upgrade-0.2.40-0.2.50.php" hash="21f170857128d15b708386635715fae9"/><file name="upgrade-0.3.0-0.3.1.php" hash="1799d8fd2cf18b77b4736d51b99d023d"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="datafeedwatch"><file name="connector.xml" hash="4ee1df77504a8ebccff49deab7ce1e49"/></dir></dir><dir name="template"><dir name="datafeedwatch"><dir name="connector"><dir name="grid"><dir name="items"><file name="row.phtml" hash="ada54a40e55899c3262f30c3de55d5c6"/></dir><file name="items.phtml" hash="d5928a0cf756d93eb517da7363563ca8"/><file name="pager.phtml" hash="6f41d682d5e4e9dcf9876f35d24a4651"/></dir><file name="grid.phtml" hash="76e9670e214dc1256b902a4d6ef33a3c"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="pl_PL"><file name="DataFeedWatch_Connector.csv" hash="fb9f9a1dacfc2698ee05abcdd1342b86"/></dir><dir name="en_US"><file name="DataFeedWatch_Connector.csv" hash="fcfdb3ab74add74d704e504161411ef6"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="datafeedwatch"><dir name="connector"><dir name="css"><dir name="grid"><file name="inheritance.css" hash="3d23c2a5285d6cdc4a514015926a8272"/></dir></dir><dir name="js"><dir name="grid"><file name="inheritance.js" hash="9fc3594f48fa519e11e2e17d0b427668"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.3.0</min><max>7.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DataFeedWatch_Connector</name>
4
+ <version>0.3.3</version>
5
  <stability>stable</stability>
6
  <license uri="https://opensource.org/licenses/OSL-3.0">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>DataFeedWatch extension for Magento</summary>
10
  <description>DataFeedWatch enables Magento shops to optimize their product datafeed for Google Shopping and other channels</description>
11
+ <notes>DataFeedWatch - Release version 0.3.3</notes>
12
  <authors><author><name>DataFeedWatch</name><user>WordWatch</user><email>support@datafeedwatch.com</email></author></authors>
13
+ <date>2016-06-23</date>
14
+ <time>13:28:15</time>
15
+ <contents><target name="mageetc"><dir name="modules"><file name="DataFeedWatch_Connector.xml" hash="df95373d268ebdc76ce48357f220dc15"/></dir></target><target name="magecommunity"><dir name="DataFeedWatch"><dir name="Connector"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Button"><file name="Add.php" hash="a658851b480f5a475257be5eef217c16"/><file name="Extort.php" hash="cdf82e240841d96c15d59151571ee79c"/><file name="Open.php" hash="bc9605ba4852057019abc030db0a05a7"/><file name="Refresh.php" hash="913e50a9fb9f86f4c331e65c24e27218"/><file name="Restore.php" hash="571fe89a4514999cee65b65136894a9c"/></dir><dir name="Grid"><file name="Inheritance.php" hash="39f73b43227bc34df5cead15ddc251da"/></dir></dir><dir name="Grid"><dir name="Items"><file name="Row.php" hash="18e05a8d2c7898693256dd07507f94fd"/></dir><file name="Items.php" hash="a01a38ff3e3ae2e998441e1b8797e1d0"/><file name="Pager.php" hash="9ae5979b8e1ce7eafa6b2e7e429b8247"/></dir><file name="Grid.php" hash="3c4a5eefc0ae7e9638c119433bb93f0f"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="fbdcdd9246232b2b3e6fac8df05bdf8e"/><file name="Registry.php" hash="602c20dfb574df45e05ed3065439b263"/></dir><dir name="Model"><dir name="Api"><file name="User.php" hash="2d7fc0477d68f2e9f4febf0e43879a69"/></dir><file name="Api.php" hash="f07b325d90defc0d30450fbb0bbfd75b"/><file name="Cron.php" hash="2c85e3d5809b25fe6dd14a80991197d1"/><file name="Observer.php" hash="38a65f7aa9d70182a3d1bcd8287ce44c"/><file name="Product.php" hash="c7c6c481aa5f2e39e4b314b535cefb9f"/><dir name="Resource"><dir name="Product"><dir name="Collection"><file name="Db.php" hash="2a417751e524398f90b99cc7556ff182"/></dir><file name="Collection.php" hash="ce250ddc545aba36d9f2afd2ae319da2"/></dir><file name="Product.php" hash="746a8bde3cc3ce8d594ab8d35a78859c"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Inheritance.php" hash="9b8934ffc1943a2557bc1078fd44ad0c"/></dir></dir></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="DatafeedwatchController.php" hash="f3d364f4d0b3aa64478bdd783f807b95"/></dir></dir><dir name="data"><dir name="datafeedwatch_connector_setup"><file name="data-upgrade-0.2.40-0.2.50.php" hash="f999c30c7f3031e1ead8f83a966c1bb7"/><file name="data-upgrade-0.3.0-0.3.1.php" hash="7a242695a5c78801d84d81b1da99f18c"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="0054cf5d1bd7b9bc001c84b5fc8f72c6"/><file name="api.xml" hash="780b354b3fe3e807d16602cbe0a27c5c"/><file name="config.xml" hash="c18bab9cde1c55f6e8149f453bbc28df"/><file name="system.xml" hash="35d85a2485f6e8eb63bfc0298bc53470"/></dir><dir name="sql"><dir name="datafeedwatch_connector_setup"><file name="upgrade-0.2.40-0.2.50.php" hash="a0d6d1a6fb14efa154803c0710d3859f"/><file name="upgrade-0.3.0-0.3.1.php" hash="f13269dd737fa10ad903b6a5c69f3dc3"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><dir name="datafeedwatch"><file name="connector.xml" hash="4ee1df77504a8ebccff49deab7ce1e49"/></dir></dir><dir name="template"><dir name="datafeedwatch"><dir name="connector"><dir name="grid"><dir name="items"><file name="row.phtml" hash="ada54a40e55899c3262f30c3de55d5c6"/></dir><file name="items.phtml" hash="d5928a0cf756d93eb517da7363563ca8"/><file name="pager.phtml" hash="6f41d682d5e4e9dcf9876f35d24a4651"/></dir><file name="grid.phtml" hash="76e9670e214dc1256b902a4d6ef33a3c"/></dir></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="pl_PL"><file name="DataFeedWatch_Connector.csv" hash="fb9f9a1dacfc2698ee05abcdd1342b86"/></dir><dir name="en_US"><file name="DataFeedWatch_Connector.csv" hash="fcfdb3ab74add74d704e504161411ef6"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="datafeedwatch"><dir name="connector"><dir name="css"><dir name="grid"><file name="inheritance.css" hash="3d23c2a5285d6cdc4a514015926a8272"/></dir></dir><dir name="js"><dir name="grid"><file name="inheritance.js" hash="9fc3594f48fa519e11e2e17d0b427668"/></dir></dir></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.3.0</min><max>7.0.0</max></php></required></dependencies>
18
  </package>