Skip to content

Commit

Permalink
Release 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kheechieng
Kheechieng committed Oct 6, 2016
1 parent 6fb6718 commit eaa6702
Show file tree
Hide file tree
Showing 10 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion MOLPayActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ protected override void OnCreate(Bundle savedInstanceState)
String json = Intent.GetStringExtra(MOLPayPaymentDetails);
paymentDetails = JsonConvert.DeserializeObject<Dictionary<String, object>>(json);
paymentDetails.Add(module_id, "molpay-mobile-xdk-xamarin-android");
paymentDetails.Add(wrapper_version, "0");
paymentDetails.Add(wrapper_version, "1");

mpMainUI = FindViewById<WebView>(Resource.Id.MPMainUI);
mpMOLPayUI = FindViewById<WebView>(Resource.Id.MPMOLPayUI);
Expand Down
2 changes: 1 addition & 1 deletion MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.8ef18f5b.js"></script> <script src="scripts/scripts.4f7e4095.js"></script> </body> </html>
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.8ef18f5b.js"></script> <script src="scripts/scripts.47330a76.js"></script> </body> </html>
1 change: 1 addition & 0 deletions MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/scripts/scripts.47330a76.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/scripts/scripts.4f7e4095.js
View file

This file was deleted.

2 changes: 1 addition & 1 deletion MOLPayXDKExample/MOLPayXDKExample/MOLPayActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ protected override void OnCreate(Bundle savedInstanceState)
String json = Intent.GetStringExtra(MOLPayPaymentDetails);
paymentDetails = JsonConvert.DeserializeObject<Dictionary<String, object>>(json);
paymentDetails.Add(module_id, "molpay-mobile-xdk-xamarin-android");
paymentDetails.Add(wrapper_version, "0");
paymentDetails.Add(wrapper_version, "1");

mpMainUI = FindViewById<WebView>(Resource.Id.MPMainUI);
mpMOLPayUI = FindViewById<WebView>(Resource.Id.MPMOLPayUI);
Expand Down
2 changes: 1 addition & 1 deletion MOLPayXDKExample/MOLPayXDKExample/MOLPayXDKExample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\images\poweredByMOLPay.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\scripts.4f7e4095.js" />
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\scripts.47330a76.js" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\vendor.8ef18f5b.js" />
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This is the complete and functional MOLPay Xamarin Android payment module that i

Step 7 - Right click on your android project and select Properties. Select Android Manifest in the window that opens. Check WRITE_EXTERNAL_STORAGE in the list of permissions.

Step 8 - Install Json.NET by going to Tools -> NuGet Package Manager -> Package Manager Console, paste this 'Install-Package Newtonsoft.Json' (without the quotes) into the console and press enter. You may refer to this website http://www.newtonsoft.com/json.
Step 8 - Install Json.NET by going to Tools -> NuGet Package Manager -> Package Manager Console, and run this command 'Install-Package Newtonsoft.Json' (without the quotes) in the console. You may refer to this website http://www.newtonsoft.com/json.

Step 9 - Override the OnActivityResult function.
protected override void OnActivityResult(int requestCode, Result resultCode, Intent data)
Expand Down
2 changes: 1 addition & 1 deletion molpay-mobile-xdk-www/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.8ef18f5b.js"></script> <script src="scripts/scripts.4f7e4095.js"></script> </body> </html>
<!doctype html> <html> <head> <meta charset="utf-8"> <title></title> <meta name="description" content=""> <!-- <meta name="viewport" content="width=device-width"> --> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="format-detection" content="telephone=no"> <!-- Place favicon.ico and apple-touch-icon.png in the root directory --> <link rel="stylesheet" href="styles/vendor.34eb91d2.css"> <link rel="stylesheet" href="styles/main.d7e0b867.css"> </head> <body ng-app="molpayXsdkApp"> <div class="header"> </div> <div id="app-body" class="app-body container-fluid"> <div class="row"> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> <div class="col-xs-12 col-sm-8 col-md-6 col-lg-4" ng-view=""></div> <div class="hidden-xs col-sm-2 col-md-3 col-lg-4"></div> </div> </div> <div ng-show="isStarting || isLoading" class="text-center"> <br> <p>Preparing...</p> <p>Please wait.</p> </div> <div class="footer"> </div> <div ng-show="isLoading" class="loading text-center vertical-center"> <div class="loadingbackground"></div> <i class="fa fa-spinner fa-spin fa-3x"></i> <div class="loading-text">Loading...</div> </div> <script src="scripts/vendor.8ef18f5b.js"></script> <script src="scripts/scripts.47330a76.js"></script> </body> </html>
1 change: 1 addition & 0 deletions molpay-mobile-xdk-www/scripts/scripts.47330a76.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion molpay-mobile-xdk-www/scripts/scripts.4f7e4095.js
View file

This file was deleted.

0 comments on commit eaa6702

Please sign in to comment.