sync from bitbucket

bambora · Feb 28, 2018 · 244872b · 244872b
1 parent 1db7581
commit 244872b
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 32 deletions.
diff --git a/APAC-BNPayment.podspec b/APAC-BNPayment.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name             = "APAC-BNPayment"
-  spec.version          = "1.2.3"
+  spec.version          = "1.2.5"
   spec.summary          = "The Mobile Payment SDK from Bambora (APAC) makes it simple to accept credit card payments in your app."
   build_tag             = spec.version
   spec.homepage         = "http://bambora.com/en/au"
@@ -14,10 +14,11 @@ Pod::Spec.new do |spec|
   spec.requires_arc     = true
   spec.module_name = 'BNPayment'
   spec.header_dir = 'BNPayment'
-  spec.source_files     = 'BNPayment/BNPayment.h','BNPayment/Core/**','BNPayment/UI/**'
+  spec.source_files     = 'BNPayment/**/**'
+  spec.exclude_files = 'BNPayment/CardIO/**'
   spec.vendored_frameworks = 'Example/VisaCheckoutHybrid.framework'
   spec.dependency 'CardIO', '~> 5.4.1'
   spec.resource_bundles = {
                             'BNPayment' => ['Assets/**/*.{png,bundle,xib,nib,cer,html}']
                           }
-end
+end
diff --git a/BNPayment/Core/Models/BNCardRegistrationGuiSetting.h b/BNPayment/Core/Models/BNCardRegistrationGuiSetting.h
@@ -36,7 +36,7 @@ typedef enum
     registrationExpiryDateWatermark,
     registrationSecurityCodeWatermark,
     registrationButtonColor,
-    registrationCardIOEnable,
+    registrationCardIODisable,
     registrationCardIOColor
 } cardRegistrationGuiEnum;
 
@@ -49,7 +49,7 @@ typedef enum
 @property (nonatomic, strong) NSString *securityCodeWatermark;
 //Color Hex Code ie. #00ff00
 @property (nonatomic, strong) NSString *registrationButtonColor;
-@property (nonatomic) BOOL registrationCardIOEnable;
+@property (nonatomic) BOOL registrationCardIODisable;
 @property (nonatomic, strong) NSString *registrationCardIOColor;
 
 +(NSString *)GetGuiKey:(cardRegistrationGuiEnum)cardRegistrationGuiEnum;

diff --git a/BNPayment/Core/Models/BNCardRegistrationGuiSetting.m b/BNPayment/Core/Models/BNCardRegistrationGuiSetting.m
@@ -35,7 +35,7 @@ + (BNCardRegistrationGuiSetting *)BNCardRegistrationGuiSetting:
                      expiryDateWatermark:(NSString *)expiryDateWatermark
                    securityCodeWatermark:(NSString *)securityCodeWatermark
                  registrationButtonColor:(NSString *)registrationButtonColor
-                 registrationCardIOEnable:(BOOL)registrationCardIOEnable
+                 registrationCardIODisable:(BOOL)registrationCardIODisable
                  registrationCardIOColor:(NSString *)registrationCardIOColor
 {
     BNCardRegistrationGuiSetting *cardRegistrationGuiSetting = [BNCardRegistrationGuiSetting new];
@@ -46,7 +46,7 @@ + (BNCardRegistrationGuiSetting *)BNCardRegistrationGuiSetting:
     cardRegistrationGuiSetting.expiryDateWatermark = expiryDateWatermark;
     cardRegistrationGuiSetting.securityCodeWatermark = securityCodeWatermark;
     cardRegistrationGuiSetting.registrationButtonColor = registrationButtonColor;
-    cardRegistrationGuiSetting.registrationCardIOEnable = registrationCardIOEnable;
+    cardRegistrationGuiSetting.registrationCardIODisable = registrationCardIODisable;
     cardRegistrationGuiSetting.registrationCardIOColor = registrationCardIOColor;
     return cardRegistrationGuiSetting;
 }
@@ -77,8 +77,8 @@ +(NSString *)GetGuiKey:(cardRegistrationGuiEnum)cardRegistrationGuiEnum{
         case registrationButtonColor:
             guiKey = @"registrationButtonColor";
             break;
-        case registrationCardIOEnable:
-            guiKey = @"registrationCardIOEnable";
+        case registrationCardIODisable:
+            guiKey = @"registrationCardDisable";
             break;
         case registrationCardIOColor:
             guiKey = @"registrationCardIOColor";

diff --git a/BNPayment/Core/Models/BNSubmitSinglePaymentCardGuiSetting.h b/BNPayment/Core/Models/BNSubmitSinglePaymentCardGuiSetting.h
@@ -38,7 +38,7 @@ typedef enum
     payButtonColor,
     switchButtonColor,
     loadingBarColor,
-    cardIOEnable,
+    cardIODisable,
     cardIOColor
 } submitSinglePaymentCardGuiEnum;
 
@@ -54,7 +54,7 @@ typedef enum
 @property (nonatomic, strong) NSString *payButtonColor;
 @property (nonatomic, strong) NSString *loadingBarColor;
 @property (nonatomic, strong) NSString *cardIOColor;
-@property (nonatomic) BOOL cardIOEnable;
+@property (nonatomic) BOOL cardIODisable;
 +(NSString *)GetGuiKey:(submitSinglePaymentCardGuiEnum)guiEnum;
 
 

diff --git a/BNPayment/Core/Models/BNSubmitSinglePaymentCardGuiSetting.m b/BNPayment/Core/Models/BNSubmitSinglePaymentCardGuiSetting.m
@@ -61,8 +61,8 @@ +(NSString *)GetGuiKey:(submitSinglePaymentCardGuiEnum)guiEnum{
         case cardIOColor:
             guiKey = @"cardIOColor";
             break;
-        case cardIOEnable:
-            guiKey = @"cardIOEnable";
+        case cardIODisable:
+            guiKey = @"cardIODisable";
             break;
         default:
             [NSException raise:NSGenericException format:@"Unexpected submitSinglePaymentCardGuiEnum."];

diff --git a/BNPayment/UI/ViewControllers/BNCreditCardRegistrationVC.m b/BNPayment/UI/ViewControllers/BNCreditCardRegistrationVC.m
@@ -287,7 +287,7 @@ - (void)registerButtonCustomisation {
 - (void)cardIOCustomisation{
     if(_guiSetting!=nil && _cardIOButton!=nil)
     {
-        if(_guiSetting.registrationCardIOEnable)
+        if(!_guiSetting.registrationCardIODisable)
         {
             if(_guiSetting.registrationCardIOColor.length==7)
             {

diff --git a/BNPayment/UI/ViewControllers/BNSubmitSinglePaymentCardVC.m b/BNPayment/UI/ViewControllers/BNSubmitSinglePaymentCardVC.m
@@ -390,7 +390,7 @@ - (void)loadingBarColorCustomisation {
 - (void)cardIOCustomisation{
     if(_guiSetting!=nil && _cardIOButton!=nil)
     {
-        if(_guiSetting.cardIOEnable)
+        if(!_guiSetting.cardIODisable)
         {
             if(_guiSetting.cardIOColor.length==7)
             {

diff --git a/Example/BNPayment-Example/AppSettings.m b/Example/BNPayment-Example/AppSettings.m
@@ -334,13 +334,13 @@ - (BNCardRegistrationGuiSetting* )getCardRegistrationGuiSetting{
         _cardRegistrationGuiSetting.securityCodeWatermark =[[NSUserDefaults standardUserDefaults] valueForKey: [BNCardRegistrationGuiSetting GetGuiKey:registrationSecurityCodeWatermark]];
         _cardRegistrationGuiSetting.registrationButtonColor =[[NSUserDefaults standardUserDefaults] valueForKey: [BNCardRegistrationGuiSetting GetGuiKey:registrationButtonColor]];
         _cardRegistrationGuiSetting.registerButtonText =[[NSUserDefaults standardUserDefaults] valueForKey: [BNCardRegistrationGuiSetting GetGuiKey:registrationButtonText]];
-        if([[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]allKeys] containsObject:[BNCardRegistrationGuiSetting GetGuiKey:registrationCardIOEnable]])
+        if([[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]allKeys] containsObject:[BNCardRegistrationGuiSetting GetGuiKey:registrationCardIODisable]])
         {
-            _cardRegistrationGuiSetting.registrationCardIOEnable =[[NSUserDefaults standardUserDefaults] boolForKey: [BNCardRegistrationGuiSetting GetGuiKey:registrationCardIOEnable]];
+            _cardRegistrationGuiSetting.registrationCardIODisable =[[NSUserDefaults standardUserDefaults] boolForKey: [BNCardRegistrationGuiSetting GetGuiKey:registrationCardIODisable]];
         }
         else
         {
-            _cardRegistrationGuiSetting.registrationCardIOEnable=YES;
+            _cardRegistrationGuiSetting.registrationCardIODisable=NO;
         }
         _cardRegistrationGuiSetting.registrationCardIOColor =[[NSUserDefaults standardUserDefaults] valueForKey: [BNCardRegistrationGuiSetting GetGuiKey:registrationCardIOColor]];
 
@@ -361,13 +361,13 @@ - (BNSubmitSinglePaymentCardGuiSetting* )getSubmitSinglePaymentGuiSetting{
         _submitSinglePaymentCardGuiSetting.payButtonColor =[[NSUserDefaults standardUserDefaults] valueForKey: [BNSubmitSinglePaymentCardGuiSetting GetGuiKey:payButtonColor]];
         _submitSinglePaymentCardGuiSetting.payButtonText =[[NSUserDefaults standardUserDefaults] valueForKey: [BNSubmitSinglePaymentCardGuiSetting GetGuiKey:payButtonText]];
         _submitSinglePaymentCardGuiSetting.loadingBarColor =[[NSUserDefaults standardUserDefaults] valueForKey: [BNSubmitSinglePaymentCardGuiSetting GetGuiKey:loadingBarColor]];
-        if([[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]allKeys] containsObject:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:cardIOEnable]])
+        if([[[[NSUserDefaults standardUserDefaults] dictionaryRepresentation]allKeys] containsObject:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:cardIODisable]])
         {
-            _submitSinglePaymentCardGuiSetting.cardIOEnable =[[NSUserDefaults standardUserDefaults] boolForKey:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:cardIOEnable]];
+            _submitSinglePaymentCardGuiSetting.cardIODisable =[[NSUserDefaults standardUserDefaults] boolForKey:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:cardIODisable]];
         }
         else
         {
-            _submitSinglePaymentCardGuiSetting.cardIOEnable=YES;
+            _submitSinglePaymentCardGuiSetting.cardIODisable=NO;
         }
         _submitSinglePaymentCardGuiSetting.cardIOColor =[[NSUserDefaults standardUserDefaults] valueForKey: [BNSubmitSinglePaymentCardGuiSetting GetGuiKey:cardIOColor]];
     }
@@ -390,7 +390,7 @@ - (void) setCardRegistrationGuiSetting:(BNCardRegistrationGuiSetting*) guiSettin
     [[NSUserDefaults standardUserDefaults] setValue: guiSetting.securityCodeWatermark forKey:[BNCardRegistrationGuiSetting GetGuiKey:registrationSecurityCodeWatermark]];
     [[NSUserDefaults standardUserDefaults] setValue: guiSetting.registerButtonText forKey:[BNCardRegistrationGuiSetting GetGuiKey:registrationButtonText]];
     [[NSUserDefaults standardUserDefaults] setValue: guiSetting.registrationButtonColor forKey:[BNCardRegistrationGuiSetting GetGuiKey:registrationButtonColor]];
-    [[NSUserDefaults standardUserDefaults] setBool:guiSetting.registrationCardIOEnable forKey:[BNCardRegistrationGuiSetting GetGuiKey:registrationCardIOEnable]];
+    [[NSUserDefaults standardUserDefaults] setBool:guiSetting.registrationCardIODisable forKey:[BNCardRegistrationGuiSetting GetGuiKey:registrationCardIODisable]];
     [[NSUserDefaults standardUserDefaults] setValue: guiSetting.registrationCardIOColor forKey:[BNCardRegistrationGuiSetting GetGuiKey:registrationCardIOColor]];
     [[NSUserDefaults standardUserDefaults] synchronize];
     _cardRegistrationGuiSetting = guiSetting;
@@ -409,7 +409,7 @@ - (void) setSubmitSinglePaymentCardGuiSetting:(BNSubmitSinglePaymentCardGuiSetti
     [[NSUserDefaults standardUserDefaults] setValue: guiSetting.payButtonColor forKey:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:payButtonColor]];
     [[NSUserDefaults standardUserDefaults] setValue: guiSetting.switchButtonColor forKey:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:switchButtonColor]];
     [[NSUserDefaults standardUserDefaults] setValue: guiSetting.loadingBarColor forKey:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:loadingBarColor]];
-    [[NSUserDefaults standardUserDefaults] setBool:guiSetting.cardIOEnable forKey:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:cardIOEnable]];
+    [[NSUserDefaults standardUserDefaults] setBool:guiSetting.cardIODisable forKey:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:cardIODisable]];
     [[NSUserDefaults standardUserDefaults] setValue: guiSetting.cardIOColor forKey:[BNSubmitSinglePaymentCardGuiSetting GetGuiKey:cardIOColor]];
     [[NSUserDefaults standardUserDefaults] synchronize];
     _submitSinglePaymentCardGuiSetting = guiSetting;

diff --git a/Example/BNPayment-Example/DeveloperViewController.swift b/Example/BNPayment-Example/DeveloperViewController.swift
@@ -208,7 +208,7 @@ class DeveloperViewController: UIViewController {
         cardRegistrationGuiSetting.securityCodeWatermark = txtRegistrationSecurityCode.text
         cardRegistrationGuiSetting.registrationButtonColor = txtRegistrationButtonColor.text
         cardRegistrationGuiSetting.registerButtonText = txtRegistrationButtonText.text
-        cardRegistrationGuiSetting.registrationCardIOEnable=registrationCardIOSwitch.isOn
+        cardRegistrationGuiSetting.registrationCardIODisable = !(registrationCardIOSwitch.isOn)
         cardRegistrationGuiSetting.registrationCardIOColor=txtRegistrationCardIOColor.text
         AppSettings.sharedInstance().setCardRegistrationGuiSetting(cardRegistrationGuiSetting)
     }
@@ -226,9 +226,9 @@ class DeveloperViewController: UIViewController {
         submitSinglePaymentCardGuiSetting.switchButtonColor = txtPaymentSwitchButtonColor.text
         submitSinglePaymentCardGuiSetting.switchButtonColor = txtPaymentSwitchButtonColor.text
         submitSinglePaymentCardGuiSetting.loadingBarColor = txtPaymentLoadingColor.text
-        submitSinglePaymentCardGuiSetting.cardIOEnable=paymentCardIOSwitch.isOn
+        submitSinglePaymentCardGuiSetting.cardIODisable = !(paymentCardIOSwitch.isOn)
         submitSinglePaymentCardGuiSetting.cardIOColor=txtPaymentCardIOColor.text
-    AppSettings.sharedInstance().setSubmitSinglePaymentCardGuiSetting(submitSinglePaymentCardGuiSetting)
+        AppSettings.sharedInstance().setSubmitSinglePaymentCardGuiSetting(submitSinglePaymentCardGuiSetting)
     }
 
 
@@ -242,7 +242,7 @@ class DeveloperViewController: UIViewController {
         txtRegistrationSecurityCode.text = cardRegistrationGuiSetting?.securityCodeWatermark
         txtRegistrationButtonColor.text = cardRegistrationGuiSetting?.registrationButtonColor
         txtRegistrationButtonText.text = cardRegistrationGuiSetting?.registerButtonText
-        registrationCardIOSwitch.setOn((cardRegistrationGuiSetting?.registrationCardIOEnable)!, animated: true)
+        registrationCardIOSwitch.setOn(!(cardRegistrationGuiSetting?.registrationCardIODisable)!, animated: true)
         txtRegistrationCardIOColor.text = cardRegistrationGuiSetting?.registrationCardIOColor
     }
 
@@ -258,7 +258,7 @@ class DeveloperViewController: UIViewController {
         txtPaymentSecurityCode.text = submitSinglePaymentCardGuiSetting?.securityCodeWatermark
         txtPaymentSwitchButtonColor.text = submitSinglePaymentCardGuiSetting?.switchButtonColor
         txtPaymentLoadingColor.text = submitSinglePaymentCardGuiSetting?.loadingBarColor
-        paymentCardIOSwitch.setOn((submitSinglePaymentCardGuiSetting?.cardIOEnable)!, animated: true)
+        paymentCardIOSwitch.setOn(!(submitSinglePaymentCardGuiSetting?.cardIODisable)!, animated: true)
         txtPaymentCardIOColor.text = submitSinglePaymentCardGuiSetting?.cardIOColor
     }
 

diff --git a/Example/BNPayment-Example/Info.plist b/Example/BNPayment-Example/Info.plist
@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>NSPhotoLibraryUsageDescription</key>
-	<string>card.io-iOS-SDK requirement. Not really used</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleDisplayName</key>
@@ -19,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.8</string>
+	<string>1.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>10</string>
 	<key>ITSAppUsersNonExempEncryption</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>
@@ -49,6 +47,8 @@
 	<string>Scan your card</string>
 	<key>NSFaceIDUsageDescription</key>
 	<string>Login</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>card.io-iOS-SDK requirement. Not really used</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>