Magmodules_Channable - Version 1.5.3

Version Notes

Channable Connect

Download this release

Release Info

Developer Magmodules
Extension Magmodules_Channable
Version 1.5.3
Comparing to
See all releases


Code changes from version 1.5.2 to 1.5.3

Files changed (6) hide show
  1. app/code/community/Magmodules/Channable/Helper/Data.php +9 -0
  2. app/code/community/Magmodules/Channable/Model/Channable.php +2 -0
  3. app/code/community/Magmodules/Channable/controllers/FeedController.php +5 -2
  4. app/code/community/Magmodules/Channable/etc/config.xml +1 -1
  5. app/code/community/Magmodules/Channable/etc/system.xml +1 -1
  6. package.xml +4 -4
app/code/community/Magmodules/Channable/Helper/Data.php CHANGED
@@ -527,6 +527,10 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract
527
  $price = $product->getPrice();
528
  }
529
 
 
 
 
 
530
  $price = Mage::helper('tax')->getPrice($product, $price, $taxParam);
531
  $priceData['regular_price'] = number_format(($price * $priceMarkup), 2, '.', '') . $currency;
532
  $pricerulePrice = Mage::helper('tax')->getPrice($product, $product->getFinalPrice(), $taxParam);
@@ -561,6 +565,11 @@ class Magmodules_Channable_Helper_Data extends Mage_Core_Helper_Abstract
561
  $priceData['final_price_clean'] = $price;
562
  $priceData['price'] = number_format(($price * $priceMarkup), 2, '.', '') . $currency;
563
 
 
 
 
 
 
564
  if (isset($salesPrice)) {
565
  $priceData['sales_price'] = number_format(($salesPrice * $priceMarkup), 2, '.', '') . $currency;
566
  }
527
  $price = $product->getPrice();
528
  }
529
 
530
+ if($price == 0) {
531
+ $price = $product->getMinPrice();
532
+ }
533
+
534
  $price = Mage::helper('tax')->getPrice($product, $price, $taxParam);
535
  $priceData['regular_price'] = number_format(($price * $priceMarkup), 2, '.', '') . $currency;
536
  $pricerulePrice = Mage::helper('tax')->getPrice($product, $product->getFinalPrice(), $taxParam);
565
  $priceData['final_price_clean'] = $price;
566
  $priceData['price'] = number_format(($price * $priceMarkup), 2, '.', '') . $currency;
567
 
568
+ $minPrice = Mage::helper('tax')->getPrice($product, $product->getMinPrice(), $taxParam);
569
+ $maxPrice = Mage::helper('tax')->getPrice($product, $product->getMaxPrice(), $taxParam);
570
+ $priceData['min_price'] = number_format(($minPrice * $priceMarkup), 2, '.', '') . $currency;
571
+ $priceData['max_price'] = number_format(($maxPrice * $priceMarkup), 2, '.', '') . $currency;
572
+
573
  if (isset($salesPrice)) {
574
  $priceData['sales_price'] = number_format(($salesPrice * $priceMarkup), 2, '.', '') . $currency;
575
  }
app/code/community/Magmodules/Channable/Model/Channable.php CHANGED
@@ -411,6 +411,8 @@ class Magmodules_Channable_Model_Channable extends Magmodules_Channable_Model_Co
411
  }
412
  } else {
413
  $prices['price'] = $data['price'];
 
 
414
  $prices['special_price'] = '';
415
  $prices['special_price_from'] = '';
416
  $prices['special_price_to'] = '';
411
  }
412
  } else {
413
  $prices['price'] = $data['price'];
414
+ $prices['min_price'] = $data['min_price'];
415
+ $prices['max_price'] = $data['max_price'];
416
  $prices['special_price'] = '';
417
  $prices['special_price_from'] = '';
418
  $prices['special_price_to'] = '';
app/code/community/Magmodules/Channable/controllers/FeedController.php CHANGED
@@ -49,8 +49,11 @@ class Magmodules_Channable_FeedController extends Mage_Core_Controller_Front_Act
49
  if ($this->getRequest()->getParam('array')) {
50
  $this->getResponse()->setBody(Zend_Debug::dump($feed, null, false));
51
  } else {
52
- $this->getResponse()->clearHeaders()->setHeader('Content-type', 'application/json', true);
53
- $this->getResponse()->setBody(json_encode($feed));
 
 
 
54
  }
55
  }
56
 
49
  if ($this->getRequest()->getParam('array')) {
50
  $this->getResponse()->setBody(Zend_Debug::dump($feed, null, false));
51
  } else {
52
+ $this->getResponse()
53
+ ->clearHeaders()
54
+ ->setHeader('Content-type', 'application/json', true)
55
+ ->setHeader('Cache-control', 'no-cache', true)
56
+ ->setBody(json_encode($feed));
57
  }
58
  }
59
 
app/code/community/Magmodules/Channable/etc/config.xml CHANGED
@@ -21,7 +21,7 @@
21
  <config>
22
  <modules>
23
  <Magmodules_Channable>
24
- <version>1.5.2</version>
25
  </Magmodules_Channable>
26
  </modules>
27
  <global>
21
  <config>
22
  <modules>
23
  <Magmodules_Channable>
24
+ <version>1.5.3</version>
25
  </Magmodules_Channable>
26
  </modules>
27
  <global>
app/code/community/Magmodules/Channable/etc/system.xml CHANGED
@@ -460,7 +460,7 @@
460
  <label>Use Simple Product Pricing</label>
461
  <frontend_type>select</frontend_type>
462
  <source_model>adminhtml/system_config_source_yesno</source_model>
463
- <sort_order>73</sort_order>
464
  <show_in_default>1</show_in_default>
465
  <show_in_website>1</show_in_website>
466
  <show_in_store>1</show_in_store>
460
  <label>Use Simple Product Pricing</label>
461
  <frontend_type>select</frontend_type>
462
  <source_model>adminhtml/system_config_source_yesno</source_model>
463
+ <sort_order>94</sort_order>
464
  <show_in_default>1</show_in_default>
465
  <show_in_website>1</show_in_website>
466
  <show_in_store>1</show_in_store>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Channable</name>
4
- <version>1.5.2</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>2017-02-23</date>
14
- <time>20:39:37</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="fc53f0c561ca32bc6ffc3d17dde7570e"/><file name="Filter.php" hash="0bfd9fefc4a7f04af7aeccd0fe9fcad5"/><file name="Shipping.php" hash="48f0c405e83631ebb165cc50f4e035da"/></dir><dir name="Renderer"><file name="Select.php" hash="c8a97ab2a71f5474d11318fd50bc168b"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="dc680e24f97f9a769e5a4ff4c750fa90"/><file name="Heading.php" hash="09777edbb0062b0f99ea3824fd127e84"/><file name="Note.php" hash="42e26d74ad76ac7eca12d5a212a5f2be"/><file name="Token.php" hash="6e809966d3aed97b842c68477996343e"/><file name="Version.php" hash="ad660b7959fa06a590c8c00f02e39066"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="63116f51d3a75ec69d7f74b6b9950b5f"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="cbfa8733617d6c96e4e8ae5cf3850d69"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="bcbf696fdd327b12a0895816ae66ada7"/><file name="Filter.php" hash="93abb519f912add18195cfc2a3f60b3f"/><file name="Shipping.php" hash="b433283a8fed0936c7c2fdbbff06c10e"/></dir></dir><dir name="Source"><file name="Action.php" hash="6aaed6e376b2ce9fe6871027b4f4d079"/><file name="Attribute.php" hash="3e9e6d6dc48cc500b72f90f89482be79"/><file name="Category.php" hash="5901ec44903748a44e7c4c69f7de6868"/><file name="Categorytype.php" hash="0f69fbca909d1135c25965eb9cfdf41a"/><file name="Conditions.php" hash="680e2fb975de6a33ff168fb04a8d4ade"/><file name="Configurable.php" hash="abed96b3926da39bb0a751fdcc28484e"/><file name="Countries.php" hash="34622dbc2cee8c451e181a1f1db33136"/><file name="Images.php" hash="28216f43b0c78770ae0bc84232d9520e"/><file name="Mainimage.php" hash="86b5ac701685fcc0b3b56f50a862b03c"/><file name="Name.php" hash="dbe143cf77290b595cd052e5fdfe6fe0"/><file name="Pricemodel.php" hash="9fdfa8270bd9536b7a4c9048095a73a9"/><file name="Selectattribute.php" hash="5e331ad6c91bb4b99473ead9d5132512"/><file name="Shipping.php" hash="a4b1bb51f3e31be2af09175f35f4fc68"/><file name="Tax.php" hash="05e5924fab96857d05a45e97d52a0ae2"/><file name="Textattribute.php" hash="66f0b262767536a8becfbf4d3dca1bbd"/><file name="Type.php" hash="f0a0699a41b7be8d3cd4bd2fa0b8d27d"/><file name="Visibility.php" hash="1508553037c72cf06161a1dbeb569e5f"/><file name="Weight.php" hash="f7e9cab8b3242ff87a0f014e5165d60f"/></dir></dir></dir></dir><file name="Channable.php" hash="25ee4059bdbdad283a776c33382fd8ad"/><file name="Common.php" hash="d521bf371d151171bd36d119e30cfe85"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ChannableController.php" hash="f712fd77b6f4dc486d3d44f5df890867"/></dir><file name="FeedController.php" hash="b91d04adafefa324a6905f7062f585f1"/></dir><dir name="data"><dir name="magmodules_channable_setup"><file name="data-upgrade-1.4.8-1.4.9.php" hash="d95271975c1ec02cf63930561ac9492f"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="d23b65e6c4fe7b127729813b52b52fe5"/><file name="config.xml" hash="ba93d04bf262647a5f430b730d781a05"/><file name="system.xml" hash="e6353f04b11c0b26b3af0fcbf176129f"/></dir><dir name="sql"><dir name="magmodules_channable_setup"><file name="upgrade-1.4.8-1.4.9.php" hash="5605fa6c600a98089ebb2e7459258a40"/></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="da_DK"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="de_DE"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="en_US"><file name="Magmodules_Channable.csv" hash="a9b4826f541118a32379e79c8d76eed5"/></dir><dir name="es_ES"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="fr_FR"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="it_IT"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="nl_NL"><file name="Magmodules_Channable.csv" hash="f30dde1524db77662e17b0e24492ca40"/></dir><dir name="pl_PL"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="pt_PT"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="sv_SE"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Channable.xml" hash="66249a224021f304abc72c666c605240"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>7.9.9</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Magmodules_Channable</name>
4
+ <version>1.5.3</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>2017-03-27</date>
14
+ <time>09:37:26</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="fc53f0c561ca32bc6ffc3d17dde7570e"/><file name="Filter.php" hash="0bfd9fefc4a7f04af7aeccd0fe9fcad5"/><file name="Shipping.php" hash="48f0c405e83631ebb165cc50f4e035da"/></dir><dir name="Renderer"><file name="Select.php" hash="c8a97ab2a71f5474d11318fd50bc168b"/></dir></dir></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Feeds.php" hash="dc680e24f97f9a769e5a4ff4c750fa90"/><file name="Heading.php" hash="09777edbb0062b0f99ea3824fd127e84"/><file name="Note.php" hash="42e26d74ad76ac7eca12d5a212a5f2be"/><file name="Token.php" hash="6e809966d3aed97b842c68477996343e"/><file name="Version.php" hash="ad660b7959fa06a590c8c00f02e39066"/></dir></dir></dir></dir><dir name="Widget"><dir name="Info"><file name="Info.php" hash="63116f51d3a75ec69d7f74b6b9950b5f"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="6dc9f0d58c1db90e810ed44305a7e269"/></dir><dir name="Model"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Backend"><dir name="Design"><file name="Extra.php" hash="bcbf696fdd327b12a0895816ae66ada7"/><file name="Filter.php" hash="93abb519f912add18195cfc2a3f60b3f"/><file name="Shipping.php" hash="b433283a8fed0936c7c2fdbbff06c10e"/></dir></dir><dir name="Source"><file name="Action.php" hash="6aaed6e376b2ce9fe6871027b4f4d079"/><file name="Attribute.php" hash="3e9e6d6dc48cc500b72f90f89482be79"/><file name="Category.php" hash="5901ec44903748a44e7c4c69f7de6868"/><file name="Categorytype.php" hash="0f69fbca909d1135c25965eb9cfdf41a"/><file name="Conditions.php" hash="680e2fb975de6a33ff168fb04a8d4ade"/><file name="Configurable.php" hash="abed96b3926da39bb0a751fdcc28484e"/><file name="Countries.php" hash="34622dbc2cee8c451e181a1f1db33136"/><file name="Images.php" hash="28216f43b0c78770ae0bc84232d9520e"/><file name="Mainimage.php" hash="86b5ac701685fcc0b3b56f50a862b03c"/><file name="Name.php" hash="dbe143cf77290b595cd052e5fdfe6fe0"/><file name="Pricemodel.php" hash="9fdfa8270bd9536b7a4c9048095a73a9"/><file name="Selectattribute.php" hash="5e331ad6c91bb4b99473ead9d5132512"/><file name="Shipping.php" hash="a4b1bb51f3e31be2af09175f35f4fc68"/><file name="Tax.php" hash="05e5924fab96857d05a45e97d52a0ae2"/><file name="Textattribute.php" hash="66f0b262767536a8becfbf4d3dca1bbd"/><file name="Type.php" hash="f0a0699a41b7be8d3cd4bd2fa0b8d27d"/><file name="Visibility.php" hash="1508553037c72cf06161a1dbeb569e5f"/><file name="Weight.php" hash="f7e9cab8b3242ff87a0f014e5165d60f"/></dir></dir></dir></dir><file name="Channable.php" hash="e55801d46fa104c8a8628b61a192a6e3"/><file name="Common.php" hash="d521bf371d151171bd36d119e30cfe85"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="ChannableController.php" hash="f712fd77b6f4dc486d3d44f5df890867"/></dir><file name="FeedController.php" hash="9b3ffaf24df505ceae2409badfe54ad1"/></dir><dir name="data"><dir name="magmodules_channable_setup"><file name="data-upgrade-1.4.8-1.4.9.php" hash="d95271975c1ec02cf63930561ac9492f"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="d23b65e6c4fe7b127729813b52b52fe5"/><file name="config.xml" hash="cb1e24fe848970baa04da4ff25947f3e"/><file name="system.xml" hash="996035d74009b17a0cd0e53bc1303783"/></dir><dir name="sql"><dir name="magmodules_channable_setup"><file name="upgrade-1.4.8-1.4.9.php" hash="5605fa6c600a98089ebb2e7459258a40"/></dir></dir></dir></dir></target><target name="magelocale"><dir><dir name="da_DK"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="de_DE"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="en_US"><file name="Magmodules_Channable.csv" hash="a9b4826f541118a32379e79c8d76eed5"/></dir><dir name="es_ES"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="fr_FR"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="it_IT"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="nl_NL"><file name="Magmodules_Channable.csv" hash="f30dde1524db77662e17b0e24492ca40"/></dir><dir name="pl_PL"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="pt_PT"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir><dir name="sv_SE"><file name="Magmodules_Channable.csv" hash="d41d8cd98f00b204e9800998ecf8427e"/></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Magmodules_Channable.xml" hash="66249a224021f304abc72c666c605240"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>7.9.9</max></php></required></dependencies>
18
  </package>