Atosho - Version 1.1.3

Version Notes

Minor fixes

Download this release

Release Info

Developer Magento Core Team
Extension Atosho
Version 1.1.3
Comparing to
See all releases


Code changes from version 1.1.2 to 1.1.3

Files changed (3) hide show
  1. app/code/community/Atosho/Integration/controllers/FeedController.php +10 -0
  2. app/code/community/Atosho/Integration/etc/config.xml +1 -1
  3. package.xml +4 -4
app/code/community/Atosho/Integration/controllers/FeedController.php CHANGED
@@ -570,6 +570,10 @@ class Atosho_Integration_FeedController extends Mage_Core_Controller_Front_Actio
570
  $this->isvatincluded = (int)$taxHelper->priceIncludesTax();
571
  $this->currency = Mage::app()->getStore()->getCurrentCurrencyCode();
572
 
 
 
 
 
573
  $this->mediaUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA);
574
  // In case of missing trailing slash
575
  if (substr($this->mediaUrl, -1) != '/') $this->mediaUrl .= '/';
@@ -644,6 +648,11 @@ class Atosho_Integration_FeedController extends Mage_Core_Controller_Front_Actio
644
  if (strlen($sku) == 0) {
645
  return null;
646
  }
 
 
 
 
 
647
 
648
  // Detect product type
649
  if ($product->getData('type_id') == 'configurable') {
@@ -830,6 +839,7 @@ class Atosho_Integration_FeedController extends Mage_Core_Controller_Front_Actio
830
 
831
  if (!$p['active']) $writer->writeElement('active', $p['active']);
832
  $writer->writeElement('sku', $p['sku']);
 
833
  $writer->writeElement('type', $p['type']);
834
  if (isset($p['parentsku'])) $writer->writeElement('parentsku', $p['parentsku']);
835
  $writer->writeElement('title', $p['title']);
570
  $this->isvatincluded = (int)$taxHelper->priceIncludesTax();
571
  $this->currency = Mage::app()->getStore()->getCurrentCurrencyCode();
572
 
573
+ $this->storeUrl = Mage::app()->getStore()->getBaseUrl();
574
+ // In case of missing trailing slash
575
+ if (substr($this->storeUrl, -1) != '/') $this->storeUrl .= '/';
576
+
577
  $this->mediaUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_MEDIA);
578
  // In case of missing trailing slash
579
  if (substr($this->mediaUrl, -1) != '/') $this->mediaUrl .= '/';
648
  if (strlen($sku) == 0) {
649
  return null;
650
  }
651
+
652
+ // Product URL
653
+ if (strlen($product->getData('url_path')) > 0) {
654
+ $p['url'] = $this->storeUrl.$product->getData('url_path');
655
+ }
656
 
657
  // Detect product type
658
  if ($product->getData('type_id') == 'configurable') {
839
 
840
  if (!$p['active']) $writer->writeElement('active', $p['active']);
841
  $writer->writeElement('sku', $p['sku']);
842
+ if (isset($p['url'])) $writer->writeElement('url', $p['url']);
843
  $writer->writeElement('type', $p['type']);
844
  if (isset($p['parentsku'])) $writer->writeElement('parentsku', $p['parentsku']);
845
  $writer->writeElement('title', $p['title']);
app/code/community/Atosho/Integration/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Atosho_Integration>
5
- <version>1.1.2</version>
6
  </Atosho_Integration>
7
  </modules>
8
  <frontend>
2
  <config>
3
  <modules>
4
  <Atosho_Integration>
5
+ <version>1.1.3</version>
6
  </Atosho_Integration>
7
  </modules>
8
  <frontend>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Atosho</name>
4
- <version>1.1.2</version>
5
  <stability>stable</stability>
6
  <license>OSL-3.0</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>Exposes product catalog to Atosho in the form of an XML feed. Creates a new payment method called 'Atosho Payment' which indicates that an order has been paid through Atosho.</description>
11
  <notes>Minor fixes</notes>
12
  <authors><author><name>Atosho</name><user>auto-converted</user><email>magento@atosho.com</email></author></authors>
13
- <date>2012-06-12</date>
14
- <time>13:39:52</time>
15
- <contents><target name="mageetc"><dir name="modules"><file name="Atosho_All.xml" hash="80137c2c28f206ab9a22ffe1f9dbb58b"/></dir></target><target name="magecommunity"><dir name="Atosho"><dir name="Integration"><dir name="Model"><dir name="Mysql4"><file name="Setup.php" hash="814ccf08196d33a81a8a70485b7c6a2c"/></dir></dir><dir name="controllers"><file name="FeedController.php" hash="568c2f1cedc3a558a00391255ea1363b"/></dir><dir name="etc"><file name="config.xml" hash="0b423b13cf278cbe26dc81b845623ff7"/></dir><dir name="sql"><dir name="atosho_integration_setup"><file name="mysql4-install-1.0.2.php" hash="23d224fabbe3979273ce398a2af5243d"/></dir></dir></dir><dir name="AtoshoPayment"><dir name="Model"><file name="AtoshoPayment.php" hash="7d9afd8abc45ca252ccf36ed7f70c27f"/></dir><dir name="etc"><file name="config.xml" hash="30b5190de1b9b2cb1d3759995ca7c2ff"/><file name="system.xml" hash="ca3e25cb7ceef0da772eb88f91dd32cc"/></dir></dir><dir name="Shipping"><dir name="Model"><dir name="Carrier"><file name="Atosho.php" hash="dcd80ea031ec160eadadac847e80973b"/></dir></dir><dir name="etc"><file name="config.xml" hash="6770b1b833aa1454da307015fdbe5216"/><file name="system.xml" hash="96c2ade90fd06ab5bc3ef787a2af029a"/></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Atosho</name>
4
+ <version>1.1.3</version>
5
  <stability>stable</stability>
6
  <license>OSL-3.0</license>
7
  <channel>community</channel>
10
  <description>Exposes product catalog to Atosho in the form of an XML feed. Creates a new payment method called 'Atosho Payment' which indicates that an order has been paid through Atosho.</description>
11
  <notes>Minor fixes</notes>
12
  <authors><author><name>Atosho</name><user>auto-converted</user><email>magento@atosho.com</email></author></authors>
13
+ <date>2012-07-02</date>
14
+ <time>11:33:46</time>
15
+ <contents><target name="mageetc"><dir name="modules"><file name="Atosho_All.xml" hash="80137c2c28f206ab9a22ffe1f9dbb58b"/></dir></target><target name="magecommunity"><dir name="Atosho"><dir name="Integration"><dir name="Model"><dir name="Mysql4"><file name="Setup.php" hash="814ccf08196d33a81a8a70485b7c6a2c"/></dir></dir><dir name="controllers"><file name="FeedController.php" hash="0dc4799c2419594f66b6ecc8e2a4283e"/></dir><dir name="etc"><file name="config.xml" hash="c3ba89eb7cd99ed5f146e8314be03f50"/></dir><dir name="sql"><dir name="atosho_integration_setup"><file name="mysql4-install-1.0.2.php" hash="23d224fabbe3979273ce398a2af5243d"/></dir></dir></dir><dir name="AtoshoPayment"><dir name="Model"><file name="AtoshoPayment.php" hash="7d9afd8abc45ca252ccf36ed7f70c27f"/></dir><dir name="etc"><file name="config.xml" hash="30b5190de1b9b2cb1d3759995ca7c2ff"/><file name="system.xml" hash="ca3e25cb7ceef0da772eb88f91dd32cc"/></dir></dir><dir name="Shipping"><dir name="Model"><dir name="Carrier"><file name="Atosho.php" hash="dcd80ea031ec160eadadac847e80973b"/></dir></dir><dir name="etc"><file name="config.xml" hash="6770b1b833aa1454da307015fdbe5216"/><file name="system.xml" hash="96c2ade90fd06ab5bc3ef787a2af029a"/></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>