Magmodules_Channable - Version 1.4.7

Version Notes

Channable Connect

Download this release

Release Info

Developer Magmodules
Extension Magmodules_Channable
Version 1.4.7
Comparing to
See all releases


Code changes from version 1.4.6 to 1.4.7

Files changed (4) hide show
  1. app/code/community/Magmodules/Channable/Helper/Data.php +17 -12
  2. app/code/community/Magmodules/Channable/Model/Channable.php +1 -1
  3. app/code/community/Magmodules/Channable/etc/config.xml +1 -1
  4. package.xml +4 -4
app/code/community/Magmodules/Channable/Helper/Data.php CHANGED
@@ -102,12 +102,14 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
102
  }
103
 
104
  if($config['field'][$field]['type'] == 'media_image') {
105
- if(!empty($value)) {
106
- if($value != 'no_selection') {
107
- $value = $config['media_url'] . 'catalog/product' . $value;
108
- } else {
109
- $value = '';
110
- }
 
 
111
  }
112
  }
113
 
@@ -250,27 +252,26 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
250
  }
251
  }
252
  }
253
- } else { // FOR OLDER VERSIONS
254
  if($product->getThumbnail()) {
255
  if($product->getThumbnail() != 'no_selection') {
256
  $image = $config['media_image_url'] . $product->getThumbnail();
257
- $image_data['image']['thumb'] = $image;
258
  }
259
  }
260
  if($product->getSmallImage()) {
261
  if($product->getSmallImage() != 'no_selection') {
262
  $image = $config['media_image_url'] . $product->getSmallImage();
263
- $image_data['image']['small'] = $image;
264
  }
265
  }
266
  if($product->getImage()) {
267
  if($product->getImage() != 'no_selection') {
268
  $image = $config['media_image_url'] . $product->getImage();
269
- $image_data['image']['base'] = $image;
270
  }
271
  }
272
  }
273
-
274
  if(!empty($config['images'])) {
275
  $image_data['image_link'] = $image;
276
  $container = new Varien_Object(array('attribute' => new Varien_Object(array('id' => $config['media_gallery_id']))));
@@ -288,7 +289,11 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract {
288
  }
289
  return $image_data;
290
  } else {
291
- return $image;
 
 
 
 
292
  }
293
  }
294
  }
102
  }
103
 
104
  if($config['field'][$field]['type'] == 'media_image') {
105
+ if($field != 'image_link') {
106
+ if(!empty($value)) {
107
+ if($value != 'no_selection') {
108
+ $value = $config['media_url'] . 'catalog/product' . $value;
109
+ } else {
110
+ $value = '';
111
+ }
112
+ }
113
  }
114
  }
115
 
252
  }
253
  }
254
  }
255
+ } else {
256
  if($product->getThumbnail()) {
257
  if($product->getThumbnail() != 'no_selection') {
258
  $image = $config['media_image_url'] . $product->getThumbnail();
259
+ $image_data['image']['thumbnail'] = $image;
260
  }
261
  }
262
  if($product->getSmallImage()) {
263
  if($product->getSmallImage() != 'no_selection') {
264
  $image = $config['media_image_url'] . $product->getSmallImage();
265
+ $image_data['image']['small_image'] = $image;
266
  }
267
  }
268
  if($product->getImage()) {
269
  if($product->getImage() != 'no_selection') {
270
  $image = $config['media_image_url'] . $product->getImage();
271
+ $image_data['image']['image'] = $image;
272
  }
273
  }
274
  }
 
275
  if(!empty($config['images'])) {
276
  $image_data['image_link'] = $image;
277
  $container = new Varien_Object(array('attribute' => new Varien_Object(array('id' => $config['media_gallery_id']))));
289
  }
290
  return $image_data;
291
  } else {
292
+ if(!empty($image_data['image']['image'])) {
293
+ return $image_data['image']['image'];
294
+ } else {
295
+ return $image;
296
+ }
297
  }
298
  }
299
  }
app/code/community/Magmodules/Channable/Model/Channable.php CHANGED
@@ -141,7 +141,7 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
141
  $attributes['name'] = array('label' => 'name', 'source' => Mage::getStoreConfig('channable/data/name', $storeId));
142
  $attributes['description'] = array('label' => 'description', 'source' => Mage::getStoreConfig('channable/data/description', $storeId));
143
  $attributes['product_url'] = array('label' => 'url', 'source' => '');
144
- $attributes['image_link'] = array('label' => 'image', 'source' => '');
145
  $attributes['price'] = array('label' => 'price', 'source' => '');
146
  $attributes['sku'] = array('label' => 'sku', 'source' => Mage::getStoreConfig('channable/data/sku', $storeId));
147
  $attributes['brand'] = array('label' => 'brand', 'source' => Mage::getStoreConfig('channable/data/brand', $storeId));
141
  $attributes['name'] = array('label' => 'name', 'source' => Mage::getStoreConfig('channable/data/name', $storeId));
142
  $attributes['description'] = array('label' => 'description', 'source' => Mage::getStoreConfig('channable/data/description', $storeId));
143
  $attributes['product_url'] = array('label' => 'url', 'source' => '');
144
+ $attributes['image_link'] = array('label' => 'image', 'source' => Mage::getStoreConfig('channable/data/default_image', $storeId));
145
  $attributes['price'] = array('label' => 'price', 'source' => '');
146
  $attributes['sku'] = array('label' => 'sku', 'source' => Mage::getStoreConfig('channable/data/sku', $storeId));
147
  $attributes['brand'] = array('label' => 'brand', 'source' => Mage::getStoreConfig('channable/data/brand', $storeId));
app/code/community/Magmodules/Channable/etc/config.xml CHANGED
@@ -19,7 +19,7 @@
19
  <config>
20
  <modules>
21
  <Magmodules_Channable>
22
- <version>1.4.6</version>
23
  </Magmodules_Channable>
24
  </modules>
25
  <global>
19
  <config>
20
  <modules>
21
  <Magmodules_Channable>
22
+ <version>1.4.7</version>
23
  </Magmodules_Channable>
24
  </modules>
25
  <global>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Channable</name>
4
- <version>1.4.6</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Magmodules_Channable</description>
11
  <notes>Channable Connect</notes>
12
  <authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
13
- <date>2016-09-16</date>
14
- <time>10:31:49</time>
15
- <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Channable"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="73e9ccaafacba4153962b37a8038c1ad"/><file name="Filter.php" hash="b64842b1a7bbe5b879468c034ade22bd"/><file name="Shipping.php" hash="7f15ea3b4fed5dcb20b37a78dd84cf5d"/></dir><dir name="Renderer"><file name="Select.php" hash="90a71e109a5f96bca26209c922a74961"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="e1127c67a55f163e0c17ae54111b4538"/><file name="Heading.php" hash="cf8597dec6375bbf35014e1a491605d6"/><file name="Note.php" hash="6d7c8056bf0418ab6008dd86ed1d93ca"/><file name="Token.php" hash="d6f89e494288e7d90525d8067a7bb1de"/><file name="Version.php" hash="7be709c731b412258539184c3c4e01dd"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="1e9f175e9be64df06e971f2307b5fd5e"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="a7f519fec4d3e373f42878040d7469dc"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="6f888d0db7ed195c93a84748dd0a0c94"/><file name="Filter.php" hash="6609193f2296111f82276f09dc548be2"/><file name="Shipping.php" hash="6bea82000c4341ff2c5a9b05c992406c"/></dir></dir><dir name="Source"><file name="Action.php" hash="d655c22564992e02daccd9aac650358a"/><file name="Attribute.php" hash="714c0aafbe76d361fe883483bb7036d0"/><file name="Category.php" hash="bad1adc7e7890cfa5b83de0cd7a16835"/><file name="Categorytype.php" hash="7284943e01d7fe3346da7233ea827086"/><file name="Conditions.php" hash="aeb42d43282065fda73860f6a6d9da46"/><file name="Configurable.php" hash="08f157df27a2424e1a91d81bc1a572a7"/><file name="Countries.php" hash="ca6b39297950c9800059c34f7307d627"/><file name="Images.php" hash="d1c8294e6434fa3b0c03635b45964cc0"/><file name="Mainimage.php" hash="c85a8c05df234c188a0aff45a93a6b5c"/><file name="Name.php" hash="86af909704dc4f9320f2154d7c38ff4b"/><file name="Pricemodel.php" hash="359aeff8e7dc6099f55c493abed92a75"/><file name="Selectattribute.php" hash="5579305934bb5b51a443cc9525215975"/><file name="Shipping.php" hash="da2a147c1b6cf21a9f6f47e0456524dd"/><file name="Tax.php" hash="1b50c014c9e204e60cbbfcb883c76a9b"/><file name="Textattribute.php" hash="ea0a682c8a1aa0b51ee3e529c60fcbe8"/><file name="Type.php" hash="ffe6276231f501ac35943d3a83c77447"/><file name="Visibility.php" hash="c2e80831d9d8b5fc6cd642a590812a56"/><file name="Weight.php" hash="ba1e3c862ea2779c275d3d267b819435"/></dir></dir></dir></dir><file name="Channable.php" hash="355952b740d0f84b5ec479e774f30598"/><file name="Common.php" hash="7e910793305c571fc948e08e1be000c0"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ChannableController.php" hash="e6110aeea10eca08da781c70206f6ed9"/></dir><file name="FeedController.php" hash="e2b205016ebdc274835165111b1ed7f9"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f6d3e3176f08cd111e0655837c3365dd"/><file name="config.xml" hash="d6af6549d06d9e0c4ef563fbd0d4e1ee"/><file name="system.xml" hash="a899289abe17ad825fcac279374743c1"/></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Channable.csv" hash="b7f6f15de57f502ccf1c98e71006a823"/></dir><dir name="nl_NL"><file name="Magmodules_Channable.csv" hash="2eaec8847182a0005c575e0acf6e1c1d"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Channable.xml" hash="061032d718f1ddd64de211fc7133685c"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Channable</name>
4
+ <version>1.4.7</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.magmodules.eu/license-agreement/">Single Server License</license>
7
  <channel>community</channel>
10
  <description>Magmodules_Channable</description>
11
  <notes>Channable Connect</notes>
12
  <authors><author><name>Magmodules</name><user>magmodules</user><email>info@magmodules.nl</email></author></authors>
13
+ <date>2016-09-21</date>
14
+ <time>13:41:51</time>
15
+ <contents><target name="magecommunity"><dir name="Magmodules"><dir name="Channable"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Extra.php" hash="73e9ccaafacba4153962b37a8038c1ad"/><file name="Filter.php" hash="b64842b1a7bbe5b879468c034ade22bd"/><file name="Shipping.php" hash="7f15ea3b4fed5dcb20b37a78dd84cf5d"/></dir><dir name="Renderer"><file name="Select.php" hash="90a71e109a5f96bca26209c922a74961"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="e1127c67a55f163e0c17ae54111b4538"/><file name="Heading.php" hash="cf8597dec6375bbf35014e1a491605d6"/><file name="Note.php" hash="6d7c8056bf0418ab6008dd86ed1d93ca"/><file name="Token.php" hash="d6f89e494288e7d90525d8067a7bb1de"/><file name="Version.php" hash="7be709c731b412258539184c3c4e01dd"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="1e9f175e9be64df06e971f2307b5fd5e"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="dc7a49be42b243814a617bebc0663c62"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="6f888d0db7ed195c93a84748dd0a0c94"/><file name="Filter.php" hash="6609193f2296111f82276f09dc548be2"/><file name="Shipping.php" hash="6bea82000c4341ff2c5a9b05c992406c"/></dir></dir><dir name="Source"><file name="Action.php" hash="d655c22564992e02daccd9aac650358a"/><file name="Attribute.php" hash="714c0aafbe76d361fe883483bb7036d0"/><file name="Category.php" hash="bad1adc7e7890cfa5b83de0cd7a16835"/><file name="Categorytype.php" hash="7284943e01d7fe3346da7233ea827086"/><file name="Conditions.php" hash="aeb42d43282065fda73860f6a6d9da46"/><file name="Configurable.php" hash="08f157df27a2424e1a91d81bc1a572a7"/><file name="Countries.php" hash="ca6b39297950c9800059c34f7307d627"/><file name="Images.php" hash="d1c8294e6434fa3b0c03635b45964cc0"/><file name="Mainimage.php" hash="c85a8c05df234c188a0aff45a93a6b5c"/><file name="Name.php" hash="86af909704dc4f9320f2154d7c38ff4b"/><file name="Pricemodel.php" hash="359aeff8e7dc6099f55c493abed92a75"/><file name="Selectattribute.php" hash="5579305934bb5b51a443cc9525215975"/><file name="Shipping.php" hash="da2a147c1b6cf21a9f6f47e0456524dd"/><file name="Tax.php" hash="1b50c014c9e204e60cbbfcb883c76a9b"/><file name="Textattribute.php" hash="ea0a682c8a1aa0b51ee3e529c60fcbe8"/><file name="Type.php" hash="ffe6276231f501ac35943d3a83c77447"/><file name="Visibility.php" hash="c2e80831d9d8b5fc6cd642a590812a56"/><file name="Weight.php" hash="ba1e3c862ea2779c275d3d267b819435"/></dir></dir></dir></dir><file name="Channable.php" hash="217d026dd81598e96e669711d5e26f44"/><file name="Common.php" hash="7e910793305c571fc948e08e1be000c0"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ChannableController.php" hash="e6110aeea10eca08da781c70206f6ed9"/></dir><file name="FeedController.php" hash="e2b205016ebdc274835165111b1ed7f9"/></dir><dir name="etc"><file name="adminhtml.xml" hash="f6d3e3176f08cd111e0655837c3365dd"/><file name="config.xml" hash="946b973edcc30c6890ebe11d3b8d6bcd"/><file name="system.xml" hash="a899289abe17ad825fcac279374743c1"/></dir></dir></dir></target><target name="magelocale"><dir><dir name="en_US"><file name="Magmodules_Channable.csv" hash="b7f6f15de57f502ccf1c98e71006a823"/></dir><dir name="nl_NL"><file name="Magmodules_Channable.csv" hash="2eaec8847182a0005c575e0acf6e1c1d"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Channable.xml" hash="061032d718f1ddd64de211fc7133685c"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>