edroneCRM - Version 1.0.1

Version Notes

Added support for multiple currencies

Download this release

Release Info

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


Code changes from version 1.0.0 to 1.0.1

Files changed (9) hide show
  1. app/code/local/Edrone/Base/Block/Base.php +1 -1
  2. app/code/local/Edrone/Base/Block/Order.php +3 -1
  3. app/code/local/Edrone/Base/etc/config.xml +1 -1
  4. app/code/local/Edrone/Base/etc/system.xml +2 -2
  5. app/design/frontend/base/default/template/edrone/cart_view.phtml +1 -1
  6. app/design/frontend/base/default/template/edrone/default.phtml +1 -1
  7. app/design/frontend/base/default/template/edrone/product_view.phtml +1 -1
  8. app/design/frontend/base/default/template/edrone/success_view.phtml +4 -2
  9. package.xml +6 -6
app/code/local/Edrone/Base/Block/Base.php CHANGED
@@ -23,7 +23,7 @@ class Edrone_Base_Block_Base extends Mage_Core_Block_Template
23
  /**
24
  * @return Edrone_Base_Helper_Config
25
  */
26
- public function getHelper()
27
  {
28
  return $this->helper;
29
  }
23
  /**
24
  * @return Edrone_Base_Helper_Config
25
  */
26
+ public function getConfigHelper()
27
  {
28
  return $this->helper;
29
  }
app/code/local/Edrone/Base/Block/Order.php CHANGED
@@ -23,7 +23,9 @@ class Edrone_Base_Block_Order extends Edrone_Base_Block_Base
23
  $orderData['image'] = join('|', $images);
24
  $orderData['order_id'] = $order->getIncrementId();
25
  $orderData['order_payment_value'] = $order->getGrandTotal();
26
- $orderData['currency'] = $order->getBaseCurrencyCode();
 
 
27
 
28
  return $orderData;
29
  }
23
  $orderData['image'] = join('|', $images);
24
  $orderData['order_id'] = $order->getIncrementId();
25
  $orderData['order_payment_value'] = $order->getGrandTotal();
26
+ $orderData['base_payment_value'] = $order->getBaseGrandTotal();
27
+ $orderData['base_currency'] = $order->getBaseCurrencyCode();
28
+ $orderData['order_currency'] = $order->getOrderCurrencyCode();
29
 
30
  return $orderData;
31
  }
app/code/local/Edrone/Base/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Edrone_Base>
5
- <version>1.0.0</version>
6
  </Edrone_Base>
7
  </modules>
8
  <global>
2
  <config>
3
  <modules>
4
  <Edrone_Base>
5
+ <version>1.0.1</version>
6
  </Edrone_Base>
7
  </modules>
8
  <global>
app/code/local/Edrone/Base/etc/system.xml CHANGED
@@ -15,8 +15,8 @@
15
  <show_in_website>1</show_in_website>
16
  <show_in_store>1</show_in_store>
17
 
18
- <groups translate="label" module="edrone">
19
- <base>
20
  <label>Edrone</label>
21
  <tab>edrone</tab>
22
  <sort_order>10</sort_order>
15
  <show_in_website>1</show_in_website>
16
  <show_in_store>1</show_in_store>
17
 
18
+ <groups>
19
+ <base translate="label" module="edrone">
20
  <label>Edrone</label>
21
  <tab>edrone</tab>
22
  <sort_order>10</sort_order>
app/design/frontend/base/default/template/edrone/cart_view.phtml CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /* @var $this Edrone_Base_Block_Cart */
3
- $helper = $this->getHelper();
4
  $customerData = $this->getCustomerData();
5
  $productData = $this->getProductData();
6
  ?>
1
  <?php
2
  /* @var $this Edrone_Base_Block_Cart */
3
+ $helper = $this->getConfigHelper();
4
  $customerData = $this->getCustomerData();
5
  $productData = $this->getProductData();
6
  ?>
app/design/frontend/base/default/template/edrone/default.phtml CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /* @var $this Edrone_Base_Block_Base */
3
- $helper = $this->getHelper();
4
  $customerData = $this->getCustomerData();
5
  ?>
6
 
1
  <?php
2
  /* @var $this Edrone_Base_Block_Base */
3
+ $helper = $this->getConfigHelper();
4
  $customerData = $this->getCustomerData();
5
  ?>
6
 
app/design/frontend/base/default/template/edrone/product_view.phtml CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /* @var $this Edrone_Base_Block_Product */
3
- $helper = $this->getHelper();
4
  $customerData = $this->getCustomerData();
5
  $productData = $this->getProductData();
6
  ?>
1
  <?php
2
  /* @var $this Edrone_Base_Block_Product */
3
+ $helper = $this->getConfigHelper();
4
  $customerData = $this->getCustomerData();
5
  $productData = $this->getProductData();
6
  ?>
app/design/frontend/base/default/template/edrone/success_view.phtml CHANGED
@@ -1,6 +1,6 @@
1
  <?php
2
  /* @var $this Edrone_Base_Block_Order */
3
- $helper = $this->getHelper();
4
  $customerData = $this->getCustomerData();
5
  $orderData = $this->getOrderData();
6
  ?>
@@ -20,7 +20,9 @@ $orderData = $this->getOrderData();
20
  _edrone.product_images = '<?php echo $orderData['image'] ?>';
21
  _edrone.order_id = '<?php echo $orderData['order_id'] ?>';
22
  _edrone.order_payment_value = '<?php echo $orderData['order_payment_value'] ?>';
23
- _edrone.currency = '<?php echo $orderData['currency'] ?>';
 
 
24
  _edrone.action_type = 'order';
25
  _edrone.country = '<?php echo $customerData['country'] ?>';
26
  _edrone.city = '<?php echo $customerData['city'] ?>';
1
  <?php
2
  /* @var $this Edrone_Base_Block_Order */
3
+ $helper = $this->getConfigHelper();
4
  $customerData = $this->getCustomerData();
5
  $orderData = $this->getOrderData();
6
  ?>
20
  _edrone.product_images = '<?php echo $orderData['image'] ?>';
21
  _edrone.order_id = '<?php echo $orderData['order_id'] ?>';
22
  _edrone.order_payment_value = '<?php echo $orderData['order_payment_value'] ?>';
23
+ _edrone.base_payment_value = '<?php echo $orderData['base_payment_value'] ?>';
24
+ _edrone.base_currency = '<?php echo $orderData['base_currency'] ?>';
25
+ _edrone.order_currency = '<?php echo $orderData['order_currency'] ?>';
26
  _edrone.action_type = 'order';
27
  _edrone.country = '<?php echo $customerData['country'] ?>';
28
  _edrone.city = '<?php echo $customerData['city'] ?>';
package.xml CHANGED
@@ -1,19 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>edroneCRM</name>
4
- <version>1.0.0</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.&#xD;
11
- License: GPL</description>
12
- <notes>edrone magento module - initial public release</notes>
13
  <authors><author><name>Micha&#x142; Blak</name><user>MAG002993376</user><email>michalblak@gmail.com</email></author></authors>
14
- <date>2015-05-27</date>
15
- <time>07:24:25</time>
16
- <contents><target name="magelocal"><dir name="Edrone"><dir name="Base"><dir name="Block"><file name="Base.php" hash="3973d98222018fe0bf3bdbf3a874b16a"/><file name="Cart.php" hash="ed49bc87f960039570aa016c7c0fae6a"/><file name="Order.php" hash="b2a4e9caa2180ba37cb5cc75b9419d8e"/><file name="Product.php" hash="174503941cc8dbabddf875a4001bc6fd"/></dir><dir name="Helper"><file name="Config.php" hash="5b0ffff08d4f2c8a3dfd08837732d776"/><file name="Data.php" hash="bd4dcfb429a76044eb2dab3958b89b15"/></dir><dir name="Model"><file name="Observer.php" hash="f35c3bf591865d6db22e2477580df76c"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0e715e76c00295dc4e555411455fedfb"/><file name="config.xml" hash="57c22e147944614c9365b2f93771a851"/><file name="system.xml" hash="6ea9bd6557a047e88bdf2f9de7da5de5"/></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="e1649ff612464ab28bce8fb7bfd7b77a"/><file name="default.phtml" hash="1575862a52ea6a868cefe3a70e4be06c"/><file name="product_view.phtml" hash="37f24589924909223973682f85ccf351"/><file name="success_view.phtml" hash="1a70c7b2270c2011ee4f588015964cef"/></dir></dir><dir name="layout"><file name="edrone.xml" hash="b08f6069d1a9a10c6e32a9757f9bc4cf"/></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Edrone_Base.xml" hash="4c5f7b0e7d7ab7ba79395f08d76f2f74"/></dir></dir></target><target name="magelocale"><dir name="pl_PL"><file name="Edrone.csv" hash="b8aa59d39815f4d92738129cc9fbdf34"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>edroneCRM</name>
4
+ <version>1.0.1</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.&#xD;
11
+ </description>
12
+ <notes>Added support for multiple currencies</notes>
13
  <authors><author><name>Micha&#x142; Blak</name><user>MAG002993376</user><email>michalblak@gmail.com</email></author></authors>
14
+ <date>2015-06-23</date>
15
+ <time>11:06:31</time>
16
+ <contents><target name="magelocal"><dir name="Edrone"><dir name="Base"><dir name="Block"><file name="Base.php" hash="31615b38225a40db0b4fcc538bc50581"/><file name="Cart.php" hash="ed49bc87f960039570aa016c7c0fae6a"/><file name="Order.php" hash="0d9a593ed3646bf3d0aa7ead2481e8b6"/><file name="Product.php" hash="174503941cc8dbabddf875a4001bc6fd"/></dir><dir name="Helper"><file name="Config.php" hash="5b0ffff08d4f2c8a3dfd08837732d776"/><file name="Data.php" hash="bd4dcfb429a76044eb2dab3958b89b15"/></dir><dir name="Model"><file name="Observer.php" hash="f35c3bf591865d6db22e2477580df76c"/></dir><dir name="etc"><file name="adminhtml.xml" hash="0e715e76c00295dc4e555411455fedfb"/><file name="config.xml" hash="800f2853c0c6b2f359687fff825e0efc"/><file name="system.xml" hash="08dd398842eb30b924f224ac4aa4609d"/></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="bcb3ab32948091ece175df562b026c73"/><file name="default.phtml" hash="c8913317a103ef436e77f25fc9c989a5"/><file name="product_view.phtml" hash="2364ec38d816af9137354df153686aaf"/><file name="success_view.phtml" hash="ef79948abc407c1b88bab6f0a6837aa9"/></dir></dir><dir name="layout"><file name="edrone.xml" hash="b08f6069d1a9a10c6e32a9757f9bc4cf"/></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Edrone_Base.xml" hash="4c5f7b0e7d7ab7ba79395f08d76f2f74"/></dir></dir></target><target name="magelocale"><dir name="pl_PL"><file name="Edrone.csv" hash="b8aa59d39815f4d92738129cc9fbdf34"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>