epoqRS - Version 1.1.2

Version Notes

- Minor bugfixes
- Added Enterprise 1.9 Fullpagecache compatibility

Download this release

Release Info

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


Code changes from version 1.1.1 to 1.1.2

Files changed (9) hide show
  1. app/code/community/Flagbit/EpoqInterface/Block/Abstract.php +8 -11
  2. app/code/community/Flagbit/EpoqInterface/Block/Export/Productlist.php +1 -1
  3. app/code/community/Flagbit/EpoqInterface/Block/Recommentation/Abstract.php +1 -1
  4. app/code/community/Flagbit/EpoqInterface/Block/Recommentation/Product.php +1 -1
  5. app/code/community/Flagbit/EpoqInterface/Block/Track/Product.php +1 -1
  6. app/code/community/Flagbit/EpoqInterface/Helper/Data.php +30 -0
  7. app/code/community/Flagbit/EpoqInterface/Model/Recommendation/Product.php +3 -10
  8. app/code/community/Flagbit/EpoqInterface/etc/config.xml +2 -2
  9. package.xml +4 -4
app/code/community/Flagbit/EpoqInterface/Block/Abstract.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: Abstract.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
 
@@ -20,6 +20,7 @@ class Flagbit_EpoqInterface_Block_Abstract extends Mage_Core_Block_Abstract
20
 
21
  const XML_TENANT_ID_PATH = 'epoqinterface/config/tenant_id';
22
  protected $_lastRecommentationId = null;
 
23
 
24
 
25
  protected function arrayToString($array, $prefix = null){
@@ -192,16 +193,12 @@ class Flagbit_EpoqInterface_Block_Abstract extends Mage_Core_Block_Abstract
192
  * @return Mage_Catalog_Model_Product
193
  */
194
  public function getProduct()
195
- {
196
- $productId = null;
197
- if(Mage::registry('current_product') instanceof Mage_Catalog_Model_Product){
198
- $productId = Mage::registry('current_product')->getId();
199
- }else{
200
- $processor = Mage::getSingleton('enterprise_pagecache/processor');
201
- $cacheId = $processor->getRequestCacheId() . '_current_product_id';
202
- $productId = Mage::app()->loadCache($cacheId);
203
- }
204
- return Mage::getSingleton('catalog/product')->load($productId);
205
  }
206
 
207
 
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: Abstract.php 574 2010-11-19 08:19:43Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
20
 
21
  const XML_TENANT_ID_PATH = 'epoqinterface/config/tenant_id';
22
  protected $_lastRecommentationId = null;
23
+ protected $_product = null;
24
 
25
 
26
  protected function arrayToString($array, $prefix = null){
193
  * @return Mage_Catalog_Model_Product
194
  */
195
  public function getProduct()
196
+ {
197
+ if($this->_product === null){
198
+ $productId = Mage::helper('epoqinterface')->getProductId();
199
+ $this->_product = Mage::getSingleton('catalog/product')->load($productId);
200
+ }
201
+ return $this->_product;
 
 
 
 
202
  }
203
 
204
 
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 514 2010-08-27 07:04:33Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: Productlist.php 574 2010-11-19 08:19:43Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
app/code/community/Flagbit/EpoqInterface/Block/Recommentation/Abstract.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: Abstract.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
 
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: Abstract.php 574 2010-11-19 08:19:43Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
app/code/community/Flagbit/EpoqInterface/Block/Recommentation/Product.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: Product.php 238 2009-07-03 09:22:08Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: Product.php 574 2010-11-19 08:19:43Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
app/code/community/Flagbit/EpoqInterface/Block/Track/Product.php CHANGED
@@ -68,7 +68,7 @@ class Flagbit_EpoqInterface_Block_Track_Product extends Flagbit_EpoqInterface_Bl
68
  'epoq_attributes' => $this->getProductAttributes(),
69
  'epoq_locakey' => substr(Mage::getSingleton('core/locale')->getLocale(), 0, 2)
70
  );
71
-
72
  return array_merge(parent::getParamsArray(), $variables);
73
  }
74
 
68
  'epoq_attributes' => $this->getProductAttributes(),
69
  'epoq_locakey' => substr(Mage::getSingleton('core/locale')->getLocale(), 0, 2)
70
  );
71
+
72
  return array_merge(parent::getParamsArray(), $variables);
73
  }
74
 
app/code/community/Flagbit/EpoqInterface/Helper/Data.php CHANGED
@@ -18,4 +18,34 @@ class Flagbit_EpoqInterface_Helper_Data extends Mage_Core_Helper_Abstract
18
  {
19
 
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
  }
18
  {
19
 
20
 
21
+ /**
22
+ * get current Product Id
23
+ *
24
+ * @return int
25
+ */
26
+ public function getProductId()
27
+ {
28
+ $productId = null;
29
+ if(Mage::registry('current_product') instanceof Mage_Catalog_Model_Product
30
+ && Mage::registry('current_product')->getId()){
31
+ $productId = Mage::registry('current_product')->getId();
32
+
33
+ if(version_compare(Mage::getVersion(), '1.9.0', '<')
34
+ && (string)Mage::getConfig()->getModuleConfig('Enterprise_PageCache')->active == 'true'){
35
+ $processor = Mage::getSingleton('enterprise_pagecache/processor');
36
+ $cacheId = $processor->getRequestCacheId() . '_current_product_id';
37
+ Mage::app()->saveCache(Mage::registry('current_product')->getId(), $cacheId);
38
+ }
39
+
40
+ }elseif((string)Mage::getConfig()->getModuleConfig('Enterprise_PageCache')->active == 'true'){
41
+ $processor = Mage::getSingleton('enterprise_pagecache/processor');
42
+ $cacheId = $processor->getRequestCacheId() . '_current_product_id';
43
+ if(Mage::app()->loadCache($cacheId)){
44
+ $productId = Mage::app()->loadCache($cacheId);
45
+ }
46
+ }
47
+
48
+ return $productId;
49
+ }
50
+
51
  }
app/code/community/Flagbit/EpoqInterface/Model/Recommendation/Product.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: Product.php 238 2009-07-03 09:22:08Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
@@ -36,15 +36,8 @@ class Flagbit_EpoqInterface_Model_Recommendation_Product extends Flagbit_EpoqInt
36
  */
37
  public function getProductId()
38
  {
39
- $productId = null;
40
- if(Mage::registry('current_product') instanceof Mage_Catalog_Model_Product){
41
- $productId = Mage::registry('current_product')->getId();
42
- }else{
43
- $processor = Mage::getSingleton('enterprise_pagecache/processor');
44
- $cacheId = $processor->getRequestCacheId() . '_current_product_id';
45
- $productId = Mage::app()->loadCache($cacheId);
46
- }
47
- return $productId;
48
  }
49
 
50
 
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: Product.php 574 2010-11-19 08:19:43Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
36
  */
37
  public function getProductId()
38
  {
39
+
40
+ return Mage::helper('epoqinterface')->getProductId();
 
 
 
 
 
 
 
41
  }
42
 
43
 
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 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,7 +20,7 @@
20
  <modules>
21
  <Flagbit_EpoqInterface>
22
  <active>true</active>
23
- <version>1.1.1</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 574 2010-11-19 08:19:43Z 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.1.2</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.1.1</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
@@ -15,9 +15,9 @@
15
  <notes>- Minor bugfixes
16
  - Added Enterprise 1.9 Fullpagecache compatibility</notes>
17
  <authors><author><name>Flagbit GmbH Co. KG</name><user>auto-converted</user><email>magento@flagbit.de</email></author></authors>
18
- <date>2010-11-19</date>
19
- <time>09:15:09</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="9bf6f2dbae103789081b6caae5d1802f"/></dir><dir name="Recommentation"><file name="Abstract.php" hash="1b02b196c062a586ac06ba4c366e9acf"/><file name="Cart.php" hash="a5c689e8cfcf9f3c8f07b88d07003684"/><file name="Product.php" hash="6ca3c8ab884b1f84486df228a91fa44e"/><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="10f489467f4a01975c3496df8953ffc9"/><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="cache.xml" hash="d3698a0b91a9aa83cca30b0f35b1270f"/><file name="config.xml" hash="60625aaf187021375af6ccc0281c316a"/><file name="system.xml" hash="be045020f604fcb0fe73c086cea8d3f2"/></dir><dir name="Helper"><file name="Data.php" hash="2ea5098c3816538c0bf9de85677ac808"/></dir><dir name="Model"><dir name="Container"><file name="Product.php" hash="bb25e96a4159584c9701854d51962e52"/><file name="TrackProduct.php" hash="f95bbb60d7344859f71bd13b22d587c7"/></dir><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="48e2ea7bede7860e9b941352fb9ee456"/><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="0f7a742aec56269ded3152e66f3c9c2c"/><file name="Observer.php" hash="6a8bfa71b605dcf37874542e1d721a87"/><file name="Session.php" hash="413f7d31ad2d5878f20a7db7adf5d207"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><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.1.2</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
15
  <notes>- Minor bugfixes
16
  - Added Enterprise 1.9 Fullpagecache compatibility</notes>
17
  <authors><author><name>Flagbit GmbH Co. KG</name><user>auto-converted</user><email>magento@flagbit.de</email></author></authors>
18
+ <date>2010-11-22</date>
19
+ <time>20:00:53</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="0f570e5c7e11b7c2f0541620c1e0eeca"/></dir><dir name="Recommentation"><file name="Abstract.php" hash="cfae612e74727fcb3282ba5facd360a3"/><file name="Cart.php" hash="a5c689e8cfcf9f3c8f07b88d07003684"/><file name="Product.php" hash="d638397d1445e330997d1a57d60ce5d0"/><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="24de1ef7d04e2356c943f27dc962aa60"/></dir><file name="Abstract.php" hash="a89d2de3e728db99459102a2c54c4a19"/><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="cache.xml" hash="d3698a0b91a9aa83cca30b0f35b1270f"/><file name="config.xml" hash="9a9c892c74a9a1dd49aade55fa3e593c"/><file name="system.xml" hash="be045020f604fcb0fe73c086cea8d3f2"/></dir><dir name="Helper"><file name="Data.php" hash="d838c052155e9263c1aaee676b29ced3"/></dir><dir name="Model"><dir name="Container"><file name="Product.php" hash="bb25e96a4159584c9701854d51962e52"/><file name="TrackProduct.php" hash="f95bbb60d7344859f71bd13b22d587c7"/></dir><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="ac0b68271069f594367328000d28e993"/><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="0f7a742aec56269ded3152e66f3c9c2c"/><file name="Observer.php" hash="6a8bfa71b605dcf37874542e1d721a87"/><file name="Session.php" hash="413f7d31ad2d5878f20a7db7adf5d207"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><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>