epoqRS - Version 1.1.7

Version Notes

- Minor bugfixes
- Added Enterprise 1.9 Fullpagecache compatibility

Release Info

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

Code changes from version 1.1.6 to 1.1.7

Files changed (7) hide show

app/code/community/Flagbit/EpoqInterface/Block/Export/Productlist.php +2 -1
app/code/community/Flagbit/EpoqInterface/Block/Track/Cart.php +7 -5
app/code/community/Flagbit/EpoqInterface/Model/Abstract.php +18 -17
app/code/community/Flagbit/EpoqInterface/Model/Observer.php +1 -1
app/code/community/Flagbit/EpoqInterface/Model/Order.php +3 -6
app/code/community/Flagbit/EpoqInterface/etc/config.xml +3 -4
package.xml +4 -4

app/code/community/Flagbit/EpoqInterface/Block/Export/Productlist.php CHANGED Viewed

	@@ -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 ~~673~~ 2011-07-27 14:18:~~59Z~~ weller $
15	* @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16	*/
17
	@@ -134,6 +134,7 @@ class Flagbit_EpoqInterface_Block_Export_Productlist extends Flagbit_EpoqInterfa
134	->getAttribute('manufacturer')) ? $this->getProduct()->getAttributeText('manufacturer') : '',
135	'g:upc' => $this->getProduct()->getSku(),
136	'g:quantity' => $this->getProduct()->isSaleable(),

137
138	// e Namespace
139	'e:locakey' => substr(Mage::getSingleton('core/locale')->getLocale(), 0, 2),


11	* TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12	* Public License for more details. *
13	* *
14	+ * @version $Id: Productlist.php 884 2011-09-01 13:34:31Z weller $
15	* @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16	*/
17

134	->getAttribute('manufacturer')) ? $this->getProduct()->getAttributeText('manufacturer') : '',
135	'g:upc' => $this->getProduct()->getSku(),
136	'g:quantity' => $this->getProduct()->isSaleable(),
137	+ 'g:visibility' => $this->getProduct()->getVisibility(),
138
139	// e Namespace
140	'e:locakey' => substr(Mage::getSingleton('core/locale')->getLocale(), 0, 2),

app/code/community/Flagbit/EpoqInterface/Block/Track/Cart.php CHANGED Viewed

	@@ -22,11 +22,10 @@ class Flagbit_EpoqInterface_Block_Track_Cart extends Flagbit_EpoqInterface_Block
22
23	protected function _toHtml()
24	{
25	-
26	if (!$this->_beforeToHtml()
27	or (!$this->getSession()->getCartUpdate() && $this->getRequest()->getControllerName() == 'cart')
28	&& !$this->getSession()->getBlockTrackCartOutput()) {
29	- return '';
30	}
31
32	$output = $this->getSession()->getBlockTrackCartOutput();
	@@ -34,7 +33,7 @@ class Flagbit_EpoqInterface_Block_Track_Cart extends Flagbit_EpoqInterface_Block
34	if($output){
35	$this->getSession()->unsBlockTrackCartOutput();
36	$this->getSession()->unsCartUpdate();
37	- return $output;
38	}
39
40	$variables = array(
	@@ -43,11 +42,14 @@ class Flagbit_EpoqInterface_Block_Track_Cart extends Flagbit_EpoqInterface_Block
43	);
44
45
46	-
47	$function = $this->getSession()->getCartUpdate() == 'process' ? 'processCart' : 'updateCart';
48
49	$this->getSession()->unsCartUpdate();
50	-




51	return $this->getJavascriptOutput(
52	$this->arrayToString(
53	$this->getParamsArray()


22
23	protected function _toHtml()
24	{

25	if (!$this->_beforeToHtml()
26	or (!$this->getSession()->getCartUpdate() && $this->getRequest()->getControllerName() == 'cart')
27	&& !$this->getSession()->getBlockTrackCartOutput()) {
28	+ #return '';
29	}
30
31	$output = $this->getSession()->getBlockTrackCartOutput();

33	if($output){
34	$this->getSession()->unsBlockTrackCartOutput();
35	$this->getSession()->unsCartUpdate();
36	+ #return $output;
37	}
38
39	$variables = array(

42	);
43
44

45	$function = $this->getSession()->getCartUpdate() == 'process' ? 'processCart' : 'updateCart';
46
47	$this->getSession()->unsCartUpdate();
48	+
49	+ $data = array(
50	+ 'action' => $function
51	+ );
52	+
53	return $this->getJavascriptOutput(
54	$this->arrayToString(
55	$this->getParamsArray()

app/code/community/Flagbit/EpoqInterface/Model/Abstract.php CHANGED Viewed

@@ -56,23 +56,24 @@ class Flagbit_EpoqInterface_Model_Abstract extends Mage_Core_Model_Abstract {
                 			->log('Response: '.$this->getRestClient()->getHttpClient()->getLastResponse());
                 	}catch (Exception $e){
-            -
-            -
                		// developer mode
-            -
                		if(Mage::getIsDeveloperMode()){
-            -
-            -
            	    		Mage::helper('epoqinterface/debug')
-            -
            	    			->log('Exception: '.$e->getMessage())
-            -
            		    		->log('Request URI: '.$this->getRestClient()->getUri()->getUri())
-            -
            		    		->log('Response: '.$this->getRestClient()->getHttpClient()->getLastResponse());
-            -
-            -
                			throw $e;
-            -
-            -
                		// error handling
-            -
                		}elseif($this->getIsErrorHandling()){
-            -
-            -
                			$this->updateRequestFailureTime();
-            -
                			$this->updateFailureCount();
-            -
                		}
                 		return null;
+                	}


56	->log('Response: '.$this->getRestClient()->getHttpClient()->getLastResponse());
57
58	}catch (Exception $e){
59	+ if(strpos($e->getMessage(), 'simplexml') === false){
60	+ // developer mode
61	+ if(Mage::getIsDeveloperMode()){
62	+
63	+ Mage::helper('epoqinterface/debug')
64	+ ->log('Exception: '.$e->getMessage())
65	+ ->log('Request URI: '.$this->getRestClient()->getUri()->getUri())
66	+ ->log('Response: '.$this->getRestClient()->getHttpClient()->getLastResponse());
67	+
68	+ throw $e;
69	+
70	+ // error handling
71	+ }elseif($this->getIsErrorHandling()){
72	+
73	+ $this->updateRequestFailureTime();
74	+ $this->updateFailureCount();
75	+ }
76	+ }
77	return null;
78	}
79

app/code/community/Flagbit/EpoqInterface/Model/Observer.php CHANGED Viewed

	@@ -76,7 +76,7 @@ class Flagbit_EpoqInterface_Model_Observer {
76
77	$this->getSession()->setCartUpdate('remove');
78	}
79	-
80
81	/**
82	* Observer: salesOrderPlaceAfter


76
77	$this->getSession()->setCartUpdate('remove');
78	}
79	+
80
81	/**
82	* Observer: salesOrderPlaceAfter

app/code/community/Flagbit/EpoqInterface/Model/Order.php CHANGED Viewed

	@@ -23,12 +23,9 @@ class Flagbit_EpoqInterface_Model_Order extends Flagbit_EpoqInterface_Model_Abst
23	*
24	* @param Mage_Sales_Model_Order $order
25	*/
26	- public function send($order){
27	-
28	- $~~data = array~~(
29	- 'action' => 'processCart'
30	- );
31	-
32	Mage::getSingleton('epoqinterface/recommendation_cart', $this->getData());
33	}
34


23	*
24	* @param Mage_Sales_Model_Order $order
25	*/
26	+ public function send($order)
27	+ {
28	+ $this->setAction('processCart');



29	Mage::getSingleton('epoqinterface/recommendation_cart', $this->getData());
30	}
31

app/code/community/Flagbit/EpoqInterface/etc/config.xml CHANGED Viewed

	@@ -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 ~~666~~ 2011-07-06 13:44:~~33Z~~ ~~rieker~~ $
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.6</version>
24	</Flagbit_EpoqInterface>
25	</modules>
26
	@@ -105,8 +105,7 @@
105	<method>salesOrderPlaceAfter</method>
106	</epoqinterface>
107	</observers>
108	- </sales_order_place_after>
109	-
110	<checkout_onepage_controller_success_action>
111	<observers>
112	<epoqinterface_order_success>


12	* TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
13	* Public License for more details. *
14	* *
15	+ * @version $Id: config.xml 674 2011-07-27 14:25:17Z 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.7</version>
24	</Flagbit_EpoqInterface>
25	</modules>
26

105	<method>salesOrderPlaceAfter</method>
106	</epoqinterface>
107	</observers>
108	+ </sales_order_place_after>

109	<checkout_onepage_controller_success_action>
110	<observers>
111	<epoqinterface_order_success>

package.xml CHANGED Viewed

	@@ -1,7 +1,7 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>epoqRS</name>
4	- <version>1.1.6</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>2011-07-27</date>
19	- <time>16:21:43</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="~~d499c6a4e1de52c255394388e901ea5f~~"/></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="Order.php" hash="c707b8713c18d5cf461cecd0599d4308"/><file name="Product.php" hash="dd686a4945efe302cdb5902beaad9626"/></dir><file name="Abstract.php" hash="8bdcabd1d0c8ed69410562912516e59f"/><file name="Head.php" hash="b6844d21b14dc9ebb1697be9e12a57f9"/></dir><dir name="controllers"><file name="IndexController.php" hash="3bafbecbbb637b6b9a57c45d21c182cf"/></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="~~5654bb0b42eb4957a55d5f54265632be~~"/><file name="system.xml" hash="926c4e860754bf4eaad428c62ac236c1"/></dir><dir name="Helper"><file name="Data.php" hash="cda2b853bd923e033de47f87faf6bd78"/><file name="Debug.php" hash="7ab1e3121471d87ee59f02d129f308be"/></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="802bc1c01c3bd2b5053e07e8ee9d36eb"/><file name="Cart.php" hash="69de1db1a05bef9f795e6e4de45617af"/><file name="Product.php" hash="a86b84718495e92ffe0eb470c21f3d01"/><file name="User.php" hash="549e3ba3efe4035c47a7a6c8b13eb39f"/></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><dir name="Product"><file name="Collection.php" hash="a4f75912e9ab77fd4346ae1f949756ed"/></dir></dir></dir></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="~~8e0b0fb6c149dac3df1a34ec886f1b6d~~"/><file name="Observer.php" hash="~~b164a1415ed688a38d6f684da82cf852~~"/><file name="Order.php" hash="~~b325cd7eb4723b47d87af480669701e6~~"/><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="8deb118ffaded408e2f135934a2c34fb"/></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 name="default"><dir name="default"><dir name="layout"><file name="epoqinterface.xml" hash="d76009f0b7326fce1e3e300592930c74"/></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.7</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>2011-10-19</date>
19	+ <time>13:59:47</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="d040797a69fcae6e4418f79dba2ffdba"/></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="603237f10d9e491c338753d0458a3e93"/><file name="Order.php" hash="c707b8713c18d5cf461cecd0599d4308"/><file name="Product.php" hash="dd686a4945efe302cdb5902beaad9626"/></dir><file name="Abstract.php" hash="8bdcabd1d0c8ed69410562912516e59f"/><file name="Head.php" hash="b6844d21b14dc9ebb1697be9e12a57f9"/></dir><dir name="controllers"><file name="IndexController.php" hash="3bafbecbbb637b6b9a57c45d21c182cf"/></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="fc1033e3cd8c8af9c758e46513995e77"/><file name="system.xml" hash="926c4e860754bf4eaad428c62ac236c1"/></dir><dir name="Helper"><file name="Data.php" hash="cda2b853bd923e033de47f87faf6bd78"/><file name="Debug.php" hash="7ab1e3121471d87ee59f02d129f308be"/></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="802bc1c01c3bd2b5053e07e8ee9d36eb"/><file name="Cart.php" hash="69de1db1a05bef9f795e6e4de45617af"/><file name="Product.php" hash="a86b84718495e92ffe0eb470c21f3d01"/><file name="User.php" hash="549e3ba3efe4035c47a7a6c8b13eb39f"/></dir><dir name="Resource"><dir name="Eav"><dir name="Mysql4"><dir name="Product"><file name="Collection.php" hash="a4f75912e9ab77fd4346ae1f949756ed"/></dir></dir></dir></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="dfe4eb9d9696a1944ab564d57f1e9979"/><file name="Observer.php" hash="8eee408fb89a359a89d2bfc732b46699"/><file name="Order.php" hash="ea86b408bd6a809ccd6f2b0f85b3f4d0"/><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="8deb118ffaded408e2f135934a2c34fb"/></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 name="default"><dir name="default"><dir name="layout"><file name="epoqinterface.xml" hash="d76009f0b7326fce1e3e300592930c74"/></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>