Skip to content

Commit

Permalink
Release 3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@Kheechieng
Kheechieng committed Oct 4, 2016
1 parent 586ab70 commit d1615ec
Show file tree
Hide file tree
Showing 15 changed files with 42 additions and 36 deletions.
3 changes: 2 additions & 1 deletion MOLPayActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public class MOLPayActivity : Activity
public const String mp_is_recurring = "mp_is_recurring";
public const String mp_sandbox_mode = "mp_sandbox_mode";
public const String mp_allowed_channels = "mp_allowed_channels";
public const String mp_express_mode = "mp_express_mode";

private const String mpopenmolpaywindow = "mpopenmolpaywindow://";
private const String mpcloseallwindows = "mpcloseallwindows://";
Expand Down Expand Up @@ -202,7 +203,7 @@ public override Boolean ShouldOverrideUrlLoading(WebView view, string url)
isClosingReceipt = true;
}
}
catch (Exception ex)
catch (Exception)
{
molpayActivity.PassTransactionResultBack(dataString);
}
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" class="loading text-center vertical-center"> <p>Loading.</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.f206a627.js"></script> <script src="scripts/scripts.2c26c95c.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="loading text-center vertical-center"> <p>Loading.</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.bece1f14.js"></script> </body> </html>
1 change: 0 additions & 1 deletion MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/scripts/scripts.2c26c95c.js
View file

This file was deleted.

1 change: 1 addition & 0 deletions MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/scripts/scripts.bece1f14.js
View file

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/scripts/vendor.8ef18f5b.js
View file

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions MOLPayXDKExample/MOLPayXDKExample/Assets/molpay-mobile-xdk-www/scripts/vendor.f206a627.js
View file

This file was deleted.

3 changes: 2 additions & 1 deletion MOLPayXDKExample/MOLPayXDKExample/MOLPayActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public class MOLPayActivity : Activity
public const String mp_is_recurring = "mp_is_recurring";
public const String mp_sandbox_mode = "mp_sandbox_mode";
public const String mp_allowed_channels = "mp_allowed_channels";
public const String mp_express_mode = "mp_express_mode";

private const String mpopenmolpaywindow = "mpopenmolpaywindow://";
private const String mpcloseallwindows = "mpcloseallwindows://";
Expand Down Expand Up @@ -202,7 +203,7 @@ public override Boolean ShouldOverrideUrlLoading(WebView view, string url)
isClosingReceipt = true;
}
}
catch (Exception ex)
catch (Exception)
{
molpayActivity.PassTransactionResultBack(dataString);
}
Expand Down
6 changes: 3 additions & 3 deletions MOLPayXDKExample/MOLPayXDKExample/MOLPayXDKExample.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\fonts\fontawesome-webfont.eot" />
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\fonts\fontawesome-webfont.ttf" />
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\fonts\fontawesome-webfont.woff" />
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\fonts\fontawesome-webfont.woff2" />
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\fonts\FontAwesome.otf" />
<None Include="app.config" />
<None Include="GettingStarted.Xamarin" />
<None Include="packages.config" />
<None Include="Resources\AboutResources.txt" />
Expand Down Expand Up @@ -105,10 +105,10 @@
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\images\poweredByMOLPay.png" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\scripts.2c26c95c.js" />
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\scripts.bece1f14.js" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\vendor.f206a627.js" />
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\scripts\vendor.8ef18f5b.js" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\molpay-mobile-xdk-www\styles\main.d7e0b867.css" />
Expand Down
1 change: 1 addition & 0 deletions MOLPayXDKExample/MOLPayXDKExample/MainActivity.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ protected override void OnCreate(Bundle bundle)
paymentDetails.Add(MOLPayActivity.mp_sandbox_mode, false);
//String[] allowedChannels = new String[] { "credit", "credit3", null };
//paymentDetails.Add(MOLPayActivity.mp_allowed_channels, allowedChannels);
paymentDetails.Add(MOLPayActivity.mp_express_mode, false);

Intent intent = new Intent(this, typeof(MOLPayActivity));
intent.PutExtra(MOLPayActivity.MOLPayPaymentDetails, JsonConvert.SerializeObject(paymentDetails));
Expand Down
5 changes: 4 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,15 @@ This is the complete and functional MOLPay Xamarin Android payment module that i
String[] allowedChannels = new String[] { "credit", "credit3", null };
paymentDetails.Add(MOLPayActivity.mp_allowed_channels, allowedChannels);

// Optional, required a valid mp_channel value, this will skip the payment info page and go direct to the payment screen.
paymentDetails.Add(MOLPayActivity.mp_express_mode, false);

## Start the payment module

Intent intent = new Intent(this, typeof(MOLPayActivity));
intent.PutExtra(MOLPayActivity.MOLPayPaymentDetails, JsonConvert.SerializeObject(paymentDetails));
StartActivityForResult(intent, MOLPayActivity.MOLPayXDK);

## Cash channel payment process (How does it work?)

This is how the cash channels work on XDK:
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" class="loading text-center vertical-center"> <p>Loading.</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.f206a627.js"></script> <script src="scripts/scripts.2c26c95c.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="loading text-center vertical-center"> <p>Loading.</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.bece1f14.js"></script> </body> </html>
1 change: 0 additions & 1 deletion molpay-mobile-xdk-www/scripts/scripts.2c26c95c.js
View file

This file was deleted.

1 change: 1 addition & 0 deletions molpay-mobile-xdk-www/scripts/scripts.bece1f14.js
View file

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions molpay-mobile-xdk-www/scripts/vendor.8ef18f5b.js
View file

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions molpay-mobile-xdk-www/scripts/vendor.f206a627.js
View file

This file was deleted.

0 comments on commit d1615ec

Please sign in to comment.