Atosho - Version 1.1.2

Version Notes

Minor fixes

Download this release

Release Info

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


Code changes from version 1.1.1 to 1.1.2

Files changed (4) hide show
  1. app/code/community/Atosho/Integration/controllers/FeedController.php +2 -3
  2. app/code/community/Atosho/Integration/etc/config.xml +1 -1
  3. app/code/community/Atosho/Integration/sql/atosho_integration_setup/mysql4-install-1.0.2.php +3 -1
  4. package.xml +4 -4
app/code/community/Atosho/Integration/controllers/FeedController.php CHANGED
@@ -323,7 +323,7 @@ class Atosho_Integration_FeedController extends Mage_Core_Controller_Front_Actio
323
 
324
  $this->prepare();
325
 
326
- $this->parentLoadMethod = (isset($params['parentloadmethod']) ? $params['parentloadmethod'] : 0);
327
  if ($this->parentLoadMethod == 0) {
328
  $this->parents = $this->getParentList();
329
  }
@@ -434,8 +434,7 @@ class Atosho_Integration_FeedController extends Mage_Core_Controller_Front_Actio
434
  $this->skus = array();
435
  $collection = $this->getProductCollection()
436
  ->addAttributeToFilter('type_id', array('in' => array('simple', 'configurable')))
437
- ->addAttributeToSelect('sku')
438
- ->addAttributeToSelect('status');
439
 
440
  $idsSelect = $collection->getSelect();
441
  $idsSelect->reset(Varien_Db_Select::COLUMNS);
323
 
324
  $this->prepare();
325
 
326
+ $this->parentLoadMethod = (isset($params['parentloadmethod']) ? $params['parentloadmethod'] : 2);
327
  if ($this->parentLoadMethod == 0) {
328
  $this->parents = $this->getParentList();
329
  }
434
  $this->skus = array();
435
  $collection = $this->getProductCollection()
436
  ->addAttributeToFilter('type_id', array('in' => array('simple', 'configurable')))
437
+ ->addAttributeToSelect('sku');
 
438
 
439
  $idsSelect = $collection->getSelect();
440
  $idsSelect->reset(Varien_Db_Select::COLUMNS);
app/code/community/Atosho/Integration/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Atosho_Integration>
5
- <version>1.1.1</version>
6
  </Atosho_Integration>
7
  </modules>
8
  <frontend>
2
  <config>
3
  <modules>
4
  <Atosho_Integration>
5
+ <version>1.1.2</version>
6
  </Atosho_Integration>
7
  </modules>
8
  <frontend>
app/code/community/Atosho/Integration/sql/atosho_integration_setup/mysql4-install-1.0.2.php CHANGED
@@ -1,4 +1,5 @@
1
  <?php
 
2
  $url = Mage::app()->getStore()->getBaseUrl();
3
  $host = parse_url($url, PHP_URL_HOST);
4
 
@@ -21,4 +22,5 @@ $mail->setFrom('magento@atosho.com', $host);
21
  $mail->addTo('magento@atosho.com', 'Atosho');
22
  $mail->setSubject('Extension Installed');
23
  $mail->setBodyText($body);
24
- $mail->send();
 
1
  <?php
2
+ /*
3
  $url = Mage::app()->getStore()->getBaseUrl();
4
  $host = parse_url($url, PHP_URL_HOST);
5
 
22
  $mail->addTo('magento@atosho.com', 'Atosho');
23
  $mail->setSubject('Extension Installed');
24
  $mail->setBodyText($body);
25
+ $mail->send();
26
+ */
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Atosho</name>
4
- <version>1.1.1</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-04</date>
14
- <time>12:04:54</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="b1942ad58cbf0e484571b50f1cdf9231"/></dir><dir name="etc"><file name="config.xml" hash="2b124fee13c4cae7e097a8e05a775ea0"/></dir><dir name="sql"><dir name="atosho_integration_setup"><file name="mysql4-install-1.0.2.php" hash="02d4fc9fdd1a0fc74a6199409c9ce8a6"/></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.2</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-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>