Rejoiner - Version 1.1.0

Version Notes

Added functionality to generate discount coupon code for abandoned transactions.

Download this release

Release Info

Developer Magento Core Team
Extension Rejoiner
Version 1.1.0
Comparing to
See all releases


Code changes from version 1.0.9 to 1.1.0

Files changed (4) hide show
  1. app/code/community/Rejoiner/Acr/Helper/Data.php +0 -1
  2. app/code/community/Rejoiner/Acr/Model/System/Config/Source/Salesrule.php +6 -4
  3. app/design/adminhtml/default/default/template/rejoiner_acr/notification.phtml +2 -2
  4. package.xml +5 -5
app/code/community/Rejoiner/Acr/Helper/Data.php CHANGED
@@ -84,7 +84,6 @@ class Rejoiner_Acr_Helper_Data extends Mage_Core_Helper_Abstract
84
  Mage::getSingleton('checkout/cart')
85
  ->getQuote()
86
  ->setPromo(strlen($couponCode) ? $couponCode : '')
87
- ->collectTotals()
88
  ->save();
89
  }
90
  return $couponCode;
84
  Mage::getSingleton('checkout/cart')
85
  ->getQuote()
86
  ->setPromo(strlen($couponCode) ? $couponCode : '')
 
87
  ->save();
88
  }
89
  return $couponCode;
app/code/community/Rejoiner/Acr/Model/System/Config/Source/Salesrule.php CHANGED
@@ -4,13 +4,15 @@ class Rejoiner_Acr_Model_System_Config_Source_Salesrule {
4
 
5
  public function toOptionArray()
6
  {
7
- $options = array();
8
- $additional=array();
9
- $additional['value'] = 'rule_id';
10
- $additional['label'] = 'name';
 
11
  $collection = Mage::getResourceModel('salesrule/rule_collection')->loadData();
12
  foreach ($collection as $item) {
13
  if ($item->getUseAutoGeneration()) {
 
14
  foreach ($additional as $code => $field) {
15
  $data[$code] = $item->getData($field);
16
  }
4
 
5
  public function toOptionArray()
6
  {
7
+ $options = array();
8
+ $additional= array(
9
+ 'value' => 'rule_id',
10
+ 'label' => 'name'
11
+ );
12
  $collection = Mage::getResourceModel('salesrule/rule_collection')->loadData();
13
  foreach ($collection as $item) {
14
  if ($item->getUseAutoGeneration()) {
15
+ $data = array();
16
  foreach ($additional as $code => $field) {
17
  $data[$code] = $item->getData($field);
18
  }
app/design/adminhtml/default/default/template/rejoiner_acr/notification.phtml CHANGED
@@ -18,6 +18,6 @@
18
  }
19
  </script>
20
  <div id="rejoiner_notification" class="notification-global notification-global-notice">
21
- <strong>Rejoiner:</strong> <?php echo $this->helper('rejoiner_acr')->__('It looks like your checkout functionality have been overridden by some extension. So there is a chance that Rejoiner Snippets will not work. Please contact us') ?> <a href="mailto:help@rejoiner.com" >help@rejoiner.com</a>. <a href="#" onclick="denyRejoinerNotification(); return false;"><?php echo $this->helper('rejoiner_acr')->__('Remove this notification') ?></a>
22
  </div>
23
- <?php endif; ?>
18
  }
19
  </script>
20
  <div id="rejoiner_notification" class="notification-global notification-global-notice">
21
+ <strong>Rejoiner:</strong> <?php echo $this->helper('rejoiner_acr')->__('It looks like your checkout configuration have been modified by another extension. This isn`t always an issue, but please email') ?> <a href="mailto:support@rejoiner.com" >support@rejoiner.com</a><?php echo $this->helper('rejoiner_acr')->__(' to verify that your Rejoiner tags are injecting properly') ?>. <a href="#" onclick="denyRejoinerNotification(); return false;"><?php echo $this->helper('rejoiner_acr')->__('Never show this message again') ?></a>
22
  </div>
23
+ <?php endif; ?>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Rejoiner</name>
4
- <version>1.0.9</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Rejoiner Cart Abandonment Remarketing</summary>
10
- <description>Turn abandoned carts into 15% more sales with Rejoiner.</description>
11
  <notes>Added functionality to generate discount coupon code for abandoned transactions.</notes>
12
  <authors><author><name>Mike</name><user>auto-converted</user><email>mike@rejoiner.com</email></author></authors>
13
- <date>2014-02-12</date>
14
- <time>15:24:58</time>
15
- <contents><target name="mageetc"><dir name="modules"><file name="Rejoiner_Acr.xml" hash="1aad3601804cead81b6e687dfcb5b83f"/></dir></target><target name="magecommunity"><dir name="Rejoiner"><dir name="Acr"><dir name="Block"><dir name="Adminhtml"><file name="Notification.php" hash="4b4837b59ab85fa886e65be49d511490"/></dir><file name="Snippets.php" hash="e1854b0555146371e75214b9f1b14284"/></dir><dir name="Helper"><file name="Data.php" hash="f35ff29ccfdb985d3ad079d5bf43e222"/></dir><dir name="Model"><dir name="Resource"><file name="Setup.php" hash="48f66ad159e3d10a21cc04a980ca923e"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Salesrule.php" hash="a8177bea6817c327fae8bb22cecf0502"/></dir></dir></dir><file name="Notification.php" hash="a03d68e9bbaa820ce87557fca9f8f811"/><file name="Observer.php" hash="df2d853ad73acab825dcae806c1e23e1"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="RejoinerController.php" hash="c2e5fea12a2fc23905d86f119c2baa39"/></dir><file name="AddtocartController.php" hash="a4c47b73379ab7d6319d4d00efca7c1f"/></dir><dir name="etc"><file name="config.xml" hash="7599dc7571149cb04bc66061590d9207"/><file name="system.xml" hash="7e3be6d652a90327fbb5c6d3d198f5a2"/></dir><dir name="sql"><dir name="rejoiner_setup"><file name="mysql4-install-1.0.0.0.php" hash="8d9a21c9c09fe44c6fe51ddd2106e3e0"/><file name="mysql4-upgrade-1.0.0.0-1.0.1.0.php" hash="36cc70cc6dd37aab7f3c460e0af58d59"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="rejoiner_acr.xml" hash="365a3c5ba3a233c9ccca4bbbed89e745"/></dir><dir name="template"><dir name="rejoiner_acr"><file name="conversion.phtml" hash="13a53b2f28e5f5fa6e0644ea9cf5a6a4"/><file name="email.phtml" hash="05e54d0999953acf865b6a439c4bb6b5"/><file name="tracking.phtml" hash="1fb47f23cd14449a3978c12bb320fdd4"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="rejoiner_acr.xml" hash="3181cf1ca63813a9ce633ed3268659f4"/></dir><dir name="template"><dir name="rejoiner_acr"><file name="notification.phtml" hash="90e1ddade6bbe1ecb0ffb68bf291469d"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Rejoiner_Acr.csv" hash="24fe23f6afe1d770202d94e65373565e"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Rejoiner</name>
4
+ <version>1.1.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Rejoiner Cart Abandonment Remarketing</summary>
10
+ <description>Minor changes in rejoiner notifications functionality.</description>
11
  <notes>Added functionality to generate discount coupon code for abandoned transactions.</notes>
12
  <authors><author><name>Mike</name><user>auto-converted</user><email>mike@rejoiner.com</email></author></authors>
13
+ <date>2014-02-20</date>
14
+ <time>14:54:47</time>
15
+ <contents><target name="mageetc"><dir name="modules"><file name="Rejoiner_Acr.xml" hash="1aad3601804cead81b6e687dfcb5b83f"/></dir></target><target name="magecommunity"><dir name="Rejoiner"><dir name="Acr"><dir name="Block"><dir name="Adminhtml"><file name="Notification.php" hash="4b4837b59ab85fa886e65be49d511490"/></dir><file name="Snippets.php" hash="e1854b0555146371e75214b9f1b14284"/></dir><dir name="Helper"><file name="Data.php" hash="2d19148045fcf45ee693793174a3fe2c"/></dir><dir name="Model"><dir name="Resource"><file name="Setup.php" hash="48f66ad159e3d10a21cc04a980ca923e"/></dir><dir name="System"><dir name="Config"><dir name="Source"><file name="Salesrule.php" hash="1b6a8d728b5fa308b18a222c5981ed52"/></dir></dir></dir><file name="Notification.php" hash="a03d68e9bbaa820ce87557fca9f8f811"/><file name="Observer.php" hash="df2d853ad73acab825dcae806c1e23e1"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="RejoinerController.php" hash="c2e5fea12a2fc23905d86f119c2baa39"/></dir><file name="AddtocartController.php" hash="a4c47b73379ab7d6319d4d00efca7c1f"/></dir><dir name="etc"><file name="config.xml" hash="7599dc7571149cb04bc66061590d9207"/><file name="system.xml" hash="7e3be6d652a90327fbb5c6d3d198f5a2"/></dir><dir name="sql"><dir name="rejoiner_setup"><file name="mysql4-install-1.0.0.0.php" hash="8d9a21c9c09fe44c6fe51ddd2106e3e0"/><file name="mysql4-upgrade-1.0.0.0-1.0.1.0.php" hash="36cc70cc6dd37aab7f3c460e0af58d59"/></dir></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="rejoiner_acr.xml" hash="365a3c5ba3a233c9ccca4bbbed89e745"/></dir><dir name="template"><dir name="rejoiner_acr"><file name="conversion.phtml" hash="13a53b2f28e5f5fa6e0644ea9cf5a6a4"/><file name="email.phtml" hash="05e54d0999953acf865b6a439c4bb6b5"/><file name="tracking.phtml" hash="1fb47f23cd14449a3978c12bb320fdd4"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="rejoiner_acr.xml" hash="3181cf1ca63813a9ce633ed3268659f4"/></dir><dir name="template"><dir name="rejoiner_acr"><file name="notification.phtml" hash="46aaacc2cc264891ae151c90b44ab076"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Rejoiner_Acr.csv" hash="24fe23f6afe1d770202d94e65373565e"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>