Fanplayr - Version 1.0.63

Version Notes

- Added support for FireCheckout

Download this release

Release Info

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


Code changes from version 1.0.62 to 1.0.63

Files changed (3) hide show
  1. app/code/community/Fanplayr/Socialcoupons/Model/EmbedObserver.php +37 -2
  2. app/etc/modules/Fanplayr_Socialcoupons.xml +1 -1
  3. package.xml +5 -5
app/code/community/Fanplayr/Socialcoupons/Model/EmbedObserver.php CHANGED
@@ -469,6 +469,8 @@
469
  || $route == 'index/index/streamcheckout/streamcheckout' // StreamCheckout by Made People
470
  || $route == 'index/saveAll/streamcheckout/streamcheckout' // StreamCheckout (AJAX)
471
  || $route == 'index/applyCoupon/streamcheckout/streamcheckout' // StreamCheckout (Coupon)
 
 
472
  || in_array($route, $extraAllowedRoutes)
473
  ){
474
  // do nothing
@@ -521,6 +523,7 @@
521
 
522
  // which input do we use?
523
  $inpVar = 'coupon_code';
 
524
  $setPost = false;
525
 
526
  // one step checkout
@@ -550,7 +553,23 @@
550
  $inpVar = 'stream_coupon_code';
551
  }
552
 
 
 
 
 
 
 
 
 
553
  $depCoupon = Mage::app()->getRequest()->getParam($inpVar); // normal coupon
 
 
 
 
 
 
 
 
554
  $disallowedPrefix = Mage::getStoreConfig('fanplayrsocialcoupons/config/dep_prefix');
555
 
556
  // remove spaces
@@ -560,7 +579,15 @@
560
  // then set it to prefix with "..." on the end
561
  if (strpos($depCoupon, $disallowedPrefix) === 0) {
562
  Mage::app()->getRequest()->setParam($inpVar, $disallowedPrefix . '...');
563
- if ($setPost) Mage::app()->getRequest()->setPost($inpVar, $disallowedPrefix . '...');
 
 
 
 
 
 
 
 
564
  return;
565
  }
566
 
@@ -588,7 +615,15 @@
588
  $session->setData('fanplayr_used_deputies', $sessionDeps);
589
 
590
  Mage::app()->getRequest()->setParam($inpVar, $actualCoupon);
591
- if ($setPost) Mage::app()->getRequest()->setPost($inpVar, $actualCoupon);
 
 
 
 
 
 
 
 
592
  }
593
  }
594
 
469
  || $route == 'index/index/streamcheckout/streamcheckout' // StreamCheckout by Made People
470
  || $route == 'index/saveAll/streamcheckout/streamcheckout' // StreamCheckout (AJAX)
471
  || $route == 'index/applyCoupon/streamcheckout/streamcheckout' // StreamCheckout (Coupon)
472
+ || $route == 'index/index/firecheckout/firecheckout' // FireCheckout
473
+ || $route == 'index/saveCoupon/firecheckout/firecheckout' // FireCheckout, input coupon
474
  || in_array($route, $extraAllowedRoutes)
475
  ){
476
  // do nothing
523
 
524
  // which input do we use?
525
  $inpVar = 'coupon_code';
526
+ $inpVarIsArray = false;
527
  $setPost = false;
528
 
529
  // one step checkout
553
  $inpVar = 'stream_coupon_code';
554
  }
555
 
556
+ // FireCheckout
557
+ if ($route == 'index/saveCoupon/firecheckout/firecheckout') {
558
+ $setPost = true;
559
+ $inpVar = 'coupon';
560
+ // it's an array so had to add a bunch of extra stuff :(
561
+ $inpVarIsArray = 'code';
562
+ }
563
+
564
  $depCoupon = Mage::app()->getRequest()->getParam($inpVar); // normal coupon
565
+ if ($inpVarIsArray) {
566
+ if (is_array($depCoupon) && array_key_exists($inpVarIsArray, $depCoupon)) {
567
+ $depCoupon = $depCoupon[$inpVarIsArray];
568
+ }else{
569
+ // error getting coupon for array fields
570
+ return;
571
+ }
572
+ }
573
  $disallowedPrefix = Mage::getStoreConfig('fanplayrsocialcoupons/config/dep_prefix');
574
 
575
  // remove spaces
579
  // then set it to prefix with "..." on the end
580
  if (strpos($depCoupon, $disallowedPrefix) === 0) {
581
  Mage::app()->getRequest()->setParam($inpVar, $disallowedPrefix . '...');
582
+ if ($setPost){
583
+ if ($inpVarIsArray) {
584
+ $tmpIn = Mage::app()->getRequest()->getPost($inpVar);
585
+ $tmpIn[$inpVarIsArray] = $disallowedPrefix . '...';
586
+ Mage::app()->getRequest()->setPost($inpVar, $tmpIn);
587
+ }else{
588
+ Mage::app()->getRequest()->setPost($inpVar, $disallowedPrefix . '...');
589
+ }
590
+ }
591
  return;
592
  }
593
 
615
  $session->setData('fanplayr_used_deputies', $sessionDeps);
616
 
617
  Mage::app()->getRequest()->setParam($inpVar, $actualCoupon);
618
+ if ($setPost){
619
+ if ($inpVarIsArray) {
620
+ $tmpIn = Mage::app()->getRequest()->getPost($inpVar);
621
+ $tmpIn[$inpVarIsArray] = $actualCoupon;
622
+ Mage::app()->getRequest()->setPost($inpVar, $tmpIn);
623
+ }else{
624
+ Mage::app()->getRequest()->setPost($inpVar, $actualCoupon);
625
+ }
626
+ }
627
  }
628
  }
629
 
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.62</version>
8
  </Fanplayr_Socialcoupons>
9
  </modules>
10
  </config>
4
  <Fanplayr_Socialcoupons>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ <version>1.0.63</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.62</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>- More robust order tracking</notes>
12
  <authors><author><name>Tarwin Stroh-Spijer</name><user>auto-converted</user><email>tarwin@fanplayr.com</email></author></authors>
13
- <date>2015-04-28</date>
14
- <time>03:28:00</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="fdec05265dcbd58961c096a771d3afba"/><file name="OrderObserver.php" hash="e3558a5e1f62c58cf3a250451f2a90e2"/></dir><dir name="controllers"><file name="AjaxController.php" hash="4952297c3110702e708234f5f6855475"/><file name="CompyController.php" hash="5c8aac0a977892f58cd28659488f9e1c"/><file name="CouponController.php" hash="85bf29a6eaeb3bfe355486844db7b988"/><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="fbacae0b26d370a94c0b6c8a60ea69c3"/></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="635a718778311c314351b14613a5a288"/><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="635a718778311c314351b14613a5a288"/><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.63</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>- Added support for FireCheckout</notes>
12
  <authors><author><name>Tarwin Stroh-Spijer</name><user>auto-converted</user><email>tarwin@fanplayr.com</email></author></authors>
13
+ <date>2015-05-06</date>
14
+ <time>12:16:36</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="11592931c558358fcea228a7878c2d89"/><file name="OrderObserver.php" hash="e3558a5e1f62c58cf3a250451f2a90e2"/></dir><dir name="controllers"><file name="AjaxController.php" hash="4952297c3110702e708234f5f6855475"/><file name="CompyController.php" hash="5c8aac0a977892f58cd28659488f9e1c"/><file name="CouponController.php" hash="85bf29a6eaeb3bfe355486844db7b988"/><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="1ea150988967f872274ce86d287c3a15"/></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="635a718778311c314351b14613a5a288"/><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="635a718778311c314351b14613a5a288"/><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>