epoqRS - Version 1.0.10

Version Notes

- Minor bugfixes
- Added 1.4 compatibility

Download this release

Release Info

Developer Magento Core Team
Extension epoqRS
Version 1.0.10
Comparing to
See all releases


Code changes from version 1.0.9 to 1.0.10

Files changed (4) hide show
  1. app/code/community/Flagbit/EpoqInterface/Block/Export/Productlist.php +9 -3
  2. app/code/community/Flagbit/EpoqInterface/Block/Recommentation/Abstract.php +2 -2
  3. app/code/community/Flagbit/EpoqInterface/etc/config.xml +2 -2
  4. package.xml +4 -4
app/code/community/Flagbit/EpoqInterface/Block/Export/Productlist.php CHANGED
@@ -11,7 +11,7 @@
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
- * @version $Id: Productlist.php 487 2010-08-05 12:32:57Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
@@ -47,7 +47,12 @@ class Flagbit_EpoqInterface_Block_Export_Productlist extends Flagbit_EpoqInterfa
47
  /*@var $products Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection */
48
  $products = $product->getCollection()
49
  ->addStoreFilter()
50
- ->addAttributeToSort('news_from_date','desc')
 
 
 
 
 
51
  ->addAttributeToSelect(array('name', 'short_description', 'price', 'image'), 'inner');
52
  //->addAttributeToSelect(array('special_price', 'special_from_date', 'special_to_date'), 'left');
53
 
@@ -112,7 +117,8 @@ class Flagbit_EpoqInterface_Block_Export_Productlist extends Flagbit_EpoqInterfa
112
  'g:product_type'=> implode('>', $this->getCategoryPath(true)),
113
  'g:brand' => $this->getProduct()->getManufacturer(),
114
  'g:upc' => $this->getProduct()->getSku(),
115
-
 
116
  // e Namespace
117
  'e:locakey' => substr(Mage::getSingleton('core/locale')->getLocale(), 0, 2),
118
 
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: Productlist.php 514 2010-08-27 07:04:33Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
47
  /*@var $products Mage_Catalog_Model_Resource_Eav_Mysql4_Product_Collection */
48
  $products = $product->getCollection()
49
  ->addStoreFilter()
50
+ ->joinField('qty',
51
+ 'cataloginventory/stock_item',
52
+ 'qty',
53
+ 'product_id=entity_id',
54
+ '{{table}}.stock_id=1',
55
+ 'left')
56
  ->addAttributeToSelect(array('name', 'short_description', 'price', 'image'), 'inner');
57
  //->addAttributeToSelect(array('special_price', 'special_from_date', 'special_to_date'), 'left');
58
 
117
  'g:product_type'=> implode('>', $this->getCategoryPath(true)),
118
  'g:brand' => $this->getProduct()->getManufacturer(),
119
  'g:upc' => $this->getProduct()->getSku(),
120
+ 'g:quantity' => $this->getProduct()->getQty(),
121
+
122
  // e Namespace
123
  'e:locakey' => substr(Mage::getSingleton('core/locale')->getLocale(), 0, 2),
124
 
app/code/community/Flagbit/EpoqInterface/Block/Recommentation/Abstract.php CHANGED
@@ -24,7 +24,7 @@ class Flagbit_EpoqInterface_Block_Recommentation_Abstract extends Mage_Catalog_B
24
  protected $_itemCollection;
25
 
26
  protected $_itemLimits = array();
27
-
28
  protected function _prepareData()
29
  {
30
 
@@ -41,7 +41,7 @@ class Flagbit_EpoqInterface_Block_Recommentation_Abstract extends Mage_Catalog_B
41
  if ($this->getItemLimit('upsell') > 0) {
42
  $this->_itemCollection->setPageSize($this->getItemLimit('upsell'));
43
  }
44
-
45
  $this->_itemCollection->load();
46
 
47
  foreach ($this->_itemCollection as $product) {
24
  protected $_itemCollection;
25
 
26
  protected $_itemLimits = array();
27
+
28
  protected function _prepareData()
29
  {
30
 
41
  if ($this->getItemLimit('upsell') > 0) {
42
  $this->_itemCollection->setPageSize($this->getItemLimit('upsell'));
43
  }
44
+
45
  $this->_itemCollection->load();
46
 
47
  foreach ($this->_itemCollection as $product) {
app/code/community/Flagbit/EpoqInterface/etc/config.xml CHANGED
@@ -12,7 +12,7 @@
12
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
13
  * Public License for more details. *
14
  * *
15
- * @version $Id: config.xml 487 2010-08-05 12:32:57Z weller $
16
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
17
  */
18
  -->
@@ -20,7 +20,7 @@
20
  <modules>
21
  <Flagbit_EpoqInterface>
22
  <active>true</active>
23
- <version>1.0.9</version>
24
  </Flagbit_EpoqInterface>
25
  </modules>
26
 
12
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
13
  * Public License for more details. *
14
  * *
15
+ * @version $Id: config.xml 514 2010-08-27 07:04:33Z weller $
16
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
17
  */
18
  -->
20
  <modules>
21
  <Flagbit_EpoqInterface>
22
  <active>true</active>
23
+ <version>1.0.10</version>
24
  </Flagbit_EpoqInterface>
25
  </modules>
26
 
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>epoqRS</name>
4
- <version>1.0.9</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
@@ -15,9 +15,9 @@
15
  <notes>- Minor bugfixes
16
  - Added 1.4 compatibility</notes>
17
  <authors><author><name>Flagbit GmbH </name><user>auto-converted</user><email>magento@flagbit.de</email></author></authors>
18
- <date>2010-08-26</date>
19
- <time>17:33:19</time>
20
- <contents><target name="magelocale"><dir name="de_DE"><file name="Flagbit_EpoqInterface.csv" hash="5643b01f9cbebd4ce9317d839a2e428b"/></dir></target><target name="magecommunity"><dir name="Flagbit"><dir name="EpoqInterface"><dir name="Block"><dir name="Export"><file name="Productlist.php" hash="c6ada0a082916d50d686a056d51be8be"/></dir><dir name="Recommentation"><file name="Abstract.php" hash="b45914c6c47ff4ab86432e30bfd86aea"/><file name="Cart.php" hash="a5c689e8cfcf9f3c8f07b88d07003684"/><file name="Product.php" hash="8552f551ad33c2f28e0b80834fbaf8d9"/><file name="User.php" hash="1e8b594b8c54fb475e4595dbe39059fc"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Version.php" hash="71e3964c13333a57929221aa8e2edf07"/></dir></dir></dir></dir><dir name="Track"><file name="Cart.php" hash="4e0ce66e9832296aa7539f0573e712f1"/><file name="Product.php" hash="22e36d5c180ba8a96f0d36ab5747c485"/></dir><file name="Abstract.php" hash="4d52b874305ce4f340773971c5c485c9"/><file name="Head.php" hash="b6844d21b14dc9ebb1697be9e12a57f9"/></dir><dir name="controllers"><file name="IndexController.php" hash="6a5dbe8275701af11cd07b59ff57f4a8"/></dir><dir name="documentation"><file name="Installation_Guide_Magento_epoq_RS_1.0.0.pdf" hash="0227444742853b68a6f600404dc0a92d"/></dir><dir name="etc"><file name="config.xml" hash="df4e996c0482fc49f429676587636302"/><file name="system.xml" hash="be045020f604fcb0fe73c086cea8d3f2"/></dir><dir name="Helper"><file name="Data.php" hash="2ea5098c3816538c0bf9de85677ac808"/></dir><dir name="Model"><dir name="Customer"><file name="Profiles.php" hash="fbedb6a3259a29db05b2c8783d02957b"/></dir><dir name="Recommendation"><file name="Abstract.php" hash="8ab50a9132dd79ecc0e216ccb326a5c2"/><file name="Cart.php" hash="fb66d1db5a156e7a89de52c4cfbc30ce"/><file name="Product.php" hash="81f3f8f7a59c1b72dc2526d768494bb9"/><file name="User.php" hash="549e3ba3efe4035c47a7a6c8b13eb39f"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Attemps.php" hash="c01ebd5c76fd4d51305ed7111326d57d"/><file name="Idletime.php" hash="957ec9d0c4af2d52add60a9765c4e573"/><file name="Timeout.php" hash="95c38625ad50dc44ba2b2d371de1db65"/></dir></dir></dir><file name="Abstract.php" hash="5f6a2508e34f9ae0a7f8f7aff2e67510"/><file name="Observer.php" hash="6a8bfa71b605dcf37874542e1d721a87"/><file name="Session.php" hash="413f7d31ad2d5878f20a7db7adf5d207"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="epoqinterface.xml" hash="41bcb5bd071cde519b317aad3d8df8fb"/></dir><dir name="template"><dir name="epoqinterface"><dir name="recommendation"><file name="cart.phtml" hash="e3246573dda615454289ff1d39d1a172"/><file name="product.phtml" hash="a6daaf727c1d4b2db7a65772883725bf"/><file name="user.phtml" hash="0c5584382092f0b469d054d08297ba8b"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Flagbit_EpoqInterface.xml" hash="8ada99bfdbcc7727ad36339bc11da6ec"/></dir></target></contents>
21
  <compatible/>
22
  <dependencies/>
23
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>epoqRS</name>
4
+ <version>1.0.10</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
15
  <notes>- Minor bugfixes
16
  - Added 1.4 compatibility</notes>
17
  <authors><author><name>Flagbit GmbH </name><user>auto-converted</user><email>magento@flagbit.de</email></author></authors>
18
+ <date>2010-10-04</date>
19
+ <time>14:33:27</time>
20
+ <contents><target name="magelocale"><dir name="de_DE"><file name="Flagbit_EpoqInterface.csv" hash="5643b01f9cbebd4ce9317d839a2e428b"/></dir></target><target name="magecommunity"><dir name="Flagbit"><dir name="EpoqInterface"><dir name="Block"><dir name="Export"><file name="Productlist.php" hash="765bffe5d694158bc7de73af612e6611"/></dir><dir name="Recommentation"><file name="Abstract.php" hash="1b02b196c062a586ac06ba4c366e9acf"/><file name="Cart.php" hash="a5c689e8cfcf9f3c8f07b88d07003684"/><file name="Product.php" hash="8552f551ad33c2f28e0b80834fbaf8d9"/><file name="User.php" hash="1e8b594b8c54fb475e4595dbe39059fc"/></dir><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Version.php" hash="71e3964c13333a57929221aa8e2edf07"/></dir></dir></dir></dir><dir name="Track"><file name="Cart.php" hash="4e0ce66e9832296aa7539f0573e712f1"/><file name="Product.php" hash="22e36d5c180ba8a96f0d36ab5747c485"/></dir><file name="Abstract.php" hash="4d52b874305ce4f340773971c5c485c9"/><file name="Head.php" hash="b6844d21b14dc9ebb1697be9e12a57f9"/></dir><dir name="controllers"><file name="IndexController.php" hash="6a5dbe8275701af11cd07b59ff57f4a8"/></dir><dir name="documentation"><file name="Installation_Guide_Magento_epoq_RS_1.0.0.pdf" hash="0227444742853b68a6f600404dc0a92d"/></dir><dir name="etc"><file name="config.xml" hash="674d8e66e6a14fb7c7afc76d2f9854f9"/><file name="system.xml" hash="be045020f604fcb0fe73c086cea8d3f2"/></dir><dir name="Helper"><file name="Data.php" hash="2ea5098c3816538c0bf9de85677ac808"/></dir><dir name="Model"><dir name="Customer"><file name="Profiles.php" hash="fbedb6a3259a29db05b2c8783d02957b"/></dir><dir name="Recommendation"><file name="Abstract.php" hash="8ab50a9132dd79ecc0e216ccb326a5c2"/><file name="Cart.php" hash="fb66d1db5a156e7a89de52c4cfbc30ce"/><file name="Product.php" hash="81f3f8f7a59c1b72dc2526d768494bb9"/><file name="User.php" hash="549e3ba3efe4035c47a7a6c8b13eb39f"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Attemps.php" hash="c01ebd5c76fd4d51305ed7111326d57d"/><file name="Idletime.php" hash="957ec9d0c4af2d52add60a9765c4e573"/><file name="Timeout.php" hash="95c38625ad50dc44ba2b2d371de1db65"/></dir></dir></dir><file name="Abstract.php" hash="5f6a2508e34f9ae0a7f8f7aff2e67510"/><file name="Observer.php" hash="6a8bfa71b605dcf37874542e1d721a87"/><file name="Session.php" hash="413f7d31ad2d5878f20a7db7adf5d207"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="epoqinterface.xml" hash="41bcb5bd071cde519b317aad3d8df8fb"/></dir><dir name="template"><dir name="epoqinterface"><dir name="recommendation"><file name="cart.phtml" hash="e3246573dda615454289ff1d39d1a172"/><file name="product.phtml" hash="a6daaf727c1d4b2db7a65772883725bf"/><file name="user.phtml" hash="0c5584382092f0b469d054d08297ba8b"/></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Flagbit_EpoqInterface.xml" hash="8ada99bfdbcc7727ad36339bc11da6ec"/></dir></target></contents>
21
  <compatible/>
22
  <dependencies/>
23
  </package>