Paypal_InContext - Version 2.0.0

Version Notes

Fixed config loaded
fixed compatibility with Idev OneStepCheckout

Download this release

Release Info

Developer Tikhonov Alex
Extension Paypal_InContext
Version 2.0.0
Comparing to
See all releases


Code changes from version 0.1.9 to 2.0.0

Files changed (3) hide show
  1. app/code/community/Paypal/InContext/etc/config.xml +1 -1
  2. package.xml +6 -5
  3. skin/frontend/base/default/js/checkout/paypal-in-context.js +7 -4
app/code/community/Paypal/InContext/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Paypal_InContext>
5
- <version>0.1.9</version>
6
  </Paypal_InContext>
7
  </modules>
8
 
2
  <config>
3
  <modules>
4
  <Paypal_InContext>
5
+ <version>2.0.0</version>
6
  </Paypal_InContext>
7
  </modules>
8
 
package.xml CHANGED
@@ -1,18 +1,19 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Paypal_InContext</name>
4
- <version>0.1.9</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Displays a PayPal in-context checkout window with the merchant website in the background</summary>
10
  <description>Displays a PayPal in-context checkout window with the merchant website in the background</description>
11
- <notes>add compatibility with Idev OneStepCheckout </notes>
 
12
  <authors><author><name>Tikhonov Alex</name><user>nakilon</user><email>tihonov.sania@gmail.com</email></author></authors>
13
- <date>2015-11-23</date>
14
- <time>14:51:43</time>
15
- <contents><target name="magecommunity"><dir name="Paypal"><dir name="InContext"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Merchant.php" hash="c318d24329008a15e0f1d34dec520d54"/></dir></dir></dir></dir></dir><file name="Js.php" hash="4f6cf18b97a7202c3d980dc901017638"/><dir name="Paypal"><file name="Shortcut.php" hash="65b16b243a7af38a1a1e16556b2ddb51"/><file name="Shortcutuk.php" hash="56f3164949451c2b8755ffc1c958962b"/></dir></dir><dir name="Controller"><dir name="Express"><file name="Abstract.php" hash="89f478b50a5d373c4d2118dc434ad7d7"/></dir></dir><dir name="Model"><file name="Observer.php" hash="109d96386ed89a89b45282a8d0d09835"/><dir name="Paypal"><file name="Config.php" hash="42ca14d5c4a86c56fa007a554a0b918f"/></dir><file name="Paypal.php" hash="7856a0aaf391716d8a62f09586892798"/><file name="Paypaluk.php" hash="7826a6ad9b1b6d3119ce746ee6a2f58d"/></dir><dir name="controllers"><file name="ExpressController.php" hash="b5c1ca59f1b9e7bd9c2b6227aa12b8d5"/><file name="ExpressController.php.old" hash="6c7876b7b546e4c5384514b5e331331b"/><file name="ExpressukController.php" hash="5510ed72e457ddb977219bff1d5590c3"/></dir><dir name="etc"><file name="adminhtml.xml" hash="527bc29c7976f429362c69ca2d741e51"/><file name="config.xml" hash="96199af3ef17b77edfdecbd7e1765aea"/><file name="system.xml" hash="8f6b170346cad1b807109f6e308e5655"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="incontext.xml" hash="a738201a16edb1d0f65b215743b143d8"/></dir><dir name="template"><dir name="incontext"><file name="js.phtml" hash="e91a0522dec2be5809d7e9ca3bfe1a37"/><dir name="onepage"><file name="payment.phtml" hash="3d86296835db6ddd6d7639690a0cd9c5"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="js"><dir name="checkout"><file name="iwd-jquery-2.1.3.min.js" hash="9772750934a0092349bd664ee16cce53"/><file name="paypal-in-context.js" hash="cf993ac5164f6f30debc0177b36e5c65"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Paypal_InContext.xml" hash="516d93ced7f2b513e454a42da1963599"/></dir></target></contents>
16
  <compatible/>
17
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Paypal_InContext</name>
4
+ <version>2.0.0</version>
5
  <stability>stable</stability>
6
  <license>GPL</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Displays a PayPal in-context checkout window with the merchant website in the background</summary>
10
  <description>Displays a PayPal in-context checkout window with the merchant website in the background</description>
11
+ <notes>Fixed config loaded&#xD;
12
+ fixed compatibility with Idev OneStepCheckout</notes>
13
  <authors><author><name>Tikhonov Alex</name><user>nakilon</user><email>tihonov.sania@gmail.com</email></author></authors>
14
+ <date>2015-12-03</date>
15
+ <time>07:55:46</time>
16
+ <contents><target name="magecommunity"><dir name="Paypal"><dir name="InContext"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Merchant.php" hash="c318d24329008a15e0f1d34dec520d54"/></dir></dir></dir></dir></dir><file name="Js.php" hash="4f6cf18b97a7202c3d980dc901017638"/><dir name="Paypal"><file name="Shortcut.php" hash="65b16b243a7af38a1a1e16556b2ddb51"/><file name="Shortcutuk.php" hash="56f3164949451c2b8755ffc1c958962b"/></dir></dir><dir name="Controller"><dir name="Express"><file name="Abstract.php" hash="89f478b50a5d373c4d2118dc434ad7d7"/></dir></dir><dir name="Model"><file name="Observer.php" hash="109d96386ed89a89b45282a8d0d09835"/><dir name="Paypal"><file name="Config.php" hash="42ca14d5c4a86c56fa007a554a0b918f"/></dir><file name="Paypal.php" hash="7856a0aaf391716d8a62f09586892798"/><file name="Paypaluk.php" hash="7826a6ad9b1b6d3119ce746ee6a2f58d"/></dir><dir name="controllers"><file name="ExpressController.php" hash="b5c1ca59f1b9e7bd9c2b6227aa12b8d5"/><file name="ExpressController.php.old" hash="6c7876b7b546e4c5384514b5e331331b"/><file name="ExpressukController.php" hash="5510ed72e457ddb977219bff1d5590c3"/></dir><dir name="etc"><file name="adminhtml.xml" hash="527bc29c7976f429362c69ca2d741e51"/><file name="config.xml" hash="b19b399be93d2ac2981e4bd781f473ea"/><file name="system.xml" hash="8f6b170346cad1b807109f6e308e5655"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="incontext.xml" hash="a738201a16edb1d0f65b215743b143d8"/></dir><dir name="template"><dir name="incontext"><file name="js.phtml" hash="e91a0522dec2be5809d7e9ca3bfe1a37"/><dir name="onepage"><file name="payment.phtml" hash="3d86296835db6ddd6d7639690a0cd9c5"/></dir></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="frontend"><dir name="base"><dir name="default"><dir name="js"><dir name="checkout"><file name="iwd-jquery-2.1.3.min.js" hash="9772750934a0092349bd664ee16cce53"/><file name="paypal-in-context.js" hash="a9a46bc1b3d984badbefcdc9a690b2b7"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Paypal_InContext.xml" hash="516d93ced7f2b513e454a42da1963599"/></dir></target></contents>
17
  <compatible/>
18
  <dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
19
  </package>
skin/frontend/base/default/js/checkout/paypal-in-context.js CHANGED
@@ -47,16 +47,17 @@ window.paypalCheckoutReady = function() {
47
  if (typeof(PayPalLightboxConfig)=="undefined"){
48
  return;
49
  }
 
 
 
50
  if (PayPalLightboxConfig.isActive==0){
51
  return;
52
  }
53
 
54
  if (typeof(IDS)=="undefined"){
 
55
  if ($('paypal-save-button')!=undefined){
56
- IDS = new Array();
57
  IDS.push('paypal-save-button');
58
- }else{
59
- return;
60
  }
61
  }else{
62
  if ($('paypal-save-button')!=undefined){
@@ -141,7 +142,9 @@ document.observe("dom:loaded", function() {
141
  return ;
142
  }
143
  if (typeof(PayPalLightboxConfig)!="undefined"){
144
- PayPalLightboxConfig = JSON.parse(PayPalLightboxConfig);
 
 
145
  if (PayPalLightboxConfig.isActive==0){
146
  return;
147
  }
47
  if (typeof(PayPalLightboxConfig)=="undefined"){
48
  return;
49
  }
50
+ if(typeof(PayPalLightboxConfig) != "object"){
51
+ PayPalLightboxConfig = JSON.parse(PayPalLightboxConfig);
52
+ }
53
  if (PayPalLightboxConfig.isActive==0){
54
  return;
55
  }
56
 
57
  if (typeof(IDS)=="undefined"){
58
+ IDS = new Array();
59
  if ($('paypal-save-button')!=undefined){
 
60
  IDS.push('paypal-save-button');
 
 
61
  }
62
  }else{
63
  if ($('paypal-save-button')!=undefined){
142
  return ;
143
  }
144
  if (typeof(PayPalLightboxConfig)!="undefined"){
145
+ if(typeof(PayPalLightboxConfig) != "object"){
146
+ PayPalLightboxConfig = JSON.parse(PayPalLightboxConfig);
147
+ }
148
  if (PayPalLightboxConfig.isActive==0){
149
  return;
150
  }