edroneCRM - Version 1.0.7

Version Notes

edrone magento module - upgrade to 1.0.7

Download this release

Release Info

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


Code changes from version 1.0.6 to 1.0.7

Files changed (8) hide show
  1. app/code/local/Edrone/Base/Block/Base.php +3 -15
  2. app/code/local/Edrone/Base/Block/Base.php~ +0 -111
  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 +2 -2
  6. app/design/frontend/base/default/template/edrone/product_view.phtml +2 -2
  7. app/design/frontend/base/default/template/edrone/success_view.phtml +2 -2
  8. package.xml +6 -6
app/code/local/Edrone/Base/Block/Base.php CHANGED
@@ -7,10 +7,6 @@ class Edrone_Base_Block_Base extends Mage_Core_Block_Template
7
  * @var Edrone_Base_Helper_Config
8
  */
9
  private $configHelper;
10
- /**
11
- * @var Edrone_Base_Helper_Data
12
- */
13
- private $helper;
14
 
15
  /**
16
  * @var array
@@ -22,7 +18,6 @@ class Edrone_Base_Block_Base extends Mage_Core_Block_Template
22
  parent::_construct();
23
 
24
  $this->configHelper = Mage::helper('edrone/config');
25
- $this->helper = Mage::helper('edrone');
26
  }
27
 
28
  /**
@@ -33,13 +28,6 @@ class Edrone_Base_Block_Base extends Mage_Core_Block_Template
33
  return $this->configHelper;
34
  }
35
 
36
- /**
37
- * @return Edrone_Base_Helper_Data
38
- */
39
- public function getHelper()
40
- {
41
- return $this->helper;
42
- }
43
 
44
  /**
45
  * @return array
@@ -65,10 +53,10 @@ class Edrone_Base_Block_Base extends Mage_Core_Block_Template
65
  $this->customerData['last_name'] = $customer->getLastname();
66
  $this->customerData['email'] = $customer->getEmail();
67
 
68
- /*$subscriber = Mage::getModel('newsletter/subscriber')->loadByEmail($customer->getEmail());
69
  if($subscriber){
70
  $this->customerData['subscriber_status'] = ( $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED ) ? 1 : 0;
71
- }*/
72
 
73
  if ($address = $customer->getDefaultShippingAddress()) {
74
  $this->customerData['country'] = $address->getCountry();
@@ -103,7 +91,7 @@ class Edrone_Base_Block_Base extends Mage_Core_Block_Template
103
  $this->customerData['city'] = $address->getFirstname();
104
  $this->customerData['phone'] = $address->getTelephone();
105
  }
106
-
107
  $this->customerData['is_logged_in'] = 0;
108
 
109
 
7
  * @var Edrone_Base_Helper_Config
8
  */
9
  private $configHelper;
 
 
 
 
10
 
11
  /**
12
  * @var array
18
  parent::_construct();
19
 
20
  $this->configHelper = Mage::helper('edrone/config');
 
21
  }
22
 
23
  /**
28
  return $this->configHelper;
29
  }
30
 
 
 
 
 
 
 
 
31
 
32
  /**
33
  * @return array
53
  $this->customerData['last_name'] = $customer->getLastname();
54
  $this->customerData['email'] = $customer->getEmail();
55
 
56
+ $subscriber = Mage::getModel('newsletter/subscriber')->loadByEmail($customer->getEmail());
57
  if($subscriber){
58
  $this->customerData['subscriber_status'] = ( $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED ) ? 1 : 0;
59
+ }
60
 
61
  if ($address = $customer->getDefaultShippingAddress()) {
62
  $this->customerData['country'] = $address->getCountry();
91
  $this->customerData['city'] = $address->getFirstname();
92
  $this->customerData['phone'] = $address->getTelephone();
93
  }
94
+ $this->customerData['subscriber_status'] = '';
95
  $this->customerData['is_logged_in'] = 0;
96
 
97
 
app/code/local/Edrone/Base/Block/Base.php~ DELETED
@@ -1,111 +0,0 @@
1
- <?php
2
-
3
- class Edrone_Base_Block_Base extends Mage_Core_Block_Template
4
- {
5
-
6
- /**
7
- * @var Edrone_Base_Helper_Config
8
- */
9
- private $configHelper;
10
- /**
11
- * @var Edrone_Base_Helper_Data
12
- */
13
- private $helper;
14
-
15
- /**
16
- * @var array
17
- */
18
- protected $customerData = array();
19
-
20
- public function _construct()
21
- {
22
- parent::_construct();
23
-
24
- $this->configHelper = Mage::helper('edrone/config');
25
- $this->helper = Mage::helper('edrone');
26
- }
27
-
28
- /**
29
- * @return Edrone_Base_Helper_Config
30
- */
31
- public function getConfigHelper()
32
- {
33
- return $this->configHelper;
34
- }
35
-
36
- /**
37
- * @return Edrone_Base_Helper_Data
38
- */
39
- public function getHelper()
40
- {
41
- return $this->helper;
42
- }
43
-
44
- /**
45
- * @return array
46
- */
47
- public function getCustomerData()
48
- {
49
- if(!count($this->customerData)) {
50
- if (Mage::getSingleton('customer/session')->isLoggedIn()) {
51
- $this->getLoggedCustomerData();
52
- } else {
53
- $this->getGuestCustomerData();
54
- }
55
- }
56
-
57
- return $this->customerData;
58
- }
59
-
60
- private function getLoggedCustomerData()
61
- {
62
- /** @var Mage_Customer_Model_Customer $customer */
63
- $customer = Mage::getSingleton('customer/session')->getCustomer();
64
- $this->customerData['first_name'] = $customer->getFirstname();
65
- $this->customerData['last_name'] = $customer->getLastname();
66
- $this->customerData['email'] = $customer->getEmail();
67
-
68
- $subscriber = Mage::getModel('newsletter/subscriber')->loadByEmail($customer->getEmail());
69
- if($subscriber){
70
- $this->customerData['subscriber_status'] = ( $subscriber->getStatus() == Mage_Newsletter_Model_Subscriber::STATUS_SUBSCRIBED ) ? 1 : 0;
71
- }
72
-
73
- if ($address = $customer->getDefaultShippingAddress()) {
74
- $this->customerData['country'] = $address->getCountry();
75
- $this->customerData['city'] = $address->getCity();
76
- $this->customerData['phone'] = $address->getTelephone();
77
- } else {
78
- $this->customerData['country'] = '';
79
- $this->customerData['city'] = '';
80
- $this->customerData['phone'] = '';
81
- }
82
-
83
- $this->customerData['is_logged_in'] = 1;
84
- }
85
-
86
- private function getGuestCustomerData()
87
- {
88
- $this->customerData['first_name'] = '';
89
- $this->customerData['last_name'] = '';
90
- $this->customerData['email'] = '';
91
- $this->customerData['country'] = '';
92
- $this->customerData['city'] = '';
93
- $this->customerData['phone'] = '';
94
-
95
- $quote = Mage::getModel('checkout/cart')->getQuote();
96
- $address = $quote->getBillingAddress();
97
-
98
- if($address) {
99
- $this->customerData['first_name'] = $address->getFirstname();
100
- $this->customerData['last_name'] = $address->getFirstname();
101
- $this->customerData['email'] = $address->getFirstname();
102
- $this->customerData['country'] = $address->getFirstname();
103
- $this->customerData['city'] = $address->getFirstname();
104
- $this->customerData['phone'] = $address->getTelephone();
105
- }
106
-
107
- $this->customerData['is_logged_in'] = 0;
108
-
109
-
110
- }
111
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/local/Edrone/Base/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Edrone_Base>
5
- <version>1.0.5</version>
6
  </Edrone_Base>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Edrone_Base>
5
+ <version>1.0.7</version>
6
  </Edrone_Base>
7
  </modules>
8
  <global>
app/design/frontend/base/default/template/edrone/cart_view.phtml CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /* @var $this Edrone_Base_Block_Cart */
3
  $helper = $this->getConfigHelper();
4
- $helper2 = $this->getHelper();
5
  $customerData = $this->getCustomerData();
6
  $productData = $this->getProductData();
7
  ?>
@@ -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.0.5';
15
  _edrone.platform = 'Magento';
16
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
17
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
1
  <?php
2
  /* @var $this Edrone_Base_Block_Cart */
3
  $helper = $this->getConfigHelper();
4
+ $helper2 = Mage::helper('edrone');
5
  $customerData = $this->getCustomerData();
6
  $productData = $this->getProductData();
7
  ?>
11
  (function (srcjs) {
12
  window._edrone = window._edrone || {};
13
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
14
+ _edrone.version = '1.0.7';
15
  _edrone.platform = 'Magento';
16
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
17
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
app/design/frontend/base/default/template/edrone/default.phtml CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /* @var $this Edrone_Base_Block_Base */
3
  $helper = $this->getConfigHelper();
4
- $helper2 = $this->getHelper();
5
  $customerData = $this->getCustomerData();
6
  ?>
7
 
@@ -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.0.5';
13
  _edrone.platform = 'Magento';
14
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
15
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
1
  <?php
2
  /* @var $this Edrone_Base_Block_Base */
3
  $helper = $this->getConfigHelper();
4
+ $helper2 = Mage::helper('edrone');
5
  $customerData = $this->getCustomerData();
6
  ?>
7
 
9
  (function (srcjs) {
10
  window._edrone = window._edrone || {};
11
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
12
+ _edrone.version = '1.0.7';
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
@@ -1,7 +1,7 @@
1
  <?php
2
  /* @var $this Edrone_Base_Block_Product */
3
  $helper = $this->getConfigHelper();
4
- $helper2 = $this->getHelper();
5
  $customerData = $this->getCustomerData();
6
  $productData = $this->getProductData();
7
  ?>
@@ -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.0.5';
14
  _edrone.platform = 'Magento';
15
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
16
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
1
  <?php
2
  /* @var $this Edrone_Base_Block_Product */
3
  $helper = $this->getConfigHelper();
4
+ $helper2 = Mage::helper('edrone');
5
  $customerData = $this->getCustomerData();
6
  $productData = $this->getProductData();
7
  ?>
10
  (function (srcjs) {
11
  window._edrone = window._edrone || {};
12
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
13
+ _edrone.version = '1.0.7';
14
  _edrone.platform = 'Magento';
15
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
16
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
app/design/frontend/base/default/template/edrone/success_view.phtml CHANGED
@@ -1,7 +1,7 @@
1
  <?php
2
  /* @var $this Edrone_Base_Block_Order */
3
  $helper = $this->getConfigHelper();
4
- $helper2 = $this->getHelper();
5
  $customerData = $this->getCustomerData();
6
  $orderData = $this->getOrderData();
7
  ?>
@@ -11,7 +11,7 @@ $orderData = $this->getOrderData();
11
  (function (srcjs) {
12
  window._edrone = window._edrone || {};
13
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
14
- _edrone.version = '1.0.5';
15
  _edrone.platform = 'Magento';
16
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
17
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
1
  <?php
2
  /* @var $this Edrone_Base_Block_Order */
3
  $helper = $this->getConfigHelper();
4
+ $helper2 = Mage::helper('edrone');
5
  $customerData = $this->getCustomerData();
6
  $orderData = $this->getOrderData();
7
  ?>
11
  (function (srcjs) {
12
  window._edrone = window._edrone || {};
13
  _edrone.app_id = '<?php echo $helper->getAppId() ?>';
14
+ _edrone.version = '1.0.7';
15
  _edrone.platform = 'Magento';
16
  _edrone.platform_version = '<?php echo Mage::getVersion(); ?>';
17
  _edrone.trace_url = '<?php echo $helper->getCollectorUrl() ?>';
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>edroneCRM</name>
4
- <version>1.0.6</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
8
  <extends/>
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 - 1.0.6 release</notes>
12
  <authors><author><name>Micha&#x142; Blak</name><user>MAG002993376</user><email>michalblak@gmail.com</email></author></authors>
13
- <date>2015-11-16</date>
14
- <time>10:17:56</time>
15
- <contents><target name="magelocal"><dir name="Edrone"><dir name="Base"><dir name="Block"><file name="Base.php" hash="ad12027aa8779c42a3da96bb4c17e40b"/><file name="Base.php~" hash="82030cabfaba3e3fd52915d4b7b25a44"/><file name="Cart.php" hash="3beb45a6fd0f7dd2bb57969f0b0bcf3c"/><file name="Order.php" hash="81d09cbe0f5c89fb93294739b84e49b9"/><file name="Product.php" hash="c2a7fa725d55ddda2c31edfcdd523eb0"/></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="f35c3bf591865d6db22e2477580df76c"/></dir><dir name="controllers"><file name="NewsletterController.php" hash="fa9e82363c785ce94e005a7aad141162"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0e715e76c00295dc4e555411455fedfb"/><file name="config.xml" hash="2545eea07f413e16e0b2eda541dac12b"/><file name="system.xml" hash="51dc19fd276baa4e2b3fd8e290e67d4b"/></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="ff8f5744edae1c093830624c0e6f7d70"/><file name="default.phtml" hash="59d4d6a24afd1b45c9fc9b40920e9586"/><file name="product_view.phtml" hash="26aed783e26a2d555ddcf7a7a5cf07d1"/><file name="success_view.phtml" hash="efae373e96dd732d672440a5775724cc"/></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.0.7</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
8
  <extends/>
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 - upgrade to 1.0.7</notes>
12
  <authors><author><name>Micha&#x142; Blak</name><user>MAG002993376</user><email>michalblak@gmail.com</email></author></authors>
13
+ <date>2015-11-17</date>
14
+ <time>13:04:09</time>
15
+ <contents><target name="magelocal"><dir name="Edrone"><dir name="Base"><dir name="Block"><file name="Base.php" hash="9a9f6496b408cd0d2cda9bace75995a9"/><file name="Cart.php" hash="3beb45a6fd0f7dd2bb57969f0b0bcf3c"/><file name="Order.php" hash="81d09cbe0f5c89fb93294739b84e49b9"/><file name="Product.php" hash="c2a7fa725d55ddda2c31edfcdd523eb0"/></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="f35c3bf591865d6db22e2477580df76c"/></dir><dir name="controllers"><file name="NewsletterController.php" hash="fa9e82363c785ce94e005a7aad141162"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0e715e76c00295dc4e555411455fedfb"/><file name="config.xml" hash="2d676be4c6535f9d95dcd2ecf69fc714"/><file name="system.xml" hash="51dc19fd276baa4e2b3fd8e290e67d4b"/></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="d87c1aea769064aa23de62495e0975c3"/><file name="default.phtml" hash="c45e5dd18786879acc8f99b407dcaf24"/><file name="product_view.phtml" hash="ca7087ca855d158e8e2ef33cbe46b822"/><file name="success_view.phtml" hash="dd2affad3022a957a9ebae358025757e"/></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>