Merge pull request #600 from veritrans/develop

Release 1.26.0
veritrans · May 22, 2024 · 2808f8b · 2808f8b
2 parents a11cfe0 + 4e43009
commit 2808f8b
Show file tree

Hide file tree

Showing 25 changed files with 232 additions and 13 deletions.
diff --git a/MidtransCoreKit.podspec b/MidtransCoreKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name             = "MidtransCoreKit"
-s.version          = "1.25.0"
+s.version          = "1.26.0"
 s.summary          = "Veritrans mobile SDK beta version"
 s.homepage         = "https://veritrans.co.id/"
 s.license          = 'MIT'

diff --git a/MidtransCoreKit/MidtransCoreKit.xcodeproj/project.pbxproj b/MidtransCoreKit/MidtransCoreKit.xcodeproj/project.pbxproj
@@ -79,6 +79,10 @@
 		DDB30C39264235BC00BC1235 /* MidtransPaymentUOB.m in Sources */ = {isa = PBXBuildFile; fileRef = DDB30C38264235BC00BC1235 /* MidtransPaymentUOB.m */; };
 		DDB30C472642375300BC1235 /* MidtransPaymentUOB.h in Headers */ = {isa = PBXBuildFile; fileRef = DDB30C332642359D00BC1235 /* MidtransPaymentUOB.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DDB30C4B2642375600BC1235 /* MidtransPaymentUOB.m in Sources */ = {isa = PBXBuildFile; fileRef = DDB30C38264235BC00BC1235 /* MidtransPaymentUOB.m */; };
+		DDB675762BF2B7F400AF5D2C /* MidtransPaymentKredivo.m in Sources */ = {isa = PBXBuildFile; fileRef = DDB675752BF2B7F400AF5D2C /* MidtransPaymentKredivo.m */; };
+		DDB675772BF2B7F400AF5D2C /* MidtransPaymentKredivo.h in Headers */ = {isa = PBXBuildFile; fileRef = DDB675742BF2B7F400AF5D2C /* MidtransPaymentKredivo.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		DDB675782BF2B87B00AF5D2C /* MidtransPaymentKredivo.h in Headers */ = {isa = PBXBuildFile; fileRef = DDB675742BF2B7F400AF5D2C /* MidtransPaymentKredivo.h */; };
+		DDB675792BF2B87D00AF5D2C /* MidtransPaymentKredivo.m in Sources */ = {isa = PBXBuildFile; fileRef = DDB675752BF2B7F400AF5D2C /* MidtransPaymentKredivo.m */; };
 		DDBC2FB82537C0C3002FCD06 /* MidtransPaymentShopeePay.h in Headers */ = {isa = PBXBuildFile; fileRef = DDBC2FB72537C0C3002FCD06 /* MidtransPaymentShopeePay.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		DDBC2FBB2537C0EB002FCD06 /* MidtransPaymentShopeePay.m in Sources */ = {isa = PBXBuildFile; fileRef = DDBC2FBA2537C0EB002FCD06 /* MidtransPaymentShopeePay.m */; };
 		DDBCB0EF27FDC3ED00D06C55 /* MidtransBinDetails.h in Headers */ = {isa = PBXBuildFile; fileRef = DDBCB0ED27FDC3ED00D06C55 /* MidtransBinDetails.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -482,6 +486,8 @@
 		DDA6BF7827FA9B0500296359 /* MIDExbinData.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MIDExbinData.m; sourceTree = "<group>"; };
 		DDB30C332642359D00BC1235 /* MidtransPaymentUOB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MidtransPaymentUOB.h; sourceTree = "<group>"; };
 		DDB30C38264235BC00BC1235 /* MidtransPaymentUOB.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MidtransPaymentUOB.m; sourceTree = "<group>"; };
+		DDB675742BF2B7F400AF5D2C /* MidtransPaymentKredivo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MidtransPaymentKredivo.h; sourceTree = "<group>"; };
+		DDB675752BF2B7F400AF5D2C /* MidtransPaymentKredivo.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MidtransPaymentKredivo.m; sourceTree = "<group>"; };
 		DDBC2FB72537C0C3002FCD06 /* MidtransPaymentShopeePay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MidtransPaymentShopeePay.h; sourceTree = "<group>"; };
 		DDBC2FBA2537C0EB002FCD06 /* MidtransPaymentShopeePay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MidtransPaymentShopeePay.m; sourceTree = "<group>"; };
 		DDBCB0ED27FDC3ED00D06C55 /* MidtransBinDetails.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MidtransBinDetails.h; sourceTree = "<group>"; };
@@ -868,6 +874,8 @@
 				DDBC2FBA2537C0EB002FCD06 /* MidtransPaymentShopeePay.m */,
 				DD64CE4F253DB2FF0069F4B4 /* MidtransPaymentQRIS.h */,
 				DD64CE52253DB3CC0069F4B4 /* MidtransPaymentQRIS.m */,
+				DDB675742BF2B7F400AF5D2C /* MidtransPaymentKredivo.h */,
+				DDB675752BF2B7F400AF5D2C /* MidtransPaymentKredivo.m */,
 			);
 			name = Payment;
 			sourceTree = "<group>";
@@ -1015,6 +1023,7 @@
 			files = (
 				E57120471E937A790064F515 /* NSString+MidtransValidation.h in Headers */,
 				E57120481E937A790064F515 /* SNPUITrackingManager.h in Headers */,
+				DDB675782BF2B87B00AF5D2C /* MidtransPaymentKredivo.h in Headers */,
 				E57120491E937A790064F515 /* MidtransConstant.h in Headers */,
 				E571204A1E937A790064F515 /* MidtransImageManager.h in Headers */,
 				E571204B1E937A790064F515 /* MidtransCreditCardHelper.h in Headers */,
@@ -1115,6 +1124,7 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				DDB675772BF2B7F400AF5D2C /* MidtransPaymentKredivo.h in Headers */,
 				E5711FFF1E937A030064F515 /* MidtransTransactionExpire.h in Headers */,
 				E5711FF31E9379950064F515 /* SNPPointResponse.h in Headers */,
 				E5711FF71E9379B90064F515 /* MidtransPaymentListModel.h in Headers */,
@@ -1392,6 +1402,7 @@
 				E546D1FC217EFF4C006D4650 /* MidtransPaymentAkulaku.m in Sources */,
 				E57120211E937A2C0064F515 /* MidtransPaymentRequestV2ShippingAddress.m in Sources */,
 				E57120221E937A2C0064F515 /* MidtransPaymentRequestV2TransactionDetails.m in Sources */,
+				DDB675792BF2B87D00AF5D2C /* MidtransPaymentKredivo.m in Sources */,
 				E57120231E937A2C0064F515 /* MidtransObtainedPromo.m in Sources */,
 				E57120241E937A2C0064F515 /* MidtransTransactionTokenResponse.m in Sources */,
 				E57120251E937A2C0064F515 /* MidtransVirtualAccountModel.m in Sources */,
@@ -1443,6 +1454,7 @@
 				E55F639D1E934C6400C012C8 /* MidtransImageManager.m in Sources */,
 				DDB30C39264235BC00BC1235 /* MidtransPaymentUOB.m in Sources */,
 				E55F639E1E934C6400C012C8 /* MidtransCreditCardHelper.m in Sources */,
+				DDB675762BF2B7F400AF5D2C /* MidtransPaymentKredivo.m in Sources */,
 				0C1B35D11ED6B106003F6806 /* SNPFreeTextInquiry.m in Sources */,
 				E55F639F1E934C6400C012C8 /* MidtransLuhn.m in Sources */,
 				E55F63A01E934C6400C012C8 /* MidtransConfig.m in Sources */,
@@ -1758,7 +1770,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/MidtransCoreKit/RG",
 				);
-				MARKETING_VERSION = 1.25.0;
+				MARKETING_VERSION = 1.26.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.midtrans.MidtransCoreKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1794,7 +1806,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/MidtransCoreKit/RG",
 				);
-				MARKETING_VERSION = 1.25.0;
+				MARKETING_VERSION = 1.26.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.midtrans.MidtransCoreKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransConstant.h b/MidtransCoreKit/MidtransCoreKit/MidtransConstant.h
@@ -10,7 +10,7 @@
  *  error domain
  */
 
-static NSString * const MIDTRANS_SDK_CURRENT_VERSION = @"1.25.0";
+static NSString * const MIDTRANS_SDK_CURRENT_VERSION = @"1.26.0";
 static NSString * const MIDTRANS_CUSTOMFIELD_1 = @"custom_field1";
 static NSString * const MIDTRANS_CUSTOMFIELD_2 = @"custom_field2";
 static NSString * const MIDTRANS_CUSTOMFIELD_3 = @"custom_field3";
@@ -41,6 +41,7 @@ static NSString * const MIDTRANS_PAYMENT_GOPAY = @"gopay";
 static NSString * const MIDTRANS_PAYMENT_ALFAMART = @"alfamart";
 static NSString * const MIDTRANS_PAYMENT_INDOMARET = @"indomaret";
 static NSString * const MIDTRANS_PAYMENT_AKULAKU = @"akulaku";
+static NSString * const MIDTRANS_PAYMENT_KREDIVO = @"kredivo";
 static NSString * const MIDTRANS_PAYMENT_CIMB_CLICKS = @"cimb_clicks";
 static NSString * const MIDTRANS_PAYMENT_DANAMON_ONLINE = @"danamon_online";
 static NSString * const MIDTRANS_PAYMENT_CSTORE = @"cstore";

diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransCoreKit.h b/MidtransCoreKit/MidtransCoreKit/MidtransCoreKit.h
@@ -85,4 +85,5 @@ FOUNDATION_EXPORT const unsigned char MidtransCoreKitVersionString[];
 #import "MIDExbinData.h"
 #import "MIDExbinResponse.h"
 #import "MidtransBinDetails.h"
+#import "MidtransPaymentKredivo.h"
 
diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransPaymentKredivo.h b/MidtransCoreKit/MidtransCoreKit/MidtransPaymentKredivo.h
@@ -0,0 +1,18 @@
+//
+//  MidtransPaymentKredivo.h
+//  MidtransCoreKit
+//
+//  Created by Muhammad Masykur on 14/05/24.
+//  Copyright © 2024 Midtrans. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "MidtransPaymentDetails.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface MidtransPaymentKredivo : NSObject <MidtransPaymentDetails>
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransPaymentKredivo.m b/MidtransCoreKit/MidtransCoreKit/MidtransPaymentKredivo.m
@@ -0,0 +1,19 @@
+//
+//  MidtransPaymentKredivo.m
+//  MidtransCoreKit
+//
+//  Created by Muhammad Masykur on 14/05/24.
+//  Copyright © 2024 Midtrans. All rights reserved.
+//
+
+#import "MidtransPaymentKredivo.h"
+#import "MidtransHelper.h"
+#import "MidtransConstant.h"
+
+@implementation MidtransPaymentKredivo
+
+- (NSDictionary *)dictionaryValue {
+    return @{@"payment_type":MIDTRANS_PAYMENT_KREDIVO};
+}
+
+@end
diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransPaymentWebController.m b/MidtransCoreKit/MidtransCoreKit/MidtransPaymentWebController.m
@@ -38,6 +38,9 @@ - (void)viewDidLoad {
     else if ([self.paymentIdentifier isEqualToString:MIDTRANS_PAYMENT_AKULAKU]) {
         self.title = @"Akulaku PayLater";
     }
+    else if ([self.paymentIdentifier isEqualToString:MIDTRANS_PAYMENT_KREDIVO]) {
+        self.title = @"Kredivo";
+    }
     else if ([self.paymentIdentifier isEqualToString:MIDTRANS_PAYMENT_BCA_KLIKPAY]) {
         self.title = @"BCA KlikPay";
     }
@@ -133,6 +136,7 @@ - (void)dismissWebviewWithURL: (NSString*)requestURL {
         ([self.paymentIdentifier isEqualToString:MIDTRANS_PAYMENT_BCA_KLIKPAY] && [requestURL containsString:@"id="]) ||
         ([self.paymentIdentifier isEqualToString:MIDTRANS_PAYMENT_MANDIRI_ECASH] && [requestURL containsString:@"notify"]) ||
         ([self.paymentIdentifier isEqualToString:MIDTRANS_PAYMENT_AKULAKU] && [requestURL containsString:@"akulaku/callback"]) ||
+        ([self.paymentIdentifier isEqualToString:MIDTRANS_PAYMENT_KREDIVO] && [requestURL containsString:@"order_id"]) ||
         ([self.paymentIdentifier isEqualToString:MIDTRANS_PAYMENT_BRI_EPAY] && [requestURL containsString:@"briPayment"])) {
         if ([self.delegate respondsToSelector:@selector(webPaymentController_transactionPending:)]) {
             [self.delegate webPaymentController_transactionPending:self];

diff --git a/MidtransDemo/MidtransDemo/MDOptionsViewController.m b/MidtransDemo/MidtransDemo/MDOptionsViewController.m
@@ -74,7 +74,8 @@ - (void)initConfiguration{
                 [MDOption optionGeneralWithName:@"Danamon Online" value:@(MidtransPaymentFeatureDanamonOnline)],
                 [MDOption optionGeneralWithName:@"Gopay" value:@(MidtransPaymentFeatureGOPAY)],
                 [MDOption optionGeneralWithName:@"ShopeePay" value:@(MidtransPaymentFeatureShopeePay)],
-                [MDOption optionGeneralWithName:@"UOB Ezpay" value:@(MidtransPaymentFeatureUOB)]
+                [MDOption optionGeneralWithName:@"UOB Ezpay" value:@(MidtransPaymentFeatureUOB)],
+                [MDOption optionGeneralWithName:@"Kredivo" value:@(MidtransPaymentFeatureKredivo)]
     ];
     MDOptionView *optDirectPayment = [MDOptionView viewWithIcon:[UIImage imageNamed:@"payment_channel"]
                                             titleTemplate:@"Direct Payment Feature %@"

diff --git a/MidtransDemo/MidtransDemo/payment_channels.json b/MidtransDemo/MidtransDemo/payment_channels.json
@@ -86,5 +86,9 @@
   {
     "type": "akulaku",
     "name": "Akulaku PayLater"
+  },
+  {
+    "type": "kredivo",
+    "name": "Kredivo"
   }
 ]
diff --git a/MidtransKit.podspec b/MidtransKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name             = "MidtransKit"
-s.version          = "1.25.0"
+s.version          = "1.26.0"
 s.summary          = "Veritrans mobile SDK beta version"
 s.homepage         = "https://veritrans.co.id/"
 s.license          = 'MIT'
@@ -18,7 +18,7 @@ s.source_files = 'MidtransKit/MidtransKit/**/*.{h,m}'
 s.resource_bundles = {
     'MidtransKit' => ['MidtransKit/MidtransKit/resources/*', 'MidtransKit/PrivacyInfo.xcprivacy']
 }
-s.dependency 'MidtransCoreKit', '1.25.0'
+s.dependency 'MidtransCoreKit', '1.26.0'
 s.static_framework = true
 s.default_subspec = 'UI'