epoqRS - Version 1.0.3

Version Notes

- Minor bugfixes
- Added 1.4 compatibility

Download this release

Release Info

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


Code changes from version 1.0.1 to 1.0.3

Files changed (8) hide show
  1. app/code/community/Flagbit/EpoqInterface/Block/Export/Productlist.php +4 -1
  2. app/code/community/Flagbit/EpoqInterface/Block/Recommentation/Abstract.php +2 -2
  3. app/code/community/Flagbit/EpoqInterface/Model/Abstract.php +1 -0
  4. app/code/community/Flagbit/EpoqInterface/Model/Recommendation/Abstract.php +14 -8
  5. app/code/community/Flagbit/EpoqInterface/controllers/IndexController.php +12 -5
  6. app/code/community/Flagbit/EpoqInterface/etc/config.xml +2 -2
  7. app/design/frontend/default/default/layout/epoqinterface.xml +4 -2
  8. package.xml +6 -6
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 249 2010-03-11 10:50:33Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
@@ -132,6 +132,9 @@ class Flagbit_EpoqInterface_Block_Export_Productlist extends Flagbit_EpoqInterfa
132
 
133
  // e Namespace
134
  'e:locakey' => substr(Mage::getSingleton('core/locale')->getLocale(), 0, 2),
 
 
 
135
 
136
  );
137
 
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: Productlist.php 466 2010-07-08 12:30:54Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
132
 
133
  // e Namespace
134
  'e:locakey' => substr(Mage::getSingleton('core/locale')->getLocale(), 0, 2),
135
+
136
+ // c Namespace
137
+ 'c:mgtproducttype' => $product->getTypeId(),
138
 
139
  );
140
 
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 238 2009-07-03 09:22:08Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
@@ -28,7 +28,7 @@ class Flagbit_EpoqInterface_Block_Recommentation_Abstract extends Mage_Catalog_B
28
  protected function _prepareData()
29
  {
30
 
31
- $this->_itemCollection = Mage::getSingleton($this->_collectionModel)->getCollection()
32
  ->addStoreFilter();
33
 
34
  Mage::getResourceSingleton('checkout/cart')->addExcludeProductFilter($this->_itemCollection,
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: Abstract.php 466 2010-07-08 12:30:54Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
28
  protected function _prepareData()
29
  {
30
 
31
+ $this->_itemCollection = Mage::getSingleton($this->_collectionModel, $this->getData())->getCollection()
32
  ->addStoreFilter();
33
 
34
  Mage::getResourceSingleton('checkout/cart')->addExcludeProductFilter($this->_itemCollection,
app/code/community/Flagbit/EpoqInterface/Model/Abstract.php CHANGED
@@ -93,6 +93,7 @@ class Flagbit_EpoqInterface_Model_Abstract extends Mage_Core_Model_Abstract {
93
  )
94
  );
95
  }
 
96
 
97
  return $this->_restClient;
98
  }
93
  )
94
  );
95
  }
96
+ var_dump($this->_restClient->getHttpClient());
97
 
98
  return $this->_restClient;
99
  }
app/code/community/Flagbit/EpoqInterface/Model/Recommendation/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 246 2009-09-07 16:18:00Z tuerk $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
@@ -25,9 +25,15 @@ class Flagbit_EpoqInterface_Model_Recommendation_Abstract extends Flagbit_EpoqIn
25
  * @return void
26
  */
27
  public function __construct()
28
- {
29
-
30
-
 
 
 
 
 
 
31
  // get Data
32
  $result = $this->_doRequest();
33
  if(!$result instanceof Zend_Rest_Client_Result){
@@ -105,15 +111,15 @@ class Flagbit_EpoqInterface_Model_Recommendation_Abstract extends Flagbit_EpoqIn
105
  return $string;
106
  }
107
 
 
108
  protected function getParamsArray(){
109
-
110
-
111
-
112
  $variables = array(
113
  'tenantId' => Mage::getStoreConfig(self::XML_TENANT_ID_PATH),
114
  'sessionId' => Mage::getSingleton('core/session')->getSessionId(),
115
  'demo' => Mage::getStoreConfig(self::XML_DEMO_PATH) ? 6 : 0,
116
- 'widgetTheme' => 'xml'
 
117
  );
118
 
119
  if($customerId = Mage::getSingleton('customer/session')->getId()){
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: Abstract.php 466 2010-07-08 12:30:54Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
25
  * @return void
26
  */
27
  public function __construct()
28
+ {
29
+ $args = func_get_args();
30
+ if (empty($args[0])) {
31
+ $args[0] = array();
32
+ }
33
+ $this->_data = $args[0];
34
+
35
+ $this->_construct();
36
+
37
  // get Data
38
  $result = $this->_doRequest();
39
  if(!$result instanceof Zend_Rest_Client_Result){
111
  return $string;
112
  }
113
 
114
+
115
  protected function getParamsArray(){
116
+
 
 
117
  $variables = array(
118
  'tenantId' => Mage::getStoreConfig(self::XML_TENANT_ID_PATH),
119
  'sessionId' => Mage::getSingleton('core/session')->getSessionId(),
120
  'demo' => Mage::getStoreConfig(self::XML_DEMO_PATH) ? 6 : 0,
121
+ 'widgetTheme' => 'xml',
122
+ 'rules' => $this->getRules()
123
  );
124
 
125
  if($customerId = Mage::getSingleton('customer/session')->getId()){
app/code/community/Flagbit/EpoqInterface/controllers/IndexController.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: IndexController.php 249 2010-03-11 10:50:33Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
@@ -29,10 +29,17 @@ class Flagbit_EpoqInterface_IndexController extends Mage_Core_Controller_Front_A
29
  $this->setFlag('', self::FLAG_NO_DISPATCH, true);
30
  }
31
 
32
- $username = Mage::getStoreConfig(self::XML_AUTH_USERNAME_PATH);
33
  $password = Mage::getStoreConfig(self::XML_AUTH_PASSWORD_PATH);
34
 
 
 
 
 
 
 
35
  // Authentication
 
36
  if(!empty($username)
37
  && !empty($password)
38
  && ($this->getRequest()->getServer('PHP_AUTH_USER') != $username
@@ -42,7 +49,7 @@ class Flagbit_EpoqInterface_IndexController extends Mage_Core_Controller_Front_A
42
  $this->getResponse()->setHeader('WWW-authenticate', 'basic realm="epoq Interface"', true);
43
  $this->getResponse()->sendHeaders();
44
  $this->setFlag('', self::FLAG_NO_DISPATCH, true);
45
- }
46
 
47
  return parent::preDispatch();
48
  }
@@ -55,8 +62,8 @@ class Flagbit_EpoqInterface_IndexController extends Mage_Core_Controller_Front_A
55
 
56
  public function productlistAction(){
57
 
58
- //$this->getResponse()->setHeader('Content-type', 'text/plain; charset=UTF-8');
59
- $this->getResponse()->setHeader('Content-type', 'text/xml; charset=UTF-8');
60
  $this->loadLayout(false);
61
  $this->renderLayout();
62
  }
11
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
12
  * Public License for more details. *
13
  * *
14
+ * @version $Id: IndexController.php 466 2010-07-08 12:30:54Z weller $
15
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
16
  */
17
 
29
  $this->setFlag('', self::FLAG_NO_DISPATCH, true);
30
  }
31
 
32
+ //$username = Mage::getStoreConfig(self::XML_AUTH_USERNAME_PATH);
33
  $password = Mage::getStoreConfig(self::XML_AUTH_PASSWORD_PATH);
34
 
35
+ if(!empty($password)
36
+ && $password != $this->getRequest()->getParam('pass')){
37
+
38
+ $this->setFlag('', self::FLAG_NO_DISPATCH, true);
39
+ }
40
+
41
  // Authentication
42
+ /*
43
  if(!empty($username)
44
  && !empty($password)
45
  && ($this->getRequest()->getServer('PHP_AUTH_USER') != $username
49
  $this->getResponse()->setHeader('WWW-authenticate', 'basic realm="epoq Interface"', true);
50
  $this->getResponse()->sendHeaders();
51
  $this->setFlag('', self::FLAG_NO_DISPATCH, true);
52
+ }*/
53
 
54
  return parent::preDispatch();
55
  }
62
 
63
  public function productlistAction(){
64
 
65
+ $this->getResponse()->setHeader('Content-type', 'text/plain; charset=UTF-8');
66
+ //$this->getResponse()->setHeader('Content-type', 'text/xml; charset=UTF-8');
67
  $this->loadLayout(false);
68
  $this->renderLayout();
69
  }
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 249 2010-03-11 10:50: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.0.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 466 2010-07-08 12:30:54Z 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.3</version>
24
  </Flagbit_EpoqInterface>
25
  </modules>
26
 
app/design/frontend/default/default/layout/epoqinterface.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: epoqinterface.xml 248 2010-03-11 09:52:13Z weller $
16
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
17
  */
18
  -->
@@ -28,7 +28,9 @@
28
  <reference name="content">
29
  <block type="epoqinterface/track_product" name="epoqinterface.track.product"/>
30
  <reference name="product.info.additional">
31
- <block type="epoqinterface/recommentation_product" name="epoqinterface.recommendation.product" template="epoqinterface/recommendation/product.phtml"/>
 
 
32
  </reference>
33
  </reference>
34
  </catalog_product_view>
12
  * TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General *
13
  * Public License for more details. *
14
  * *
15
+ * @version $Id: epoqinterface.xml 466 2010-07-08 12:30:54Z weller $
16
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License, version 2
17
  */
18
  -->
28
  <reference name="content">
29
  <block type="epoqinterface/track_product" name="epoqinterface.track.product"/>
30
  <reference name="product.info.additional">
31
+ <block type="epoqinterface/recommentation_product" name="epoqinterface.recommendation.product" template="epoqinterface/recommendation/product.phtml">
32
+ <!-- <action method="setRules"><rules>name(value)</rules></action> -->
33
+ </block>
34
  </reference>
35
  </reference>
36
  </catalog_product_view>
package.xml CHANGED
@@ -1,9 +1,9 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>epoqRS</name>
4
- <version>1.0.1</version>
5
  <stability>stable</stability>
6
- <license uri="http://opensource.org/licenses/gpl-license.php">GPL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Integrates the epoq Recommendation Service for improved product consulting and cross selling functionality.</summary>
@@ -14,10 +14,10 @@
14
  Try epoq Recommendation Service - free and without obligation in our 30-day trial version.</description>
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><author><name>Michael T&#xFC;rk</name><user>auto-converted</user><email>tuerk@flagbit.de</email></author></authors>
18
- <date>2010-04-30</date>
19
- <time>17:01:10</time>
20
- <contents><target name="magelocale"><dir name="de_DE"><file name="Flagbit_EpoqInterface.csv" hash="b49a8dca7e1a97c94ce4afb70840a4de"/></dir></target><target name="magecommunity"><dir name="Flagbit"><dir name="EpoqInterface"><dir name="Block"><dir name="Export"><file name="Productlist.php" hash="293ea4b91f4e4cb185ced9c4f25acdc3"/></dir><dir name="Recommentation"><file name="Abstract.php" hash="8d7e0337f9d7812d6e3abe816c33447c"/><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="6fbb664a73d7ebcbdb55b8b292283148"/><file name="Product.php" hash="22e36d5c180ba8a96f0d36ab5747c485"/></dir><file name="Abstract.php" hash="cfe361b44c038667b052fefa12685b1a"/><file name="Head.php" hash="b6844d21b14dc9ebb1697be9e12a57f9"/></dir><dir name="controllers"><file name="IndexController.php" hash="aa6fe7f5ed8321989eedcf41135a91d8"/></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="56effd6ec621b46b76dcff003721d77d"/><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="44f7fd28a2ba9452f890305d4599ed52"/><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="b6338b4c898a1e1333eae681303410a8"/><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="476e8bbc6c840354f932378bc1d2d936"/></dir><dir name="template"><dir name="epoqinterface"><dir name="recommendation"><file name="cart.phtml" hash="769240e46c4adcd3c7f5acfa335ee70b"/><file name="product.phtml" hash="2a77d8537f2f563c8ea344cd2f212cf3"/><file name="user.phtml" hash="7a8b0829f89f9c3fcd4aefd359c5a1a5"/></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.3</version>
5
  <stability>stable</stability>
6
+ <license>GPL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Integrates the epoq Recommendation Service for improved product consulting and cross selling functionality.</summary>
14
  Try epoq Recommendation Service - free and without obligation in our 30-day trial version.</description>
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-07-08</date>
19
+ <time>14:39:20</time>
20
+ <contents><target name="magelocale"><dir name="de_DE"><file name="Flagbit_EpoqInterface.csv" hash="b49a8dca7e1a97c94ce4afb70840a4de"/></dir></target><target name="magecommunity"><dir name="Flagbit"><dir name="EpoqInterface"><dir name="Block"><dir name="Export"><file name="Productlist.php" hash="a30568c751ae6df1c695087dde8fc6a9"/></dir><dir name="Recommentation"><file name="Abstract.php" hash="d26677df7fddd18c0402a3365e6df708"/><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="6fbb664a73d7ebcbdb55b8b292283148"/><file name="Product.php" hash="22e36d5c180ba8a96f0d36ab5747c485"/></dir><file name="Abstract.php" hash="cfe361b44c038667b052fefa12685b1a"/><file name="Head.php" hash="b6844d21b14dc9ebb1697be9e12a57f9"/></dir><dir name="controllers"><file name="IndexController.php" hash="df9d03bde0e10dccdf47136db9975313"/></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="c40556ae09263a08659c241b288fdb08"/><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="769240e46c4adcd3c7f5acfa335ee70b"/><file name="product.phtml" hash="2a77d8537f2f563c8ea344cd2f212cf3"/><file name="user.phtml" hash="7a8b0829f89f9c3fcd4aefd359c5a1a5"/></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>