Merge pull request #21 from MOLPay/Leow

Release 3.12.0
RazerMS · May 8, 2017 · 85fe8c3 · 85fe8c3
2 parents ee12587 + 8947aa3
commit 85fe8c3
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,6 @@
+/.*\.DS_Store$
+.DS_Store
+
 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
 [Bb]in/
 [Oo]bj/

diff --git a/MOLPay.cs b/MOLPay.cs
@@ -43,6 +43,8 @@ public class MOLPay : UIViewController
 		public const string mp_bill_email_edit_disabled = "mp_bill_email_edit_disabled";
 		public const string mp_bill_mobile_edit_disabled = "mp_bill_mobile_edit_disabled";
 		public const string mp_bill_description_edit_disabled = "mp_bill_description_edit_disabled";
+		public const string mp_language = "mp_language";
+		public const string mp_dev_mode = "mp_dev_mode";
 
 		private const string mpopenmolpaywindow = "mpopenmolpaywindow://";
 		private const string mpcloseallwindows = "mpcloseallwindows://";

diff --git a/MOLPayXDKExample/MOLPayXDKExample/Content/molpay-mobile-xdk-www/index.html b/MOLPayXDKExample/MOLPayXDKExample/Content/molpay-mobile-xdk-www/index.html
@@ -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.88dcea2c.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>{{label_preparing}}</p> <p>{{label_pleasewait}}</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">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.03193944.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.88dcea2c.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>{{label_preparing}}</p> <p>{{label_pleasewait}}</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">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.69e44cc3.js"></script> </body> </html>
diff --git a/MOLPayXDKExample/MOLPayXDKExample/Content/molpay-mobile-xdk-www/scripts/scripts.03193944.js b/MOLPayXDKExample/MOLPayXDKExample/Content/molpay-mobile-xdk-www/scripts/scripts.03193944.js
diff --git a/MOLPayXDKExample/MOLPayXDKExample/Content/molpay-mobile-xdk-www/scripts/scripts.69e44cc3.js b/MOLPayXDKExample/MOLPayXDKExample/Content/molpay-mobile-xdk-www/scripts/scripts.69e44cc3.js
diff --git a/MOLPayXDKExample/MOLPayXDKExample/MOLPay.cs b/MOLPayXDKExample/MOLPayXDKExample/MOLPay.cs
@@ -43,6 +43,8 @@ public class MOLPay : UIViewController
 		public const string mp_bill_email_edit_disabled = "mp_bill_email_edit_disabled";
 		public const string mp_bill_mobile_edit_disabled = "mp_bill_mobile_edit_disabled";
 		public const string mp_bill_description_edit_disabled = "mp_bill_description_edit_disabled";
+		public const string mp_language = "mp_language";
+		public const string mp_dev_mode = "mp_dev_mode";
 
 		private const string mpopenmolpaywindow = "mpopenmolpaywindow://";
 		private const string mpcloseallwindows = "mpcloseallwindows://";

diff --git a/README.md b/README.md
@@ -156,6 +156,12 @@ This plugin provides an integrated MOLPay payment module that contains a wrapper
     // Optional, explicitly force disable billing description edit.
     paymentDetails.Add(MOLPay.mp_bill_description_edit_disabled, true);
 
+    // Optional, EN, MS, VI, TH, FIL, MY, KM, ID, ZH.
+    paymentDetails.Add(MOLPay.mp_language, "EN");
+
+    // Optional, enable for online sandbox testing.
+    paymentDetails.Add(MOLPay.mp_dev_mode, false);
+
 ## Start the payment module UI
 
     MOLPay molpay = new MOLPay(paymentDetails, MolpayCallback);

diff --git a/molpay-mobile-xdk-www/index.html b/molpay-mobile-xdk-www/index.html
@@ -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.88dcea2c.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>{{label_preparing}}</p> <p>{{label_pleasewait}}</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">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.03193944.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.88dcea2c.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>{{label_preparing}}</p> <p>{{label_pleasewait}}</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">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.69e44cc3.js"></script> </body> </html>
diff --git a/molpay-mobile-xdk-www/scripts/scripts.03193944.js b/molpay-mobile-xdk-www/scripts/scripts.03193944.js
diff --git a/molpay-mobile-xdk-www/scripts/scripts.69e44cc3.js b/molpay-mobile-xdk-www/scripts/scripts.69e44cc3.js
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.88dcea2c.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>{{label_preparing}}</p> <p>{{label_pleasewait}}</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">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.03193944.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.88dcea2c.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>{{label_preparing}}</p> <p>{{label_pleasewait}}</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">{{label_loading}}</div> </div> <script src="scripts/vendor.f57621ed.js"></script> <script src="scripts/scripts.69e44cc3.js"></script> </body> </html>