Skip to content

Commit

Permalink
BETA 0.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Leow authored and Leow committed Dec 1, 2016
1 parent 5979b0d commit 9b76e52
Show file tree
Hide file tree
Showing 9 changed files with 25 additions and 13 deletions.
2 changes: 1 addition & 1 deletion MOLPayReactExampleProject/ios/MOLPayXDK.bundle/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 || D7ARequeryActiveNow" 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.80b0fea7.js"></script> <script src="scripts/scripts.6a95b82a.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 || D7ARequeryActiveNow" 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.80b0fea7.js"></script> <script src="scripts/scripts.51ee3c6e.js"></script> </body> </html>
1 change: 1 addition & 0 deletions ...eactExampleProject/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.51ee3c6e.js
View file

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion ...eactExampleProject/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.6a95b82a.js
View file

This file was deleted.

6 changes: 6 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,12 @@ var paymentDetails = {
// Optional, required a valid mp_channel value, this will skip the payment info page and go direct to the payment screen.
'mp_express_mode': false
// Optional, enable this for extended email format validation based on W3C standards.
'mp_advanced_email_validation_enabled': true,
// Optional, enable this for extended phone format validation based on Google i18n standards.
'mp_advanced_phone_validation_enabled' : true
};
```

Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ android {

dependencies {
compile 'com.facebook.react:react-native:+'
compile 'com.molpay:molpay-mobile-xdk-android:3.5.0'
compile 'com.molpay:molpay-mobile-xdk-android:3.6.0'
}
2 changes: 2 additions & 0 deletions android/src/main/java/com/molpayxdk/MOLPayReact.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public void setPaymentDetails(String str,@Nullable Callback successCallback, @Nu
paymentDetails.put(MOLPayActivity.mp_allowed_channels, obj.getString("mp_allowed_channels"));
paymentDetails.put(MOLPayActivity.mp_sandbox_mode, obj.getString("mp_sandbox_mode"));
paymentDetails.put(MOLPayActivity.mp_express_mode, obj.getString("mp_express_mode"));
paymentDetails.put(MOLPayActivity.mp_advanced_email_validation_enabled, obj.getString("mp_advanced_email_validation_enabled"));
paymentDetails.put(MOLPayActivity.mp_advanced_phone_validation_enabled, obj.getString("mp_advanced_phone_validation_enabled"));

}catch(Exception e){
if(this.errorCallback != null){
Expand Down
4 changes: 3 additions & 1 deletion index.android.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,9 @@ var jsonparse = function(paymentDetails) {
mp_is_recurring: "",
mp_allowed_channels: "",
mp_sandbox_mode: "",
mp_express_mode: ""
mp_express_mode: "",
mp_advanced_email_validation_enabled: true,
mp_advanced_phone_validation_enabled: true
}

for(var key in payment){
Expand Down
18 changes: 10 additions & 8 deletions index.ios.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ var jsonparse = function(paymentDetails) {
mp_is_recurring: "",
mp_allowed_channels: "",
mp_sandbox_mode: "",
mp_express_mode: ""
mp_express_mode: "",
mp_advanced_email_validation_enabled: true,
mp_advanced_phone_validation_enabled: true
}

for(var key in payment){
if(paymentDetails[key]){
payment[key] = paymentDetails[key]
}else{
payment[key] = "";
}
for (var key in payment) {
if (paymentDetails[key]) {
payment[key] = paymentDetails[key]
} else {
payment[key] = "";
}
}
return payment;
}
Expand Down Expand Up @@ -70,4 +72,4 @@ var molpay = {
}
}

module.exports = molpay;
module.exports = molpay;
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "MOLPayXDK",
"version": "0.5.0",
"version": "0.6.0",
"private": true,
"scripts": {
"start": "node node_modules/react-native/local-cli/cli.js start"
Expand Down

0 comments on commit 9b76e52

Please sign in to comment.