BETA 0.10.0

RazerMS · Mar 29, 2017 · 64cb45c · 64cb45c
1 parent 4e98b9e
commit 64cb45c
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 17 deletions.
diff --git a/MOLPayXDK/android/build.gradle b/MOLPayXDK/android/build.gradle
@@ -14,5 +14,5 @@ android {
 
 dependencies {
     compile 'com.facebook.react:react-native:+'
-    compile 'com.molpay:molpay-mobile-xdk-android:3.9.1'
+    compile 'com.molpay:molpay-mobile-xdk-android:3.10.0'
 }
diff --git a/MOLPayXDK/android/src/main/java/com/molpayxdk/MOLPayReact.java b/MOLPayXDK/android/src/main/java/com/molpayxdk/MOLPayReact.java
@@ -78,7 +78,7 @@ public void setPaymentDetails(String str,@Nullable Callback successCallback, @Nu
             paymentDetails.put(MOLPayActivity.mp_bill_description_edit_disabled, obj.getString("mp_bill_description_edit_disabled"));
             paymentDetails.put("is_submodule", true);
             paymentDetails.put("module_id", "molpay-mobile-xdk-reactnative-beta-android");
-            paymentDetails.put("wrapper_version", "2");
+            paymentDetails.put("wrapper_version", "0");
 
         }catch(Exception e){
             if(this.errorCallback != null){

diff --git a/MOLPayXDK/ios/MOLPayReactManager.m b/MOLPayXDK/ios/MOLPayReactManager.m
@@ -21,7 +21,7 @@ @interface MOLPayReactManager ()
 
 @end
 
-// CalendarManager.m
+// MOLPayReactManager.m
 @implementation MOLPayReactManager
 
 RCT_EXPORT_MODULE();
@@ -33,8 +33,8 @@ @implementation MOLPayReactManager
 
     [mpvc.view setBackgroundColor:[UIColor whiteColor]];
     [paymentDetailsMutable setObject:@"YES" forKey:@"is_submodule"];
-    [paymentDetailsMutable setObject:@"molpay-mobile-reactnative-beta-ios" forKey:@"module_id"];
-    [paymentDetailsMutable setObject:@"2" forKey:@"wrapper_version"];
+    [paymentDetailsMutable setObject:@"molpay-mobile-xdk-reactnative-beta-ios" forKey:@"module_id"];
+    [paymentDetailsMutable setObject:@"0" forKey:@"wrapper_version"];
     mpvc.PaymentDetails = paymentDetailsMutable;
   	UINavigationController *nc = [[UINavigationController alloc] initWithRootViewController:mpvc];
   	mpvc.didDismiss = ^(NSDictionary *data) {

diff --git a/MOLPayXDK/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/index.html b/MOLPayXDK/ios/MOLPayXDK.bundle/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.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>{{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.1780c687.js"></script> <script src="scripts/scripts.7554129b.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>{{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.d549f114.js"></script> </body> </html>
diff --git a/MOLPayXDK/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.7554129b.js b/MOLPayXDK/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.7554129b.js
diff --git a/MOLPayXDK/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.d549f114.js b/MOLPayXDK/ios/MOLPayXDK.bundle/molpay-mobile-xdk-www/scripts/scripts.d549f114.js
diff --git a/...mobile-xdk-www/scripts/vendor.1780c687.js → ...mobile-xdk-www/scripts/vendor.f57621ed.js b/...mobile-xdk-www/scripts/vendor.1780c687.js → ...mobile-xdk-www/scripts/vendor.f57621ed.js
diff --git a/README.md b/README.md
@@ -38,8 +38,10 @@ Credit card payment channel is not available in Android 4.1, 4.2, and 4.3. due t
 3) add the following import to `MainApplication.java` (`MainActivity.java` if RN < 0.33) of your application
 
 ```java
+//add these three
 import com.molpayxdk.MOLPayReact;
 import com.molpayxdk.MOLPayReactActivity;
+import android.content.Intent;
 
 public class MainActivity extends ReactActivity {
     /**

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "MOLPayXDK",
-  "version": "0.9.2",
+  "version": "0.10.0",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start"
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>{{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.1780c687.js"></script> <script src="scripts/scripts.7554129b.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>{{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.d549f114.js"></script> </body> </html>