Version Notes
Functionality improvements for multiple stores support.
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Rejoiner |
| Version | 1.1.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.1.0 to 1.1.1
app/code/community/Rejoiner/Acr/Helper/Data.php
CHANGED
|
@@ -89,4 +89,23 @@ class Rejoiner_Acr_Helper_Data extends Mage_Core_Helper_Abstract
|
|
| 89 |
return $couponCode;
|
| 90 |
}
|
| 91 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 92 |
}
|
| 89 |
return $couponCode;
|
| 90 |
}
|
| 91 |
|
| 92 |
+
public function checkHttps()
|
| 93 |
+
{
|
| 94 |
+
if (empty($this->_currentProtocolSecurity)) {
|
| 95 |
+
if (isset($_SERVER['HTTPS']) &&
|
| 96 |
+
($_SERVER['HTTPS'] == 'on' || $_SERVER['HTTPS'] == 1) ||
|
| 97 |
+
isset($_SERVER['HTTP_X_FORWARDED_PROTO']) &&
|
| 98 |
+
$_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') {
|
| 99 |
+
$secure = true;
|
| 100 |
+
}
|
| 101 |
+
else {
|
| 102 |
+
$secure = false;
|
| 103 |
+
}
|
| 104 |
+
$this->_currentProtocolSecurity = $secure;
|
| 105 |
+
} else {
|
| 106 |
+
$secure = $this->_currentProtocolSecurity;
|
| 107 |
+
}
|
| 108 |
+
|
| 109 |
+
return $secure;
|
| 110 |
+
}
|
| 111 |
}
|
app/code/community/Rejoiner/Acr/controllers/AddtocartController.php
CHANGED
|
@@ -16,8 +16,8 @@ class Rejoiner_Acr_AddtocartController extends Mage_Core_Controller_Front_Action
|
|
| 16 |
$cart = Mage::helper('checkout/cart')->getCart();
|
| 17 |
$params = $this->getRequest()->getParams();
|
| 18 |
foreach ($params as $product) {
|
| 19 |
-
if ($product) {
|
| 20 |
-
$prodModel = Mage::getModel('catalog/product')->load($product['product']);
|
| 21 |
$cart->addProduct($prodModel, $product);
|
| 22 |
}
|
| 23 |
}
|
| 16 |
$cart = Mage::helper('checkout/cart')->getCart();
|
| 17 |
$params = $this->getRequest()->getParams();
|
| 18 |
foreach ($params as $product) {
|
| 19 |
+
if ($product && is_array($product)) {
|
| 20 |
+
$prodModel = Mage::getModel('catalog/product')->load((int)$product['product']);
|
| 21 |
$cart->addProduct($prodModel, $product);
|
| 22 |
}
|
| 23 |
}
|
app/design/adminhtml/default/default/template/rejoiner_acr/notification.phtml
CHANGED
|
@@ -4,9 +4,10 @@
|
|
| 4 |
*/
|
| 5 |
?>
|
| 6 |
<?php if ($this->canShow()): ?>
|
|
|
|
| 7 |
<script type="text/javascript">
|
| 8 |
function denyRejoinerNotification() {
|
| 9 |
-
new Ajax.Request('<?php echo $this->getUrl('*/rejoiner/denyNotification', array('_current' => true)); ?>', {
|
| 10 |
method: 'post',
|
| 11 |
onComplete: function(transport) {
|
| 12 |
if (200 == transport.status) {
|
|
@@ -18,6 +19,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 configuration
|
| 22 |
</div>
|
| 23 |
<?php endif; ?>
|
| 4 |
*/
|
| 5 |
?>
|
| 6 |
<?php if ($this->canShow()): ?>
|
| 7 |
+
<?php $secure = Mage::helper('rejoiner_acr')->checkHttps(); ?>
|
| 8 |
<script type="text/javascript">
|
| 9 |
function denyRejoinerNotification() {
|
| 10 |
+
new Ajax.Request('<?php echo $this->getUrl('*/rejoiner/denyNotification', array('_current' => true, '_secure' => $secure)); ?>', {
|
| 11 |
method: 'post',
|
| 12 |
onComplete: function(transport) {
|
| 13 |
if (200 == transport.status) {
|
| 19 |
}
|
| 20 |
</script>
|
| 21 |
<div id="rejoiner_notification" class="notification-global notification-global-notice">
|
| 22 |
+
<strong>Rejoiner:</strong> <?php echo $this->helper('rejoiner_acr')->__('It looks like your checkout configuration has been modified by another extension. This is not 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>
|
| 23 |
</div>
|
| 24 |
<?php endif; ?>
|
app/locale/en_US/Rejoiner_Acr.csv
CHANGED
|
@@ -1,6 +1,8 @@
|
|
| 1 |
"Rejoiner Abandoned Cart Recovery","Rejoiner Abandoned Cart Recovery"
|
| 2 |
"Rejoined site-id","Rejoined site-id"
|
| 3 |
-
"It looks like your checkout
|
|
|
|
|
|
|
| 4 |
"Remove this notification","Remove this notification"
|
| 5 |
"Generate Coupon Code","Generate Coupon Code"
|
| 6 |
-
"Select Shopping Cart Price Rule","Select Shopping Cart Price Rule"
|
| 1 |
"Rejoiner Abandoned Cart Recovery","Rejoiner Abandoned Cart Recovery"
|
| 2 |
"Rejoined site-id","Rejoined site-id"
|
| 3 |
+
"It looks like your checkout configuration has been modified by another extension. This is not always an issue, but please email","It looks like your checkout configuration has been modified by another extension. This is not always an issue, but please email"
|
| 4 |
+
"to verify that your Rejoiner tags are injecting properly", "to verify that your Rejoiner tags are injecting properly"
|
| 5 |
+
"Never show this message again", "Never show this message again"
|
| 6 |
"Remove this notification","Remove this notification"
|
| 7 |
"Generate Coupon Code","Generate Coupon Code"
|
| 8 |
+
"Select Shopping Cart Price Rule","Select Shopping Cart Price Rule"
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Rejoiner</name>
|
| 4 |
-
<version>1.1.
|
| 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>
|
| 12 |
<authors><author><name>Mike</name><user>auto-converted</user><email>mike@rejoiner.com</email></author></authors>
|
| 13 |
-
<date>2014-02-
|
| 14 |
-
<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="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Rejoiner</name>
|
| 4 |
+
<version>1.1.1</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>Functionality improvements for multiple stores support.</notes>
|
| 12 |
<authors><author><name>Mike</name><user>auto-converted</user><email>mike@rejoiner.com</email></author></authors>
|
| 13 |
+
<date>2014-02-26</date>
|
| 14 |
+
<time>15:03:11</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="6bf5f57f4e0c5f394432749d2bafa158"/></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="9a11506f06aa714dc520ee8cf7a87696"/></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="3a3872e6434bf7d2ca7fa0edfe6f9726"/></dir></dir></dir></dir></dir></target><target name="magelocale"><dir name="en_US"><file name="Rejoiner_Acr.csv" hash="ca059e55cd2380cd1d7af351fa00d9cf"/></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies/>
|
| 18 |
</package>
|
