Conversionmonk_Cmembedcode - Version 1.1.0

Version Notes

Second Release

Download this release

Release Info

Developer Piplayan
Extension Conversionmonk_Cmembedcode
Version 1.1.0
Comparing to
See all releases


Code changes from version 1.0.0 to 1.1.0

app/code/community/Conversionmonk/Cmembedcode/Adminhtml/Block/Newsletter/Subscriber/Grid.php CHANGED
@@ -54,23 +54,12 @@ class Conversionmonk_Cmembedcode_Adminhtml_Block_Newsletter_Subscriber_Grid exte
54
 
55
  protected function _prepareColumns()
56
  {
 
57
  parent::_prepareColumns();
58
 
59
- $this->mrRemoveColumn('firstname');
60
- $this->mrRemoveColumn('lastname');
61
-
62
-
63
- $this->addColumnAfter('firstname', array(
64
- 'header' => Mage::helper('newsletter')->__('First Name'),
65
- 'index' => 'customer_firstname',
66
- 'renderer' => 'Conversionmonk_Cmembedcode_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Firstname'
67
- ), Mage::getStoreConfig('newsletterextended/fields/show_prefix') ? 'prefix' : (Mage::getStoreConfig('newsletterextended/fields/show_gender') ? 'gender' : 'type'));
68
-
69
- $this->addColumnAfter('lastname', array(
70
- 'header' => Mage::helper('newsletter')->__('Last Name'),
71
- 'index' => 'customer_lastname',
72
- 'renderer' => 'Conversionmonk_Cmembedcode_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Lastname'
73
- ), 'firstname');
74
 
75
  $this->addColumnAfter('cmonk_subscriber_source', array(
76
  'header' => Mage::helper('newsletter')->__('Source'),
@@ -80,22 +69,11 @@ class Conversionmonk_Cmembedcode_Adminhtml_Block_Newsletter_Subscriber_Grid exte
80
 
81
  // manually sort again, that our custom order works
82
  $this->sortColumnsByOrder();
 
83
 
84
  return $this;
85
  }
86
 
87
- public function mrRemoveColumn($columnId)
88
- {
89
- if (method_exists($this, "removeColumn")) {
90
- return $this->removeColumn($columnId);
91
- }
92
- else if (isset($this->_columns[$columnId])) {
93
- unset($this->_columns[$columnId]);
94
- if ($this->_lastColumnId == $columnId) {
95
- $this->_lastColumnId = key($this->_columns);
96
- }
97
- }
98
- return $this;
99
- }
100
 
101
  }
54
 
55
  protected function _prepareColumns()
56
  {
57
+
58
  parent::_prepareColumns();
59
 
60
+ $configValueEnabled = Mage::getStoreConfig('csettings/gcsettings/showcolumn');
61
+ if($configValueEnabled)
62
+ {
 
 
 
 
 
 
 
 
 
 
 
 
63
 
64
  $this->addColumnAfter('cmonk_subscriber_source', array(
65
  'header' => Mage::helper('newsletter')->__('Source'),
69
 
70
  // manually sort again, that our custom order works
71
  $this->sortColumnsByOrder();
72
+ }
73
 
74
  return $this;
75
  }
76
 
77
+
 
 
 
 
 
 
 
 
 
 
 
 
78
 
79
  }
app/code/community/Conversionmonk/Cmembedcode/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Firstname.php DELETED
@@ -1,29 +0,0 @@
1
- <?php
2
- class Conversionmonk_Cmembedcode_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Firstname extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
3
- {
4
- public function render(Varien_Object $row)
5
- {
6
- // not logged in => use subscriber data
7
- if ($row->getType() != 2) {
8
- $value = $row->getCmonkSubscriberFirstname();
9
- }
10
- // logged-in with override
11
- elseif (Mage::getStoreConfig('cmembedcode/fields/customer_override')) {
12
-
13
- // fallback enabled => fallback to customer data if no data found in subscriber
14
- if (Mage::getStoreConfig('cmembedcode/fields/customer_fallback')) {
15
- $value = $row->getCmonkSubscriberFirstname() ? $row->getCmonkSubscriberFirstname() : $row->getCustomerFirstname();
16
- }
17
- // fallback disabled => only use subscriber data event if it's empty
18
- else {
19
- $value = $row->getCmonkSubscriberFirstname();
20
- }
21
- }
22
- // logged-in without override => only use customer data even if it's empty
23
- else {
24
- $value = $row->getCustomerFirstname();
25
- }
26
-
27
- return $value ? $value : '---';
28
- }
29
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Conversionmonk/Cmembedcode/Adminhtml/Block/Newsletter/Subscriber/Grid/Renderer/Lastname.php DELETED
@@ -1,30 +0,0 @@
1
- <?php
2
- class Conversionmonk_Cmembedcode_Adminhtml_Block_Newsletter_Subscriber_Grid_Renderer_Lastname extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
3
- {
4
-
5
- public function render(Varien_Object $row)
6
- {
7
- // not logged in => use subscriber data
8
- if ($row->getType() != 2) {
9
- $value = $row->getCmonkSubscriberLastname();
10
- }
11
- // logged-in with override
12
- elseif (Mage::getStoreConfig('cmembedcode/fields/customer_override')) {
13
-
14
- // fallback enabled => fallback to customer data if no data found in subscriber
15
- if (Mage::getStoreConfig('cmembedcode/fields/customer_fallback')) {
16
- $value = $row->getCmonkSubscriberLastname() ? $row->getCmonkSubscriberLastname() : $row->getCustomerLastname();
17
- }
18
- // fallback disabled => only use subscriber data event if it's empty
19
- else {
20
- $value = $row->getCmonkSubscriberLastname();
21
- }
22
- }
23
- // logged-in without override => only use customer data even if it's empty
24
- else {
25
- $value = $row->getCustomerLastname();
26
- }
27
-
28
- return $value ? $value : '---';
29
- }
30
- }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
app/code/community/Conversionmonk/Cmembedcode/Model/Observer.php CHANGED
@@ -6,30 +6,19 @@ class Conversionmonk_Cmembedcode_Model_Observer
6
  $subscriber = $observer->getEvent()->getSubscriber();
7
  $data = Mage::app()->getRequest()->getParams() ? Mage::app()->getRequest()->getParams() : array();
8
 
9
- if (Mage::getSingleton('customer/session')->isLoggedIn()) {
10
-
11
- $customer = Mage::getSingleton('customer/session')->getCustomer();
12
-
13
- if (isset($data['email']) && $customer->getEmail() === $data['email']) {
14
-
15
- if (!Mage::getStoreConfig('cmembedcode/fields/customer_override')) {
16
- $data['firstname'] = '';
17
- $data['lastname'] = '';
18
- $data['subscriber_source'] = '';
19
- }
20
-
21
- }
22
- }
23
 
24
  // store data only if email is provided
25
- if (isset($data['email'])) {
26
- //$data['firstname'] = 'testfirst1';
27
- /*echo "<pre />";
28
- print_r($data);
29
- die;*/
30
- if (isset($data['firstname'])) $subscriber->setCmonkSubscriberFirstname($data['firstname']);
31
- if (isset($data['lastname'])) $subscriber->setCmonkSubscriberLastname($data['lastname']);
32
  if (isset($data['subscriber_source'])) $subscriber->setCmonkSubscriberSource($data['subscriber_source']);
 
 
 
 
33
  }
34
 
35
  return $this;
6
  $subscriber = $observer->getEvent()->getSubscriber();
7
  $data = Mage::app()->getRequest()->getParams() ? Mage::app()->getRequest()->getParams() : array();
8
 
9
+
 
 
 
 
 
 
 
 
 
 
 
 
 
10
 
11
  // store data only if email is provided
12
+ if (isset($data['showcolumn'])){
13
+ $configValueEnabled = $data['showcolumn'];
14
+ }
15
+
16
+ if (isset($data['email'])) {
 
 
17
  if (isset($data['subscriber_source'])) $subscriber->setCmonkSubscriberSource($data['subscriber_source']);
18
+ if($configValueEnabled != '') {
19
+ $configSwitch = new Mage_Core_Model_Config();
20
+ $configSwitch ->saveConfig('csettings/gcsettings/showcolumn', $data['showcolumn'], 'default', 0);
21
+ }
22
  }
23
 
24
  return $this;
app/code/community/Conversionmonk/Cmembedcode/Model/Subscriber.php CHANGED
@@ -9,36 +9,6 @@ class Conversionmonk_Cmembedcode_Model_Subscriber extends Mage_Newsletter_Model_
9
  $this->customer = Mage::getModel('customer/customer')->load($this->getCustomerId());
10
  }
11
  return $this->customer;
12
- }
13
-
14
- public function getSubscriberFirstname()
15
- {
16
- $firstname = parent::getCmonkSubscriberFirstname();
17
-
18
- if (!$firstname && $this->getCustomer()) {
19
- $firstname = $this->getCustomer()->getFirstname();
20
- }
21
- return $firstname;
22
- }
23
-
24
- public function getSubscriberLastname()
25
- {
26
- $lastname = parent::getCmonkSubscriberLastname();
27
-
28
- if (!$lastname && $this->getCustomer()) {
29
- $lastname = $this->getCustomer()->getLastname();
30
- }
31
- return $lastname;
32
- }
33
-
34
- public function getSubscriberFullName()
35
- {
36
- return trim($this->getCmonkSubscriberFirstname() . ' ' . $this->getCmonkSubscriberLastname());
37
- }
38
-
39
-
40
-
41
-
42
-
43
 
44
  }
9
  $this->customer = Mage::getModel('customer/customer')->load($this->getCustomerId());
10
  }
11
  return $this->customer;
12
+ }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
13
 
14
  }
app/code/community/Conversionmonk/Cmembedcode/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Conversionmonk_Cmembedcode>
5
- <version>1.0.0</version>
6
  </Conversionmonk_Cmembedcode>
7
  </modules>
8
  <frontend>
@@ -85,4 +85,9 @@
85
  </global>
86
  <adminhtml>
87
  </adminhtml>
 
 
 
 
 
88
  </config>
2
  <config>
3
  <modules>
4
  <Conversionmonk_Cmembedcode>
5
+ <version>1.1.0</version>
6
  </Conversionmonk_Cmembedcode>
7
  </modules>
8
  <frontend>
85
  </global>
86
  <adminhtml>
87
  </adminhtml>
88
+ <csettings>
89
+ <gcsettings>
90
+ <showcolumn>0</showcolumn>
91
+ </gcsettings>
92
+ </csettings>
93
  </config>
app/code/community/Conversionmonk/Cmembedcode/sql/conversionmonk_cmembedcode_setup/mysql4-install-1.0.0.php CHANGED
@@ -5,18 +5,6 @@ $installer->startSetup();
5
  // add additional columns to "newsletter_subscriber" table
6
  $tableName = $installer->getTable('newsletter_subscriber');
7
 
8
- $installer->getConnection()->addColumn($tableName, 'cmonk_subscriber_firstname', array(
9
- 'nullable' => true,
10
- 'length' => 255,
11
- 'type' => Varien_Db_Ddl_Table::TYPE_TEXT,
12
- 'comment' => 'added by conversionmonk'
13
- ));
14
- $installer->getConnection()->addColumn($tableName, 'cmonk_subscriber_lastname', array(
15
- 'nullable' => true,
16
- 'length' => 255,
17
- 'type' => Varien_Db_Ddl_Table::TYPE_TEXT,
18
- 'comment' => 'added by conversionmonk'
19
- ));
20
  $installer->getConnection()->addColumn($tableName, 'cmonk_subscriber_source', array(
21
  'nullable' => true,
22
  'length' => 255,
5
  // add additional columns to "newsletter_subscriber" table
6
  $tableName = $installer->getTable('newsletter_subscriber');
7
 
 
 
 
 
 
 
 
 
 
 
 
 
8
  $installer->getConnection()->addColumn($tableName, 'cmonk_subscriber_source', array(
9
  'nullable' => true,
10
  'length' => 255,
app/design/frontend/base/default/template/cmembedcode/index.phtml CHANGED
@@ -1,3 +1,6 @@
 
 
 
1
  <?php
2
  echo Mage::getStoreConfig('csettings/gcsettings/cmanalyticscode');
3
  ?>
1
+ <script type="text/javascript">
2
+ var _CnvMonk_initsettings={mage_base_url:"<?php echo Mage::getBaseUrl(); ?>"};
3
+ </script>
4
  <?php
5
  echo Mage::getStoreConfig('csettings/gcsettings/cmanalyticscode');
6
  ?>
app/etc/modules/Conversionmonk_Cmembedcode.xml CHANGED
@@ -4,7 +4,7 @@
4
  <Conversionmonk_Cmembedcode>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
- <version>1.0.0</version>
8
  </Conversionmonk_Cmembedcode>
9
  </modules>
10
  </config>
4
  <Conversionmonk_Cmembedcode>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ <version>1.1.0</version>
8
  </Conversionmonk_Cmembedcode>
9
  </modules>
10
  </config>
package.xml CHANGED
@@ -1,20 +1,20 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Conversionmonk_Cmembedcode</name>
4
- <version>1.0.0</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL)</license>
7
  <channel>community</channel>
8
  <extends/>
9
- <summary>This extension for Magento allows you to easily integrate ConversionMonk with Magento. </summary>
10
  <description>ConversionMonk extension for Magento allows you to easily integrate ConversionMonk with Magento. The extension works with both Magento Enterprise Edition and Magento Community Edition.&#xD;
11
  &#xD;
12
  ConversionMonk is an automated conversion optimization and web personalization platform. Our web-based SaaS software tracks website visitors' behavior and then displays targeted content, messages and offers in real time.</description>
13
- <notes>First Preview Release</notes>
14
  <authors><author><name>Piplayan</name><user>piplayan</user><email>piplayan@conversionmonk.com</email></author></authors>
15
- <date>2015-11-24</date>
16
- <time>06:12:31</time>
17
- <contents><target name="magecommunity"><dir name="Conversionmonk"><dir name="Cmembedcode"><dir name="Adminhtml"><dir name="Block"><dir name="Newsletter"><dir name="Subscriber"><dir name="Grid"><dir name="Renderer"><file name="Firstname.php" hash="b4ad83a7a22963ab905b3e4f17870e48"/><file name="Lastname.php" hash="86225f344469264dd0dfbe3fe5bb66d4"/></dir></dir><file name="Grid.php" hash="211dfbf38c5dd5e578b3f8b9a2d554c4"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="b01c803a7f2a19e05cd81ef2967abd24"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Subscriber"><file name="Collection.php" hash="667a7c7106afbf9b1502e3585d12ddec"/></dir></dir><file name="Observer.php" hash="b763797a715476e834b58a6cd806c87f"/><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="6632d5d5376b25d0374aaa90c8175383"/></dir></dir><file name="Subscriber.php" hash="4553a916f4a102e87ebc77bdae978c09"/></dir><dir name="controllers"><dir name="Newsletter"><file name="SubscriberController.php" hash="3c049a7166adb2dd22b10bef4b9a8c85"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="cc9ae9cb60d382a0d99c5c545670d366"/><file name="config.xml" hash="f149882fb237b44526ce64537f9bbd83"/><file name="system.xml" hash="68232ab3a4c1e860963efad39921ad74"/></dir><dir name="sql"><dir name="conversionmonk_cmembedcode_setup"><file name="mysql4-install-1.0.0.php" hash="efee1132c56800bd1d67809d3081fcf6"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="cmembedcode.xml" hash="5c0ec2245cace3245a8c28cfcf04c954"/></dir><dir name="template"><dir name="cmembedcode"><file name="index.phtml" hash="1f529d1f53dcafeb02fd06b5224a0bdf"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Conversionmonk_Cmembedcode.xml" hash="0f8d77cf82d0f36093637afc79522738"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Conversionmonk_Cmembedcode</name>
4
+ <version>1.1.0</version>
5
  <stability>stable</stability>
6
  <license>Open Software License (OSL)</license>
7
  <channel>community</channel>
8
  <extends/>
9
+ <summary>This extension for Magento allows you to easily integrate ConversionMonk with Magento.</summary>
10
  <description>ConversionMonk extension for Magento allows you to easily integrate ConversionMonk with Magento. The extension works with both Magento Enterprise Edition and Magento Community Edition.&#xD;
11
  &#xD;
12
  ConversionMonk is an automated conversion optimization and web personalization platform. Our web-based SaaS software tracks website visitors' behavior and then displays targeted content, messages and offers in real time.</description>
13
+ <notes>Second Release</notes>
14
  <authors><author><name>Piplayan</name><user>piplayan</user><email>piplayan@conversionmonk.com</email></author></authors>
15
+ <date>2016-03-08</date>
16
+ <time>18:59:13</time>
17
+ <contents><target name="magecommunity"><dir name="Conversionmonk"><dir name="Cmembedcode"><dir name="Adminhtml"><dir name="Block"><dir name="Newsletter"><dir name="Subscriber"><file name="Grid.php" hash="03fc6ef43c6a73551ec5e2c71f86902d"/></dir></dir></dir></dir><dir name="Helper"><file name="Data.php" hash="b01c803a7f2a19e05cd81ef2967abd24"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Subscriber"><file name="Collection.php" hash="667a7c7106afbf9b1502e3585d12ddec"/></dir></dir><file name="Observer.php" hash="98411af5849d13aea54a51f1cf72b1cc"/><dir name="Resource"><dir name="Mysql4"><file name="Setup.php" hash="6632d5d5376b25d0374aaa90c8175383"/></dir></dir><file name="Subscriber.php" hash="9c4a01abb0cf13a96bd70d5fb40ee072"/></dir><dir name="controllers"><dir name="Newsletter"><file name="SubscriberController.php" hash="3c049a7166adb2dd22b10bef4b9a8c85"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="cc9ae9cb60d382a0d99c5c545670d366"/><file name="config.xml" hash="0096023cd582dbda0ae3a477c855255c"/><file name="system.xml" hash="68232ab3a4c1e860963efad39921ad74"/></dir><dir name="sql"><dir name="conversionmonk_cmembedcode_setup"><file name="mysql4-install-1.0.0.php" hash="6018bd449c44a93fb1239b093db3356f"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="cmembedcode.xml" hash="5c0ec2245cace3245a8c28cfcf04c954"/></dir><dir name="template"><dir name="cmembedcode"><file name="index.phtml" hash="8d8a446cbfdfbc48c624803408435682"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Conversionmonk_Cmembedcode.xml" hash="61356e7479bc143333c582caa640e69b"/></dir></target></contents>
18
  <compatible/>
19
  <dependencies><required><php><min>5.1.0</min><max>6.0.0</max></php></required></dependencies>
20
  </package>