Version Notes
- Small updates
Download this release
Release Info
Developer | Magento Core Team |
Extension | Fanplayr |
Version | 1.0.68 |
Comparing to | |
See all releases |
Code changes from version 1.0.67 to 1.0.68
- app/code/community/Fanplayr/Socialcoupons/Block/Adminhtml/System/Config/Form/Field/Installhelper.php +3 -3
- app/code/community/Fanplayr/Socialcoupons/Model/OrderObserver.php +2 -2
- app/code/community/Fanplayr/Socialcoupons/controllers/CompyController.php +1 -1
- app/design/frontend/base/default/template/fanplayr/embed.phtml +2 -2
- app/design/frontend/base/default/template/fanplayr/success.phtml +1 -1
- app/design/frontend/default/default/template/fanplayr/embed.phtml +2 -2
- app/design/frontend/default/default/template/fanplayr/success.phtml +1 -1
- package.xml +4 -4
- skin/frontend/socialcoupons/fanplayr_join.html +1 -1
- skin/frontend/socialcoupons/fanplayr_socialcoupons.js +2 -2
app/code/community/Fanplayr/Socialcoupons/Block/Adminhtml/System/Config/Form/Field/Installhelper.php
CHANGED
@@ -279,7 +279,7 @@ EOT;
|
|
279 |
} else {
|
280 |
$errorGettingInstallData = false;
|
281 |
try {
|
282 |
-
$m = json_decode($this->httpGetContent('http://
|
283 |
'acc_key' => $accKey,
|
284 |
'shop_id' => $shopId,
|
285 |
'secret' => $secret,
|
@@ -308,7 +308,7 @@ EOT;
|
|
308 |
}
|
309 |
|
310 |
try {
|
311 |
-
$campData = addslashes($this->httpGetContent('http://
|
312 |
'acc_key' => $accKey,
|
313 |
'shop_id' => $shopId,
|
314 |
'secret' => $secret,
|
@@ -366,7 +366,7 @@ EOT;
|
|
366 |
<p>Your Store has been linked to Fanplayr, but you still need to create a campaign. Click below to get started.</p>
|
367 |
<p>You will have to <a href="#" onclick="refreshPage();">refresh</a> the page to see campaigns once you have created them.</p>
|
368 |
</div>
|
369 |
-
<a href="http://
|
370 |
</div>
|
371 |
<script>
|
372 |
fanplayrJQuery().ready(function() {
|
279 |
} else {
|
280 |
$errorGettingInstallData = false;
|
281 |
try {
|
282 |
+
$m = json_decode($this->httpGetContent('http://my.fanplayr.com/api.magentoCheckInstall/', array(
|
283 |
'acc_key' => $accKey,
|
284 |
'shop_id' => $shopId,
|
285 |
'secret' => $secret,
|
308 |
}
|
309 |
|
310 |
try {
|
311 |
+
$campData = addslashes($this->httpGetContent('http://my.fanplayr.com/api.magentoGetCampaigns/all/1/', array(
|
312 |
'acc_key' => $accKey,
|
313 |
'shop_id' => $shopId,
|
314 |
'secret' => $secret,
|
366 |
<p>Your Store has been linked to Fanplayr, but you still need to create a campaign. Click below to get started.</p>
|
367 |
<p>You will have to <a href="#" onclick="refreshPage();">refresh</a> the page to see campaigns once you have created them.</p>
|
368 |
</div>
|
369 |
+
<a href="http://my.fanplayr.com/login/" id="fanplayr-start-button" target="_blank"><div class="fanplayr-icon fanplayr-icon-star"></div>Create a Fanplayr Campaign</a>
|
370 |
</div>
|
371 |
<script>
|
372 |
fanplayrJQuery().ready(function() {
|
app/code/community/Fanplayr/Socialcoupons/Model/OrderObserver.php
CHANGED
@@ -110,7 +110,7 @@
|
|
110 |
// order created, let's tell Fanplayr to link details at a later time
|
111 |
if ($state == Mage_Sales_Model_Order::STATE_PENDING_PAYMENT) {
|
112 |
|
113 |
-
$url .= 'http://
|
114 |
|
115 |
// we will only have these on the before
|
116 |
// get session data if we can
|
@@ -135,7 +135,7 @@
|
|
135 |
// log the order with Fanplayr
|
136 |
} else if ($state == Mage_Sales_Model_Order::STATE_PROCESSING) {
|
137 |
|
138 |
-
$url .= 'http://
|
139 |
|
140 |
// get order info
|
141 |
$data = $this->getLastOrderInformation($order->getId());
|
110 |
// order created, let's tell Fanplayr to link details at a later time
|
111 |
if ($state == Mage_Sales_Model_Order::STATE_PENDING_PAYMENT) {
|
112 |
|
113 |
+
$url .= 'http://my.fanplayr.com/api.track.v1.ordercreated/';
|
114 |
|
115 |
// we will only have these on the before
|
116 |
// get session data if we can
|
135 |
// log the order with Fanplayr
|
136 |
} else if ($state == Mage_Sales_Model_Order::STATE_PROCESSING) {
|
137 |
|
138 |
+
$url .= 'http://my.fanplayr.com/api.track.v1.orderpaid/';
|
139 |
|
140 |
// get order info
|
141 |
$data = $this->getLastOrderInformation($order->getId());
|
app/code/community/Fanplayr/Socialcoupons/controllers/CompyController.php
CHANGED
@@ -646,7 +646,7 @@ EOT;
|
|
646 |
if ($inform) {
|
647 |
$m = null;
|
648 |
try {
|
649 |
-
$m = json_decode($this->httpGetContent('http://
|
650 |
'acc_key' => $accKey,
|
651 |
'shop_id' => $shopId,
|
652 |
'secret' => $secret,
|
646 |
if ($inform) {
|
647 |
$m = null;
|
648 |
try {
|
649 |
+
$m = json_decode($this->httpGetContent('http://my.fanplayr.com/api.magentoInformWidget/', array(
|
650 |
'acc_key' => $accKey,
|
651 |
'shop_id' => $shopId,
|
652 |
'secret' => $secret,
|
app/design/frontend/base/default/template/fanplayr/embed.phtml
CHANGED
@@ -19,7 +19,7 @@
|
|
19 |
<?php if(!$noTags){ ?><script><?php } ?>
|
20 |
window.fplr = (function(d, s, key) {
|
21 |
var f, js = d.createElement(s), fjs = d.getElementsByTagName(s)[0]; js.async = true;
|
22 |
-
js.src = '//
|
23 |
return window.fplr || (f = { _r: [], ready: function(a){ f._r.push(a) }, setSessionId: function(a, b){ f._s = a; f._l = b; if (b && a) setSessionCookie('fplr_magento_sess', a, 0); else if (b && !a) setSessionCookie('fplr_magento_sess', '', -1); } });
|
24 |
})(document, 'script');
|
25 |
|
@@ -87,7 +87,7 @@
|
|
87 |
var js = d.createElement(s);
|
88 |
var fjs = d.getElementsByTagName(s)[0];
|
89 |
js.async = true;
|
90 |
-
js.src = 'https://d1q7pknmpq2wkm.cloudfront.net/js/
|
91 |
(new Date().getTime()); fjs.parentNode.insertBefore(js, fjs);
|
92 |
};
|
93 |
<?php if ($embedType == 5){ /* direct lazy loading */ ?>
|
19 |
<?php if(!$noTags){ ?><script><?php } ?>
|
20 |
window.fplr = (function(d, s, key) {
|
21 |
var f, js = d.createElement(s), fjs = d.getElementsByTagName(s)[0]; js.async = true;
|
22 |
+
js.src = '//my.fanplayr.com/website/<?=$k?>/?v=3'; fjs.parentNode.insertBefore(js, fjs);
|
23 |
return window.fplr || (f = { _r: [], ready: function(a){ f._r.push(a) }, setSessionId: function(a, b){ f._s = a; f._l = b; if (b && a) setSessionCookie('fplr_magento_sess', a, 0); else if (b && !a) setSessionCookie('fplr_magento_sess', '', -1); } });
|
24 |
})(document, 'script');
|
25 |
|
87 |
var js = d.createElement(s);
|
88 |
var fjs = d.getElementsByTagName(s)[0];
|
89 |
js.async = true;
|
90 |
+
js.src = 'https://d1q7pknmpq2wkm.cloudfront.net/js/my.fanplayr.com/fp_smart.js?' +
|
91 |
(new Date().getTime()); fjs.parentNode.insertBefore(js, fjs);
|
92 |
};
|
93 |
<?php if ($embedType == 5){ /* direct lazy loading */ ?>
|
app/design/frontend/base/default/template/fanplayr/success.phtml
CHANGED
@@ -44,7 +44,7 @@
|
|
44 |
var js = d.createElement(s);
|
45 |
var fjs = d.getElementsByTagName(s)[0];
|
46 |
js.async = true;
|
47 |
-
js.src = 'https://d1q7pknmpq2wkm.cloudfront.net/js/
|
48 |
fjs.parentNode.insertBefore(js, fjs);
|
49 |
<?php }else if($data['embedType'] == 3){ ?>
|
50 |
// fanplayr sales order waiting for MasterTMS
|
44 |
var js = d.createElement(s);
|
45 |
var fjs = d.getElementsByTagName(s)[0];
|
46 |
js.async = true;
|
47 |
+
js.src = 'https://d1q7pknmpq2wkm.cloudfront.net/js/my.fanplayr.com/fp_custom_orders.js?' + (new Date().getTime());
|
48 |
fjs.parentNode.insertBefore(js, fjs);
|
49 |
<?php }else if($data['embedType'] == 3){ ?>
|
50 |
// fanplayr sales order waiting for MasterTMS
|
app/design/frontend/default/default/template/fanplayr/embed.phtml
CHANGED
@@ -19,7 +19,7 @@
|
|
19 |
<?php if(!$noTags){ ?><script><?php } ?>
|
20 |
window.fplr = (function(d, s, key) {
|
21 |
var f, js = d.createElement(s), fjs = d.getElementsByTagName(s)[0]; js.async = true;
|
22 |
-
js.src = '//
|
23 |
return window.fplr || (f = { _r: [], ready: function(a){ f._r.push(a) }, setSessionId: function(a, b){ f._s = a; f._l = b; if (b && a) setSessionCookie('fplr_magento_sess', a, 0); else if (b && !a) setSessionCookie('fplr_magento_sess', '', -1); } });
|
24 |
})(document, 'script');
|
25 |
|
@@ -87,7 +87,7 @@
|
|
87 |
var js = d.createElement(s);
|
88 |
var fjs = d.getElementsByTagName(s)[0];
|
89 |
js.async = true;
|
90 |
-
js.src = 'https://d1q7pknmpq2wkm.cloudfront.net/js/
|
91 |
(new Date().getTime()); fjs.parentNode.insertBefore(js, fjs);
|
92 |
};
|
93 |
<?php if ($embedType == 5){ /* direct lazy loading */ ?>
|
19 |
<?php if(!$noTags){ ?><script><?php } ?>
|
20 |
window.fplr = (function(d, s, key) {
|
21 |
var f, js = d.createElement(s), fjs = d.getElementsByTagName(s)[0]; js.async = true;
|
22 |
+
js.src = '//my.fanplayr.com/website/<?=$k?>/?v=3'; fjs.parentNode.insertBefore(js, fjs);
|
23 |
return window.fplr || (f = { _r: [], ready: function(a){ f._r.push(a) }, setSessionId: function(a, b){ f._s = a; f._l = b; if (b && a) setSessionCookie('fplr_magento_sess', a, 0); else if (b && !a) setSessionCookie('fplr_magento_sess', '', -1); } });
|
24 |
})(document, 'script');
|
25 |
|
87 |
var js = d.createElement(s);
|
88 |
var fjs = d.getElementsByTagName(s)[0];
|
89 |
js.async = true;
|
90 |
+
js.src = 'https://d1q7pknmpq2wkm.cloudfront.net/js/my.fanplayr.com/fp_smart.js?' +
|
91 |
(new Date().getTime()); fjs.parentNode.insertBefore(js, fjs);
|
92 |
};
|
93 |
<?php if ($embedType == 5){ /* direct lazy loading */ ?>
|
app/design/frontend/default/default/template/fanplayr/success.phtml
CHANGED
@@ -44,7 +44,7 @@
|
|
44 |
var js = d.createElement(s);
|
45 |
var fjs = d.getElementsByTagName(s)[0];
|
46 |
js.async = true;
|
47 |
-
js.src = 'https://d1q7pknmpq2wkm.cloudfront.net/js/
|
48 |
fjs.parentNode.insertBefore(js, fjs);
|
49 |
<?php }else if($data['embedType'] == 3){ ?>
|
50 |
// fanplayr sales order waiting for MasterTMS
|
44 |
var js = d.createElement(s);
|
45 |
var fjs = d.getElementsByTagName(s)[0];
|
46 |
js.async = true;
|
47 |
+
js.src = 'https://d1q7pknmpq2wkm.cloudfront.net/js/my.fanplayr.com/fp_custom_orders.js?' + (new Date().getTime());
|
48 |
fjs.parentNode.insertBefore(js, fjs);
|
49 |
<?php }else if($data['embedType'] == 3){ ?>
|
50 |
// fanplayr sales order waiting for MasterTMS
|
package.xml
CHANGED
@@ -1,18 +1,18 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Fanplayr</name>
|
4 |
-
<version>1.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.fanplayr.com/Fanplayr_terms_and_conditions.pdf">Fanplayr License</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Fanplayr Conversions enables Magento merchants to harness an automated solution to track, analyze and intelligently target your visitors</summary>
|
10 |
<description>Fanplayr Conversion enables Magento merchants to harness an automated solution to track, analyze and intelligently target your visitors</description>
|
11 |
-
<notes>-
|
12 |
<authors><author><name>Tarwin Stroh-Spijer</name><user>auto-converted</user><email>tarwin@fanplayr.com</email></author></authors>
|
13 |
<date>2015-10-23</date>
|
14 |
-
<time>00:
|
15 |
-
<contents><target name="mageskin"><dir name="frontend"><dir name="socialcoupons"><dir name="images"><file name="accept.png" hash="8bfed48756f192ed7afe6eaa4799aae4"/><file name="activity.gif" hash="fc4ac1c258ac6d13be5afe5ecc5f10e6"/><file name="disable.png" hash="bb2fc85482c3e9c9a9ab4bc3e8e4ebe6"/><file name="fanplayr_logo.png" hash="3d8827fedc2ff79d3041a64265a2f7e0"/><file name="genius_16.png" hash="895bf92ff7689c8116bf1a6f7583c3ab"/><file name="pencil.png" hash="a34e71ab08a6d1162b948d26321dea50"/><file name="progress-loader.gif" hash="5243dea18965998ada5477a2117e2ead"/><file name="sales_16.png" hash="e7b77f97a81b4339c9c6b94e1077a675"/><file name="star_gold.png" hash="73541d75f70cbda977a8b04bf87ddc39"/><file name="warning.png" hash="c847e1076da70df83ef5284622b82a74"/><file name=".picasa.ini" hash="98908647c7af9a7c540c9d711b911d0c"/></dir><file name="fanplayr_join.html" hash="
|
16 |
<compatible/>
|
17 |
<dependencies/>
|
18 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>Fanplayr</name>
|
4 |
+
<version>1.0.68</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.fanplayr.com/Fanplayr_terms_and_conditions.pdf">Fanplayr License</license>
|
7 |
<channel>community</channel>
|
8 |
<extends/>
|
9 |
<summary>Fanplayr Conversions enables Magento merchants to harness an automated solution to track, analyze and intelligently target your visitors</summary>
|
10 |
<description>Fanplayr Conversion enables Magento merchants to harness an automated solution to track, analyze and intelligently target your visitors</description>
|
11 |
+
<notes>- Small updates</notes>
|
12 |
<authors><author><name>Tarwin Stroh-Spijer</name><user>auto-converted</user><email>tarwin@fanplayr.com</email></author></authors>
|
13 |
<date>2015-10-23</date>
|
14 |
+
<time>00:24:54</time>
|
15 |
+
<contents><target name="mageskin"><dir name="frontend"><dir name="socialcoupons"><dir name="images"><file name="accept.png" hash="8bfed48756f192ed7afe6eaa4799aae4"/><file name="activity.gif" hash="fc4ac1c258ac6d13be5afe5ecc5f10e6"/><file name="disable.png" hash="bb2fc85482c3e9c9a9ab4bc3e8e4ebe6"/><file name="fanplayr_logo.png" hash="3d8827fedc2ff79d3041a64265a2f7e0"/><file name="genius_16.png" hash="895bf92ff7689c8116bf1a6f7583c3ab"/><file name="pencil.png" hash="a34e71ab08a6d1162b948d26321dea50"/><file name="progress-loader.gif" hash="5243dea18965998ada5477a2117e2ead"/><file name="sales_16.png" hash="e7b77f97a81b4339c9c6b94e1077a675"/><file name="star_gold.png" hash="73541d75f70cbda977a8b04bf87ddc39"/><file name="warning.png" hash="c847e1076da70df83ef5284622b82a74"/><file name=".picasa.ini" hash="98908647c7af9a7c540c9d711b911d0c"/></dir><file name="fanplayr_join.html" hash="72f2ba80caf3b3f790a3eed928c79626"/><file name="fanplayr_socialcoupons.css" hash="ef40e0653303cbe861ac2141fce32222"/><file name="fanplayr_socialcoupons.js" hash="ee3946e645278c5a0f59a0e70ca55271"/><file name="fanplayr_socialcoupons.min.css" hash="c6d326ff4161a090b77a0b00e2f7d81d"/><file name="jquery-1.7.2.min.js" hash="8d1a6f9c08b59506c56b18e2b2695fc8"/></dir></dir></target><target name="magecommunity"><dir name="Fanplayr"><dir name="Socialcoupons"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Installhelper.php" hash="48b824adc5d637c3647c6ef59949f53b"/></dir></dir></dir></dir></dir></dir><dir name="Model"><file name="CartObserver.php" hash="baca491c222a4dd401e779a7c60d98bc"/><file name="EmbedObserver.php" hash="ca5bee8368e0a3e8c64bc5a340940422"/><file name="OrderObserver.php" hash="e3558a5e1f62c58cf3a250451f2a90e2"/></dir><dir name="controllers"><file name="AjaxController.php" hash="fbfd12884cf72357e51eeb39c89faadc"/><file name="CompyController.php" hash="5c8aac0a977892f58cd28659488f9e1c"/><file name="CouponController.php" hash="f1d8297710aaf3388f0d3fc527437eba"/><file name="IndexController.php" hash="8b18f83d9592433bfd4f196cf574fec3"/></dir><dir name="etc"><file name="config.xml" hash="df1c1ebc423b6e0dc0c71b6ba87e80b4"/><file name="system.xml" hash="a32e53b5dd521ca60be8b61bc49c886b"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Fanplayr_Socialcoupons.xml" hash="4c5eca7d22afefcedbed6037f3ff1d25"/></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="template"><dir name="fanplayr"><file name="embed.phtml" hash="0c38f0a60f4ce02ca8a58a98815ec0db"/><file name="success.phtml" hash="1f7f7fadf2d2c051adc60bee21027d9a"/><file name="embed_ajax.phtml" hash="1248d9f1e3b294d4e43faf85b896a9ad"/></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="template"><dir name="fanplayr"><file name="embed.phtml" hash="0c38f0a60f4ce02ca8a58a98815ec0db"/><file name="success.phtml" hash="1f7f7fadf2d2c051adc60bee21027d9a"/><file name="embed_ajax.phtml" hash="1248d9f1e3b294d4e43faf85b896a9ad"/></dir></dir></dir></dir></dir></target></contents>
|
16 |
<compatible/>
|
17 |
<dependencies/>
|
18 |
</package>
|
skin/frontend/socialcoupons/fanplayr_join.html
CHANGED
@@ -36,7 +36,7 @@
|
|
36 |
</head>
|
37 |
<body>
|
38 |
<script>
|
39 |
-
document.write('<iframe style="" width="700" height="510" frameborder="0" src="//
|
40 |
</script>
|
41 |
</body>
|
42 |
</html>
|
36 |
</head>
|
37 |
<body>
|
38 |
<script>
|
39 |
+
document.write('<iframe style="" width="700" height="510" frameborder="0" src="//my.fanplayr.com/join/with/magento/chrome/0/?' + queryString + '"></iframe>');
|
40 |
</script>
|
41 |
</body>
|
42 |
</html>
|
skin/frontend/socialcoupons/fanplayr_socialcoupons.js
CHANGED
@@ -115,9 +115,9 @@ if (typeof Array.prototype.map !== "function") {
|
|
115 |
tOut += (isIntegrated ? ' fanplayr-is-added ' : ' fanplayr-not-added ');
|
116 |
|
117 |
if (camp.type == 'genius'){
|
118 |
-
tOut += '" id="' + id + '" data-key="' + camp.key + '" data-type="' + camp.type + '"><td class="fanplayr-type-genius">' + camp.name + '</td><td align="right"><a class="fanplayr-list-button" href="http://
|
119 |
}else{
|
120 |
-
tOut += '" id="' + id + '" data-key="' + camp.key + '" data-type="' + camp.type + '"><td class="fanplayr-type-sales">' + camp.name + '</td><td align="right"><a class="fanplayr-list-button fanplayr-add-remove-button" href="#"><div class="fanplayr-add-remove fanplayr-icon"></div><span>Activate</span></a><a class="fanplayr-list-button" href="http://
|
121 |
}
|
122 |
|
123 |
if (cStatus == 'draft') outD += tOut;
|
115 |
tOut += (isIntegrated ? ' fanplayr-is-added ' : ' fanplayr-not-added ');
|
116 |
|
117 |
if (camp.type == 'genius'){
|
118 |
+
tOut += '" id="' + id + '" data-key="' + camp.key + '" data-type="' + camp.type + '"><td class="fanplayr-type-genius">' + camp.name + '</td><td align="right"><a class="fanplayr-list-button" href="http://my.fanplayr.com/dashboard.genius.site/campaignId/' + camp.id + '/" target="_blank"><div class="fanplayr-icon fanplayr-edit"></div><span>View / Edit</span></a></td></tr>';
|
119 |
}else{
|
120 |
+
tOut += '" id="' + id + '" data-key="' + camp.key + '" data-type="' + camp.type + '"><td class="fanplayr-type-sales">' + camp.name + '</td><td align="right"><a class="fanplayr-list-button fanplayr-add-remove-button" href="#"><div class="fanplayr-add-remove fanplayr-icon"></div><span>Activate</span></a><a class="fanplayr-list-button" href="http://my.fanplayr.com/dashboard.campaign.overview/campaignId/' + camp.id + '/" target="_blank"><div class="fanplayr-icon fanplayr-edit"></div><span>Edit</span></a></td></tr>';
|
121 |
}
|
122 |
|
123 |
if (cStatus == 'draft') outD += tOut;
|