Merge pull request #528 from veritrans/release/release-1.18.0

Release/release 1.18.0
veritrans · Dec 15, 2020 · f6a4193 · f6a4193
2 parents 9df42ad + 9238ead
commit f6a4193
Show file tree

Hide file tree

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

diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransConstant.h b/MidtransCoreKit/MidtransCoreKit/MidtransConstant.h
@@ -52,6 +52,7 @@ static NSString * const MIDTRANS_PAYMENT_ECHANNEL = @"echannel";
 static NSString * const MIDTRANS_PAYMENT_PERMATA_VA = @"permata_va";
 static NSString * const MIDTRANS_PAYMENT_BCA_VA = @"bca_va";
 static NSString * const MIDTRANS_PAYMENT_BNI_VA = @"bni_va";
+static NSString * const MIDTRANS_PAYMENT_BRI_VA = @"bri_va";
 static NSString * const MIDTRANS_PAYMENT_ALL_VA = @"all_va";
 static NSString * const MIDTRANS_PAYMENT_OTHER_VA= @"other_va";
 static NSString * const MIDTRANS_PAYMENT_VA = @"va";

diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransPaymentBankTransfer.h b/MidtransCoreKit/MidtransCoreKit/MidtransPaymentBankTransfer.h
@@ -14,6 +14,7 @@ typedef NS_ENUM(NSUInteger, MidtransVAType) {
     VTVATypeMandiri,
     VTVATypePermata,
     VTVATypeBNI,
+    VTVATypeBRI,
     VTVATypeAll,
     VTVATypeOther
 };

diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransPaymentBankTransfer.m b/MidtransCoreKit/MidtransCoreKit/MidtransPaymentBankTransfer.m
@@ -38,6 +38,8 @@ - (NSString *)paymentType {
             return MIDTRANS_PAYMENT_PERMATA_VA;
         case VTVATypeBNI:
             return MIDTRANS_PAYMENT_BNI_VA;
+        case VTVATypeBRI:
+            return MIDTRANS_PAYMENT_BRI_VA;
         case VTVATypeOther:
             return MIDTRANS_PAYMENT_OTHER_VA;
     }

diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransPaymentCreditCard.h b/MidtransCoreKit/MidtransCoreKit/MidtransPaymentCreditCard.h
@@ -62,7 +62,9 @@
 + (instancetype _Nonnull)modelWithMaskedCard:(NSString *_Nonnull)maskedCard
                                     customer:(MidtransCustomerDetails *_Nonnull)customer
                                     saveCard:(BOOL)saveCard
-                                 installment:(NSString *_Nullable)installment;
+                                 installment:(NSString *_Nullable)installment
+                                      promos:(NSDictionary *_Nullable)promos;
+
 
 + (instancetype _Nonnull)modelWithToken:(NSString *_Nonnull)token
                                customer:(MidtransCustomerDetails *_Nonnull)customer

diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransPaymentCreditCard.m b/MidtransCoreKit/MidtransCoreKit/MidtransPaymentCreditCard.m
@@ -55,7 +55,7 @@ + (instancetype)modelWithToken:(NSString *)token customer:(MidtransCustomerDetai
     return payment;
 }
 
-+ (instancetype)modelWithMaskedCard:(NSString *)maskedCard customer:(MidtransCustomerDetails *)customer saveCard:(BOOL)saveCard installment:(NSString *)installment {
++ (instancetype)modelWithMaskedCard:(NSString *)maskedCard customer:(MidtransCustomerDetails *)customer saveCard:(BOOL)saveCard installment:(NSString *)installment promos:(NSDictionary * _Nullable)promos {
     MidtransPaymentCreditCard *payment = [MidtransPaymentCreditCard new];
     if (installment !=nil) {
         payment.installment = installment;
@@ -64,6 +64,7 @@ + (instancetype)modelWithMaskedCard:(NSString *)maskedCard customer:(MidtransCus
     payment.customerDetails = customer;
     payment.maskedCard = maskedCard;
     payment.saveCard = saveCard;
+    payment.promos = promos;
     return payment;
 }
 

diff --git a/MidtransDemo/MidtransDemo/MDOptionManager.h b/MidtransDemo/MidtransDemo/MDOptionManager.h
@@ -32,5 +32,6 @@
 @property (nonatomic) MDOption *mandiriPointOption;
 @property (nonatomic) MDOption *installmentOption;
 @property (nonatomic) MDOption *paymentChannel;
+@property (nonatomic) MDOption *directPaymentFeature;
 - (void)resetConfiguration;
 @end
diff --git a/MidtransDemo/MidtransDemo/MDOptionManager.m b/MidtransDemo/MidtransDemo/MDOptionManager.m
@@ -49,6 +49,7 @@ - (instancetype)init {
         self.customFieldOption = [self unArchivedObject:@"md_custom_field"];
         self.installmentOption = [self unArchivedObject:@"md_installment"];
         self.paymentChannel = [self unArchivedObject:@"md_payment_channel"];
+        self.directPaymentFeature = [self unArchivedObject:@"md_direct_payment_feature"];
     }
     return self;
 }
@@ -141,6 +142,10 @@ - (void)setPaymentChannel:(MDOption *)paymentChannel {
     _paymentChannel = paymentChannel;
     [self archiveObject:paymentChannel key:@"md_payment_channel"];
 }
+- (void)setDirectPaymentFeature:(MDOption *)directPaymentFeature {
+    _directPaymentFeature = directPaymentFeature;
+    [self archiveObject:directPaymentFeature key:@"md_direct_payment_feature"];
+}
 
 - (id)unArchivedObject:(NSString *)key {
     NSData *data = defaults_object(key);
@@ -179,5 +184,6 @@ - (void)resetConfiguration {
     self.installmentOption =nil;
     self.customFieldOption = nil;
     self.paymentChannel = nil;
+    self.directPaymentFeature = nil;
 }
 @end
diff --git a/MidtransDemo/MidtransDemo/MDOptionsViewController.m b/MidtransDemo/MidtransDemo/MDOptionsViewController.m
@@ -54,6 +54,31 @@ - (void)initConfiguration{
                                                identifier:OPTAcquiringBank];
     [optAcqBank selectOptionAtIndex:[options indexOfOption:[MDOptionManager shared].issuingBankOption]];
 
+    //Direct Payment
+    options = @[[MDOption optionGeneralWithName:@"None" value:nil],
+                [MDOption optionGeneralWithName:@"Bank Transfer" value:@(MidtransPaymentFeatureBankTransfer)],
+                [MDOption optionGeneralWithName:@"Credit Card" value:@(MidtransPaymentFeatureCreditCard)],
+                [MDOption optionGeneralWithName:@"Bank Transfer BCAVA" value:@(MidtransPaymentFeatureBankTransferBCAVA)],
+                [MDOption optionGeneralWithName:@"Bank Transfer MandiriVA" value:@(MidtransPaymentFeatureBankTransferMandiriVA)],
+                [MDOption optionGeneralWithName:@"Bank Transfer BNIVA" value:@(MidtransPaymentFeatureBankTransferBNIVA)],
+                [MDOption optionGeneralWithName:@"Bank Transfer BRIVA" value:@(MidtransPaymentFeatureBankTransferBRIVA)],
+                [MDOption optionGeneralWithName:@"Bank Transfer PermataVA" value:@(MidtransPaymentFeatureBankTransferPermataVA)],
+                [MDOption optionGeneralWithName:@"Bank Transfer OtherVA" value:@(MidtransPaymentFeatureBankTransferOtherVA)],
+                [MDOption optionGeneralWithName:@"Klik BCA" value:@(MidtransPaymentFeatureKlikBCA)],
+                [MDOption optionGeneralWithName:@"Indomaret" value:@(MidtransPaymentFeatureIndomaret)],
+                [MDOption optionGeneralWithName:@"Alfamart" value:@(MidtransPaymentFeatureAlfamart)],
+                [MDOption optionGeneralWithName:@"CIMB Clicks" value:@(MidtransPaymentFeatureCIMBClicks)],
+                [MDOption optionGeneralWithName:@"BRI Epay" value:@(MidtransPaymentFeatureBRIEpay)],
+                [MDOption optionGeneralWithName:@"Akulaku" value:@(MidtransPaymentFeatureAkulaku)],
+                [MDOption optionGeneralWithName:@"Danamon Online" value:@(MidtransPaymentFeatureDanamonOnline)],
+                [MDOption optionGeneralWithName:@"Gopay" value:@(MidtransPaymentFeatureGOPAY)],
+                [MDOption optionGeneralWithName:@"ShopeePay" value:@(MidtransPaymentFeatureShopeePay)]
+    ];
+    MDOptionView *optDirectPayment = [MDOptionView viewWithIcon:[UIImage imageNamed:@"payment_channel"]
+                                            titleTemplate:@"Direct Payment Feature %@"
+                                                  options:options
+                                               identifier:OPTDirectPayment];
+    [optDirectPayment selectOptionAtIndex:[options indexOfOption:[MDOptionManager shared].directPaymentFeature]];
 
 
     ////// auth type
@@ -259,7 +284,8 @@ - (void)initConfiguration{
                          optBNIVA,
                          optCustomField,
                          optInstallment,
-                         optPaymentChannels
+                         optPaymentChannels,
+                         optDirectPayment
                          ];
 
      [self prepareOptionViews:self.optionViews];;

diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m
@@ -25,6 +25,9 @@ @interface MDOrderViewController () <MidtransUIPaymentViewControllerDelegate,Mid
 @property (weak, nonatomic) IBOutlet UIButton *payButton;
 @property (weak, nonatomic) IBOutlet UITextField *snaptokenTextField;
 @property (strong, nonatomic) NSNumber *totalAmount;
+@property (nonatomic) MidtransPaymentFeature directPaymentFeature;
+@property (nonatomic) MidtransUIPaymentViewController *paymentVC;
+
 @property (nonatomic) JGProgressHUD *progressHUD;
 @end
 
@@ -67,16 +70,16 @@ - (void)viewDidLoad {
     CC_CONFIG.paymentType = [[MDOptionManager shared].ccTypeOption.value integerValue];
     switch (CC_CONFIG.paymentType) {
         case MTCreditCardPaymentTypeOneclick:
-            clientkey = PROMO_MERCHANT_CLIENT_KEY_SANDBOX;
-            merchantServer = PROMO_MERCHANT_SERVER_URL_SANDBOX;
+            clientkey = DEMO_STORE_MERCHANT_CLIENT_KEY_SANDBOX;
+            merchantServer = DEMO_STORE_MERCHANT_SERVER_URL_SANDBOX;
             break;
         default:
-            clientkey = SHOPEEPAY_MERCHANT_CLIENT_KEY_PRODUCTION;
-            merchantServer = SHOPEEPAY_MERCHANT_SERVER_URL_PRODUCTION;
+            clientkey = DEMO_STORE_MERCHANT_CLIENT_KEY_SANDBOX;
+            merchantServer = DEMO_STORE_MERCHANT_SERVER_URL_SANDBOX;
             break;
     }
     [CONFIG setClientKey:clientkey
-             environment:MidtransServerEnvironmentProduction
+             environment:MidtransServerEnvironmentSandbox
        merchantServerURL:merchantServer];
 
     UICONFIG.hideStatusPage = NO;
@@ -104,6 +107,7 @@ - (void)viewDidLoad {
 
     CONFIG.callbackSchemeURL = @"demo.midtrans://";
     CONFIG.shopeePayCallbackURL = @"demo.midtrans://";
+    self.directPaymentFeature = [[MDOptionManager shared].directPaymentFeature.value intValue];
 
     self.amountView.backgroundColor = [UIColor mdThemeColor];
     __weak MDOrderViewController *wself = self;
@@ -217,10 +221,13 @@ - (IBAction)bayarPressed:(id)sender {
             [self presentViewController:alert animated:YES completion:nil];
         }
         else {
-
-            MidtransUIPaymentViewController *paymentVC = [[MidtransUIPaymentViewController alloc] initWithToken:token];
-            paymentVC.paymentDelegate = self;
-            [self.navigationController presentViewController:paymentVC animated:YES completion:nil];
+            if (self.directPaymentFeature != MidtransPaymentFeatureNone) {
+                self.paymentVC = [[MidtransUIPaymentViewController alloc] initWithToken:token andPaymentFeature:self.directPaymentFeature];
+            } else {
+                self.paymentVC = [[MidtransUIPaymentViewController alloc] initWithToken:token];
+            }
+            self.paymentVC.paymentDelegate = self;
+            [self.navigationController presentViewController:self.paymentVC animated:YES completion:nil];
         }
 
         //hide hud

diff --git a/MidtransDemo/MidtransDemo/MDUtils.h b/MidtransDemo/MidtransDemo/MDUtils.h
@@ -47,6 +47,7 @@ static NSString *const OPTBNIVA = @"OPTBNIVA";
 static NSString *const OPTCustomField = @"OPTCustomField";
 static NSString *const OPTInstallment = @"OPTInstallment";
 static NSString *const OPTPaymanetChannel = @"OPTPaymanetChannel";
+static NSString *const OPTDirectPayment= @"OPTDirectPayment";
 
 static NSString *const BankBCAKey = @"bca";
 static NSString *const BankMandiriKey = @"mandiri";

diff --git a/MidtransDemo/MidtransDemo/MDUtils.m b/MidtransDemo/MidtransDemo/MDUtils.m
@@ -77,6 +77,9 @@ + (void)saveOptionWithView:(MDOptionView *)view option:(MDOption *)option {
     else if ([idf isEqualToString:OPTPaymanetChannel]) {
         [MDOptionManager shared].paymentChannel = option;
     }
+    else if ([idf isEqualToString:OPTDirectPayment]) {
+        [MDOptionManager shared].directPaymentFeature = option;
+    }
 }
 
 + (NSArray <MDPayment*>*)paymentChannelsWithNames:(NSArray <NSString*>*)names {

diff --git a/MidtransDemo/MidtransDemo/MidtransDemoAppConfig.h b/MidtransDemo/MidtransDemo/MidtransDemoAppConfig.h
@@ -13,8 +13,11 @@
 static NSString * const ONE_CLICK_MERCHANT_SERVER_URL_SANDBOX = @"https://fauzi-one-click-sandbox.herokuapp.com/";
 static NSString * const ONE_CLICK_MERCHANT_CLIENT_KEY_SANDBOX = @"SB-Mid-client-61XuGAwQ8Bj8LxSS";
 
-static NSString * const PROMO_MERCHANT_SERVER_URL_SANDBOX = @"https://promo-engine-sample-server.herokuapp.com/";
-static NSString * const PROMO_MERCHANT_CLIENT_KEY_SANDBOX = @"VT-client-yrHf-c8Sxr-ck8tx";
+static NSString * const DEMO_STORE_MERCHANT_SERVER_URL_SANDBOX = @"https://promo-engine-sample-server.herokuapp.com/";
+static NSString * const DEMO_STORE_MERCHANT_CLIENT_KEY_SANDBOX = @"VT-client-yrHf-c8Sxr-ck8tx";
+
+static NSString * const PROMO_MERCHANT_SERVER_URL_SANDBOX = @"https://charmenzy-mid-mobile-sandbox.herokuapp.com/";
+static NSString * const PROMO_MERCHANT_CLIENT_KEY_SANDBOX = @"SB-Mid-client-zt7XrRxPQXZNvuBY";
 
 static NSString * const FIESTAPOINT_MERCHANT_SERVER_URL_SANDBOX = @"https://fiesta-point-sample.herokuapp.com/";
 static NSString * const FIESTAPOINT_MERCHANT_CLIENT_KEY_SANDBOX = @"SB-Mid-client-hOWJXiCCDRvT0RGr";
@@ -26,5 +29,5 @@ static NSString * const SHOPEEPAY_MERCHANT_CLIENT_KEY_PRODUCTION = @"SB-Mid-serv
 *  ITEM CONFIGURATION
 */
 
-static int const DEMO_APP_ITEM_PRICE = 1;
+static int const DEMO_APP_ITEM_PRICE = 150000;
 
diff --git a/MidtransDemo/MidtransDemo/payment_channels.json b/MidtransDemo/MidtransDemo/payment_channels.json
@@ -21,6 +21,10 @@
  },
  {
  "type": "bank_transfer",
+ "name": "Bank BRI"
+ },
+ {
+ "type": "bank_transfer",
  "name": "Other Bank"
  },
  {
@@ -62,5 +66,13 @@
   {
     "type": "gci",
     "name": "GCI"
+  },
+  {
+    "type": "gopay",
+    "name": "GoPay"
+  },
+  {
+    "type": "shopeepay",
+    "name": "ShopeePay"
   }
 ]
diff --git a/MidtransKit.podspec b/MidtransKit.podspec
@@ -1,7 +1,7 @@
 Pod::Spec.new do |s|
 
 s.name             = "MidtransKit"
-s.version          = "1.17.0"
+s.version          = "1.18.0"
 s.summary          = "Veritrans mobile SDK beta version"
 s.homepage         = "https://veritrans.co.id/"
 s.license          = 'MIT'
@@ -17,7 +17,7 @@ s.source_files = 'MidtransKit/MidtransKit/**/*.{h,m}'
 s.resource_bundles = {
     'MidtransKit' => ['MidtransKit/MidtransKit/resources/*']
 }
-s.dependency 'MidtransCoreKit', '1.17.0'
+s.dependency 'MidtransCoreKit', '1.18.0'
 s.static_framework = true
 s.default_subspec = 'UI'