edroneCRM - Version 1.1.16

Version Notes

edrone magento module - initial public release

Download this release

Release Info

Developer Michał Blak
Extension edroneCRM
Version 1.1.16
Comparing to
See all releases


Code changes from version 1.1.15 to 1.1.16

Files changed (8) hide show
  1. app/code/local/Edrone/Base/Block/Order.php +2 -1
  2. app/code/local/Edrone/Base/Model/Observer.php +4 -5
  3. app/code/local/Edrone/Base/etc/config.xml +1 -1
  4. app/design/frontend/base/default/template/edrone/cart_view.phtml +2 -2
  5. app/design/frontend/base/default/template/edrone/default.phtml +1 -1
  6. app/design/frontend/base/default/template/edrone/product_view.phtml +9 -5
  7. app/design/frontend/base/default/template/edrone/success_view.phtml +1 -1
  8. package.xml +5 -5
app/code/local/Edrone/Base/Block/Order.php CHANGED
@@ -316,6 +316,7 @@ class EdroneIns{
316
  $this->preparedpack = array_merge($event->get(),array(
317
  "app_id" => $this->appid,
318
  "version" => EDRONE_SDK_VERSION,
 
319
  ));
320
  //Calc sign - beta
321
  ksort($this->preparedpack);
@@ -428,7 +429,7 @@ class Edrone_Base_Block_Order extends Edrone_Base_Block_Base
428
 
429
  $_Product = Mage::getModel("catalog/product")->load( $item->getProductId() );
430
  $categoryIds = $_Product->getCategoryIds();//array of product categories
431
- $product_counts[] = settype($item->getQtyOrdered(), 'int');
432
  $categoryId = array_pop($categoryIds);
433
  if(is_numeric($categoryId)){
434
  $category = Mage::getModel('catalog/category')->load($categoryId);
316
  $this->preparedpack = array_merge($event->get(),array(
317
  "app_id" => $this->appid,
318
  "version" => EDRONE_SDK_VERSION,
319
+ "sender_type" => 'server',
320
  ));
321
  //Calc sign - beta
322
  ksort($this->preparedpack);
429
 
430
  $_Product = Mage::getModel("catalog/product")->load( $item->getProductId() );
431
  $categoryIds = $_Product->getCategoryIds();//array of product categories
432
+ $product_counts[] = (int)$item->getQtyOrdered();
433
  $categoryId = array_pop($categoryIds);
434
  if(is_numeric($categoryId)){
435
  $category = Mage::getModel('catalog/category')->load($categoryId);
app/code/local/Edrone/Base/Model/Observer.php CHANGED
@@ -483,7 +483,7 @@ if (!defined('EDRONE_SDK_VERSION')) {
483
  * @param string $trace_url def https://api.edrone.me/trace
484
  * @since 1.0.0
485
  */
486
- function __construct($appid, $secret, $trace_url = 'https://api-test.edrone.me/trace.php')
487
  {
488
  $this->appid = $appid;
489
  $this->secret = $secret;
@@ -513,12 +513,12 @@ if (!defined('EDRONE_SDK_VERSION')) {
513
  "sender_type" => 'server',
514
  ));
515
  //Calc sign - beta
516
- ksort($this->preparedpack);
517
  $sign = '';
518
  foreach ($this->preparedpack as $key => $value) {
519
  $sign .= $value;
520
  }
521
- $this->preparedpack['sign'] = md5($this->secret . $sign);
522
  //
523
  return $this;
524
  }
@@ -613,7 +613,7 @@ class Edrone_Base_Model_Observer
613
 
614
  $_Product = Mage::getModel("catalog/product")->load($item->getProductId());
615
  $categoryIds = $_Product->getCategoryIds(); //array of product categories
616
- $product_counts[] = settype($item->getQtyOrdered(), 'int');
617
  $categoryId = array_pop($categoryIds);
618
  if (is_numeric($categoryId)) {
619
  $category = Mage::getModel('catalog/category')->load($categoryId);
@@ -687,7 +687,6 @@ class Edrone_Base_Model_Observer
687
  $order = $observer->getEvent()->getOrder();
688
  $orderdata = $this->getOrderData($order);
689
  $status = $this->sendDataToServer($orderdata[0], $orderdata[1]);
690
-
691
  return $this;
692
  }
693
 
483
  * @param string $trace_url def https://api.edrone.me/trace
484
  * @since 1.0.0
485
  */
486
+ function __construct($appid, $secret, $trace_url = 'https://api.edrone.me/trace.php')
487
  {
488
  $this->appid = $appid;
489
  $this->secret = $secret;
513
  "sender_type" => 'server',
514
  ));
515
  //Calc sign - beta
516
+ /*ksort($this->preparedpack);
517
  $sign = '';
518
  foreach ($this->preparedpack as $key => $value) {
519
  $sign .= $value;
520
  }
521
+ $this->preparedpack['sign'] = md5($this->secret . $sign);*/
522
  //
523
  return $this;
524
  }
613
 
614
  $_Product = Mage::getModel("catalog/product")->load($item->getProductId());
615
  $categoryIds = $_Product->getCategoryIds(); //array of product categories
616
+ $product_counts[] = (int) $item->getQtyOrdered();
617
  $categoryId = array_pop($categoryIds);
618
  if (is_numeric($categoryId)) {
619
  $category = Mage::getModel('catalog/category')->load($categoryId);
687
  $order = $observer->getEvent()->getOrder();
688
  $orderdata = $this->getOrderData($order);
689
  $status = $this->sendDataToServer($orderdata[0], $orderdata[1]);
 
690
  return $this;
691
  }
692
 
app/code/local/Edrone/Base/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Edrone_Base>
5
- <version>1.1.15</version>
6
  </Edrone_Base>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Edrone_Base>
5
+ <version>1.1.16</version>
6
  </Edrone_Base>
7
  </modules>
8
  <global>
app/design/frontend/base/default/template/edrone/cart_view.phtml CHANGED
@@ -11,7 +11,7 @@ $productData = $this->getProductData();
11
  (function (srcjs) {
12
  window._edrone = window._edrone || {};
13
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
14
- _edrone.version = '1.1.15';
15
  _edrone.platform = 'Magento';
16
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
17
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
@@ -50,7 +50,7 @@ $productData = $this->getProductData();
50
  (function (srcjs) {
51
  window._edrone = window._edrone || {};
52
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
53
- _edrone.version = '1.1.15';
54
  _edrone.platform = 'Magento';
55
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
56
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
11
  (function (srcjs) {
12
  window._edrone = window._edrone || {};
13
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
14
+ _edrone.version = '1.1.16';
15
  _edrone.platform = 'Magento';
16
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
17
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
50
  (function (srcjs) {
51
  window._edrone = window._edrone || {};
52
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
53
+ _edrone.version = '1.1.16';
54
  _edrone.platform = 'Magento';
55
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
56
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
app/design/frontend/base/default/template/edrone/default.phtml CHANGED
@@ -9,7 +9,7 @@ $customerData = $this->getCustomerData();
9
  (function (srcjs) {
10
  window._edrone = window._edrone || {};
11
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
12
- _edrone.version = '1.1.15';
13
  _edrone.platform = 'Magento';
14
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
15
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
9
  (function (srcjs) {
10
  window._edrone = window._edrone || {};
11
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
12
+ _edrone.version = '1.1.16';
13
  _edrone.platform = 'Magento';
14
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
15
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
app/design/frontend/base/default/template/edrone/product_view.phtml CHANGED
@@ -10,7 +10,7 @@ $productData = $this->getProductData();
10
  (function (srcjs) {
11
  window._edrone = window._edrone || {};
12
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
13
- _edrone.version = '1.1.15';
14
  _edrone.platform = 'Magento';
15
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
16
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
@@ -42,10 +42,14 @@ $productData = $this->getProductData();
42
  var s = document.getElementsByTagName('script')[0];
43
  s.parentNode.insertBefore(doc, s);
44
 
45
- window.isBasketForm = function(find, txt) {
46
- txt = txt.split("?")[0];
47
- return txt.substr(txt.length - find.length) == find;
48
- }
 
 
 
 
49
 
50
  (function() {
51
  var origOpen = XMLHttpRequest.prototype.open;
10
  (function (srcjs) {
11
  window._edrone = window._edrone || {};
12
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
13
+ _edrone.version = '1.1.16';
14
  _edrone.platform = 'Magento';
15
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
16
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
42
  var s = document.getElementsByTagName('script')[0];
43
  s.parentNode.insertBefore(doc, s);
44
 
45
+ window.isBasketForm = function (find, txt) {
46
+             if (typeof txt === 'string' || txt instanceof String) {
47
+                 txt = txt.split("?")[0];
48
+             } else {
49
+                 return false;
50
+             }
51
+             return txt.substr(txt.length - find.length) == find;
52
+ };
53
 
54
  (function() {
55
  var origOpen = XMLHttpRequest.prototype.open;
app/design/frontend/base/default/template/edrone/success_view.phtml CHANGED
@@ -12,7 +12,7 @@ $this->sendDataToServer($orderData, $customerData);
12
  (function (srcjs) {
13
  window._edrone = window._edrone || {};
14
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
15
- _edrone.version = '1.1.15';
16
  _edrone.platform = 'Magento';
17
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
18
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
12
  (function (srcjs) {
13
  window._edrone = window._edrone || {};
14
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
15
+ _edrone.version = '1.1.16';
16
  _edrone.platform = 'Magento';
17
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
18
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>edroneCRM</name>
4
- <version>1.1.15</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
@@ -9,10 +9,10 @@
9
  <summary>edrone - first CRM for e-commerce Maintain clients &amp; increase customer retention with dynamic e-CRM.</summary>
10
  <description>edrone is collecting and analyzing Magento visitors and customers data. The plugin allows processing personal data in the real-time in order to communicate with them through dynamic and personalized e-mail.</description>
11
  <notes>edrone magento module - initial public release</notes>
12
- <authors><author><name>Micha&#x142; Blak</name><user>MAG002993376</user><email>admin@edrone.me</email></author></authors>
13
- <date>2016-12-06</date>
14
- <time>13:52:55</time>
15
- <contents><target name="magelocal"><dir name="Edrone"><dir name="Base"><dir name="Block"><file name="Base.php" hash="d0e605725b25d2bf1bc2d27af954ab69"/><file name="Cart.php" hash="0f1243e1a6e886a8676a407e03e039ea"/><file name="Order.php" hash="bc369d79c562dd7d84dd9bb193d6d846"/><file name="Product.php" hash="6ed93a752b59228a0121cc0d6f8efe15"/></dir><dir name="Helper"><file name="Config.php" hash="194670e7ef6eb1dc89b8a61a38499264"/><file name="Data.php" hash="a9040014b1b54a1d3cc7ebf401f489c0"/></dir><dir name="Model"><file name="Observer.php" hash="3f18003288b328d94b4789d204011ab1"/></dir><dir name="controllers"><file name="EdroneproductController.php" hash="1c6ec2f45cbc433ec82f4e0e342f92f8"/><file name="NewsletterController.php" hash="fa9e82363c785ce94e005a7aad141162"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0e715e76c00295dc4e555411455fedfb"/><file name="config.xml" hash="e725934aa0a1b60404d1fb759fd113e0"/><file name="system.xml" hash="4651c48710b53d58c4b6af0da08f1d4e"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="edrone"><file name="cart_view.phtml" hash="4172f9dae5383675416983aa0bc9eb05"/><file name="default.phtml" hash="29ec60db2b77ec5748b5ebb9c53d9f26"/><file name="product_view.phtml" hash="2e3c167332be825ef283d20c4a7a31ea"/><file name="success_view.phtml" hash="159f03d0e89c5c3b0ea8f74ce6ba35a2"/></dir></dir><dir name="layout"><file name="edrone.xml" hash="48e37d1c01507337f8dc33eb9e03af34"/></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Edrone_Base.xml" hash="29d3699c3a83fa4fea848a6cb7800872"/></dir></dir></target><target name="magelocale"><dir name="pl_PL"><file name="Edrone.csv" hash="b8aa59d39815f4d92738129cc9fbdf34"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>edroneCRM</name>
4
+ <version>1.1.16</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
9
  <summary>edrone - first CRM for e-commerce Maintain clients &amp; increase customer retention with dynamic e-CRM.</summary>
10
  <description>edrone is collecting and analyzing Magento visitors and customers data. The plugin allows processing personal data in the real-time in order to communicate with them through dynamic and personalized e-mail.</description>
11
  <notes>edrone magento module - initial public release</notes>
12
+ <authors><author><name>Micha&#x142; Blak</name><user>MAG002993376</user><email>michalblak@gmail.com</email></author></authors>
13
+ <date>2016-12-15</date>
14
+ <time>12:36:43</time>
15
+ <contents><target name="magelocal"><dir name="Edrone"><dir name="Base"><dir name="Block"><file name="Base.php" hash="d0e605725b25d2bf1bc2d27af954ab69"/><file name="Cart.php" hash="0f1243e1a6e886a8676a407e03e039ea"/><file name="Order.php" hash="de35ea3a9ade883baa3563758100ba32"/><file name="Product.php" hash="6ed93a752b59228a0121cc0d6f8efe15"/></dir><dir name="Helper"><file name="Config.php" hash="194670e7ef6eb1dc89b8a61a38499264"/><file name="Data.php" hash="a9040014b1b54a1d3cc7ebf401f489c0"/></dir><dir name="Model"><file name="Observer.php" hash="027e8909a474ba41d6ac2cffa753bfeb"/></dir><dir name="controllers"><file name="EdroneproductController.php" hash="1c6ec2f45cbc433ec82f4e0e342f92f8"/><file name="NewsletterController.php" hash="fa9e82363c785ce94e005a7aad141162"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0e715e76c00295dc4e555411455fedfb"/><file name="config.xml" hash="8598b890dbf6bc6d00096914ff47c7a4"/><file name="system.xml" hash="4651c48710b53d58c4b6af0da08f1d4e"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="edrone"><file name="cart_view.phtml" hash="443c80b422db1d1f00ee12b88393de88"/><file name="default.phtml" hash="4747b05f6a7f1f987cc56a21a1453891"/><file name="product_view.phtml" hash="8174361f322659cae4ec7e3b8f55728c"/><file name="success_view.phtml" hash="b84f168fef57c1c410cda61b5d7d3cde"/></dir></dir><dir name="layout"><file name="edrone.xml" hash="48e37d1c01507337f8dc33eb9e03af34"/></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Edrone_Base.xml" hash="29d3699c3a83fa4fea848a6cb7800872"/></dir></dir></target><target name="magelocale"><dir name="pl_PL"><file name="Edrone.csv" hash="b8aa59d39815f4d92738129cc9fbdf34"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>