From 82fb31162965f2a6d0d8627e28462911258b9774 Mon Sep 17 00:00:00 2001 From: vanbungkring Date: Wed, 6 Jun 2018 15:49:35 +0700 Subject: [PATCH 01/37] update --- .../MidtransMaskedCreditCard.m | 6 +- .../MidtransCoreKit/MidtransMerchantClient.h | 2 +- .../MidtransCoreKit/MidtransMerchantClient.m | 56 ++++++++++++++++++- .../MidtransDemo/MDOrderViewController.m | 40 ++++++------- .../MidtransNewCreditCardViewController.m | 8 ++- .../classes/MidtransSavedCardController.m | 1 + 6 files changed, 82 insertions(+), 31 deletions(-) diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m index f7673ab34..8895e8591 100644 --- a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m +++ b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m @@ -46,9 +46,9 @@ - (instancetype _Nonnull)initWithDictionary:(NSDictionary *_Nonnull)dictionary { if (self = [super init]) { self.savedTokenId = dictionary[kMTMaskedCreditCardIdentifier]; self.maskedNumber = dictionary[kMTMaskedCreditCardCardhash]; - self.type = dictionary[kMTMaskedCreditCardType]; - self.tokenType = dictionary[kMTMaskedCreditCardTokenType]; - self.expiresAt = dictionary[kMTMaskedCreditCardExpiresAt]; + self.type = dictionary[kMTMaskedCreditCardType]?dictionary[kMTMaskedCreditCardType]:@""; + self.tokenType = dictionary[kMTMaskedCreditCardTokenType]?dictionary[kMTMaskedCreditCardTokenType]:@""; + self.expiresAt = dictionary[kMTMaskedCreditCardExpiresAt]?dictionary[kMTMaskedCreditCardExpiresAt]:@""; self.statusCode = @""; self.transactionId = @""; } diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.h b/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.h index f3a425f47..cb71727ec 100644 --- a/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.h +++ b/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.h @@ -62,7 +62,7 @@ * updated method, snapping */ - (void)requestTransacationWithCurrentToken:(NSString *_Nonnull)token - completion:(void (^_Nullable)(MidtransTransactionTokenResponse *_Nullable token, NSError *_Nullable error))completion; + completion:(void (^_Nullable)(MidtransTransactionTokenResponse *_Nullable regenerateToken, NSError *_Nullable error))completion; - (void)requestTransactionTokenWithTransactionDetails:(nonnull MidtransTransactionDetails *)transactionDetails itemDetails:(nullable NSArray *)itemDetails diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.m b/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.m index 07d7cc9d1..81f1a42fe 100644 --- a/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.m +++ b/MidtransCoreKit/MidtransCoreKit/MidtransMerchantClient.m @@ -122,6 +122,7 @@ - (void)performTransaction:(MidtransTransaction *)transaction NSString *paymentType = transaction.paymentType; if (response) { + NSLog(@"chargeResult-->%@",response); MidtransTransactionResult *chargeResult = [[MidtransTransactionResult alloc] initWithTransactionResponse:response]; if ([paymentType isEqualToString:MIDTRANS_PAYMENT_CREDIT_CARD]) { if (completion) { @@ -183,6 +184,7 @@ - (void)fetchMaskedCardsCustomer:(MidtransCustomerDetails *)customer completion: if (!error) { for (NSDictionary *dictionary in requestResponse) { MidtransMaskedCreditCard *card = [[MidtransMaskedCreditCard alloc] initWithDictionary:dictionary]; + NSLog(@"data--> %@",card); [result addObject:card]; } } @@ -228,9 +230,59 @@ - (void)requestCustomerPointWithToken:(NSString * _Nonnull )token } - (void)requestTransacationWithCurrentToken:(NSString *_Nonnull)token - completion:(void (^_Nullable)(MidtransTransactionTokenResponse *_Nullable token, NSError *_Nullable error))completion { + completion:(void (^_Nullable)(MidtransTransactionTokenResponse *_Nullable regenerateToken, NSError *_Nullable error))completion { - //NSString *URL = [NSString stringWithFormat:@"%@/%@", [CONFIG merchantURL], MIDTRANS_CORE_SNAP_MERCHANT_SERVER_CHARGE]; + NSString *URL = [NSString stringWithFormat:ENDPOINT_TRANSACTION_DETAIL, [PRIVATECONFIG snapURL], token]; + [[MidtransNetworking shared] getFromURL:URL parameters:nil callback:^(id response, NSError *error) { + if (!error) { + MidtransPaymentRequestV2Response *paymentRequestV2 = [[MidtransPaymentRequestV2Response alloc] initWithDictionary:(NSDictionary *)response]; + + if (completion) { + NSLog(@"response-->%@",response); + MidtransTransactionTokenResponse *token2; + + MidtransAddress *billAddressConstruct = [MidtransAddress addressWithFirstName:paymentRequestV2.customerDetails.billingAddress.firstName + lastName:paymentRequestV2.customerDetails.billingAddress.firstName + phone:paymentRequestV2.customerDetails.billingAddress.phone + address:paymentRequestV2.customerDetails.billingAddress.firstName + city:paymentRequestV2.customerDetails.billingAddress.city + postalCode:paymentRequestV2.customerDetails.billingAddress.postalCode + countryCode:paymentRequestV2.customerDetails.billingAddress.countryCode]; + + + NSNumber *amount = [NSNumber numberWithInteger:[paymentRequestV2.transactionDetails.grossAmount integerValue]]; + MidtransTransactionDetails *reConstructTransactionDetail = [[MidtransTransactionDetails alloc] initWithOrderID:paymentRequestV2.transactionDetails.orderId + andGrossAmount:amount]; + + + + MidtransCustomerDetails *customerDetailsMock = [[MidtransCustomerDetails alloc] initWithFirstName:paymentRequestV2.customerDetails.firstName + lastName:paymentRequestV2.customerDetails.firstName + email:paymentRequestV2.customerDetails.email + phone:paymentRequestV2.customerDetails.phone + shippingAddress:billAddressConstruct + billingAddress:billAddressConstruct]; + NSMutableArray *itemDetails = [NSMutableArray new]; + + for (MidtransPaymentRequestV2ItemDetails *detail in paymentRequestV2.itemDetails) { + MidtransItemDetail *regenerate = [[MidtransItemDetail alloc]initWithItemID:detail.itemDetailsIdentifier name:detail.name price:[NSNumber numberWithDouble:detail.price] quantity:[NSNumber numberWithDouble:detail.quantity]]; + [itemDetails addObject:regenerate]; + } + token2 = [MidtransTransactionTokenResponse modelObjectWithDictionary:@{@"token":token} + transactionDetails:reConstructTransactionDetail + customerDetails:customerDetailsMock + itemDetails:itemDetails]; + + completion(token2,NULL); + } + + } + else { + if (completion) { + completion(NULL,error); + } + } + }]; } - (void)requestTransactionTokenWithTransactionDetails:(nonnull MidtransTransactionDetails *)transactionDetails itemDetails:(nullable NSArray *)itemDetails diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m index be5a642f5..73f9c38c4 100644 --- a/MidtransDemo/MidtransDemo/MDOrderViewController.m +++ b/MidtransDemo/MidtransDemo/MDOrderViewController.m @@ -66,23 +66,19 @@ - (void)viewDidLoad { merchantServer = @"https://demo-merchant-server.herokuapp.com"; break; } - [CONFIG setClientKey:clientkey + [CONFIG setClientKey:@"VT-client-wCSALF27ZAHMVa2U" environment:MidtransServerEnvironmentSandbox - merchantServerURL:merchantServer]; + merchantServerURL:@"https://tapri.ayopop.com/api/payments/ccPayment/v2/"]; //forced to use token storage UICONFIG.hideStatusPage = YES; - CC_CONFIG.tokenStorageEnabled = NO; - CC_CONFIG.authenticationType = [[MDOptionManager shared].authTypeOption.value integerValue]; - - CC_CONFIG.saveCardEnabled =[[MDOptionManager shared].saveCardOption.value boolValue]; - - CC_CONFIG.secure3DEnabled =[[MDOptionManager shared].secure3DOption.value boolValue]; - CC_CONFIG.authenticationType = MTAuthenticationType3DS; - CC_CONFIG.acquiringBank = [[MDOptionManager shared].issuingBankOption.value integerValue]; - CC_CONFIG.predefinedInstallment = [MDOptionManager shared].installmentOption.value; - CC_CONFIG.preauthEnabled = [[MDOptionManager shared].preauthOption.value boolValue]; - CC_CONFIG.promoEnabled = [[MDOptionManager shared].promoOption.value boolValue]; + [[MidtransCreditCardConfig shared] setPaymentType:MTCreditCardPaymentTypeTwoclick]; + [MidtransCreditCardConfig shared].setDefaultCreditSaveCardEnabled = YES; + [[MidtransCreditCardConfig shared] setSaveCardEnabled:TRUE]; + [[MidtransCreditCardConfig shared] setSecure3DEnabled:TRUE]; + [[MidtransCreditCardConfig shared] setTokenStorageEnabled:TRUE]; + [[MidtransUIConfiguration shared] setHideStatusPage:TRUE]; + [[MidtransNetworkLogger shared] startLogging]; //CC_CONFIG.showFormCredentialsUser = YES; /*set custom free text for bca*/ @@ -120,20 +116,20 @@ - (IBAction)bayarPressed:(id)sender { postalCode:[[NSUserDefaults standardUserDefaults] objectForKey:@"USER_DEMO_CONTENT_POSTAL_CODE"] countryCode:[[NSUserDefaults standardUserDefaults] objectForKey:@"USER_DEMO_CONTENT_COUNTRY"]]; - MidtransCustomerDetails *cst = [[MidtransCustomerDetails alloc] initWithFirstName:[[NSUserDefaults standardUserDefaults] objectForKey:@"USER_DEMO_CONTENT_FIRST_NAME"] - lastName:[[NSUserDefaults standardUserDefaults] objectForKey:@"USER_DEMO_CONTENT_LAST_NAME"] - email:[[NSUserDefaults standardUserDefaults] objectForKey:@"USER_DEMO_CONTENT_EMAIL"] - phone:[[NSUserDefaults standardUserDefaults] objectForKey:@"USER_DEMO_CONTENT_PHONE"] + MidtransCustomerDetails *cst = [[MidtransCustomerDetails alloc] initWithFirstName:@"Guru" + lastName:@"A" + email:@"ayopop.test@gmail.com" + phone:@"ayopop.test@gmail.com" shippingAddress:addr billingAddress:addr]; - cst.customerIdentifier = @"3A8788CE-B96F-449C-8180-B5901A08B50A"; - MidtransItemDetail *itm = [[MidtransItemDetail alloc] initWithItemID:[NSString randomWithLength:20] - name:@"Midtrans Pillow" - price:@255000 + cst.customerIdentifier = @"DE343BED-726A-4FD9-8E37-25E4138662A1"; + MidtransItemDetail *itm = [[MidtransItemDetail alloc] initWithItemID:@"AP0054942" + name:@"(Telkomsel) Rp 11.000 Processing" + price:@11363 quantity:@1]; MidtransTransactionDetails *trx = [[MidtransTransactionDetails alloc] initWithOrderID:[NSString randomWithLength:20] - andGrossAmount:@255000]; + andGrossAmount:@11363]; //configure theme MidtransUIFontSource *font = [[MidtransUIFontSource alloc] initWithFontNameBold:@"SourceSansPro-Bold" diff --git a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m index dbd487083..973a2f7de 100644 --- a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m +++ b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m @@ -127,6 +127,7 @@ - (void)viewDidLoad { else { self.maskedCards = [NSMutableArray new]; } + NSLog(@"self.maskedCards-->%@",self.maskedCards); self.bniPointActive = NO; self.mandiriPointActive = NO; self.installmentCurrentIndex = 0; @@ -1043,16 +1044,17 @@ - (void)payWithToken:(NSString *)token { else { if ([CC_CONFIG tokenStorageEnabled] && result.maskedCreditCard) { NSUInteger index = [self.maskedCards indexOfObjectPassingTest:^BOOL(MidtransMaskedCreditCard *obj, NSUInteger idx, BOOL * _Nonnull stop) { - return [result.maskedCreditCard.maskedNumber isEqualToString:obj.maskedNumber]; + NSString *masked = [[result.additionalData objectForKey:@"masked_card"] stringByReplacingOccurrencesOfString:@"-" withString:@"XXXXXX"]; + return [masked isEqualToString:obj.maskedNumber]; }]; if (index == NSNotFound) { - [self.maskedCards addObject:result.maskedCreditCard]; + // [self.maskedCards addObject:result.maskedCreditCard]; } [[MidtransMerchantClient shared] saveMaskedCards:self.maskedCards customer:self.token.customerDetails completion:^(id _Nullable result, NSError * _Nullable error) { - + }]; } if ([[result.additionalData objectForKey:@"fraud_status"] isEqualToString:@"challenge"]) { diff --git a/MidtransKit/MidtransKit/classes/MidtransSavedCardController.m b/MidtransKit/MidtransKit/classes/MidtransSavedCardController.m index 1434fda61..896dc0311 100644 --- a/MidtransKit/MidtransKit/classes/MidtransSavedCardController.m +++ b/MidtransKit/MidtransKit/classes/MidtransSavedCardController.m @@ -96,6 +96,7 @@ - (void)reloadSavedCards { [[MidtransMerchantClient shared] fetchMaskedCardsCustomer:self.token.customerDetails completion:^(NSArray * _Nullable maskedCards, NSError * _Nullable error) { + NSLog(@"maskedCards-->%@",maskedCards); if (maskedCards.count > 0) { [self.cards setArray:maskedCards]; [self.tableView reloadData]; From bcb4034c8cb805c2cf35f779460620a9f989a9e4 Mon Sep 17 00:00:00 2001 From: vanbungkring Date: Fri, 8 Jun 2018 10:32:44 +0700 Subject: [PATCH 02/37] update --- .../MidtransCoreKit/MidtransMaskedCreditCard.h | 15 ++++++++++++++- .../MidtransCoreKit/MidtransMaskedCreditCard.m | 16 +++++++++++++++- .../MidtransCoreKit/MidtransTransactionResult.m | 3 ++- .../MidtransNewCreditCardViewController.m | 3 ++- .../MIDPaymentIndomaretViewController.xib | 10 +++++----- 5 files changed, 38 insertions(+), 9 deletions(-) diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.h b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.h index 7fd1a8b0d..79d5cfe7c 100644 --- a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.h +++ b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.h @@ -42,5 +42,18 @@ static NSString * _Nonnull const kMTMaskedCreditCardExpiresAt = @"expires_at"; - (instancetype _Nonnull)initWithDictionary:(NSDictionary *_Nonnull)dictionary; - (instancetype _Nonnull)initWithData:(NSDictionary *_Nonnull)data; - +- (instancetype _Nonnull)initWithSavedTokenId:(NSString * _Nonnull)savedTokenId + maskedNumber:(NSString * _Nonnull)maskedNumber + tokenType:(NSString * _Nullable)tokenType + expiresAt:(NSString *_Nullable)expiresAt; + +/* + self.savedTokenId = dictionary[kMTMaskedCreditCardIdentifier]; + self.maskedNumber = dictionary[kMTMaskedCreditCardCardhash]; + self.type = dictionary[kMTMaskedCreditCardType]?dictionary[kMTMaskedCreditCardType]:@""; + self.tokenType = dictionary[kMTMaskedCreditCardTokenType]?dictionary[kMTMaskedCreditCardTokenType]:@""; + self.expiresAt = dictionary[kMTMaskedCreditCardExpiresAt]?dictionary[kMTMaskedCreditCardExpiresAt]:@""; + self.statusCode = @""; + self.transactionId = @""; + */ @end diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m index 8895e8591..16aa9c658 100644 --- a/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m +++ b/MidtransCoreKit/MidtransCoreKit/MidtransMaskedCreditCard.m @@ -54,7 +54,21 @@ - (instancetype _Nonnull)initWithDictionary:(NSDictionary *_Nonnull)dictionary { } return self; } - +- (instancetype )initWithSavedTokenId:(NSString * _Nonnull)savedTokenId + maskedNumber:(NSString * _Nonnull)maskedNumber + tokenType:(NSString * _Nullable)tokenType + expiresAt:(NSString *_Nullable)expiresAt { + + if (self = [super init]) { + self.maskedNumber = maskedNumber; + self.savedTokenId = savedTokenId; + self.expiresAt = expiresAt; + self.statusCode = @""; + self.transactionId = @""; + self.type = [MidtransCreditCardHelper nameFromString:self.maskedNumber]; + } + return self; +} - (NSDictionary *)dictionaryValue { return @{kMTMaskedCreditCardIdentifier:self.savedTokenId, kMTMaskedCreditCardCardhash:self.maskedNumber, diff --git a/MidtransCoreKit/MidtransCoreKit/MidtransTransactionResult.m b/MidtransCoreKit/MidtransCoreKit/MidtransTransactionResult.m index 93d4f82f5..9d25bbdd0 100644 --- a/MidtransCoreKit/MidtransCoreKit/MidtransTransactionResult.m +++ b/MidtransCoreKit/MidtransCoreKit/MidtransTransactionResult.m @@ -36,6 +36,7 @@ @implementation MidtransTransactionResult - (instancetype)initWithTransactionResponse:(NSDictionary *)response { self = [super init]; if (self) { + NSMutableDictionary *mResponse = [NSMutableDictionary dictionaryWithDictionary:response]; self.statusCode = [[mResponse objectThenDeleteForKey:@"status_code"] integerValue]; self.statusMessage = [mResponse objectThenDeleteForKey:@"status_message"]; @@ -43,7 +44,7 @@ - (instancetype)initWithTransactionResponse:(NSDictionary *)response { self.transactionStatus = [mResponse objectThenDeleteForKey:@"transaction_status"]; self.orderId = [mResponse objectThenDeleteForKey:@"order_id"]; self.paymentType = [mResponse objectThenDeleteForKey:@"payment_type"]; - + NSLog(@"daata-->%@",mResponse); id rawGrossAmount = [mResponse objectThenDeleteForKey:@"gross_amount"]; if (rawGrossAmount) { self.grossAmount = @([rawGrossAmount doubleValue]); diff --git a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m index 973a2f7de..e198a4f37 100644 --- a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m +++ b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m @@ -1048,7 +1048,8 @@ - (void)payWithToken:(NSString *)token { return [masked isEqualToString:obj.maskedNumber]; }]; if (index == NSNotFound) { - // [self.maskedCards addObject:result.maskedCreditCard]; + MidtransMaskedCreditCard *constructMaskedCard = [[MidtransMaskedCreditCard alloc] initWithSavedTokenId:[result.additionalData valueForKey:@"saved_token_id"] maskedNumber:[result.additionalData valueForKey:@"masked_card"] tokenType:@"" expiresAt:@""]; + [self.maskedCards addObject:constructMaskedCard]; } [[MidtransMerchantClient shared] saveMaskedCards:self.maskedCards diff --git a/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib b/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib index 23a17fc9c..124b38fb0 100644 --- a/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib +++ b/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib @@ -1,11 +1,11 @@ - + - + @@ -43,7 +43,7 @@ - + @@ -67,7 +67,7 @@ From 94a26673fd6707c36b636656035fa4238ea08026 Mon Sep 17 00:00:00 2001 From: vanbungkring Date: Fri, 8 Jun 2018 11:25:05 +0700 Subject: [PATCH 03/37] update --- .../MidtransDemo/MDOrderViewController.m | 4 +- .../MidtransKit/classes/MIDGopayView.h | 1 + .../MIDPaymentIndomaretViewController.m | 2 + .../classes/MidGopayViewController.m | 3 +- .../classes/MidtransNewCreditCardView.h | 1 + .../classes/MidtransNewCreditCardView.m | 1 + .../classes/MidtransVAViewController.m | 2 + .../classes/SNPPostPaymentVAViewController.m | 2 + .../MidtransKit/classes/VTVAListController.m | 3 + .../resources/MidGopayViewController.xib | 4 +- .../MidtransNewCreditCardViewController.xib | 42 ++++-- .../MidtransPaymentGCIViewController.xib | 130 ++++++++--------- .../resources/MidtransVAViewController.xib | 135 ++++++++++-------- .../SNPPostPaymentVAViewController.xib | 104 ++++++++------ .../resources/VTVAListController.xib | 121 +++++++++------- .../MIDPaymentIndomaretViewController.xib | 117 +++++++++------ 16 files changed, 391 insertions(+), 281 deletions(-) diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m index 73f9c38c4..e8fd226c6 100644 --- a/MidtransDemo/MidtransDemo/MDOrderViewController.m +++ b/MidtransDemo/MidtransDemo/MDOrderViewController.m @@ -66,9 +66,9 @@ - (void)viewDidLoad { merchantServer = @"https://demo-merchant-server.herokuapp.com"; break; } - [CONFIG setClientKey:@"VT-client-wCSALF27ZAHMVa2U" + [CONFIG setClientKey:clientkey environment:MidtransServerEnvironmentSandbox - merchantServerURL:@"https://tapri.ayopop.com/api/payments/ccPayment/v2/"]; + merchantServerURL:merchantServer]; //forced to use token storage UICONFIG.hideStatusPage = YES; diff --git a/MidtransKit/MidtransKit/classes/MIDGopayView.h b/MidtransKit/MidtransKit/classes/MIDGopayView.h index 844894fa3..1d98cca65 100644 --- a/MidtransKit/MidtransKit/classes/MIDGopayView.h +++ b/MidtransKit/MidtransKit/classes/MIDGopayView.h @@ -21,5 +21,6 @@ @property (weak, nonatomic) IBOutlet NSLayoutConstraint *transactionBottomDetailConstraints; @property (weak, nonatomic) IBOutlet UILabel *totalAmountLabel; @property (weak, nonatomic) IBOutlet UILabel *amountLabel; +@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel; @property (weak, nonatomic) IBOutlet UIButton *installGojekButton; @end diff --git a/MidtransKit/MidtransKit/classes/MIDPaymentIndomaretViewController.m b/MidtransKit/MidtransKit/classes/MIDPaymentIndomaretViewController.m index 3e3912d7f..228cbf697 100644 --- a/MidtransKit/MidtransKit/classes/MIDPaymentIndomaretViewController.m +++ b/MidtransKit/MidtransKit/classes/MIDPaymentIndomaretViewController.m @@ -21,6 +21,7 @@ @interface MIDPaymentIndomaretViewController () @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView; @property (weak, nonatomic) IBOutlet UILabel *totalAmountLabel; @property (weak, nonatomic) IBOutlet UILabel *amountLabel; +@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel; @property (weak, nonatomic) IBOutlet UIButton *confirmPaymentButton; @end @@ -41,6 +42,7 @@ - (void)viewDidLoad { [self addSubViewController:self.subGuide toView:self.instructionPage]; self.amountLabel.text = self.token.transactionDetails.grossAmount.formattedCurrencyNumber; + self.orderIdLabel.text = self.token.transactionDetails.orderId; self.instructionLabel.text = [NSString stringWithFormat:[VTClassHelper getTranslationFromAppBundleForString:@"%@ step by step"], self.paymentMethod.title]; [self.totalAmountBorderedView addGestureRecognizer: [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(totalAmountBorderedViewTapped:)]]; diff --git a/MidtransKit/MidtransKit/classes/MidGopayViewController.m b/MidtransKit/MidtransKit/classes/MidGopayViewController.m index bfe100eb1..f2f1e04a0 100644 --- a/MidtransKit/MidtransKit/classes/MidGopayViewController.m +++ b/MidtransKit/MidtransKit/classes/MidGopayViewController.m @@ -71,6 +71,7 @@ - (void)viewDidLoad { [self.view.tableView registerNib:[UINib nibWithNibName:@"VTGuideCell" bundle:VTBundle] forCellReuseIdentifier:@"VTGuideCell"]; self.headerView = [self.view.tableView dequeueReusableCellWithIdentifier:@"MidtransDirectHeader"]; self.view.amountLabel.text = self.token.transactionDetails.grossAmount.formattedCurrencyNumber; + self.view.orderIdLabel.text = self.token.transactionDetails.orderId; @@ -81,7 +82,7 @@ - (void)viewDidLoad { self.view.topNoticeLabel.text = [VTClassHelper getTranslationFromAppBundleForString:@"Please complete your ‘GO-PAY‘ payment via ‘GO-JEK‘ app"]; } else { NSURL *gojekUrl = [NSURL URLWithString:MIDTRANS_GOPAY_PREFIX]; - if (![[UIApplication sharedApplication] canOpenURL:gojekUrl]) { + if ([[UIApplication sharedApplication] canOpenURL:gojekUrl]) { self.view.finishPaymentHeightConstraints.constant = 0.0f; self.view.topWrapperView.hidden = NO; self.view.transactionBottomDetailConstraints.constant = 0.0f; diff --git a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.h b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.h index b54019f48..7b77944d1 100644 --- a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.h +++ b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.h @@ -33,6 +33,7 @@ @property (weak, nonatomic) IBOutlet UILabel *totalAmountPrice; @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView; @property (weak, nonatomic) IBOutlet MidtransUITextField *contactEmailTextField; +@property (weak, nonatomic) IBOutlet UILabel *orderIdTextLabel; @property (weak, nonatomic) IBOutlet MidtransUITextField *contactPhoneNumberTextField; - (void)configureAmountTotal:(MidtransTransactionTokenResponse *)tokenResponse; - (BOOL)isViewableError:(NSError *)error; diff --git a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.m b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.m index a2ceaa049..e4da95d48 100644 --- a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.m +++ b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardView.m @@ -54,6 +54,7 @@ - (UIImage *)templateImageNamed:(NSString *)imageName { - (void)configureAmountTotal:(MidtransTransactionTokenResponse *)tokenResponse { self.totalAmountPrice.text = tokenResponse.transactionDetails.grossAmount.formattedCurrencyNumber; + self.orderIdTextLabel.text = tokenResponse.transactionDetails.orderId; } - (UIImage *)iconWithBankName:(NSString *)bankName { return [UIImage imageNamed:[bankName lowercaseString] inBundle:VTBundle compatibleWithTraitCollection:nil]; diff --git a/MidtransKit/MidtransKit/classes/MidtransVAViewController.m b/MidtransKit/MidtransKit/classes/MidtransVAViewController.m index 814d74f4d..86c6e9c62 100644 --- a/MidtransKit/MidtransKit/classes/MidtransVAViewController.m +++ b/MidtransKit/MidtransKit/classes/MidtransVAViewController.m @@ -36,6 +36,7 @@ @interface MidtransVAViewController () @property (weak, nonatomic) IBOutlet UILabel *totalAmountTextLabel; @property (weak, nonatomic) IBOutlet UITableView *tableView; @property (weak, nonatomic) IBOutlet MIdtransUIBorderedView *totalAmountBorderedView; +@property (weak, nonatomic) IBOutlet UILabel *orderIdLabel; @property (nonatomic) NSArray *vaList; @end @@ -60,8 +61,10 @@ - (void)viewDidLoad { } self.vaList = vaListM; + self.tableView.tableFooterView = [UIView new]; self.totalAmountLabel.text = self.token.transactionDetails.grossAmount.formattedCurrencyNumber; + self.orderIdLabel.text = self.token.transactionDetails.orderId; if (self.vaList.count == 1) { [self redirectToIndex:0]; } diff --git a/MidtransKit/MidtransKit/resources/MidGopayViewController.xib b/MidtransKit/MidtransKit/resources/MidGopayViewController.xib index aab6b26ee..9794eb157 100644 --- a/MidtransKit/MidtransKit/resources/MidGopayViewController.xib +++ b/MidtransKit/MidtransKit/resources/MidGopayViewController.xib @@ -32,13 +32,13 @@ - + diff --git a/MidtransKit/MidtransKit/resources/MidtransNewCreditCardViewController.xib b/MidtransKit/MidtransKit/resources/MidtransNewCreditCardViewController.xib index 72c8ef4bc..07803a6bc 100644 --- a/MidtransKit/MidtransKit/resources/MidtransNewCreditCardViewController.xib +++ b/MidtransKit/MidtransKit/resources/MidtransNewCreditCardViewController.xib @@ -1,11 +1,11 @@ - + - + @@ -44,16 +44,16 @@ - + @@ -64,18 +64,39 @@ + + - + + - + + + + - + + @@ -89,7 +110,7 @@ - + @@ -307,12 +328,12 @@ + - @@ -333,6 +354,7 @@ + diff --git a/MidtransKit/MidtransKit/resources/MidtransPaymentGCIViewController.xib b/MidtransKit/MidtransKit/resources/MidtransPaymentGCIViewController.xib index 2d3cc1d02..dff7008de 100644 --- a/MidtransKit/MidtransKit/resources/MidtransPaymentGCIViewController.xib +++ b/MidtransKit/MidtransKit/resources/MidtransPaymentGCIViewController.xib @@ -1,6 +1,6 @@ - + @@ -27,17 +27,17 @@ - + - + - + - + @@ -54,7 +54,7 @@ - + @@ -90,7 +90,7 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + + + + + + + + + + + + + + - - - + - + + + @@ -184,27 +172,25 @@ - + + - + - - + + - - - - + - + - - + + diff --git a/MidtransKit/MidtransKit/resources/MidtransVAViewController.xib b/MidtransKit/MidtransKit/resources/MidtransVAViewController.xib index 83d41de42..552d0f8a4 100644 --- a/MidtransKit/MidtransKit/resources/MidtransVAViewController.xib +++ b/MidtransKit/MidtransKit/resources/MidtransVAViewController.xib @@ -1,11 +1,11 @@ - - + + - + @@ -19,22 +19,22 @@ - + + - - - + + - + - - + + + + + + + + + + + + + - - + - - - - - - - + + + + + + + + + + + + + + - - - + - + + + - - - - - - - - - - - - - - - - - + - + + + + + + - - - + - + + - + diff --git a/MidtransKit/MidtransKit/resources/SNPPostPaymentVAViewController.xib b/MidtransKit/MidtransKit/resources/SNPPostPaymentVAViewController.xib index f2ce66377..0c2d026ed 100644 --- a/MidtransKit/MidtransKit/resources/SNPPostPaymentVAViewController.xib +++ b/MidtransKit/MidtransKit/resources/SNPPostPaymentVAViewController.xib @@ -1,6 +1,6 @@ - + @@ -20,27 +20,24 @@ - + - - + + - + - + - - - - - + + - - + - - - - - - - - - + + + + + + + + + + + + + + - - - + - + + + - + + + + - - - + - + - + diff --git a/MidtransKit/MidtransKit/resources/VTVAListController.xib b/MidtransKit/MidtransKit/resources/VTVAListController.xib index 4c196f7e8..82cfb5d15 100644 --- a/MidtransKit/MidtransKit/resources/VTVAListController.xib +++ b/MidtransKit/MidtransKit/resources/VTVAListController.xib @@ -1,6 +1,6 @@ - + @@ -16,84 +16,109 @@ + - - - + + + - + - - - - - - - - - - - - + + - - + - - - - - - - - - + + + + + + + + + + + + + + - - - + - + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + diff --git a/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib b/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib index 124b38fb0..7df9b3118 100644 --- a/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib +++ b/MidtransKit/MidtransResources/MIDPaymentIndomaretViewController.xib @@ -1,6 +1,6 @@ - + @@ -19,22 +19,23 @@ - + - - + + + - + - - + + + + + + + - - + - - - - - + + + + + + + + + + + + + + - - - + - + + + - - - - - + + - - + - + - + From 64affa6db7578f64de8a0cb4466ed6ede1a9d2b0 Mon Sep 17 00:00:00 2001 From: vanbungkring Date: Fri, 8 Jun 2018 12:58:10 +0700 Subject: [PATCH 04/37] update fix object data on saved card --- MidtransDemo/MidtransDemo/MDOrderViewController.m | 8 ++++---- .../classes/MidtransNewCreditCardViewController.m | 2 +- .../MidtransUIPaymentDirectViewController.xib | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m index e8fd226c6..ce154ac36 100644 --- a/MidtransDemo/MidtransDemo/MDOrderViewController.m +++ b/MidtransDemo/MidtransDemo/MDOrderViewController.m @@ -66,12 +66,12 @@ - (void)viewDidLoad { merchantServer = @"https://demo-merchant-server.herokuapp.com"; break; } - [CONFIG setClientKey:clientkey + [CONFIG setClientKey:@"VT-client-wCSALF27ZAHMVa2U" environment:MidtransServerEnvironmentSandbox - merchantServerURL:merchantServer]; + merchantServerURL:@"https://tapri.ayopop.com/api/payments/ccPayment/v2/"]; //forced to use token storage - UICONFIG.hideStatusPage = YES; + UICONFIG.hideStatusPage = NO; [[MidtransCreditCardConfig shared] setPaymentType:MTCreditCardPaymentTypeTwoclick]; [MidtransCreditCardConfig shared].setDefaultCreditSaveCardEnabled = YES; [[MidtransCreditCardConfig shared] setSaveCardEnabled:TRUE]; @@ -88,7 +88,7 @@ - (void)viewDidLoad { NSDictionary *freeText = @{@"inquiry":@[inquiryConstructor,inquiryConstructor2],@"payment":@[paymentConstructor]}; CONFIG.customFreeText = freeText; - UICONFIG.hideStatusPage = YES; + UICONFIG.hideStatusPage = NO; CONFIG.customPaymentChannels = [[MDOptionManager shared].paymentChannel.value valueForKey:@"type"]; CONFIG.customBCAVANumber = [MDOptionManager shared].bcaVAOption.value; CONFIG.customBNIVANumber = [MDOptionManager shared].bniVAOption.value; diff --git a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m index e198a4f37..dafcb07c3 100644 --- a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m +++ b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m @@ -1044,7 +1044,7 @@ - (void)payWithToken:(NSString *)token { else { if ([CC_CONFIG tokenStorageEnabled] && result.maskedCreditCard) { NSUInteger index = [self.maskedCards indexOfObjectPassingTest:^BOOL(MidtransMaskedCreditCard *obj, NSUInteger idx, BOOL * _Nonnull stop) { - NSString *masked = [[result.additionalData objectForKey:@"masked_card"] stringByReplacingOccurrencesOfString:@"-" withString:@"XXXXXX"]; + NSString *masked = [result.additionalData objectForKey:@"masked_card"]; return [masked isEqualToString:obj.maskedNumber]; }]; if (index == NSNotFound) { diff --git a/MidtransKit/MidtransKit/resources/MidtransUIPaymentDirectViewController.xib b/MidtransKit/MidtransKit/resources/MidtransUIPaymentDirectViewController.xib index 1b0e10ae9..829c0dbab 100644 --- a/MidtransKit/MidtransKit/resources/MidtransUIPaymentDirectViewController.xib +++ b/MidtransKit/MidtransKit/resources/MidtransUIPaymentDirectViewController.xib @@ -1,11 +1,11 @@ - + - + @@ -62,13 +62,13 @@ @@ -86,7 +86,7 @@ - + @@ -95,7 +95,7 @@ - + From 959c99fb056ea050c5dd0bfa3b51b734109b1566 Mon Sep 17 00:00:00 2001 From: tommyyohanesmt <31880480+tommyyohanesmt@users.noreply.github.com> Date: Mon, 25 Jun 2018 13:48:23 +0700 Subject: [PATCH 06/37] add 5 minute expiry for cc token (#357) --- .../MidtransDemo/MDOptionsViewController.m | 4 ++++ .../MidtransDemo/MDOrderViewController.m | 22 ++++++++----------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 +++++++ 3 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 MidtransSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/MidtransDemo/MidtransDemo/MDOptionsViewController.m b/MidtransDemo/MidtransDemo/MDOptionsViewController.m index 147ebffe3..7598d92a1 100644 --- a/MidtransDemo/MidtransDemo/MDOptionsViewController.m +++ b/MidtransDemo/MidtransDemo/MDOptionsViewController.m @@ -72,11 +72,15 @@ - (void)initConfiguration{ MidtransTransactionExpire *minute = [[MidtransTransactionExpire alloc] initWithExpireTime:[NSDate date] expireDuration:1 withUnitTime:MindtransTimeUnitTypeMinute]; + MidtransTransactionExpire *fiveMinutes = [[MidtransTransactionExpire alloc] initWithExpireTime:[NSDate date] + expireDuration:5 + withUnitTime:MindtransTimeUnitTypeMinutes]; MidtransTransactionExpire *hour = [[MidtransTransactionExpire alloc] initWithExpireTime:[NSDate date] expireDuration:1 withUnitTime:MindtransTimeUnitTypeHour]; options = @[[MDOption optionGeneralWithName:@"No Expiry" value:nil], [MDOption optionGeneralWithName:@"1 Minute" value:minute], + [MDOption optionGeneralWithName:@"5 Minute" value:fiveMinutes], [MDOption optionGeneralWithName:@"1 Hour" value:hour]]; MDOptionView *optCustomExpiry = [MDOptionView viewWithIcon:[UIImage imageNamed:@"expiry"] titleTemplate:@"%@" diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m index 4aa740605..1103fde3d 100644 --- a/MidtransDemo/MidtransDemo/MDOrderViewController.m +++ b/MidtransDemo/MidtransDemo/MDOrderViewController.m @@ -71,18 +71,14 @@ - (void)viewDidLoad { merchantServerURL:merchantServer]; //forced to use token storage - UICONFIG.hideStatusPage = YES; - CC_CONFIG.tokenStorageEnabled = NO; - CC_CONFIG.authenticationType = [[MDOptionManager shared].authTypeOption.value integerValue]; - - CC_CONFIG.saveCardEnabled =[[MDOptionManager shared].saveCardOption.value boolValue]; - - CC_CONFIG.secure3DEnabled =[[MDOptionManager shared].secure3DOption.value boolValue]; - CC_CONFIG.authenticationType = MTAuthenticationType3DS; - CC_CONFIG.acquiringBank = [[MDOptionManager shared].issuingBankOption.value integerValue]; - CC_CONFIG.predefinedInstallment = [MDOptionManager shared].installmentOption.value; - CC_CONFIG.preauthEnabled = [[MDOptionManager shared].preauthOption.value boolValue]; - CC_CONFIG.promoEnabled = [[MDOptionManager shared].promoOption.value boolValue]; + UICONFIG.hideStatusPage = NO; + [[MidtransCreditCardConfig shared] setPaymentType:MTCreditCardPaymentTypeTwoclick]; + [MidtransCreditCardConfig shared].setDefaultCreditSaveCardEnabled = YES; + [[MidtransCreditCardConfig shared] setSaveCardEnabled:TRUE]; + [[MidtransCreditCardConfig shared] setSecure3DEnabled:TRUE]; + [[MidtransCreditCardConfig shared] setTokenStorageEnabled:TRUE]; + [[MidtransUIConfiguration shared] setHideStatusPage:FALSE]; + [[MidtransNetworkLogger shared] startLogging]; //CC_CONFIG.showFormCredentialsUser = YES; /*set custom free text for bca*/ @@ -92,7 +88,7 @@ - (void)viewDidLoad { NSDictionary *freeText = @{@"inquiry":@[inquiryConstructor,inquiryConstructor2],@"payment":@[paymentConstructor]}; CONFIG.customFreeText = freeText; - UICONFIG.hideStatusPage = YES; + UICONFIG.hideStatusPage = NO; CONFIG.customPaymentChannels = [[MDOptionManager shared].paymentChannel.value valueForKey:@"type"]; CONFIG.customBCAVANumber = [MDOptionManager shared].bcaVAOption.value; CONFIG.customBNIVANumber = [MDOptionManager shared].bniVAOption.value; diff --git a/MidtransSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/MidtransSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 000000000..18d981003 --- /dev/null +++ b/MidtransSDK.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From 1e586ff14e76b2d419e9d011e53e21861adbc545 Mon Sep 17 00:00:00 2001 From: vanbungkring Date: Mon, 25 Jun 2018 15:25:31 +0700 Subject: [PATCH 07/37] update reduce gross amount --- MidtransDemo/MidtransDemo/MDOrderViewController.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m index 1103fde3d..18de8742b 100644 --- a/MidtransDemo/MidtransDemo/MDOrderViewController.m +++ b/MidtransDemo/MidtransDemo/MDOrderViewController.m @@ -125,11 +125,11 @@ - (IBAction)bayarPressed:(id)sender { cst.customerIdentifier = @"3A8788CE-B96F-449C-8180-B5901A08B50A"; MidtransItemDetail *itm = [[MidtransItemDetail alloc] initWithItemID:[NSString randomWithLength:20] name:@"Midtrans Pillow" - price:@255000 + price:@2500 quantity:@1]; MidtransTransactionDetails *trx = [[MidtransTransactionDetails alloc] initWithOrderID:[NSString randomWithLength:20] - andGrossAmount:@255000]; + andGrossAmount:@2500]; //configure theme MidtransUIFontSource *font = [[MidtransUIFontSource alloc] initWithFontNameBold:@"SourceSansPro-Bold" From c4ae6f5b9ca4c1322f9539ae23a1340a2f0afaa0 Mon Sep 17 00:00:00 2001 From: vanbungkring Date: Mon, 25 Jun 2018 15:50:35 +0700 Subject: [PATCH 08/37] update promo velocity error --- MidtransDemo/MidtransDemo/MDOrderViewController.m | 9 +++------ .../classes/MidtransNewCreditCardViewController.m | 4 ++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m index 18de8742b..5a2ce76a9 100644 --- a/MidtransDemo/MidtransDemo/MDOrderViewController.m +++ b/MidtransDemo/MidtransDemo/MDOrderViewController.m @@ -125,11 +125,11 @@ - (IBAction)bayarPressed:(id)sender { cst.customerIdentifier = @"3A8788CE-B96F-449C-8180-B5901A08B50A"; MidtransItemDetail *itm = [[MidtransItemDetail alloc] initWithItemID:[NSString randomWithLength:20] name:@"Midtrans Pillow" - price:@2500 + price:@100000 quantity:@1]; MidtransTransactionDetails *trx = [[MidtransTransactionDetails alloc] initWithOrderID:[NSString randomWithLength:20] - andGrossAmount:@2500]; + andGrossAmount:@100000]; //configure theme MidtransUIFontSource *font = [[MidtransUIFontSource alloc] initWithFontNameBold:@"SourceSansPro-Bold" @@ -146,10 +146,7 @@ - (IBAction)bayarPressed:(id)sender { //configure expire time [[MidtransNetworkLogger shared] startLogging]; - NSDate *mydate = [NSDate date]; - NSTimeInterval secondsInEightHours = 1 * 60 * 60; - NSDate *dateEightHoursAhead = [mydate dateByAddingTimeInterval:secondsInEightHours]; - MidtransTransactionExpire *expireTime = [[MidtransTransactionExpire alloc] initWithExpireTime:nil expireDuration:1 withUnitTime:MindtransTimeUnitTypeHour]; + //MidtransTransactionExpire *expireTime = [[MidtransTransactionExpire alloc] initWithExpireTime:nil expireDuration:1 withUnitTime:MindtransTimeUnitTypeHour]; //show hud [self.progressHUD showInView:self.navigationController.view]; diff --git a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m index dafcb07c3..e9af249d9 100644 --- a/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m +++ b/MidtransKit/MidtransKit/classes/MidtransNewCreditCardViewController.m @@ -201,7 +201,7 @@ - (void)viewDidLoad { AddOnConstructor *promoConstructor = [[AddOnConstructor alloc] initWithDictionary:@{ @"addOnName":SNP_PROMO, @"addOnTitle":promos.name, - @"addOnDescriptions":[NSString stringWithFormat:@"%0.f",promos.discountedGrossAmount], + @"addOnDescriptions":[NSString stringWithFormat:@"%0.f",promos.calculatedDiscountAmount], @"addOnAdditional":[NSString stringWithFormat:@"%0.f",promos.promosIdentifier] }]; [self.promoArray addObject:promoConstructor]; @@ -438,7 +438,7 @@ - (void)updatePromoViewWithCreditCardNumber:(NSString *)number { AddOnConstructor *promoConstructor = [[AddOnConstructor alloc] initWithDictionary:@{ @"addOnName":SNP_PROMO, @"addOnTitle":promos.name, - @"addOnDescriptions":[NSString stringWithFormat:@"%0.f",promos.discountedGrossAmount], + @"addOnDescriptions":[NSString stringWithFormat:@"%0.f",promos.calculatedDiscountAmount], @"addOnAdditional":[NSString stringWithFormat:@"%0.f",promos.promosIdentifier] }]; [self.promoArray addObject:promoConstructor]; From a101830cf1d7a1bfae3c6967458626c982228b8e Mon Sep 17 00:00:00 2001 From: tommyyohanesmt <31880480+tommyyohanesmt@users.noreply.github.com> Date: Tue, 26 Jun 2018 13:41:45 +0700 Subject: [PATCH 09/37] decreased gross amount price to 2k (#359) --- .../MidtransDemo/MDOrderViewController.m | 4 ++-- .../MidtransDemo/MDOrderViewController.xib | 22 +++++++++---------- .../MidtransDemo/MDProductViewController.xib | 6 ++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.m b/MidtransDemo/MidtransDemo/MDOrderViewController.m index 5a2ce76a9..704ebc563 100644 --- a/MidtransDemo/MidtransDemo/MDOrderViewController.m +++ b/MidtransDemo/MidtransDemo/MDOrderViewController.m @@ -125,11 +125,11 @@ - (IBAction)bayarPressed:(id)sender { cst.customerIdentifier = @"3A8788CE-B96F-449C-8180-B5901A08B50A"; MidtransItemDetail *itm = [[MidtransItemDetail alloc] initWithItemID:[NSString randomWithLength:20] name:@"Midtrans Pillow" - price:@100000 + price:@2000 quantity:@1]; MidtransTransactionDetails *trx = [[MidtransTransactionDetails alloc] initWithOrderID:[NSString randomWithLength:20] - andGrossAmount:@100000]; + andGrossAmount:@2000]; //configure theme MidtransUIFontSource *font = [[MidtransUIFontSource alloc] initWithFontNameBold:@"SourceSansPro-Bold" diff --git a/MidtransDemo/MidtransDemo/MDOrderViewController.xib b/MidtransDemo/MidtransDemo/MDOrderViewController.xib index 45c4dbfa6..558f40919 100644 --- a/MidtransDemo/MidtransDemo/MDOrderViewController.xib +++ b/MidtransDemo/MidtransDemo/MDOrderViewController.xib @@ -1,11 +1,11 @@ - + - + @@ -39,14 +39,14 @@ - - + @@ -101,52 +101,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -158,13 +114,13 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -407,7 +429,7 @@ - + @@ -416,17 +438,17 @@ + - - + - + diff --git a/MidtransKit/MidtransResources/MIDDanamonOnlineViewController.xib b/MidtransKit/MidtransResources/MIDDanamonOnlineViewController.xib index 2e3288e19..006f903c9 100644 --- a/MidtransKit/MidtransResources/MIDDanamonOnlineViewController.xib +++ b/MidtransKit/MidtransResources/MIDDanamonOnlineViewController.xib @@ -1,11 +1,11 @@ - + - + @@ -19,15 +19,15 @@ - + - - + + @@ -48,53 +48,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -