Merge pull request #480 from veritrans/fix-alertView-ios13

Fauzan Erich Emmerling · web-flow · commit 5c5a12c9e72b · 2019-12-04T15:42:18.000+07:00
Fix alert view ios13
diff --git a/MidtransDemo/MidtransDemo.xcodeproj/project.pbxproj b/MidtransDemo/MidtransDemo.xcodeproj/project.pbxproj
@@ -522,7 +522,7 @@
 					E56436F11E83A72F008726D0 = {
 						CreatedOnToolsVersion = 8.2.1;
 						DevelopmentTeam = G92YEQF267;
-						ProvisioningStyle = Manual;
+						ProvisioningStyle = Automatic;
 					};
 					E5C751651E8B912F001F47D9 = {
 						CreatedOnToolsVersion = 8.2.1;
@@ -875,9 +875,7 @@
 			baseConfigurationReference = 5C11021525267A24FA5F14A7 /* Pods-MidtransDemo.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Nanang Rafsanjani (77WYT367ML)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Nanang Rafsanjani (77WYT367ML)";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = G92YEQF267;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -889,7 +887,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.midtrans.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
-				PROVISIONING_PROFILE_SPECIFIER = "SDK Demo Dev";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -899,9 +897,7 @@
 			baseConfigurationReference = F724BE8B0AB574A14BDDE958 /* Pods-MidtransDemo.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: MIDTRANS, PT (G92YEQF267)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: MIDTRANS, PT (G92YEQF267)";
-				CODE_SIGN_STYLE = Manual;
+				CODE_SIGN_STYLE = Automatic;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = G92YEQF267;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -912,7 +908,7 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.midtrans.demo;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE_SPECIFIER = "SDK Demo Adhoc";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
diff --git a/MidtransDemo/MidtransDemo/MDOptionsViewController.m b/MidtransDemo/MidtransDemo/MDOptionsViewController.m
@@ -282,9 +282,12 @@ - (void)initConfiguration{
             [opt3ds selectOptionAtIndex:1];
             [optSaveCard selectOptionAtIndex:1];
             [optAuth selectOptionAtIndex:3];
+            [opt3ds selectOptionAtIndex:1];
         }
         else if (type == MTCreditCardPaymentTypeTwoclick) {
             [optSaveCard selectOptionAtIndex:1];
+            [opt3ds selectOptionAtIndex:0];
+            [optAuth selectOptionAtIndex:0];
         }
     });
 
diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m
@@ -78,6 +78,7 @@ - (void)viewDidLoad {
        merchantServerURL:merchantServer];
     
     UICONFIG.hideStatusPage = NO;
+    CC_CONFIG.secure3DEnabled = [[MDOptionManager shared].secure3DOption.value boolValue];
     CC_CONFIG.authenticationType = [[MDOptionManager shared].authTypeOption.value integerValue];
     CC_CONFIG.saveCardEnabled =[[MDOptionManager shared].saveCardOption.value boolValue];
     CC_CONFIG.acquiringBank = [[MDOptionManager shared].issuingBankOption.value integerValue];
diff --git a/MidtransKit/MidtransKit/classes/VTKlikbcaSuccessController.m b/MidtransKit/MidtransKit/classes/VTKlikbcaSuccessController.m
@@ -56,7 +56,7 @@ - (IBAction)helpPressed:(UIButton *)sender {
 
 - (IBAction)finishPressed:(UIButton *)sender {
     NSDictionary *userInfo = @{TRANSACTION_RESULT_KEY:self.successViewModel.transactionResult};
-    [[NSNotificationCenter defaultCenter] postNotificationName:TRANSACTION_SUCCESS object:nil userInfo:userInfo];
+    [[NSNotificationCenter defaultCenter] postNotificationName:TRANSACTION_PENDING object:nil userInfo:userInfo];
     
     [self dismissViewControllerAnimated:YES completion:nil];
 }
diff --git a/MidtransKit/MidtransKit/resources/MidGopayDetailViewController.xib b/MidtransKit/MidtransKit/resources/MidGopayDetailViewController.xib

Original file line number	Diff line number	Diff line change
`@@ -282,9 +282,12 @@ - (void)initConfiguration{`
`282`	`282`	`[opt3ds selectOptionAtIndex:1];`
`283`	`283`	`[optSaveCard selectOptionAtIndex:1];`
`284`	`284`	`[optAuth selectOptionAtIndex:3];`
	`285`	`+ [opt3ds selectOptionAtIndex:1];`
`285`	`286`	`}`
`286`	`287`	`else if (type == MTCreditCardPaymentTypeTwoclick) {`
`287`	`288`	`[optSaveCard selectOptionAtIndex:1];`
	`289`	`+ [opt3ds selectOptionAtIndex:0];`
	`290`	`+ [optAuth selectOptionAtIndex:0];`
`288`	`291`	`}`
`289`	`292`	`});`
`290`	`293`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ - (IBAction)helpPressed:(UIButton *)sender {`
`56`	`56`
`57`	`57`	`- (IBAction)finishPressed:(UIButton *)sender {`
`58`	`58`	`NSDictionary *userInfo = @{TRANSACTION_RESULT_KEY:self.successViewModel.transactionResult};`
`59`		`- [[NSNotificationCenter defaultCenter] postNotificationName:TRANSACTION_SUCCESS object:nil userInfo:userInfo];`
	`59`	`+ [[NSNotificationCenter defaultCenter] postNotificationName:TRANSACTION_PENDING object:nil userInfo:userInfo];`
`60`	`60`
`61`	`61`	`[self dismissViewControllerAnimated:YES completion:nil];`
`62`	`62`	`}`