Fanplayr - Version 1.0.56

Version Notes

- Added a "custom redirect url" to our apply to cart function

Download this release

Release Info

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


Code changes from version 1.0.55 to 1.0.56

Files changed (3) hide show
  1. app/code/community/Fanplayr/Socialcoupons/controllers/CouponController.php +11 -4
  2. app/etc/modules/Fanplayr_Socialcoupons.xml +1 -1
  3. package.xml +5 -6
app/code/community/Fanplayr/Socialcoupons/controllers/CouponController.php CHANGED
@@ -13,15 +13,17 @@
13
  $p = $this->getRequest()->getParams();
14
  $code = array_key_exists('code', $p) ? $p['code'] : '';
15
 
 
 
16
  // ----------------------------------------
17
  // if we have a code then apply, otherwise error
18
  if (!empty($code)) {
19
  $this->applyCoupon($code);
20
- $this->redirect();
21
  }else {
22
  $message = $this->__('No coupon code supplied.');
23
  $this->error($message);
24
- $this->redirect();
25
  }
26
  }
27
 
@@ -132,7 +134,7 @@
132
  }
133
  }
134
 
135
- public function redirect()
136
  {
137
  // now go to cart and add thanks message
138
  $shopUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
@@ -141,6 +143,11 @@
141
  $customEmbedUrl = trim(Mage::getStoreConfig('fanplayrsocialcoupons/config/custom_embed_url'));
142
  if (!empty($customEmbedUrl)) $shopUrl = $customEmbedUrl;
143
 
 
 
 
 
 
144
  // make sure that the shop URL is protocol agnostic
145
  if (strpos($shopUrl, '//') !== false) {
146
  $shopUrl = substr($shopUrl, strpos($shopUrl, '//'));
@@ -193,4 +200,4 @@
193
  }
194
  }
195
 
196
- ?>
13
  $p = $this->getRequest()->getParams();
14
  $code = array_key_exists('code', $p) ? $p['code'] : '';
15
 
16
+ $redirectUrl = array_key_exists('redirect', $p) ? $p['redirect'] : null;
17
+
18
  // ----------------------------------------
19
  // if we have a code then apply, otherwise error
20
  if (!empty($code)) {
21
  $this->applyCoupon($code);
22
+ $this->redirect($redirectUrl);
23
  }else {
24
  $message = $this->__('No coupon code supplied.');
25
  $this->error($message);
26
+ $this->redirect($redirectUrl);
27
  }
28
  }
29
 
134
  }
135
  }
136
 
137
+ public function redirect( $overrideUrl = null )
138
  {
139
  // now go to cart and add thanks message
140
  $shopUrl = Mage::getBaseUrl(Mage_Core_Model_Store::URL_TYPE_WEB);
143
  $customEmbedUrl = trim(Mage::getStoreConfig('fanplayrsocialcoupons/config/custom_embed_url'));
144
  if (!empty($customEmbedUrl)) $shopUrl = $customEmbedUrl;
145
 
146
+ // Added by Matt, Nov 4, 2014 for Dainese.com
147
+ if ( $overrideUrl !== null ) {
148
+ $shopUrl = $overrideUrl;
149
+ }
150
+
151
  // make sure that the shop URL is protocol agnostic
152
  if (strpos($shopUrl, '//') !== false) {
153
  $shopUrl = substr($shopUrl, strpos($shopUrl, '//'));
200
  }
201
  }
202
 
203
+ ?>
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.55</version>
8
  </Fanplayr_Socialcoupons>
9
  </modules>
10
  </config>
4
  <Fanplayr_Socialcoupons>
5
  <active>true</active>
6
  <codePool>community</codePool>
7
+ <version>1.0.56</version>
8
  </Fanplayr_Socialcoupons>
9
  </modules>
10
  </config>
package.xml CHANGED
@@ -1,19 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Fanplayr</name>
4
- <version>1.0.55</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>- TBuy shipping support now allows for stackable coupons&#xD;
12
- - Facked domain tracking</notes>
13
  <authors><author><name>Tarwin Stroh-Spijer</name><user>auto-converted</user><email>tarwin@fanplayr.com</email></author></authors>
14
- <date>2014-10-31</date>
15
- <time>16:08:58</time>
16
- <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="86ec4ace497e66f91ac3857d0388939c"/></dir></dir></dir></dir></dir></dir><dir name="Model"><file name="CartObserver.php" hash="baca491c222a4dd401e779a7c60d98bc"/><file name="EmbedObserver.php" hash="9e54871336179d0a70047f2f9ebd9e75"/><file name="OrderObserver.php" hash="b91d807c426018c5775104cd088ec34a"/></dir><dir name="controllers"><file name="AjaxController.php" hash="2475b29df4b94a3f23d917c59765e632"/><file name="CompyController.php" hash="f45b1bd7ef87cbcdf17e894e6637adcb"/><file name="CouponController.php" hash="e549d11b699dab3ebcdcc7af0ae99e62"/><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="e21a0602937c58ca622ed895846b3d3e"/></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="b23ba679f2fb3c6e0e6b2df7dc7c427a"/><file name="success.phtml" hash="244d6a0380af72e13ec1fc3ce0596b90"/><file name="embed_ajax.phtml" hash="54142bcc213aa5f463de747619d2ad3f"/></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="template"><dir name="fanplayr"><file name="embed.phtml" hash="b23ba679f2fb3c6e0e6b2df7dc7c427a"/><file name="success.phtml" hash="244d6a0380af72e13ec1fc3ce0596b90"/><file name="embed_ajax.phtml" hash="54142bcc213aa5f463de747619d2ad3f"/></dir></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies/>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Fanplayr</name>
4
+ <version>1.0.56</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 a "custom redirect url" to our apply to cart function</notes>
 
12
  <authors><author><name>Tarwin Stroh-Spijer</name><user>auto-converted</user><email>tarwin@fanplayr.com</email></author></authors>
13
+ <date>2014-11-04</date>
14
+ <time>23:30:26</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="86ec4ace497e66f91ac3857d0388939c"/></dir></dir></dir></dir></dir></dir><dir name="Model"><file name="CartObserver.php" hash="baca491c222a4dd401e779a7c60d98bc"/><file name="EmbedObserver.php" hash="9e54871336179d0a70047f2f9ebd9e75"/><file name="OrderObserver.php" hash="b91d807c426018c5775104cd088ec34a"/></dir><dir name="controllers"><file name="AjaxController.php" hash="2475b29df4b94a3f23d917c59765e632"/><file name="CompyController.php" hash="f45b1bd7ef87cbcdf17e894e6637adcb"/><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="2d33b1541aa0cd988ac42662a3b4cf46"/></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="b23ba679f2fb3c6e0e6b2df7dc7c427a"/><file name="success.phtml" hash="244d6a0380af72e13ec1fc3ce0596b90"/><file name="embed_ajax.phtml" hash="54142bcc213aa5f463de747619d2ad3f"/></dir></dir></dir></dir><dir name="default"><dir name="default"><dir name="template"><dir name="fanplayr"><file name="embed.phtml" hash="b23ba679f2fb3c6e0e6b2df7dc7c427a"/><file name="success.phtml" hash="244d6a0380af72e13ec1fc3ce0596b90"/><file name="embed_ajax.phtml" hash="54142bcc213aa5f463de747619d2ad3f"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>