Public release 1.3.3

Public release 1.3.3

Author: EugeneIOs

Sources/VGSCheckoutSDK/Core/Checkout/UseCases/Payment/ViewControllers/PayWithNewCard/VGSPayWithCardViewController.swift

@@ -111,7 +111,7 @@ extension VGSPayWithCardViewController: VGSCheckoutBaseCardViewControllerDelegat
 				let state: VGSAddCardFlowState
 				switch strongSelf.viewModel.configuration.payoptFlow {
 				case .addCard:
-					state = VGSAddCardFlowState.requestSubmitted(requestResult)
+					state = VGSAddCardFlowState.checkoutDidFinish(.newCard(requestResult, cardInfo))
 				case .transfers:
 					state = VGSAddCardFlowState.checkoutTransferDidFinish(requestResult)
 				}

Sources/VGSCheckoutSDK/Core/Checkout/UseCases/Payment/Workers/APIWorkers/PaymentsAPIWorker/VGSPaymentsAPIWorker.swift

@@ -26,6 +26,13 @@ internal final class VGSPayoptAddCardAPIWorker {
 	/// Transfers path.
 	private let transfersPath = "/transfers"
 
+	// swiftlint:disable all
+
+  /// Sub-account id JSON key
+  private let SUB_ACCOUNT_KEY = "sub_account_id"
+
+	// swiftlint:enable all
+
 	/// Checkout service.
 	private weak var checkoutService: VGSCheckoutBasicPayoptServiceProtocol?
 
@@ -37,9 +44,13 @@ internal final class VGSPayoptAddCardAPIWorker {
 		vgsCollect.apiClient.customHeader = ["Authorization": "Bearer \(configuration.accessToken)"]
 	}
 
-	internal func createFinID(with newCardInfo: VGSCheckoutNewPaymentCardInfo, completion: @escaping VGSCheckoutRequestResultCompletion) {
+  internal func createFinID(with newCardInfo: VGSCheckoutNewPaymentCardInfo, completion: @escaping VGSCheckoutRequestResultCompletion) {
 
-		vgsCollect.sendData(path: finInstrumentsPath, method: .post) {[weak self] response in
+    var extraData = [String: Any]()
+    if let id = configuration.subAccountId {
+      extraData[SUB_ACCOUNT_KEY] = id
+    }
+		vgsCollect.sendData(path: finInstrumentsPath, method: .post, extraData: extraData) {[weak self] response in
 			guard let strongSelf = self else {return}
 
 			var extraData = [String: Any]()
@@ -103,12 +114,16 @@ internal final class VGSPayoptAddCardAPIWorker {
 		guard let config = configuration as? VGSCheckoutPaymentConfiguration else {
 			fatalError("Cannot send transfers in invalid flow.")
 		}
-		let transderPayload: [String: Any] = [
+		var transferPayload: [String: Any] = [
 			"order_id": config.orderId,
 			"source": finId
-		]
+    ]
+    if let id = config.subAccountId {
+      transferPayload[SUB_ACCOUNT_KEY] = id
+    }
+    
 		// Use API client sendRequest since we don't need to send collected data again.
-		vgsCollect.apiClient.sendRequest(path: transfersPath, method: .post, value: transderPayload) { response in
+		vgsCollect.apiClient.sendRequest(path: transfersPath, method: .post, value: transferPayload) { response in
 			switch response {
 			case .success(let code, let data, let response):
 				/// Additional checkout flow info.

Sources/VGSCheckoutSDK/Core/Checkout/UseCases/SaveCard/DataWorkers/PaymentOptimizationAPIWorkers/VGSSaveCardPayoptAddCardAPIWorker.swift

@@ -11,6 +11,13 @@ internal class VGSSaveCardPayoptAddCardAPIWorker: VGSSaveCardAPIWorkerProtocol {
 	/// Configuration.
 	internal let configuration: VGSCheckoutAddCardConfiguration
 
+	// swiftlint:disable all
+	
+  /// Sub-account id JSON key
+  private let SUB_ACCOUNT_KEY = "sub_account_id"
+
+	// swiftlint:enable all
+
 	// MARK: - Initialization
 
 	/// Initializer.
@@ -30,28 +37,13 @@ internal class VGSSaveCardPayoptAddCardAPIWorker: VGSSaveCardAPIWorkerProtocol {
 
 		vgsCollect.apiClient.customHeader = ["Authorization": "Bearer \(configuration.accessToken)"]
 
+    var extraData = [String: Any]()
+    if let id = configuration.subAccountId {
+      extraData[SUB_ACCOUNT_KEY] = id
+    }
 		let path = "/financial_instruments"
 
-		vgsCollect.sendData(path: path, method: .post) { response in
-			switch response {
-			case .success(let code, let data, let response):
-				let requestResult: VGSCheckoutRequestResult = .success(code, data, response, nil)
-				completion(requestResult)
-			case .failure(let code, let data, let response, let error):
-				let requestResult: VGSCheckoutRequestResult = .failure(code, data, response, error, nil)
-				completion(requestResult)
-			}
-		}
-	}
-
-	/// Saves card to create financial instrument.
-	/// - Parameter completion: `VGSCheckoutRequestResultCompletion` object, completion block.
-	internal func saveCard(with completion: @escaping VGSCheckoutRequestResultCompletion) {
-		vgsCollect.apiClient.customHeader = ["Authorization": "Bearer \(configuration.accessToken)"]
-
-		let path = "/financial_instruments"
-
-		vgsCollect.sendData(path: path, method: .post) { response in
+		vgsCollect.sendData(path: path, method: .post, extraData: extraData) { response in
 			switch response {
 			case .success(let code, let data, let response):
 				let requestResult: VGSCheckoutRequestResult = .success(code, data, response, nil)
@@ -63,33 +55,6 @@ internal class VGSSaveCardPayoptAddCardAPIWorker: VGSSaveCardAPIWorkerProtocol {
 		}
 	}
 
-	/// Initiates transfer with fin instrument id and order.
-	/// - Parameters:
-	///   - finInstrumentId: `String` object, financial instrument id from payopt.
-	///   - payment: `VGSCheckoutPayment`, payment data.
-	///   - completion: `VGSCheckoutRequestResultCompletion` object, completion block.
-//	internal func initiateTransfer(with finInstrumentId: String, payment: VGSCheckoutPayment, completion: @escaping VGSCheckoutRequestResultCompletion) {
-//
-//		// FIXME: - remove hardcoded order_id
-//		let transderPayload: [String: Any] = [
-//			"order_id" : "orderId",
-//			"financial_instrument_id": finInstrumentId
-//		]
-//
-//		let path = "/transfers"
-//
-//		vgsCollect.sendData(path: path, method: .post) { response in
-//			switch response {
-//			case .success(let code, let data, let response):
-//				let requestResult: VGSCheckoutRequestResult = .success(code, data, response, nil)
-//				completion(requestResult)
-//			case .failure(let code, let data, let response, let error):
-//				let requestResult: VGSCheckoutRequestResult = .failure(code, data, response, error, nil)
-//				completion(requestResult)
-//			}
-//		}
-//	}
-
 	/// Financial instrument id from success payopt financial instrument response.
 	/// - Parameter data: `Data?` object, response data.
 	/// - Returns: `String?` object, financial instrument id or `nil`.

Sources/VGSCheckoutSDK/Core/Configuration/PaymentOrchestration/AddCard/VGSCheckoutAddCardConfiguration.swift

@@ -39,6 +39,9 @@ public struct VGSCheckoutAddCardConfiguration: VGSCheckoutBasicConfigurationProt
 
   /// `String?`, organization vault inbound route id, could be `nil` when vault has only one route.
   public let routeId: String?
+  
+  /// `String?`, organization sub-acccount id, default `nil`.
+  public var subAccountId: String?
 
 	/// Enable save card option. If enabled - button with option to save card for future payments will be displayed. Default is `true`. Default **save card button** state is `selected`. **NOTE** User choice for save card option will not be stored on VGS side.
 	public var isSaveCardOptionEnabled: Bool = true

Sources/VGSCheckoutSDK/Core/Configuration/PaymentOrchestration/Payment/VGSCheckoutPaymentConfiguration.swift

@@ -36,6 +36,9 @@ internal struct VGSCheckoutPaymentConfiguration: VGSCheckoutBasicConfigurationPr
 
   /// `String?`, organization vault inbound route id.
   public let routeId: String?
+  
+  /// `String?`, organization sub-account id, default `nil`.
+  public var subAccountId: String?
 
 	/// Order id.
 	internal let orderId: String

Sources/VGSCheckoutSDK/Core/Configuration/PaymentOrchestration/VGSCheckoutPayoptBasicConfiguration.swift

@@ -52,6 +52,9 @@ internal protocol VGSCheckoutPayoptBasicConfiguration {
 	/// Access token.
 	var accessToken: String {get}
 
+  /// Organization sub-account id.
+  var subAccountId: String? {get set}
+
   /// Default Inbound route route id created in vault during default integration with payopt on dashboard.
   static var defaultPayoptRouteId: String {get}
 }

Sources/VGSCheckoutSDK/Helpers/CollectUtils/Extensions/Utils.swift

@@ -46,7 +46,7 @@ internal class Utils {
 
   /// VGS Checkout SDK Version.
 	/// Necessary since SPM doesn't track info plist correctly: https://forums.swift.org/t/add-info-plist-on-spm-bundle/40274/5
-  static let vgsCheckoutVersion: String = "1.3.2"
+  static let vgsCheckoutVersion: String = "1.3.3"
 }
 
 extension Dictionary {

VGSCheckoutDemoApp/VGSCheckoutDemoAppUITests/UseCasesTests/BillingAddress/VGSCheckoutAddressSectionTests.swift

@@ -44,4 +44,43 @@ class VGSCheckoutAddressSectionTests: VGSCheckoutSaveCardBaseTestCase {
 		// Check success alert.
 		verifySuccessAlertExists()
 	}
+
+	/// Test add card config when billing address section is hidden.
+	func testAddCardConfigWhenAddressHidden() {
+		// Hide billing address section.
+		app.launchArguments.append(VGSCheckoutUITestsFeature.billingAddressIsHidden.launchArgument)
+
+		// Launch app.
+		app.launch()
+
+		// Navigate to Add card config use case.
+		navigateToPayoptAddCardUseCase()
+
+		// Open checkout screen.
+		startPayoptAddCardCheckout()
+
+		// Swipe up to bottom.
+		app.swipeUp()
+
+		// Verify address hints are hidden.
+		verifyAllAddressFieldsAreHidden()
+
+		// Swipe down to up.
+		app.swipeDown()
+
+		// Wait.
+		wait(forTimeInterval: 0.3)
+
+		// Fill in card data.
+		fillInCorrectCardData()
+
+		// Wait for keyboard dismiss.
+		wait(forTimeInterval: 0.5)
+
+		// Tap to save card data.
+		tapToSaveCardInCheckout()
+
+		// Check success alert.
+		verifySuccessAddCardConfigAlertExists()
+	}
 }