Fanplayr - Version 1.0.70

Version Notes

- Simplify connection to Fanplayr

Download this release

Release Info

Developer Magento Core Team
Extension Fanplayr
Version 1.0.70
Comparing to
See all releases


Code changes from version 1.0.69 to 1.0.70

Files changed (12) hide show
  1. app/code/community/Fanplayr/Socialcoupons/Block/Adminhtml/System/Config/Form/Field/Installhelper.php +37 -23
  2. app/code/community/Fanplayr/Socialcoupons/Model/OrderObserver.php +2 -2
  3. app/code/community/Fanplayr/Socialcoupons/controllers/CompyController.php +1 -1
  4. app/design/frontend/base/default/template/fanplayr/embed.phtml +2 -2
  5. app/design/frontend/base/default/template/fanplayr/success.phtml +1 -1
  6. app/design/frontend/default/default/template/fanplayr/embed.phtml +2 -2
  7. app/design/frontend/default/default/template/fanplayr/success.phtml +1 -1
  8. app/etc/modules/Fanplayr_Socialcoupons.xml +1 -1
  9. package.xml +5 -5
  10. skin/frontend/socialcoupons/fanplayr_join.html +1 -1
  11. skin/frontend/socialcoupons/fanplayr_socialcoupons.css +4 -4
  12. skin/frontend/socialcoupons/fanplayr_socialcoupons.js +2 -2
app/code/community/Fanplayr/Socialcoupons/Block/Adminhtml/System/Config/Form/Field/Installhelper.php CHANGED
@@ -163,8 +163,6 @@ class Fanplayr_Socialcoupons_Block_Adminhtml_System_Config_Form_Field_Installhel
163
  c.setAttribute("href", '{$skinDir}/fanplayr_socialcoupons.css');
164
  document.getElementsByTagName("head")[0].appendChild(c);
165
  </script>
166
- <script type="text/javascript" src="{$skinDir}/jquery-1.7.2.min.js"></script>
167
- <script type="text/javascript" src="{$skinDir}/fanplayr_socialcoupons.js"></script>
168
  <script>
169
  $.noConflict()(function($) {
170
  // remove unneeded TDs, we want all the space!
@@ -201,6 +199,14 @@ class Fanplayr_Socialcoupons_Block_Adminhtml_System_Config_Form_Field_Installhel
201
  Fanplayr.configShopUrl = "{$shopUrl}";
202
  });
203
  </script>
 
 
 
 
 
 
 
 
204
  <div id="fanplayrsocialcoupons-console" style="display:none;">
205
  <div>
206
  <p>Please be very careful when editing these values manually. Not for the faint of heart.</p>
@@ -210,9 +216,6 @@ class Fanplayr_Socialcoupons_Block_Adminhtml_System_Config_Form_Field_Installhel
210
  <table>
211
  <tr><td><label></label></td><td></td></tr>
212
  <tr><td><label>Custom URL</label></td><td><input type="text" id="fanplayrsocialcoupons-console-url" name="fanplayrsocialcoupons-console-url" value="{$customShopUrlEdit}" /></td></tr>
213
- <tr><td><label>Account Key</label></td><td><input type="text" id="fanplayrsocialcoupons-console-acckey" name="fanplayrsocialcoupons-console-acckey" value="{$accKey}" /></td></tr>
214
- <tr><td><label>Secret</label></td><td><input type="text" id="fanplayrsocialcoupons-console-secret" name="fanplayrsocialcoupons-console-secret" value="{$secret}" /></td></tr>
215
- <tr><td><label>Shop ID</label></td><td><input type="text" id="fanplayrsocialcoupons-console-shopid" name="fanplayrsocialcoupons-console-shopid" value="{$shopId}" /></td></tr>
216
  <tr><td><label>Gamafied</label></td><td><input type="text" id="fanplayrsocialcoupons-console-gamafied" name="fanplayrsocialcoupons-console-gamafied" value="{$gamafiedKeys}" /></td></tr>
217
  <tr><td><label>S &amp; T</label></td><td><input type="text" id="fanplayrsocialcoupons-console-snt" name="fanplayrsocialcoupons-console-snt" value="{$sntKeys}" /></td></tr>
218
  <tr><td><label>Disable on URLs</label></td><td><input type="text" id="fanplayrsocialcoupons-console-disableonurls" name="fanplayrsocialcoupons-console-disableonurls" value="{$disableOnUrls}" /></td></tr>
@@ -231,7 +234,14 @@ class Fanplayr_Socialcoupons_Block_Adminhtml_System_Config_Form_Field_Installhel
231
 
232
  <tr><td><label title="Set to '1' to disable">Disable TBuy Discounts</label></td><td><input type="text" id="fanplayrsocialcoupons-console-usetbuy" name="fanplayrsocialcoupons-console-usetbuy" value="{$useTbuy}" /></td></tr>
233
 
234
- <tr><td colspan="2"><a href="#" id="fanplayrsocialcoupons-console-save" onclick="Fanplayr.console.save(); return false;">Save</a> <a href="#" id="fanplayrsocialcoupons-console-hide" onclick="Fanplayr.console.hide(); return false;">Hide</a></td></tr>
 
 
 
 
 
 
 
235
  </table>
236
  <div id="fanplayrsocialcoupons-console-saving" style="display: none;"><b>Please be patient, saving ...</b></div>
237
  </div>
@@ -254,32 +264,21 @@ EOT;
254
 
255
  // our install HTML
256
  $installHtml = <<<EOT
257
- <script>
258
- fanplayrJQuery().ready(function() {
259
- var $ = fanplayrJQuery;
260
- var fanplayrInstallModal = new FanplayrModal('fanplayr_install_modal');
261
- $('#fanplayr-install-button').on('click', function(e) {
262
- e.preventDefault();
263
- fanplayrInstallModal.load('{$skinDir}/fanplayr_join.html?{$queryString}');
264
- });
265
- });
266
- </script>
267
  <div id="fanplayr-install-wrapper">
268
  <p>
269
  <img src="{$skinDir}/images/fanplayr_logo.png" width="200" height="65" alt="Fanplayr Logo" title="Fanplayr" />
270
  </p>
271
  <div id="fanplayr-install-description">
272
  <p>Welcome to Fanplayr, the leader in targeted conversions.</p>
273
- <p>Click on the button below to get started by linking your Fanplayr account to your Magento Store. If you don't have an account yet you will have a chance to create one. Easy!</p>
274
  </div>
275
- <a href="#" id="fanplayr-install-button"><div class="fanplayr-icon fanplayr-add"></div>Link to Fanplayr</a>
276
  </div>
277
  EOT;
278
  $outputHtml = $installHtml;
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,
@@ -292,7 +291,18 @@ EOT;
292
 
293
  // just give 'em an error
294
  if ($errorGettingInstallData) {
295
- $outputHtml = 'Sorry, there was an error getting information about your installation. Please refresh to try again.';
 
 
 
 
 
 
 
 
 
 
 
296
  }else{
297
  // the server said there was an error
298
  if ($m->error) {
@@ -308,7 +318,7 @@ EOT;
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,7 +376,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://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() {
@@ -403,7 +413,11 @@ EOT;
403
 
404
  //
405
  // Return
406
- return $showConsoleHtml . $generalHtml . $outputHtml;
 
 
 
 
407
  }
408
 
409
  // -------------------------------------------------------------------------
163
  c.setAttribute("href", '{$skinDir}/fanplayr_socialcoupons.css');
164
  document.getElementsByTagName("head")[0].appendChild(c);
165
  </script>
 
 
166
  <script>
167
  $.noConflict()(function($) {
168
  // remove unneeded TDs, we want all the space!
199
  Fanplayr.configShopUrl = "{$shopUrl}";
200
  });
201
  </script>
202
+ <div id="fanplayrsocialcoupons-console-simple">
203
+ <table>
204
+ <tr><td><label></label></td><td></td></tr>
205
+ <tr><td><label>Account Key</label></td><td><input type="text" id="fanplayrsocialcoupons-console-acckey" name="fanplayrsocialcoupons-console-acckey" value="{$accKey}" /></td></tr>
206
+ <tr><td><label>Secret</label></td><td><input type="text" id="fanplayrsocialcoupons-console-secret" name="fanplayrsocialcoupons-console-secret" value="{$secret}" /></td></tr>
207
+ <tr><td><label>Shop ID</label></td><td><input type="text" id="fanplayrsocialcoupons-console-shopid" name="fanplayrsocialcoupons-console-shopid" value="{$shopId}" /></td></tr>
208
+ </table>
209
+ </div>
210
  <div id="fanplayrsocialcoupons-console" style="display:none;">
211
  <div>
212
  <p>Please be very careful when editing these values manually. Not for the faint of heart.</p>
216
  <table>
217
  <tr><td><label></label></td><td></td></tr>
218
  <tr><td><label>Custom URL</label></td><td><input type="text" id="fanplayrsocialcoupons-console-url" name="fanplayrsocialcoupons-console-url" value="{$customShopUrlEdit}" /></td></tr>
 
 
 
219
  <tr><td><label>Gamafied</label></td><td><input type="text" id="fanplayrsocialcoupons-console-gamafied" name="fanplayrsocialcoupons-console-gamafied" value="{$gamafiedKeys}" /></td></tr>
220
  <tr><td><label>S &amp; T</label></td><td><input type="text" id="fanplayrsocialcoupons-console-snt" name="fanplayrsocialcoupons-console-snt" value="{$sntKeys}" /></td></tr>
221
  <tr><td><label>Disable on URLs</label></td><td><input type="text" id="fanplayrsocialcoupons-console-disableonurls" name="fanplayrsocialcoupons-console-disableonurls" value="{$disableOnUrls}" /></td></tr>
234
 
235
  <tr><td><label title="Set to '1' to disable">Disable TBuy Discounts</label></td><td><input type="text" id="fanplayrsocialcoupons-console-usetbuy" name="fanplayrsocialcoupons-console-usetbuy" value="{$useTbuy}" /></td></tr>
236
 
237
+ <tr><td colspan="2"><a href="#" id="fanplayrsocialcoupons-console-hide" onclick="Fanplayr.console.hide(); return false;">Hide</a></td></tr>
238
+
239
+ </table>
240
+ </div>
241
+
242
+ <div id="fanplayrsocialcoupons-console-action">
243
+ <table>
244
+ <tr><td colspan="2"><a href="#" id="fanplayrsocialcoupons-console-save" onclick="Fanplayr.console.save(); return false;">Save</a></td></tr>
245
  </table>
246
  <div id="fanplayrsocialcoupons-console-saving" style="display: none;"><b>Please be patient, saving ...</b></div>
247
  </div>
264
 
265
  // our install HTML
266
  $installHtml = <<<EOT
 
 
 
 
 
 
 
 
 
 
267
  <div id="fanplayr-install-wrapper">
268
  <p>
269
  <img src="{$skinDir}/images/fanplayr_logo.png" width="200" height="65" alt="Fanplayr Logo" title="Fanplayr" />
270
  </p>
271
  <div id="fanplayr-install-description">
272
  <p>Welcome to Fanplayr, the leader in targeted conversions.</p>
273
+ <p>Please enter your account details below. You can get these from your <a href="//fanplayr.com/contact/" target="_blank">Fanplayr account manager</a>.</p>
274
  </div>
 
275
  </div>
276
  EOT;
277
  $outputHtml = $installHtml;
278
  } else {
279
  $errorGettingInstallData = false;
280
  try {
281
+ $m = json_decode($this->httpGetContent('http://stage.fanplayr.com/api.magentoCheckInstall/', array(
282
  'acc_key' => $accKey,
283
  'shop_id' => $shopId,
284
  'secret' => $secret,
291
 
292
  // just give 'em an error
293
  if ($errorGettingInstallData) {
294
+ $installHtml = <<<EOT
295
+ <div id="fanplayr-error-wrapper">
296
+ <p>
297
+ <img src="{$skinDir}/images/fanplayr_logo.png" width="200" height="65" alt="Fanplayr Logo" title="Fanplayr" />
298
+ </p>
299
+ <div id="fanplayr-error-description">
300
+ <p>Sorry, there was a problem with your account details.</p>
301
+ <p>Please enter your account details below. You can get these from your <a href="//fanplayr.com/contact/" target="_blank">Fanplayr account manager</a>.</p>
302
+ </div>
303
+ </div>
304
+ EOT;
305
+ $outputHtml = $installHtml;
306
  }else{
307
  // the server said there was an error
308
  if ($m->error) {
318
  }
319
 
320
  try {
321
+ $campData = addslashes($this->httpGetContent('http://stage.fanplayr.com/api.magentoGetCampaigns/all/1/', array(
322
  'acc_key' => $accKey,
323
  'shop_id' => $shopId,
324
  'secret' => $secret,
376
  <p>Your Store has been linked to Fanplayr, but you still need to create a campaign. Click below to get started.</p>
377
  <p>You will have to <a href="#" onclick="refreshPage();">refresh</a> the page to see campaigns once you have created them.</p>
378
  </div>
379
+ <a href="http://stage.fanplayr.com/login/" id="fanplayr-start-button" target="_blank"><div class="fanplayr-icon fanplayr-icon-star"></div>Create a Fanplayr Campaign</a>
380
  </div>
381
  <script>
382
  fanplayrJQuery().ready(function() {
413
 
414
  //
415
  // Return
416
+ $jsHtml = <<<EOT
417
+ <script type="text/javascript" src="{$skinDir}/jquery-1.7.2.min.js"></script>
418
+ <script type="text/javascript" src="{$skinDir}/fanplayr_socialcoupons.js"></script>
419
+ EOT;
420
+ return $jsHtml . $showConsoleHtml . $outputHtml . $generalHtml;
421
  }
422
 
423
  // -------------------------------------------------------------------------
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://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,7 +135,7 @@
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());
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://stage.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://stage.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://my.fanplayr.com/api.magentoInformWidget/', array(
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://stage.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 = '//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,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/my.fanplayr.com/fp_smart.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 = '//stage.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/stage.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/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
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/stage.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 = '//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,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/my.fanplayr.com/fp_smart.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 = '//stage.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/stage.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/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
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/stage.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/etc/modules/Fanplayr_Socialcoupons.xml CHANGED
@@ -4,7 +4,7 @@
4
  <Fanplayr_Socialcoupons>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
- <version>1.0.69</version>
8
  </Fanplayr_Socialcoupons>
9
  </modules>
10
  </config>
4
  <Fanplayr_Socialcoupons>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ <version>1.0.70</version>
8
  </Fanplayr_Socialcoupons>
9
  </modules>
10
  </config>
package.xml CHANGED
@@ -1,18 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Fanplayr</name>
4
- <version>1.0.69</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>- Remove some PHP logs</notes>
12
  <authors><author><name>Tarwin Stroh-Spijer</name><user>auto-converted</user><email>tarwin@fanplayr.com</email></author></authors>
13
- <date>2015-11-10</date>
14
- <time>22:43:37</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="2806ffebb289748fdbf7938180fd79ee"/><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="b81b322589b97b2de8bed9fefe4a4166"/></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>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Fanplayr</name>
4
+ <version>1.0.70</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>- Simplify connection to Fanplayr</notes>
12
  <authors><author><name>Tarwin Stroh-Spijer</name><user>auto-converted</user><email>tarwin@fanplayr.com</email></author></authors>
13
+ <date>2015-11-18</date>
14
+ <time>03:17:20</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="bbd5045e749285b5429e885b9b56663f"/><file name="fanplayr_socialcoupons.css" hash="35999bbf31ea537f170da6324dd64450"/><file name="fanplayr_socialcoupons.js" hash="b0af431a33f98dcc76f7c0001393921e"/><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="284b71903038bcb3619b5dc355517cfa"/></dir></dir></dir></dir></dir></dir><dir name="Model"><file name="CartObserver.php" hash="2806ffebb289748fdbf7938180fd79ee"/><file name="EmbedObserver.php" hash="ca5bee8368e0a3e8c64bc5a340940422"/><file name="OrderObserver.php" hash="91668d1b58acd5b791b11d9fa17223a2"/></dir><dir name="controllers"><file name="AjaxController.php" hash="fbfd12884cf72357e51eeb39c89faadc"/><file name="CompyController.php" hash="c3ad31b8a189ca74e80aac75c46bf037"/><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="36e2a5713891f8b0c39e0fac0c266eef"/></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="8cbe4ae63d119855032f46afd939fa25"/><file name="success.phtml" hash="7e1bc553c579c281fb25c5b1992fc3a9"/><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="8cbe4ae63d119855032f46afd939fa25"/><file name="success.phtml" hash="7e1bc553c579c281fb25c5b1992fc3a9"/><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="//my.fanplayr.com/join/with/magento/chrome/0/?' + queryString + '"></iframe>');
40
  </script>
41
  </body>
42
  </html>
36
  </head>
37
  <body>
38
  <script>
39
+ document.write('<iframe style="" width="700" height="510" frameborder="0" src="//stage.fanplayr.com/join/with/magento/chrome/0/?' + queryString + '"></iframe>');
40
  </script>
41
  </body>
42
  </html>
skin/frontend/socialcoupons/fanplayr_socialcoupons.css CHANGED
@@ -243,7 +243,7 @@
243
  padding-left: 30px;
244
  }
245
 
246
- #fanplayrsocialcoupons-console {
247
  background: #eee;
248
  border: 1px solid #ddd;
249
  padding: 15px;
@@ -251,17 +251,17 @@
251
  margin-bottom: 30px;
252
  width: 500px;
253
  }
254
- #fanplayrsocialcoupons-console label {
255
  font-weight: bold;
256
  display: block;
257
  float: right;
258
  margin-right: 10px;
259
  }
260
- #fanplayrsocialcoupons-console input {
261
  width: 300px;
262
  margin-bottom: 12px;
263
  }
264
- #fanplayrsocialcoupons-console a {
265
  margin-top: 15px;
266
 
267
  display: block;
243
  padding-left: 30px;
244
  }
245
 
246
+ #fanplayrsocialcoupons-console, #fanplayrsocialcoupons-console-simple, #fanplayrsocialcoupons-console-action {
247
  background: #eee;
248
  border: 1px solid #ddd;
249
  padding: 15px;
251
  margin-bottom: 30px;
252
  width: 500px;
253
  }
254
+ #fanplayrsocialcoupons-console label, #fanplayrsocialcoupons-console-simple label, #fanplayrsocialcoupons-console-action label {
255
  font-weight: bold;
256
  display: block;
257
  float: right;
258
  margin-right: 10px;
259
  }
260
+ #fanplayrsocialcoupons-console input, #fanplayrsocialcoupons-console-simple input, #fanplayrsocialcoupons-console-action input {
261
  width: 300px;
262
  margin-bottom: 12px;
263
  }
264
+ #fanplayrsocialcoupons-console a, #fanplayrsocialcoupons-console-simple a, #fanplayrsocialcoupons-console-action a {
265
  margin-top: 15px;
266
 
267
  display: block;
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://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;
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://stage.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://stage.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;