diff --git a/IngenicoConnectExample/ICAppConstants.h b/IngenicoConnectExample/ICAppConstants.h index 63ac1b4..0cae105 100644 --- a/IngenicoConnectExample/ICAppConstants.h +++ b/IngenicoConnectExample/ICAppConstants.h @@ -23,5 +23,5 @@ #define kICBoletoBancarioId @"1503" #define kICBancontactId @"3012" #define kICArvatoIds [NSSet setWithArray:@[@"9000", @"9001"]] -#define kICApplicationIdentifier @"iOS Example Application/v1.6.5" +#define kICApplicationIdentifier @"iOS Example Application/v1.7.0" #endif diff --git a/IngenicoConnectExample/ICCardProductViewController.m b/IngenicoConnectExample/ICCardProductViewController.m index 8309926..fab85f3 100644 --- a/IngenicoConnectExample/ICCardProductViewController.m +++ b/IngenicoConnectExample/ICCardProductViewController.m @@ -61,10 +61,17 @@ -(ICTextFieldTableViewCell *)cellForTextField:(ICFormRowTextField *)row tableVie if ([row.paymentProductField.identifier isEqualToString:@"cardNumber"]) { if([self.confirmedPaymentProducts containsObject:self.paymentItem.identifier]) { - UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, 30, 30)]; + CGFloat size = cell.frame.size.height * 0.8; + CGFloat padding = cell.frame.size.height * 0.1; + + UIView *outerView = [[UIView alloc]initWithFrame:CGRectMake(padding, padding, size, size)]; + UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, size, size)]; imageView.contentMode = UIViewContentModeScaleAspectFit; + [outerView addSubview:imageView]; + outerView.contentMode = UIViewContentModeScaleAspectFit; + imageView.image = row.logo; - cell.rightView = imageView; + cell.rightView = outerView; } } diff --git a/IngenicoConnectExample/ICFormRowsConverter.m b/IngenicoConnectExample/ICFormRowsConverter.m index 167baaa..27893fd 100644 --- a/IngenicoConnectExample/ICFormRowsConverter.m +++ b/IngenicoConnectExample/ICFormRowsConverter.m @@ -28,6 +28,7 @@ #import #import #import +#import #import "ICFormRowDate.h" @interface ICFormRowsConverter () @@ -195,7 +196,11 @@ + (NSString *)errorMessageForError:(ICValidationError *)error withCurrency:(BOOL errorMessageKey = [NSString stringWithFormat:errorMessageFormat, @"required"]; errorMessageValue = NSLocalizedStringFromTableInBundle(errorMessageKey, kICSDKLocalizable, [ICFormRowsConverter sdkBundle], nil); errorMessage = errorMessageValue; - } else { + } else if (errorClass == [ICResidentIdNumberError class]) { + errorMessageKey = [NSString stringWithFormat:errorMessageFormat, @"residentIdNumber"]; + errorMessageValue = NSLocalizedStringFromTableInBundle(errorMessageKey, kICSDKLocalizable, [ICFormRowsConverter sdkBundle], nil); + errorMessage = errorMessageValue; + } else { [NSException raise:@"Invalid validation error" format:@"Validation error %@ is invalid", error]; } return errorMessage; diff --git a/IngenicoConnectExample/ICPaymentProductsViewControllerTarget.m b/IngenicoConnectExample/ICPaymentProductsViewControllerTarget.m index c564c72..0be43da 100644 --- a/IngenicoConnectExample/ICPaymentProductsViewControllerTarget.m +++ b/IngenicoConnectExample/ICPaymentProductsViewControllerTarget.m @@ -338,7 +338,13 @@ - (void)showApplePaySheetForPaymentProduct:(ICPaymentProduct *)paymentProduct wi [self generateSummaryItems]; PKPaymentRequest *paymentRequest = [[PKPaymentRequest alloc] init]; - [paymentRequest setCountryCode:self.context.countryCode]; + + if (paymentProduct.acquirerCountry != nil) { + [paymentRequest setCountryCode:paymentProduct.acquirerCountry]; + } else { + [paymentRequest setCountryCode:self.context.countryCode]; + } + [paymentRequest setCurrencyCode:self.context.amountOfMoney.currencyCode]; [paymentRequest setSupportedNetworks:paymentProductNetworks.paymentProductNetworks]; [paymentRequest setPaymentSummaryItems:self.summaryItems]; diff --git a/Podfile b/Podfile index 3dd1ff6..69bb0a5 100644 --- a/Podfile +++ b/Podfile @@ -6,7 +6,7 @@ target 'IngenicoConnectExample' do # use_frameworks! # Pods for IngenicoConnectExample - pod 'IngenicoConnectSDK', '~> 5.1' + pod 'IngenicoConnectSDK', '~> 5.3' pod 'SVProgressHUD' target 'IngenicoConnectExampleTests' do diff --git a/Podfile.lock b/Podfile.lock index ceef9cf..d824f89 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - IngenicoConnectSDK (5.1.0): + - IngenicoConnectSDK (5.3.0): - AFNetworking (~> 3.0) - SVProgressHUD (2.2.5)