DataFeedWatch_Connector - Version 0.2.12

Version Notes

DataFeedWatch Release version 0.2.12

Download this release

Release Info

Developer DataFeedWatch
Extension DataFeedWatch_Connector
Version 0.2.12
Comparing to
See all releases


Code changes from version 0.2.11 to 0.2.12

Files changed (4) hide show
  1. app/code/community/DataFeedWatch/Connector/Model/Api/User.php +0 -57
  2. app/code/community/DataFeedWatch/Connector/Model/Datafeedwatch/Api.php +9 -8
  3. app/code/community/DataFeedWatch/Connector/etc/config.xml +1 -1
  4. package.xml +5 -5
app/code/community/DataFeedWatch/Connector/Model/Api/User.php DELETED
@@ -1,57 +0,0 @@
1
- <?php
2
- /**
3
- * Created by PhpStorm.
4
- * User: hexacode
5
- * Date: 5/19/14
6
- * Time: 9:24 AM
7
- */
8
-
9
- class DataFeedWatch_Connector_Model_Api_User extends Mage_Api_Model_User {
10
-
11
- /**
12
- * @deprecated since 0.2.9
13
- * @return Mage_Api_Model_User|Mage_Core_Model_Abstract
14
- */
15
- public function save()
16
- {
17
- return parent::save();
18
- /*$this->_beforeSave();
19
- $data = array(
20
- 'firstname' => $this->getFirstname(),
21
- 'lastname' => $this->getLastname(),
22
- 'email' => $this->getEmail(),
23
- 'modified' => Mage::getSingleton('core/date')->gmtDate(),
24
- );
25
-
26
- if ($this->getId() > 0) {
27
- $data['user_id'] = $this->getId();
28
- }
29
-
30
- if ( $this->getUsername() ) {
31
- $data['username'] = $this->getUsername();
32
- }
33
-
34
- if ($this->getApiKey()) {
35
- $data['api_key'] = $this->_getEncodedApiKey($this->getApiKey());
36
- }
37
-
38
- if ($this->getNewApiKey()) {
39
- $data['api_key'] = $this->_getEncodedApiKey($this->getNewApiKey());
40
- }
41
-
42
- if ( !is_null($this->getIsActive()) ) {
43
- $data['is_active'] = intval($this->getIsActive());
44
- }
45
-
46
- //if ( $this->getDfwConnectHash() ) {
47
- // $data['dfw_connect_hash'] = $this->getDfwConnectHash();
48
- // }
49
-
50
-
51
- $this->setData($data);
52
- $this->_getResource()->save($this);
53
- $this->_afterSave();
54
- return $this;
55
- */
56
- }
57
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/DataFeedWatch/Connector/Model/Datafeedwatch/Api.php CHANGED
@@ -33,7 +33,7 @@ class DataFeedWatch_Connector_Model_Datafeedwatch_Api extends Mage_Catalog_Model
33
 
34
  public function version()
35
  {
36
- return Mage::getConfig()->getNode('modules/DataFeedWatch_Connector')->version;
37
  }
38
 
39
  public function product_count($options = array())
@@ -87,7 +87,7 @@ class DataFeedWatch_Connector_Model_Datafeedwatch_Api extends Mage_Catalog_Model
87
 
88
  public function products($options = array())
89
  {
90
-
91
  $this->_versionInfo = Mage::getVersionInfo();
92
 
93
 
@@ -213,7 +213,7 @@ class DataFeedWatch_Connector_Model_Datafeedwatch_Api extends Mage_Catalog_Model
213
  $parent_sku = $parent_product->getSku();
214
 
215
  //parent_url
216
- if (method_exists(Mage, 'getEdition') && Mage::getEdition() == Mage::EDITION_ENTERPRISE && Mage::getVersionInfo() >= $this->_supportedEnterprise) {
217
  $parent_url = $parent_product->getProductUrl();
218
  } else {
219
  $parent_url = $baseUrl . $parent_product->getUrlPath();
@@ -224,7 +224,8 @@ class DataFeedWatch_Connector_Model_Datafeedwatch_Api extends Mage_Catalog_Model
224
 
225
  $product_result = array( // Basic product data
226
  'product_id' => $product->getId(),
227
- 'sku' => $product->getSku()
 
228
  );
229
 
230
  $product_result['parent_id'] = $parent_id;
@@ -254,7 +255,7 @@ class DataFeedWatch_Connector_Model_Datafeedwatch_Api extends Mage_Catalog_Model
254
  }
255
 
256
 
257
- if (method_exists(Mage, 'getEdition') && Mage::getEdition() == Mage::EDITION_ENTERPRISE && Mage::getVersionInfo() >= $this->_supportedEnterprise) {
258
  $product_result['product_url'] = $product->getProductUrl();
259
  } else {
260
  $product_result['product_url'] = $baseUrl . $product->getUrlPath();
@@ -417,7 +418,7 @@ class DataFeedWatch_Connector_Model_Datafeedwatch_Api extends Mage_Catalog_Model
417
 
418
  private function getDisplayPrice($product_id)
419
  {
420
-
421
  if (!$product_id) {
422
  return 0;
423
  }
@@ -453,11 +454,11 @@ class DataFeedWatch_Connector_Model_Datafeedwatch_Api extends Mage_Catalog_Model
453
 
454
  $prices['description'] = $product->getDescription();
455
  $prices['short_description'] = $product->getShortDescription();
456
- $prices['short_description'] = $product->getShortDescription();
457
 
458
  $baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
459
 
460
- if (method_exists(Mage, 'getEdition') && Mage::getEdition() == Mage::EDITION_ENTERPRISE && Mage::getVersionInfo() >= $this->_supportedEnterprise) {
461
  $product_result['product_url'] = $product->getProductUrl();
462
  } else {
463
  $product_result['product_url'] = $baseUrl . $product->getUrlPath();
33
 
34
  public function version()
35
  {
36
+ return (string)Mage::getConfig()->getNode('modules/DataFeedWatch_Connector')->version;
37
  }
38
 
39
  public function product_count($options = array())
87
 
88
  public function products($options = array())
89
  {
90
+ $mageObject = new Mage;
91
  $this->_versionInfo = Mage::getVersionInfo();
92
 
93
 
213
  $parent_sku = $parent_product->getSku();
214
 
215
  //parent_url
216
+ if (method_exists($mageObject, 'getEdition') && Mage::getEdition() == Mage::EDITION_ENTERPRISE && Mage::getVersionInfo() >= $this->_supportedEnterprise) {
217
  $parent_url = $parent_product->getProductUrl();
218
  } else {
219
  $parent_url = $baseUrl . $parent_product->getUrlPath();
224
 
225
  $product_result = array( // Basic product data
226
  'product_id' => $product->getId(),
227
+ 'sku' => $product->getSku(),
228
+ 'product_type' => $product->getTypeId()
229
  );
230
 
231
  $product_result['parent_id'] = $parent_id;
255
  }
256
 
257
 
258
+ if (method_exists($mageObject, 'getEdition') && Mage::getEdition() == Mage::EDITION_ENTERPRISE && Mage::getVersionInfo() >= $this->_supportedEnterprise) {
259
  $product_result['product_url'] = $product->getProductUrl();
260
  } else {
261
  $product_result['product_url'] = $baseUrl . $product->getUrlPath();
418
 
419
  private function getDisplayPrice($product_id)
420
  {
421
+ $mageObject = new Mage;
422
  if (!$product_id) {
423
  return 0;
424
  }
454
 
455
  $prices['description'] = $product->getDescription();
456
  $prices['short_description'] = $product->getShortDescription();
457
+
458
 
459
  $baseUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
460
 
461
+ if (method_exists($mageObject, 'getEdition') && Mage::getEdition() == Mage::EDITION_ENTERPRISE && Mage::getVersionInfo() >= $this->_supportedEnterprise) {
462
  $product_result['product_url'] = $product->getProductUrl();
463
  } else {
464
  $product_result['product_url'] = $baseUrl . $product->getUrlPath();
app/code/community/DataFeedWatch/Connector/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <DataFeedWatch_Connector>
5
- <version>0.2.11</version>
6
  </DataFeedWatch_Connector>
7
  </modules>
8
  <admin>
2
  <config>
3
  <modules>
4
  <DataFeedWatch_Connector>
5
+ <version>0.2.12</version>
6
  </DataFeedWatch_Connector>
7
  </modules>
8
  <admin>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DataFeedWatch_Connector</name>
4
- <version>0.2.11</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -9,11 +9,11 @@
9
  <summary>DataFeedWatch extension for Magento</summary>
10
  <description>DataFeedWatch enables Magento shops to optimize their product datafeed for Google Shopping and other channels&#xD;
11
  </description>
12
- <notes>DataFeedWatch Release version 0.2.11</notes>
13
  <authors><author><name>DataFeedWatch</name><user>Adeel</user><email>adeel.developer@gmail.com</email></author></authors>
14
- <date>2014-07-08</date>
15
- <time>17:41:26</time>
16
- <contents><target name="magecommunity"><dir name="DataFeedWatch"><dir name="Connector"><dir name="Block"><dir name="Adminhtml"><file name="Connectorbackend.php" hash="7d6af1cb6dd7df3799928fe073f5576b"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="ConnectorbackendController.php" hash="2da89bd06938584f9eafeac98e4a99ef"/></dir><dir><dir name="Adminhtml"><file name="ConnectorbackendController.php" hash="2da89bd06938584f9eafeac98e4a99ef"/></dir></dir><file name="TokenController.php" hash="573ca81b110e79bc3893ac298b2aa02b"/></dir><dir name="etc"><file name="api.xml" hash="eb6eecef3f0922b809f2701aed29325d"/><file name="config.xml" hash="b0ef68502ddcdf726375d74edd199311"/><file name="system.xml" hash="ab5e8d56d032ba69c930ab7879484212"/></dir><dir name="Helper"><file name="Data.php" hash="85269d06206056aeff2fb2c25938ff9c"/></dir><dir name="Model"><dir name="Api"><file name="User.php" hash="734f274e07ca62ecf04dbefecd316330"/></dir><dir name="Datafeedwatch"><file name="Api.php" hash="d1c89b7352d52b07350b6cfbc0903043"/></dir></dir><dir name="sql"><dir><dir name="datafeedwatch_connector_setup"><file name="install-0.2.9.php" hash="326a2968b7af5a987604f880ed7c4a3c"/><file name="upgrade-0.2.10-0.2.11.php" hash="9dcefa5cafd7efd8f192af4d9c1f0c2e"/><file name="upgrade-0.2.9-0.2.10.php" hash="c9e575e9925df8440eca5aa817c1d5e4"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="connector.xml" hash="14d59b8e9f66fba5d7c1f8d0f62dfc3c"/></dir><dir name="template"><dir name="connector"><file name="connectorbackend.phtml" hash="43e0e0c8ee28090aa098b7d7c7a979ad"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DataFeedWatch_Connector.xml" hash="658a7b36ae7eb5915f40993a191aaa13"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>DataFeedWatch_Connector</name>
4
+ <version>0.2.12</version>
5
  <stability>stable</stability>
6
  <license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
9
  <summary>DataFeedWatch extension for Magento</summary>
10
  <description>DataFeedWatch enables Magento shops to optimize their product datafeed for Google Shopping and other channels&#xD;
11
  </description>
12
+ <notes>DataFeedWatch Release version 0.2.12</notes>
13
  <authors><author><name>DataFeedWatch</name><user>Adeel</user><email>adeel.developer@gmail.com</email></author></authors>
14
+ <date>2014-07-25</date>
15
+ <time>13:44:20</time>
16
+ <contents><target name="magecommunity"><dir name="DataFeedWatch"><dir name="Connector"><dir name="Block"><dir name="Adminhtml"><file name="Connectorbackend.php" hash="7d6af1cb6dd7df3799928fe073f5576b"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="ConnectorbackendController.php" hash="2da89bd06938584f9eafeac98e4a99ef"/></dir><dir><dir name="Adminhtml"><file name="ConnectorbackendController.php" hash="2da89bd06938584f9eafeac98e4a99ef"/></dir></dir><file name="TokenController.php" hash="573ca81b110e79bc3893ac298b2aa02b"/></dir><dir name="etc"><file name="api.xml" hash="eb6eecef3f0922b809f2701aed29325d"/><file name="config.xml" hash="cef1812ea3d02e61a9085dedcb6e9133"/><file name="system.xml" hash="ab5e8d56d032ba69c930ab7879484212"/></dir><dir name="Helper"><file name="Data.php" hash="85269d06206056aeff2fb2c25938ff9c"/></dir><dir name="Model"><dir name="Datafeedwatch"><file name="Api.php" hash="270bdbae10b846664914d29090d8da50"/></dir></dir><dir name="sql"><dir><dir name="datafeedwatch_connector_setup"><file name="install-0.2.9.php" hash="326a2968b7af5a987604f880ed7c4a3c"/><file name="upgrade-0.2.10-0.2.11.php" hash="9dcefa5cafd7efd8f192af4d9c1f0c2e"/><file name="upgrade-0.2.9-0.2.10.php" hash="c9e575e9925df8440eca5aa817c1d5e4"/></dir></dir></dir></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="connector.xml" hash="14d59b8e9f66fba5d7c1f8d0f62dfc3c"/></dir><dir name="template"><dir name="connector"><file name="connectorbackend.phtml" hash="43e0e0c8ee28090aa098b7d7c7a979ad"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="DataFeedWatch_Connector.xml" hash="658a7b36ae7eb5915f40993a191aaa13"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>