Merge branch 'development' of https://github.com/veritrans/Veritrans-ios-sdk into development

Author: vanbungkring

MidtransCoreKit/MidtransCoreKit/MidtransConfig.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 #import "MidtransEnvironment.h"
+#import "MidtransHelper.h"
 
 #define CONFIG ((MidtransConfig *)[MidtransConfig shared])
 
@@ -41,6 +42,8 @@
 @property (nonatomic) NSArray *customPaymentChannels;
 @property (nonatomic) NSDictionary *customFreeText;
 
+@property (nonatomic) MidtransCurrency currency;
+
 /**
  Container for data that will be sent to the Merchant Server. The common use-case for this data is to identify client to the Merchant Server. If this variable is set to non-nil, then every request to the Merchant Server will contain this data in its HTTP request header.
  

MidtransCoreKit/MidtransCoreKit/MidtransConstant.h

@@ -180,7 +180,6 @@ static NSString *const  MIDTRANS_UIKIT_TRACKING_SELECT_PAYMENT_TYPE = @"Payment
 //static NSString *const MIDTRANS_CORE_CREDIT_CARD_SCANNER_OUTPUT_EXPIRED_YEAR = @"credit_card_result_scan_expired_year";
 //static NSString *const MIDTRANS_CORE_CREDIT_CARD_SCANNER_OUTPUT_EXPIRED_MONTH = @"credit_card_result_scan_expired_month";
 
-
 static NSInteger const MIDTRANS_ERROR_CODE_3DSECURE = -30;
 static NSInteger const MIDTRANS_ERROR_CODE_CANCELED_WEBPAYMENT = -31;
 

MidtransCoreKit/MidtransCoreKit/MidtransHelper.h

@@ -9,11 +9,18 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
+typedef NS_ENUM(NSInteger, MidtransCurrency) {
+    MidtransCurrencyIDR,
+    MidtransCurrencySGD
+};
+
 extern NSString *const MidtransMaskedCardsUpdated;
 
 @interface MidtransHelper : NSObject
 + (id)nullifyIfNil:(id)object;
 + (NSBundle*)coreBundle;
++ (NSString *)stringFromCurrency:(MidtransCurrency)currency;
++ (MidtransCurrency)currencyFromString:(NSString *)string;
 @end
 
 @interface NSString (random)
@@ -28,11 +35,12 @@ extern NSString *const MidtransMaskedCardsUpdated;
 - (id)objectThenDeleteForKey:(NSString *)key;
 @end
 
-
 @interface NSObject (utilities)
 + (NSNumberFormatter *)indonesianCurrencyFormatter;
 + (NSDateFormatter *)dateFormatterWithIdentifier:(NSString *)identifier;
++ (NSNumberFormatter *)multiCurrencyFormatter:(MidtransCurrency)currency;
 @end
+
 //
 //@interface NSDictionary (SafeObject)
 //- (id)safeObjectForKey:(id)key;

MidtransCoreKit/MidtransCoreKit/MidtransHelper.m

@@ -9,7 +9,8 @@
 #import "MidtransHelper.h"
 
 NSString *const MIdtransMaskedCardsUpdated = @"vt_masked_cards_updated";
-
+NSString *const MIDTRANS_CORE_CURRENCY_IDR = @"IDR";
+NSString *const MIDTRANS_CORE_CURRENCY_SGD = @"SGD";
 
 @implementation MidtransHelper
 
@@ -36,6 +37,32 @@ + (NSBundle*)coreBundle {
     });
     return kitBundle;
 }
++ (NSString *)stringFromCurrency:(MidtransCurrency)currency {
+    switch (currency) {
+        case MidtransCurrencyIDR:
+            return MIDTRANS_CORE_CURRENCY_IDR;
+            break;
+        case MidtransCurrencySGD:
+            return MIDTRANS_CORE_CURRENCY_SGD;
+            break;
+            
+        default:
+            return MIDTRANS_CORE_CURRENCY_IDR;
+            break;
+    }
+}
++ (MidtransCurrency)currencyFromString:(NSString *)string {
+    NSString *uppercaseString = string.uppercaseString;
+    if ([uppercaseString.uppercaseString isEqualToString:MIDTRANS_CORE_CURRENCY_SGD]) {
+        return MidtransCurrencySGD;
+    }
+    else if ([uppercaseString isEqualToString:MIDTRANS_CORE_CURRENCY_IDR]) {
+        return MidtransCurrencyIDR;
+    }
+    else {
+        return MidtransCurrencyIDR;
+    }
+}
 
 @end
 
@@ -115,9 +142,6 @@ + (NSNumberFormatter *)indonesianCurrencyFormatter {
 
     if (currentFormatter == nil) {
         currentFormatter = [NSNumberFormatter new];
-        currentFormatter.numberStyle = NSNumberFormatterDecimalStyle;
-        currentFormatter.groupingSeparator = @",";
-        currentFormatter.decimalSeparator = @".";
         [dictionary setObject:currentFormatter forKey:identifier];
     }
 
@@ -133,5 +157,23 @@ + (NSDateFormatter *)dateFormatterWithIdentifier:(NSString *)identifier {
     }
     return currentFormatter;
 }
+
++ (NSNumberFormatter *)multiCurrencyFormatter:(MidtransCurrency)currency {
+    NSNumberFormatter *currencyFormatter = [MidtransHelper indonesianCurrencyFormatter];
+    currencyFormatter.numberStyle = NSNumberFormatterCurrencyISOCodeStyle;
+    currencyFormatter.paddingPosition = NSNumberFormatterPadAfterPrefix;
+    if (currency == MidtransCurrencySGD) {
+        currencyFormatter.locale = [NSLocale localeWithLocaleIdentifier:@"en_SG"];
+        currencyFormatter.minimumFractionDigits = 2;
+        currencyFormatter.roundingMode = NSNumberFormatterRoundHalfEven;
+    }
+    else {
+        //  by default set to indonesian
+        currencyFormatter.locale = [NSLocale localeWithLocaleIdentifier:@"id_ID"];
+        currencyFormatter.minimumFractionDigits = 0;
+        currencyFormatter.roundingMode = NSNumberFormatterRoundDown;
+    }
+    return currencyFormatter;
+}
 @end
 

MidtransCoreKit/MidtransCoreKit/MidtransItemDetail.m

@@ -8,6 +8,7 @@
 
 #import "MidtransItemDetail.h"
 #import "MidtransHelper.h"
+#import "MidtransConfig.h"
 
 @implementation NSArray (VTITemDetail)
 
@@ -44,6 +45,18 @@ - (instancetype)initWithItemID:(NSString *)itemID
 }
 
 - (NSDictionary *)dictionaryValue {
+    switch ([CONFIG currency]) {
+        case MidtransCurrencyIDR:
+            _price = [NSNumber numberWithInteger:_price.integerValue];
+            break;
+        case MidtransCurrencySGD:
+            _price = [NSNumber numberWithDouble:_price.doubleValue];
+            break;
+            
+        default:
+            _price = [NSNumber numberWithInteger:_price.integerValue];
+            break;
+    }
     return @{@"id":[MidtransHelper nullifyIfNil:_itemId],
              @"price":[MidtransHelper nullifyIfNil:_price],
              @"quantity":[MidtransHelper nullifyIfNil:_quantity],

MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.m

@@ -249,7 +249,7 @@ - (void)requestTransacationWithCurrentToken:(NSString *_Nonnull)token
                                                                                    countryCode:paymentRequestV2.customerDetails.billingAddress.countryCode];
 
 
-                NSNumber *amount =  [NSNumber numberWithInteger:[paymentRequestV2.transactionDetails.grossAmount integerValue]];
+                NSNumber *amount =  [NSNumber numberWithDouble:[paymentRequestV2.transactionDetails.grossAmount doubleValue]];
                 MidtransTransactionDetails *reConstructTransactionDetail = [[MidtransTransactionDetails alloc] initWithOrderID:paymentRequestV2.transactionDetails.orderId
                                                                                                                 andGrossAmount:amount];
 

MidtransCoreKit/MidtransCoreKit/MidtransPaymentRequestV2TransactionDetails.h

@@ -6,8 +6,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
-
+#import "MidtransHelper.h"
 
 @interface MidtransPaymentRequestV2TransactionDetails : NSObject <NSCoding, NSCopying>
 

MidtransCoreKit/MidtransCoreKit/MidtransPaymentRequestV2TransactionDetails.m

@@ -7,11 +7,9 @@
 
 #import "MidtransPaymentRequestV2TransactionDetails.h"
 
-
 NSString *const kMidtransPaymentRequestV2TransactionDetailsOrderId = @"order_id";
 NSString *const kMidtransPaymentRequestV2TransactionDetailsGrossAmount = @"gross_amount";
 
-
 @interface MidtransPaymentRequestV2TransactionDetails ()
 
 - (id)objectOrNilForKey:(id)aKey fromDictionary:(NSDictionary *)dict;
@@ -36,9 +34,9 @@ - (instancetype)initWithDictionary:(NSDictionary *)dict
     // This check serves to make sure that a non-NSDictionary object
     // passed into the model class doesn't break the parsing.
     if (self && [dict isKindOfClass:[NSDictionary class]]) {
-            self.orderId = [self objectOrNilForKey:kMidtransPaymentRequestV2TransactionDetailsOrderId fromDictionary:dict];
-            self.grossAmount = [self objectOrNilForKey:kMidtransPaymentRequestV2TransactionDetailsGrossAmount fromDictionary:dict];
-
+        self.orderId = [self objectOrNilForKey:kMidtransPaymentRequestV2TransactionDetailsOrderId fromDictionary:dict];
+        self.grossAmount = [self objectOrNilForKey:kMidtransPaymentRequestV2TransactionDetailsGrossAmount fromDictionary:dict];
+        
     }
 
     return self;
@@ -50,7 +48,7 @@ - (NSDictionary *)dictionaryRepresentation
     NSMutableDictionary *mutableDict = [NSMutableDictionary dictionary];
     [mutableDict setValue:self.orderId forKey:kMidtransPaymentRequestV2TransactionDetailsOrderId];
     [mutableDict setValue:self.grossAmount forKey:kMidtransPaymentRequestV2TransactionDetailsGrossAmount];
-
+    
     return [NSDictionary dictionaryWithDictionary:mutableDict];
 }
 

MidtransCoreKit/MidtransCoreKit/MidtransTokenizeRequest.m

@@ -81,11 +81,23 @@ - (instancetype)initWithTwoClickToken:(NSString *)token
 
 - (NSDictionary *)dictionaryValue {
     NSMutableDictionary *result = [NSMutableDictionary new];
+    switch ([CONFIG currency]) {
+        case MidtransCurrencyIDR:
+            self.grossAmount = [NSNumber numberWithInteger:self.grossAmount.integerValue];
+            break;
+        case MidtransCurrencySGD:
+            self.grossAmount = [NSNumber numberWithDouble:self.grossAmount.doubleValue];
+            break;
+        default:
+            self.grossAmount = [NSNumber numberWithInteger:self.grossAmount.integerValue];
+            break;
+    }
     switch (self.featureType) {
         case MTCreditCardPaymentTypeTwoclick: {
             [result setDictionary:@{@"client_key":[CONFIG clientKey],
                                     @"secure":self.secure ? @"true":@"false",
                                     @"gross_amount":[MidtransHelper nullifyIfNil:self.grossAmount],
+                                    @"currency":[MidtransHelper stringFromCurrency:[CONFIG currency]],
                                     @"two_click":@"true",
                                     @"token_id":[MidtransHelper nullifyIfNil:self.token]}];
             if (self.cvv) {
@@ -97,7 +109,9 @@ - (NSDictionary *)dictionaryValue {
                                     @"card_number":self.creditCard.number,
                                     @"card_type":[MidtransCreditCardHelper nameFromString: self.creditCard.number],
                                     @"secure":self.secure ? @"true":@"false",
-                                    @"gross_amount":[MidtransHelper nullifyIfNil:self.grossAmount]}];
+                                    @"gross_amount":[MidtransHelper nullifyIfNil:self.grossAmount],
+                                    @"currency":[MidtransHelper stringFromCurrency:[CONFIG currency]]
+                                    }];
             if (self.creditCard.expiryYear) {
                 [result setObject:self.creditCard.expiryYear forKey:@"card_exp_year"];
             }
@@ -114,6 +128,7 @@ - (NSDictionary *)dictionaryValue {
                                     @"card_type":[MidtransCreditCardHelper nameFromString: self.creditCard.number],
                                     @"secure":self.secure ? @"true":@"false",
                                     @"gross_amount":[MidtransHelper nullifyIfNil:self.grossAmount],
+                                    @"currency":[MidtransHelper stringFromCurrency:[CONFIG currency]],
                                     @"installment":self.installment? @"true":@"false",
                                     @"installment_term":[MidtransHelper nullifyIfNil:self.installmentTerm],
                                     @"two_click":self.twoClick? @"true":@"false"}];

MidtransCoreKit/MidtransCoreKit/MidtransTransactionDetails.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-
+#import "MidtransHelper.h"
 /**
  An object that contains various details about a transaction.
  The content of this object is adapted from
@@ -17,7 +17,9 @@
 
 @property (nonatomic, readonly) NSString *orderId;
 @property (nonatomic, readonly) NSNumber *grossAmount;
+@property (nonatomic, readonly) MidtransCurrency currency;
 - (instancetype)initWithOrderID:(NSString *)orderID andGrossAmount:(NSNumber *)grossAmount;
+- (instancetype)initWithOrderID:(NSString *)orderID andGrossAmount:(NSNumber *)grossAmount andCurrency:(MidtransCurrency)currency;
 - (NSDictionary *)dictionaryValue;
 
 @end

MidtransCoreKit/MidtransCoreKit/MidtransTransactionDetails.m

@@ -8,11 +8,13 @@
 
 #import "MidtransTransactionDetails.h"
 #import "MidtransHelper.h"
+#import "MidtransConfig.h"
 
 @interface MidtransTransactionDetails()
 
 @property (nonatomic, readwrite) NSString *orderId;
 @property (nonatomic, readwrite) NSNumber *grossAmount;
+@property (nonatomic, readwrite) MidtransCurrency currency;
 
 @end
 
@@ -26,12 +28,40 @@ - (instancetype)initWithOrderID:(NSString *)orderID andGrossAmount:(NSNumber *)g
     return self;
 }
 
+-(instancetype)initWithOrderID:(NSString *)orderID andGrossAmount:(NSNumber *)grossAmount andCurrency:(MidtransCurrency)currency {
+    if (self = [super init]) {
+        self.orderId = orderID;
+        self.grossAmount = grossAmount;
+        self.currency = currency;
+    }
+    return self;
+}
+
 - (NSDictionary *)dictionaryValue {
     // Format MUST BE compatible with
     // http://docs.veritrans.co.id/en/api/methods.html#transaction_details_attr
-    NSInteger grossAmount = [self.grossAmount integerValue];
+    NSNumber *amountNumber = nil;
+    switch ([CONFIG currency]) {
+        case MidtransCurrencyIDR:{
+            NSInteger grossAmount = [self.grossAmount integerValue];
+            amountNumber = [NSNumber numberWithInteger:grossAmount];
+        }
+            break;
+        case MidtransCurrencySGD:{
+            double grossAmount = [self.grossAmount doubleValue];
+            amountNumber = [NSNumber numberWithDouble:grossAmount];
+        }
+            break;
+        default:{
+            NSInteger grossAmount = [self.grossAmount integerValue];
+            amountNumber = [NSNumber numberWithInteger:grossAmount];
+        }
+            break;
+    }
     return @{@"order_id": self.orderId,
-             @"gross_amount": [NSNumber numberWithInteger:grossAmount]};
+             @"gross_amount": amountNumber,
+             @"currency": [MidtransHelper stringFromCurrency:self.currency]
+             };
 }
 
 @end

MidtransDemo/MidtransDemo/Assets.xcassets/dc_field.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "dc_field.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MidtransDemo/MidtransDemo/Assets.xcassets/dc_field.imageset/dc_field.png

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "dc_multicurrency.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

MidtransDemo/MidtransDemo/Assets.xcassets/dc_field.imageset/[email protected]

@@ -18,6 +18,7 @@
 @property (nonatomic) MDOption *secure3DOption;
 @property (nonatomic) MDOption *issuingBankOption;
 @property (nonatomic) MDOption *expireTimeOption;
+@property (nonatomic) MDOption *currencyOption;
 @property (nonatomic) MDOption *saveCardOption;
 @property (nonatomic) MDOption *promoOption;
 @property (nonatomic) MDOption *preauthOption;