diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fd52f01a..b12eb09a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,7 +10,7 @@ jobs:
lint:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Run linting
uses: norio-nomura/action-swiftlint@3.2.1
with:
@@ -21,7 +21,7 @@ jobs:
env:
BUILD_WRAPPER_OUT_DIR: buildwrapper # Directory where build-wrapper output will be placed
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Run xcodebuild with tests
run: xcodebuild -project dev.xcodeproj/ -scheme OmiseSDK -derivedDataPath Build/ -destination 'platform=iOS Simulator,name=iPhone 11,OS=16.2' -enableCodeCoverage YES clean build test CODE_SIGN_IDENTITY="" CODE_SIGNING_REQUIRED=NO
@@ -33,7 +33,7 @@ jobs:
run: xattr -w com.apple.xcode.CreatedByBuildSystem true ./build
- name: Upload coverage report
- uses: actions/upload-artifact@v2
+ uses: actions/upload-artifact@v3
with:
path: sonarqube-generic-coverage.xml
retention-days: 5 # Artifact will be available only for 5 days.
@@ -51,7 +51,7 @@ jobs:
needs: test
steps:
- name: Checkout repository on branch
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
ref: ${{ github.HEAD_REF }}
fetch-depth: 0
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..5bdb7e50
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "editor.inlayHints.fontSize": 12
+}
\ No newline at end of file
diff --git a/ExampleApp.xcodeproj/project.pbxproj b/ExampleApp.xcodeproj/project.pbxproj
index 1a4bba02..be84f8ad 100644
--- a/ExampleApp.xcodeproj/project.pbxproj
+++ b/ExampleApp.xcodeproj/project.pbxproj
@@ -453,7 +453,7 @@
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/omise/omise-ios.git";
requirement = {
- branch = feature/v5.0.0_improvements;
+ branch = "feature/MIT-2251_v5_AdaptableTableView";
kind = branch;
};
};
diff --git a/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index fbcb06fd..ff610e98 100644
--- a/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -5,8 +5,8 @@
"kind" : "remoteSourceControl",
"location" : "https://github.com/omise/omise-ios.git",
"state" : {
- "branch" : "feature/v5.0.0_improvements",
- "revision" : "6ff5a91c43fb163949ffc0369eb4a471fe0edba6"
+ "branch" : "feature/MIT-2251_v5_AdaptableTableView",
+ "revision" : "bf2e8840edf4cd937fdb1daf2d8e1d3a030b96bb"
}
}
],
diff --git a/ExampleApp/AppDelegate.swift b/ExampleApp/AppDelegate.swift
index 81918099..6838358f 100644
--- a/ExampleApp/AppDelegate.swift
+++ b/ExampleApp/AppDelegate.swift
@@ -6,6 +6,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
window?.tintColor = UIColor(named: "App Tint") ?? UIColor.blue
+
return true
}
}
diff --git a/ExampleApp/Models/LocalConfig.swift b/ExampleApp/Models/LocalConfig.swift
index d815c643..d9de56ab 100644
--- a/ExampleApp/Models/LocalConfig.swift
+++ b/ExampleApp/Models/LocalConfig.swift
@@ -23,16 +23,16 @@ struct LocalConfig: Codable {
devVaultBaseURL = nil
devApiBaseURL = nil
}
-
- var env: Environment {
+
+ var configuration: Configuration? {
if devMode,
let vaultBaseURLString = devVaultBaseURL,
let vaultBaseURL = URL(string: vaultBaseURLString),
let apiBaseURLString = devApiBaseURL,
let apiBaseURL = URL(string: apiBaseURLString) {
- return .dev(vaultURL: vaultBaseURL, apiURL: apiBaseURL)
+ return .init(vaultURL: vaultBaseURL, apiURL: apiBaseURL)
} else {
- return .production
+ return nil
}
}
diff --git a/ExampleApp/Models/Tools.swift b/ExampleApp/Models/Tools.swift
index 601cf8dc..ef4bf806 100644
--- a/ExampleApp/Models/Tools.swift
+++ b/ExampleApp/Models/Tools.swift
@@ -4,50 +4,60 @@ import OmiseSDK
struct PaymentPreset {
var paymentAmount: Int64
var paymentCurrency: Currency
- var allowedPaymentMethods: [SourceTypeValue]
+ var allowedPaymentMethods: [SourceType]
+ static let allPreset = PaymentPreset(
+ paymentAmount: 5_000_00,
+ paymentCurrency: .thb,
+ allowedPaymentMethods: SourceType.allCases
+ )
+
static let thailandPreset = PaymentPreset(
paymentAmount: 5_000_00,
paymentCurrency: .thb,
- allowedPaymentMethods: PaymentCreatorController.thailandDefaultAvailableSourceMethods
+ allowedPaymentMethods: SourceType.availableByDefaultInThailand
)
-
+
static let japanPreset = PaymentPreset(
paymentAmount: 5_000,
paymentCurrency: .jpy,
- allowedPaymentMethods: PaymentCreatorController.japanDefaultAvailableSourceMethods
+ allowedPaymentMethods: SourceType.availableByDefaultInJapan
)
static let singaporePreset = PaymentPreset(
paymentAmount: 5_000_00,
paymentCurrency: .sgd,
- allowedPaymentMethods: PaymentCreatorController.singaporeDefaultAvailableSourceMethods
+ allowedPaymentMethods: SourceType.availableByDefaultSingapore
)
static let malaysiaPreset = PaymentPreset(
paymentAmount: 5_000_00,
paymentCurrency: .myr,
- allowedPaymentMethods: PaymentCreatorController.malaysiaDefaultAvailableSourceMethods
+ allowedPaymentMethods: SourceType.availableByDefaultMalaysia
)
}
class Tool: NSObject {
+ static let allPaymentAmount: Int64 = PaymentPreset.allPreset.paymentAmount
+ static let allPaymentCurrency: String = PaymentPreset.allPreset.paymentCurrency.code
+ static let allAllowedPaymentMethods: [SourceType] = PaymentPreset.allPreset.allowedPaymentMethods
+
static let thailandPaymentAmount: Int64 = PaymentPreset.thailandPreset.paymentAmount
static let thailandPaymentCurrency: String = PaymentPreset.thailandPreset.paymentCurrency.code
- static let thailandAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.thailandPreset.allowedPaymentMethods
+ static let thailandAllowedPaymentMethods: [SourceType] = PaymentPreset.thailandPreset.allowedPaymentMethods
static let japanPaymentAmount: Int64 = PaymentPreset.japanPreset.paymentAmount
static let japanPaymentCurrency: String = PaymentPreset.japanPreset.paymentCurrency.code
- static let japanAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.japanPreset.allowedPaymentMethods
+ static let japanAllowedPaymentMethods: [SourceType] = PaymentPreset.japanPreset.allowedPaymentMethods
static let singaporePaymentAmount: Int64 = PaymentPreset.singaporePreset.paymentAmount
static let singaporePaymentCurrency: String = PaymentPreset.singaporePreset.paymentCurrency.code
- static let singaporeAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.singaporePreset.allowedPaymentMethods
+ static let singaporeAllowedPaymentMethods: [SourceType] = PaymentPreset.singaporePreset.allowedPaymentMethods
static let malaysiaPaymentAmount: Int64 = PaymentPreset.malaysiaPreset.paymentAmount
static let malaysiaPaymentCurrency: String = PaymentPreset.malaysiaPreset.paymentCurrency.code
- static let malaysiaAllowedPaymentMethods: [SourceTypeValue] = PaymentPreset.malaysiaPreset.allowedPaymentMethods
+ static let malaysiaAllowedPaymentMethods: [SourceType] = PaymentPreset.malaysiaPreset.allowedPaymentMethods
static func imageWith(size: CGSize, color: UIColor) -> UIImage? {
return Tool.imageWith(size: size) { (context) in
diff --git a/ExampleApp/Resources/Main.storyboard b/ExampleApp/Resources/Main.storyboard
index 18cd0100..c14fb6e6 100644
--- a/ExampleApp/Resources/Main.storyboard
+++ b/ExampleApp/Resources/Main.storyboard
@@ -30,18 +30,18 @@
-
+
-
+
-
@@ -121,8 +102,8 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
-
+
+
@@ -426,14 +407,14 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
-
+
-
+
-
+
-
-
+
-
+
-
-
+
-
+
-
-
+
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
-
-
+
@@ -766,7 +747,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -783,7 +764,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -800,7 +781,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -817,7 +798,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -834,7 +815,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -851,7 +832,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -868,7 +849,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -885,7 +866,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -902,7 +883,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -919,7 +900,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -936,7 +917,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -953,7 +934,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -970,7 +951,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -987,7 +968,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -1004,7 +985,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -1021,7 +1002,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -1038,7 +1019,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -1055,7 +1036,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
+
@@ -1071,6 +1052,23 @@ You can present via either Storyboard or Code and you can see the code in the Ex
+
+
+
+
+
+
+
+
+
+
+
@@ -1134,6 +1132,7 @@ You can present via either Storyboard or Code and you can see the code in the Ex
+
@@ -1163,147 +1162,6 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1321,24 +1179,6 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1357,23 +1197,6 @@ You can present via either Storyboard or Code and you can see the code in the Ex
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ExampleApp/Views/BaseViewController.swift b/ExampleApp/Views/BaseViewController.swift
index 6ebf9e7c..b5572e28 100644
--- a/ExampleApp/Views/BaseViewController.swift
+++ b/ExampleApp/Views/BaseViewController.swift
@@ -9,20 +9,14 @@
import UIKit
import OmiseSDK
-enum CodePathMode: Int {
- case storyboard = 0
- case code = 1
-}
-
class BaseViewController: UIViewController {
@IBOutlet private var modeChooser: UISegmentedControl!
- var currentCodePathMode: CodePathMode = .code
var paymentAmount: Int64 = 0
var paymentCurrencyCode: String = ""
var usesCapabilityDataForPaymentMethods = false
- var allowedPaymentMethods: [SourceTypeValue] = []
+ var allowedPaymentMethods: [SourceType] = []
required init?(coder: NSCoder) {
self.usesCapabilityDataForPaymentMethods = true
@@ -42,12 +36,6 @@ class BaseViewController: UIViewController {
updateUIColors()
- modeChooser.selectedSegmentIndex = CodePathMode.code.rawValue
-
- #if INTERNAL_TEST
- modeChooser.isEnabled = false
- #endif
-
let localeCountryCode: String? = {
if #available(iOS 16, *) {
return Locale.current.region?.identifier
@@ -183,13 +171,4 @@ class BaseViewController: UIViewController {
self.usesCapabilityDataForPaymentMethods = settingViewController.usesCapabilityDataForPaymentMethods
self.allowedPaymentMethods = Array(settingViewController.allowedPaymentMethods)
}
-
- @IBAction private func codePathModeChangedHandler(_ sender: UISegmentedControl) {
- if sender.selectedSegmentIndex == CodePathMode.code.rawValue {
- self.currentCodePathMode = .code
- } else {
- self.currentCodePathMode = .storyboard
- }
- }
-
}
diff --git a/ExampleApp/Views/CustomCreditCardFormViewController.swift b/ExampleApp/Views/CustomCreditCardFormViewController.swift
index 0840a965..d7e74443 100644
--- a/ExampleApp/Views/CustomCreditCardFormViewController.swift
+++ b/ExampleApp/Views/CustomCreditCardFormViewController.swift
@@ -2,24 +2,21 @@ import UIKit
import OmiseSDK
// swiftlint:disable:next type_name
-protocol CustomCreditCardFormViewControllerDelegate: AnyObject {
+protocol CustomCreditCardPaymentControllerDelegate: AnyObject {
/// Delegate method for receiving token data when card tokenization succeeds.
/// - parameter token: `OmiseToken` instance created from supplied credit card data.
/// - seealso: [Tokens API](https://www.omise.co/tokens-api)
- func creditCardFormViewController(_ controller: CustomCreditCardFormViewController, didSucceedWithToken token: Token)
+ func creditCardFormViewController(_ controller: CustomCreditCardPaymentController, didSucceedWithToken token: Token)
/// Delegate method for receiving error information when card tokenization failed.
/// This allows you to have fine-grained control over error handling when setting
/// `handleErrors` to `false`.
/// - parameter error: The error that occurred during tokenization.
/// - note: This delegate method will *never* be called if `handleErrors` property is set to `true`.
- func creditCardFormViewController(_ controller: CustomCreditCardFormViewController, didFailWithError error: Error)
+ func creditCardFormViewController(_ controller: CustomCreditCardPaymentController, didFailWithError error: Error)
}
-class CustomCreditCardFormViewController: UIViewController {
-
- let omiseClient = Client(publicKey: LocalConfig.default.publicKey)
-
+class CustomCreditCardPaymentController: UIViewController {
@IBOutlet private var cardNumberField: CardNumberTextField!
@IBOutlet private var cardNameField: CardNameTextField!
@IBOutlet private var cardExpiryField: CardExpiryDateTextField!
@@ -36,90 +33,88 @@ class CustomCreditCardFormViewController: UIViewController {
@IBOutlet private var doneButton: UIBarButtonItem!
- weak var delegate: CustomCreditCardFormViewControllerDelegate?
+ weak var delegate: CustomCreditCardPaymentControllerDelegate?
// need to refactor loadView, removing super results in crash
// swiftlint:disable:next prohibited_super_call function_body_length
override func loadView() {
super.loadView()
- if storyboard == nil {
- view.backgroundColor = .background
-
- billingStackView = UIStackView()
- billingStackView.axis = .vertical
- billingStackView.spacing = 24
- billingStackView.distribution = .equalSpacing
- billingStackView.alignment = .fill
-
- cardNumberField = CardNumberTextField()
- cardNumberField.translatesAutoresizingMaskIntoConstraints = false
- cardNumberField.placeholder = "1234567812345678"
- cardNameField = CardNameTextField()
- cardNameField.translatesAutoresizingMaskIntoConstraints = false
- cardNameField.placeholder = "John Appleseed"
- cardExpiryField = CardExpiryDateTextField()
- cardExpiryField.translatesAutoresizingMaskIntoConstraints = false
- cardExpiryField.placeholder = "MM/yy Date Format"
- cardCVVField = CardCVVTextField()
- cardCVVField.translatesAutoresizingMaskIntoConstraints = false
- cardCVVField.placeholder = "321"
-
- let cardNumberLabel = UILabel()
- cardNumberLabel.text = "Card Number"
- cardNumberLabel.translatesAutoresizingMaskIntoConstraints = false
- let cardNumberStackView = UIStackView(arrangedSubviews: [cardNumberLabel, cardNumberField])
- let cardNameLabel = UILabel()
- cardNameLabel.text = "Card Name"
- cardNameLabel.translatesAutoresizingMaskIntoConstraints = false
- let cardNameStackView = UIStackView(arrangedSubviews: [cardNameLabel, cardNameField])
- let cardExpiryLabel = UILabel()
- cardExpiryLabel.text = "Card Expiry"
- cardExpiryLabel.translatesAutoresizingMaskIntoConstraints = false
- let cardExpiryStackView = UIStackView(arrangedSubviews: [cardExpiryLabel, cardExpiryField])
- let cardCVVLabel = UILabel()
- cardCVVLabel.text = "Card CVV"
- cardCVVLabel.translatesAutoresizingMaskIntoConstraints = false
- let cardCVVStackView = UIStackView(arrangedSubviews: [cardCVVLabel, cardCVVField])
-
- let lowerRowStackView = UIStackView(arrangedSubviews: [cardExpiryStackView, cardCVVStackView])
-
- cardNumberStackView.axis = .vertical
- cardNumberStackView.distribution = .fill
- cardNumberStackView.alignment = .fill
- cardNumberStackView.spacing = 10
- cardNameStackView.axis = .vertical
- cardNameStackView.distribution = .fill
- cardNameStackView.alignment = .fill
- cardNameStackView.spacing = 10
- cardExpiryStackView.axis = .vertical
- cardExpiryStackView.distribution = .fill
- cardExpiryStackView.alignment = .fill
- cardExpiryStackView.spacing = 10
- cardCVVStackView.axis = .vertical
- cardCVVStackView.distribution = .fill
- cardCVVStackView.alignment = .fill
- cardCVVStackView.spacing = 10
- lowerRowStackView.axis = .horizontal
- lowerRowStackView.distribution = .fillEqually
- lowerRowStackView.alignment = .fill
- lowerRowStackView.spacing = 10
-
- let stackView = UIStackView(arrangedSubviews: [cardNumberStackView, cardNameStackView, lowerRowStackView])
- stackView.translatesAutoresizingMaskIntoConstraints = false
- stackView.axis = .vertical
- stackView.distribution = .fill
- stackView.alignment = .fill
- stackView.spacing = 20
-
- view.addSubview(stackView)
- NSLayoutConstraint.activate([
- stackView.leadingAnchor.constraint(equalTo: view.layoutMarginsGuide.leadingAnchor),
- stackView.trailingAnchor.constraint(equalTo: view.layoutMarginsGuide.trailingAnchor),
- stackView.topAnchor.constraint(equalTo: view.layoutMarginsGuide.topAnchor, constant: 20),
- stackView.bottomAnchor.constraint(lessThanOrEqualTo: view.layoutMarginsGuide.bottomAnchor)
- ])
- }
+ view.backgroundColor = .background
+
+ billingStackView = UIStackView()
+ billingStackView.axis = .vertical
+ billingStackView.spacing = 24
+ billingStackView.distribution = .equalSpacing
+ billingStackView.alignment = .fill
+
+ cardNumberField = CardNumberTextField()
+ cardNumberField.translatesAutoresizingMaskIntoConstraints = false
+ cardNumberField.placeholder = "1234567812345678"
+ cardNameField = CardNameTextField()
+ cardNameField.translatesAutoresizingMaskIntoConstraints = false
+ cardNameField.placeholder = "John Appleseed"
+ cardExpiryField = CardExpiryDateTextField()
+ cardExpiryField.translatesAutoresizingMaskIntoConstraints = false
+ cardExpiryField.placeholder = "MM/yy Date Format"
+ cardCVVField = CardCVVTextField()
+ cardCVVField.translatesAutoresizingMaskIntoConstraints = false
+ cardCVVField.placeholder = "321"
+
+ let cardNumberLabel = UILabel()
+ cardNumberLabel.text = "Card Number"
+ cardNumberLabel.translatesAutoresizingMaskIntoConstraints = false
+ let cardNumberStackView = UIStackView(arrangedSubviews: [cardNumberLabel, cardNumberField])
+ let cardNameLabel = UILabel()
+ cardNameLabel.text = "Card Name"
+ cardNameLabel.translatesAutoresizingMaskIntoConstraints = false
+ let cardNameStackView = UIStackView(arrangedSubviews: [cardNameLabel, cardNameField])
+ let cardExpiryLabel = UILabel()
+ cardExpiryLabel.text = "Card Expiry"
+ cardExpiryLabel.translatesAutoresizingMaskIntoConstraints = false
+ let cardExpiryStackView = UIStackView(arrangedSubviews: [cardExpiryLabel, cardExpiryField])
+ let cardCVVLabel = UILabel()
+ cardCVVLabel.text = "Card CVV"
+ cardCVVLabel.translatesAutoresizingMaskIntoConstraints = false
+ let cardCVVStackView = UIStackView(arrangedSubviews: [cardCVVLabel, cardCVVField])
+
+ let lowerRowStackView = UIStackView(arrangedSubviews: [cardExpiryStackView, cardCVVStackView])
+
+ cardNumberStackView.axis = .vertical
+ cardNumberStackView.distribution = .fill
+ cardNumberStackView.alignment = .fill
+ cardNumberStackView.spacing = 10
+ cardNameStackView.axis = .vertical
+ cardNameStackView.distribution = .fill
+ cardNameStackView.alignment = .fill
+ cardNameStackView.spacing = 10
+ cardExpiryStackView.axis = .vertical
+ cardExpiryStackView.distribution = .fill
+ cardExpiryStackView.alignment = .fill
+ cardExpiryStackView.spacing = 10
+ cardCVVStackView.axis = .vertical
+ cardCVVStackView.distribution = .fill
+ cardCVVStackView.alignment = .fill
+ cardCVVStackView.spacing = 10
+ lowerRowStackView.axis = .horizontal
+ lowerRowStackView.distribution = .fillEqually
+ lowerRowStackView.alignment = .fill
+ lowerRowStackView.spacing = 10
+
+ let verticalContainerStack = UIStackView(arrangedSubviews: [cardNumberStackView, cardNameStackView, lowerRowStackView])
+ verticalContainerStack.translatesAutoresizingMaskIntoConstraints = false
+ verticalContainerStack.axis = .vertical
+ verticalContainerStack.distribution = .fill
+ verticalContainerStack.alignment = .fill
+ verticalContainerStack.spacing = 20
+
+ view.addSubview(verticalContainerStack)
+ NSLayoutConstraint.activate([
+ verticalContainerStack.leadingAnchor.constraint(equalTo: view.layoutMarginsGuide.leadingAnchor),
+ verticalContainerStack.trailingAnchor.constraint(equalTo: view.layoutMarginsGuide.trailingAnchor),
+ verticalContainerStack.topAnchor.constraint(equalTo: view.layoutMarginsGuide.topAnchor, constant: 20),
+ verticalContainerStack.bottomAnchor.constraint(lessThanOrEqualTo: view.layoutMarginsGuide.bottomAnchor)
+ ])
setupBillingAddressFields()
}
@@ -127,12 +122,10 @@ class CustomCreditCardFormViewController: UIViewController {
override func viewDidLoad() {
super.viewDidLoad()
- if storyboard == nil {
- let saveButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.proceed))
- navigationItem.rightBarButtonItem = saveButtonItem
- self.doneButton = saveButtonItem
- navigationItem.title = "Custom Credit Card Form"
- }
+ let saveButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.proceed))
+ navigationItem.rightBarButtonItem = saveButtonItem
+ self.doneButton = saveButtonItem
+ navigationItem.title = "Custom Credit Card Form"
}
private func setupBillingAddressFields() {
@@ -158,15 +151,17 @@ class CustomCreditCardFormViewController: UIViewController {
@IBAction private func proceed(_ sender: UIBarButtonItem) {
guard let name = cardNameField.text, cardNumberField.isValid,
let expiryMonth = cardExpiryField.selectedMonth, let expiryYear = cardExpiryField.selectedYear,
- let cvv = cardCVVField.text else {
+ let cvv = cardCVVField.text, let number = cardNumberField.text else {
return
}
- let tokenRequest = Request(
+
+ let card = CreateTokenPayload.Card(
name: name,
- pan: cardNumberField.pan,
+ number: number,
expirationMonth: expiryMonth,
expirationYear: expiryYear,
securityCode: cvv,
+ phoneNumber: nil,
countryCode: countryCodeField.text ?? "",
city: cityField.text ?? "",
state: stateField.text ?? "",
@@ -175,8 +170,9 @@ class CustomCreditCardFormViewController: UIViewController {
postalCode: postalCodeField.text ?? ""
)
+ let payload = CreateTokenPayload(card: card)
doneButton.isEnabled = false
- omiseClient.send(tokenRequest) { [weak self] (result) in
+ OmiseSDK.shared.client.createToken(payload: payload) { [weak self] (result) in
guard let self = self else { return }
self.doneButton.isEnabled = false
switch result {
diff --git a/ExampleApp/Views/PaymentSettingTableViewController.swift b/ExampleApp/Views/PaymentSettingTableViewController.swift
index cb98e60b..24c33268 100644
--- a/ExampleApp/Views/PaymentSettingTableViewController.swift
+++ b/ExampleApp/Views/PaymentSettingTableViewController.swift
@@ -54,7 +54,7 @@ class PaymentSettingTableViewController: UITableViewController {
}
}
- var allowedPaymentMethods: Set = [] {
+ var allowedPaymentMethods: Set = [] {
willSet {
guard isViewLoaded else {
return
@@ -122,6 +122,7 @@ class PaymentSettingTableViewController: UITableViewController {
@IBOutlet private var grabPayPaymentCell: UITableViewCell!
@IBOutlet private var boostPaymentCell: UITableViewCell!
@IBOutlet private var shopeePayPaymentCell: UITableViewCell!
+ @IBOutlet private var shopeePayJumpAppPaymentCell: UITableViewCell!
@IBOutlet private var maybankQRPayPaymentCell: UITableViewCell!
@IBOutlet private var duitNowQRPaymentCell: UITableViewCell!
@IBOutlet private var duitNowOBWPaymentCell: UITableViewCell!
@@ -264,7 +265,7 @@ extension PaymentSettingTableViewController {
}
// swiftlint:disable:next function_body_length
- func paymentSource(for cell: UITableViewCell) -> SourceTypeValue? {
+ func paymentSource(for cell: UITableViewCell) -> SourceType? {
switch cell {
case internetBankingBAYPaymentCell:
return .internetBankingBAY
@@ -325,7 +326,7 @@ extension PaymentSettingTableViewController {
case paynowPaymentCell:
return .payNow
case truemoneyPaymentCell:
- return .trueMoney
+ return .trueMoneyWallet
case truemoneyJumpAppPaymentCell:
return .trueMoneyJumpApp
case pointsCitiCell:
@@ -335,13 +336,15 @@ extension PaymentSettingTableViewController {
case rabbitLinepayCell:
return .rabbitLinepay
case OCBCDigitalPaymentCell:
- return .mobileBankingOCBC
+ return .ocbcDigital
case grabPayPaymentCell:
return .grabPay
case boostPaymentCell:
return .boost
case shopeePayPaymentCell:
return .shopeePay
+ case shopeePayJumpAppPaymentCell:
+ return .shopeePayJumpApp
case maybankQRPayPaymentCell:
return .maybankQRPay
case duitNowQRPaymentCell:
@@ -356,7 +359,7 @@ extension PaymentSettingTableViewController {
}
// swiftlint:disable:next function_body_length
- func cell(for paymentSource: SourceTypeValue) -> UITableViewCell? {
+ func cell(for paymentSource: SourceType) -> UITableViewCell? {
switch paymentSource {
case .internetBankingBAY:
return internetBankingBAYPaymentCell
@@ -400,7 +403,7 @@ extension PaymentSettingTableViewController {
return installmentUOBPaymentCell
case .mobileBankingSCB:
return mobileBankingSCBPaymentCell
- case .mobileBankingOCBC:
+ case .ocbcDigital:
return OCBCDigitalPaymentCell
case .mobileBankingKBank:
return mobileBankingKBankPaymentCell
@@ -418,7 +421,7 @@ extension PaymentSettingTableViewController {
return paynowPaymentCell
case .payPay:
return payPayPaymentCell
- case .trueMoney:
+ case .trueMoneyWallet:
return truemoneyPaymentCell
case .trueMoneyJumpApp:
return truemoneyJumpAppPaymentCell
@@ -434,6 +437,8 @@ extension PaymentSettingTableViewController {
return boostPaymentCell
case .shopeePay:
return shopeePayPaymentCell
+ case .shopeePayJumpApp:
+ return shopeePayJumpAppPaymentCell
case .maybankQRPay:
return maybankQRPayPaymentCell
case .duitNowQR:
diff --git a/ExampleApp/Views/ProductDetailViewController.swift b/ExampleApp/Views/ProductDetailViewController.swift
index 4daa28ad..77a7ff42 100644
--- a/ExampleApp/Views/ProductDetailViewController.swift
+++ b/ExampleApp/Views/ProductDetailViewController.swift
@@ -2,118 +2,54 @@ import UIKit
import OmiseSDK
class ProductDetailViewController: BaseViewController {
- private let publicKey = LocalConfig.default.publicKey
-
- private var capability: Capability?
-
- override func viewDidLoad() {
- super.viewDidLoad()
- setupClient()
- }
-
- private func setupClient() {
- // Setup dev environment for staging
- Configuration.setDefault(Configuration(environment: LocalConfig.default.env))
-
- let client = Client(publicKey: publicKey)
+ let omiseSDK = {
+ // Initialize OmiseSDK instance with given publicKey and optional configuration used for testing
+ let omiseSDK = OmiseSDK(
+ publicKey: LocalConfig.default.publicKey,
+ configuration: LocalConfig.default.configuration
+ )
+ // Setup shared instance to use from other screens if required
+ OmiseSDK.shared = omiseSDK
+ return omiseSDK
+ }()
- client.capabilityDataWithCompletionHandler { (result) in
+ private func loadCapability() {
+ omiseSDK.client.capability { (result) in
if case .success(let capability) = result {
- self.capability = capability
print("Capability Country: \(capability.countryCode)")
}
}
}
-
- override func shouldPerformSegue(withIdentifier identifier: String, sender: Any?) -> Bool {
- if identifier == "PresentCreditFormWithModal" ||
- identifier == "ShowCreditForm" ||
- identifier == "PresentPaymentCreator" ||
- identifier == "ShowCreditFormWithCustomFields" {
- return currentCodePathMode == .storyboard
- }
-
- return true
- }
-
- override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
- super.prepare(for: segue, sender: sender)
-
- if segue.identifier == "PresentCreditFormWithModal",
- let creditCardFormNavigationController = segue.destination as? UINavigationController,
- let creditCardFormController = creditCardFormNavigationController.topViewController as? CreditCardFormViewController {
- creditCardFormController.publicKey = publicKey
- creditCardFormController.handleErrors = true
- creditCardFormController.delegate = self
- } else if segue.identifier == "ShowCreditForm",
- let creditCardFormController = segue.destination as? CreditCardFormViewController {
- creditCardFormController.publicKey = publicKey
- creditCardFormController.handleErrors = true
- creditCardFormController.delegate = self
- } else if segue.identifier == "PresentPaymentCreator",
- let paymentCreatorController = segue.destination as? PaymentCreatorController {
- paymentCreatorController.publicKey = self.publicKey
- paymentCreatorController.paymentAmount = paymentAmount
- paymentCreatorController.paymentCurrency = Currency(code: paymentCurrencyCode)
- if usesCapabilityDataForPaymentMethods, let capability = self.capability {
- paymentCreatorController.applyPaymentMethods(from: capability)
- } else {
- paymentCreatorController.allowedPaymentMethods = allowedPaymentMethods
- }
- paymentCreatorController.paymentDelegate = self
- } else if segue.identifier == "ShowCreditFormWithCustomFields",
- let vc = segue.destination as? CustomCreditCardFormViewController {
- vc.delegate = self
- }
- }
-
- @IBAction private func showModalCreditCardForm(_ sender: Any) {
- guard currentCodePathMode == .code else {
- return
- }
- let creditCardFormController = CreditCardFormViewController.makeCreditCardFormViewController(withPublicKey: publicKey)
- creditCardFormController.handleErrors = true
- creditCardFormController.delegate = self
- let navigationController = UINavigationController(rootViewController: creditCardFormController)
- present(navigationController, animated: true, completion: nil)
- }
-
- @IBAction private func showCreditCardForm(_ sender: UIButton) {
- guard currentCodePathMode == .code else {
- return
- }
- let creditCardFormController = CreditCardFormViewController.makeCreditCardFormViewController(withPublicKey: publicKey)
- creditCardFormController.handleErrors = true
- creditCardFormController.delegate = self
- show(creditCardFormController, sender: self)
+
+ @IBAction private func showModalCreditCardPayment(_ sender: Any) {
+ let viewController = omiseSDK.creditCardController(delegate: self)
+ present(viewController, animated: true, completion: nil)
}
@IBAction private func showModalPaymentCreator(_ sender: Any) {
- guard currentCodePathMode == .code else {
- return
- }
- let paymentCreatorController = PaymentCreatorController.makePaymentCreatorControllerWith(
- publicKey: publicKey,
- amount: paymentAmount,
- currency: Currency(code: paymentCurrencyCode),
- allowedPaymentMethods: allowedPaymentMethods,
- paymentDelegate: self
- )
-
- if usesCapabilityDataForPaymentMethods, let capability = self.capability {
- paymentCreatorController.applyPaymentMethods(from: capability)
+ if usesCapabilityDataForPaymentMethods {
+ let viewController = omiseSDK.choosePaymentMethodFromCapabilityController(
+ amount: paymentAmount,
+ currency: paymentCurrencyCode,
+ delegate: self
+ )
+ present(viewController, animated: true, completion: nil)
+ } else {
+ let viewController = omiseSDK.choosePaymentMethodController(
+ amount: paymentAmount,
+ currency: paymentCurrencyCode,
+ allowedPaymentMethods: allowedPaymentMethods,
+ allowedCardPayment: true,
+ delegate: self
+ )
+ present(viewController, animated: true, completion: nil)
}
-
- present(paymentCreatorController, animated: true, completion: nil)
}
- @IBAction private func showCustomCreditCardForm(_ sender: Any) {
- guard currentCodePathMode == .code else {
- return
- }
- let customCreditCardFormController = CustomCreditCardFormViewController(nibName: nil, bundle: nil)
- customCreditCardFormController.delegate = self
- show(customCreditCardFormController, sender: sender)
+ @IBAction private func showCustomCreditCardPayment(_ sender: Any) {
+ let customCreditCardPaymentController = CustomCreditCardPaymentController(nibName: nil, bundle: nil)
+ customCreditCardPaymentController.delegate = self
+ show(customCreditCardPaymentController, sender: sender)
}
@IBAction private func handlingAuthorizingPayment(_ sender: UIBarButtonItem) {
@@ -122,30 +58,41 @@ class ProductDetailViewController: BaseViewController {
preferredStyle: .alert)
alertController.addTextField(configurationHandler: nil)
alertController.addAction(UIAlertAction(title: "Cancel", style: UIAlertAction.Style.cancel, handler: nil))
- alertController.addAction(UIAlertAction(title: "Go", style: UIAlertAction.Style.default) { (_) in
- guard let textField = alertController.textFields?.first,
+ alertController.addAction(UIAlertAction(title: "Go", style: UIAlertAction.Style.default) { [weak self ](_) in
+ guard let self = self,
+ let textField = alertController.textFields?.first,
let text = textField.text,
let url = URL(string: text),
let expectedReturnURL = URLComponents(string: "https://opn.ooo/") else { return }
- let handlerController =
- AuthorizingPaymentViewController
- .makeAuthorizingPaymentViewControllerNavigationWithAuthorizedURL(
- url, expectedReturnURLPatterns: [expectedReturnURL], delegate: self)
+ let handlerController = self.omiseSDK.authorizedController(
+ authorizedURL: url,
+ expectedReturnURLPatterns: [expectedReturnURL],
+ delegate: self
+ )
self.present(handlerController, animated: true, completion: nil)
})
present(alertController, animated: true, completion: nil)
}
}
-// MARK: - Credit Card Form View Controller Delegate
+// MARK: - Authorizing Payment View Controller Delegate
-extension ProductDetailViewController: CreditCardFormViewControllerDelegate {
- func creditCardFormViewControllerDidCancel(_ controller: CreditCardFormViewController) {
- dismissForm()
+extension ProductDetailViewController: AuthorizingPaymentViewControllerDelegate {
+ func authorizingPaymentViewController(_ viewController: AuthorizingPaymentViewController, didCompleteAuthorizingPaymentWithRedirectedURL redirectedURL: URL) {
+ print(redirectedURL)
+ dismiss(animated: true, completion: nil)
}
- func creditCardFormViewController(_ controller: CreditCardFormViewController, didSucceedWithToken token: Token) {
+ func authorizingPaymentViewControllerDidCancel(_ viewController: AuthorizingPaymentViewController) {
+ dismiss(animated: true, completion: nil)
+ }
+}
+
+// MARK: - Custom Credit Card Form View Controller Delegate
+
+extension ProductDetailViewController: CustomCreditCardPaymentControllerDelegate {
+ func creditCardFormViewController(_ controller: CustomCreditCardPaymentController, didSucceedWithToken token: Token) {
dismissForm {
let alertController = UIAlertController(
title: "Token Created",
@@ -158,7 +105,7 @@ extension ProductDetailViewController: CreditCardFormViewControllerDelegate {
}
}
- func creditCardFormViewController(_ controller: CreditCardFormViewController, didFailWithError error: Error) {
+ func creditCardFormViewController(_ controller: CustomCreditCardPaymentController, didFailWithError error: Error) {
dismissForm {
let alertController = UIAlertController(
title: "Error",
@@ -172,40 +119,13 @@ extension ProductDetailViewController: CreditCardFormViewControllerDelegate {
}
}
-// MARK: - Authorizing Payment View Controller Delegate
-
-extension ProductDetailViewController: AuthorizingPaymentViewControllerDelegate {
- func authorizingPaymentViewController(_ viewController: AuthorizingPaymentViewController, didCompleteAuthorizingPaymentWithRedirectedURL redirectedURL: URL) {
- print(redirectedURL)
- dismiss(animated: true, completion: nil)
- }
-
- func authorizingPaymentViewControllerDidCancel(_ viewController: AuthorizingPaymentViewController) {
- dismiss(animated: true, completion: nil)
- }
-}
-
-// MARK: - Payment Creator Controller Delegate
-
-extension ProductDetailViewController: PaymentCreatorControllerDelegate {
-
- func paymentCreatorController(_ paymentCreatorController: PaymentCreatorController, didCreatePayment payment: Payment) {
+/// Processing result of choosing Payment Method screen
+extension ProductDetailViewController: ChoosePaymentMethodDelegate {
+ func choosePaymentMethodDidComplete(with source: Source) {
dismissForm {
- let title: String
- let message: String
-
- switch payment {
- case .token(let token):
- title = "Token Created"
- message = "A token with id of \(token.id) was successfully created. Please send this id to server to create a charge."
- case .source(let source):
- title = "Token Created"
- message = "A source with id of \(source.id) was successfully created. Please send this id to server to create a charge."
- }
-
let alertController = UIAlertController(
- title: title,
- message: message,
+ title: "Source Created\n(\(source.paymentInformation.sourceType.rawValue))",
+ message: "A source with id of \(source.id) was successfully created. Please send this id to server to create a charge.",
preferredStyle: .alert
)
let okAction = UIAlertAction(title: "OK", style: .cancel, handler: nil)
@@ -213,23 +133,8 @@ extension ProductDetailViewController: PaymentCreatorControllerDelegate {
self.present(alertController, animated: true, completion: nil)
}
}
-
- func paymentCreatorController(_ paymentCreatorController: PaymentCreatorController, didFailWithError error: Error) {
- let alertController = UIAlertController(title: "Error", message: error.localizedDescription, preferredStyle: .alert)
- let okAction = UIAlertAction(title: "OK", style: .cancel, handler: nil)
- alertController.addAction(okAction)
- paymentCreatorController.present(alertController, animated: true, completion: nil)
- }
-
- func paymentCreatorControllerDidCancel(_ paymentCreatorController: PaymentCreatorController) {
- dismissForm()
- }
-}
-
-// MARK: - Custom Credit Card Form View Controller Delegate
-extension ProductDetailViewController: CustomCreditCardFormViewControllerDelegate {
- func creditCardFormViewController(_ controller: CustomCreditCardFormViewController, didSucceedWithToken token: Token) {
+ func choosePaymentMethodDidComplete(with token: Token) {
dismissForm {
let alertController = UIAlertController(
title: "Token Created",
@@ -241,17 +146,17 @@ extension ProductDetailViewController: CustomCreditCardFormViewControllerDelegat
self.present(alertController, animated: true, completion: nil)
}
}
-
- func creditCardFormViewController(_ controller: CustomCreditCardFormViewController, didFailWithError error: Error) {
+
+ func choosePaymentMethodDidComplete(with error: Error) {
dismissForm {
- let alertController = UIAlertController(
- title: "Error",
- message: error.localizedDescription,
- preferredStyle: .alert
- )
+ let alertController = UIAlertController(title: "Error", message: error.localizedDescription, preferredStyle: .alert)
let okAction = UIAlertAction(title: "OK", style: .cancel, handler: nil)
alertController.addAction(okAction)
self.present(alertController, animated: true, completion: nil)
}
}
+
+ func choosePaymentMethodDidCancel() {
+ dismissForm()
+ }
}
diff --git a/Helpers/OmiseSwiftUIKit/.swiftpm/xcode/xcshareddata/xcschemes/OmiseSwiftUIKit.xcscheme b/Helpers/OmiseSwiftUIKit/.swiftpm/xcode/xcshareddata/xcschemes/OmiseSwiftUIKit.xcscheme
new file mode 100644
index 00000000..c18d801b
--- /dev/null
+++ b/Helpers/OmiseSwiftUIKit/.swiftpm/xcode/xcshareddata/xcschemes/OmiseSwiftUIKit.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Helpers/OmiseSwiftUIKit/Sources/OmiseSwiftUIKit/UIKitLiveKit/UIKitViewControllerPresentable.swift b/Helpers/OmiseSwiftUIKit/Sources/OmiseSwiftUIKit/UIKitLiveKit/UIKitViewControllerPresentable.swift
index cfe602db..e249072d 100644
--- a/Helpers/OmiseSwiftUIKit/Sources/OmiseSwiftUIKit/UIKitLiveKit/UIKitViewControllerPresentable.swift
+++ b/Helpers/OmiseSwiftUIKit/Sources/OmiseSwiftUIKit/UIKitLiveKit/UIKitViewControllerPresentable.swift
@@ -8,14 +8,14 @@
import SwiftUI
import UIKit
-struct UIKitViewControllerPresentable: UIViewControllerRepresentable {
- let viewController: VC
+public struct UIKitViewControllerPresentable: UIViewControllerRepresentable {
+ public let viewController: VC
- func makeUIViewController(context: Context) -> VC {
+ public func makeUIViewController(context: Context) -> VC {
viewController
}
- func updateUIViewController(_ uiViewController: VC, context: Context) {
+ public func updateUIViewController(_ uiViewController: VC, context: Context) {
// viewController
}
}
diff --git a/Helpers/OmiseSwiftUIKit/Sources/OmiseSwiftUIKit/UIKitLiveKit/UIKitViewPresentable.swift b/Helpers/OmiseSwiftUIKit/Sources/OmiseSwiftUIKit/UIKitLiveKit/UIKitViewPresentable.swift
index 2a4e8e6c..e9be9702 100644
--- a/Helpers/OmiseSwiftUIKit/Sources/OmiseSwiftUIKit/UIKitLiveKit/UIKitViewPresentable.swift
+++ b/Helpers/OmiseSwiftUIKit/Sources/OmiseSwiftUIKit/UIKitLiveKit/UIKitViewPresentable.swift
@@ -8,13 +8,13 @@
import SwiftUI
import UIKit
-struct UIKitViewPresentable: UIViewRepresentable {
- let view: V
+public struct UIKitViewPresentable: UIViewRepresentable {
+ public let view: V
- func makeUIView(context: Context) -> V {
+ public func makeUIView(context: Context) -> V {
return view
}
- func updateUIView(_ uiView: V, context: Context) {
+ public func updateUIView(_ uiView: V, context: Context) {
}
}
diff --git a/Helpers/OmiseUnitTestKit/.swiftpm/xcode/xcshareddata/xcschemes/OmiseUnitTestKit.xcscheme b/Helpers/OmiseUnitTestKit/.swiftpm/xcode/xcshareddata/xcschemes/OmiseUnitTestKit.xcscheme
new file mode 100644
index 00000000..ca4a4fa3
--- /dev/null
+++ b/Helpers/OmiseUnitTestKit/.swiftpm/xcode/xcshareddata/xcschemes/OmiseUnitTestKit.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OmiseSDK/AdaptableDynamicTableViewController.swift b/OmiseSDK/AdaptableDynamicTableViewController.swift
deleted file mode 100644
index cdef1477..00000000
--- a/OmiseSDK/AdaptableDynamicTableViewController.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-import UIKit
-
-public class AdaptableDynamicTableViewController: UITableViewController {
-
- public var showingValues: [Element] = [] {
- didSet {
- if isViewLoaded {
- tableView.reloadData()
- }
- }
- }
-
- public override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
- return showingValues.count
- }
-
- public func element(forUIIndexPath indexPath: IndexPath) -> Element {
- return showingValues[indexPath.row]
- }
-}
diff --git a/OmiseSDK/AdaptableStaticTableViewController.swift b/OmiseSDK/AdaptableStaticTableViewController.swift
deleted file mode 100644
index ef3b4680..00000000
--- a/OmiseSDK/AdaptableStaticTableViewController.swift
+++ /dev/null
@@ -1,35 +0,0 @@
-import UIKit
-
-public class AdaptableStaticTableViewController: UITableViewController {
-
- public var showingValues: [Element] = [] {
- didSet {
- if isViewLoaded {
- tableView.reloadData()
- }
- }
- }
-
- public override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
- return showingValues.count
- }
-
- public override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- let staticIndexPath = calculateStaticIndexPath(fromUIIndexPath: indexPath)
- return super.tableView(tableView, cellForRowAt: staticIndexPath)
- }
-
- public func calculateStaticIndexPath(fromUIIndexPath indexPath: IndexPath) -> IndexPath {
- return staticIndexPath(forValue: element(forUIIndexPath: indexPath))
- }
-
- public func staticIndexPath(forValue value: Element) -> IndexPath {
- let allCases = Element.allCases
- let index = allCases.firstIndex(of: value)! // swiftlint:disable:this force_unwrapping
- return IndexPath(row: allCases.distance(from: allCases.startIndex, to: index), section: 0)
- }
-
- public func element(forUIIndexPath indexPath: IndexPath) -> Element {
- return showingValues[indexPath.row]
- }
-}
diff --git a/OmiseSDK/Capability.swift b/OmiseSDK/Capability.swift
deleted file mode 100644
index 3060387d..00000000
--- a/OmiseSDK/Capability.swift
+++ /dev/null
@@ -1,502 +0,0 @@
-// swiftlint:disable file_length
-import Foundation
-
-public struct Capability: Object {
- public let countryCode: String
- public let location: String
- public let object: String
-
- public let supportedBanks: Set
-
- public let supportedBackends: [Backend]
-
- private let backends: [Capability.Backend.BackendType: Backend]
-
- public var creditCardBackend: Capability.Backend? {
- return backends[.card]
- }
-
- public subscript(type: SourceTypeValue) -> Capability.Backend? {
- return backends[.source(type)]
- }
-}
-
-extension Capability {
- public static func ~= (lhs: Capability, rhs: CreateSourceParameter) -> Bool {
- func backend(from capability: Capability, for payment: PaymentInformation) -> Backend? {
- if let paymentSourceType = SourceTypeValue(payment.sourceType) {
- return capability[paymentSourceType]
- } else {
- return nil
- }
- }
-
- guard let backend = backend(from: lhs, for: rhs.paymentInformation) else {
- return false
- }
-
- let isValidValue = backend.supportedCurrencies.contains(rhs.currency)
-
- let isPaymentValid: Bool
- switch backend.payment {
- case .installment(_, availableNumberOfTerms: let availableNumberofTerms):
- if case .installment(let installment) = rhs.paymentInformation {
- isPaymentValid = availableNumberofTerms.contains(installment.numberOfTerms)
- } else {
- isPaymentValid = false
- }
- default:
- isPaymentValid = true
- }
-
- return isValidValue && isPaymentValid
- }
-}
-
-extension Capability {
- public struct Backend: Codable, Equatable {
- public let payment: Payment
- public let supportedCurrencies: Set
- public let banks: [Bank]?
-
- public enum Payment: Equatable {
- case card(Set)
- case installment(PaymentInformation.Installment.Brand, availableNumberOfTerms: IndexSet)
- case internetBanking(PaymentInformation.InternetBanking)
- case mobileBanking(PaymentInformation.MobileBanking)
- case billPayment(PaymentInformation.BillPayment)
- case alipay
- case alipayCN
- case alipayHK
- case atome
- case dana
- case gcash
- case kakaoPay
- case touchNGoAlipayPlus
- case touchNGo
- case promptpay
- case paynow
- case truemoney
- case truemoneyJumpApp
- case points(PaymentInformation.Points)
- case eContext
- case fpx
- case rabbitLinepay
- case ocbcDigital
- case grabPay
- case grabPayRms
- case boost
- case shopeePay
- case shopeePayJumpApp
- case maybankQRPay
- case duitNowQR
- case duitNowOBW
- case payPay
- case weChat
- case unknownSource(String, configurations: [String: Any])
- }
-
- public struct Bank: Codable, Equatable {
- // swiftlint:disable:next nesting
- enum CodingKeys: String, CodingKey {
- case name, code
- case isActive = "active"
- }
-
- public let name: String
- public let code: String
- public let isActive: Bool
- }
- }
-}
-
-extension Capability: Codable {
- private enum CodingKeys: String, CodingKey {
- case countryCode = "country"
- case object
- case location
- case supportedBanks = "banks"
- case paymentBackends = "payment_methods"
- }
-}
-
-extension Capability.Backend {
- private enum CodingKeys: String, CodingKey {
- case object
- case name
- case supportedCurrencies = "currencies"
- case allowedInstallmentTerms = "installment_terms"
- case cardBrands = "card_brands"
- case banks
- case provider
- }
-}
-
-extension Capability.Backend.Payment {
- // swiftlint:disable:next function_body_length
- public static func == (lhs: Capability.Backend.Payment, rhs: Capability.Backend.Payment) -> Bool {
- switch (lhs, rhs) {
- case (.card, .card), (.alipay, .alipay), (.alipayCN, .alipayCN), (.alipayHK, .alipayHK):
- return true
- case (.atome, .atome):
- return true
- case (.dana, .dana), (.gcash, .gcash), (.kakaoPay, .kakaoPay), (.touchNGoAlipayPlus, .touchNGoAlipayPlus):
- return true
- case (.touchNGo, .touchNGo):
- return true
- case (.promptpay, .promptpay), (.paynow, .paynow):
- return true
- case (.truemoney, .truemoney):
- return true
- case (.eContext, .eContext):
- return true
- case (.points(let lhsValue), .points(let rhsValue)):
- return lhsValue == rhsValue
- case (.installment(let lhsValue, _), .installment(let rhsValue, _)):
- return lhsValue == rhsValue
- case (.internetBanking(let lhsValue), .internetBanking(let rhsValue)):
- return lhsValue == rhsValue
- case (.mobileBanking(let lhsValue), .mobileBanking(let rhsValue)):
- return lhsValue == rhsValue
- case (.billPayment(let lhsValue), .billPayment(let rhsValue)):
- return lhsValue == rhsValue
- case (.fpx, .fpx):
- return true
- case (.rabbitLinepay, .rabbitLinepay):
- return true
- case (.ocbcDigital, .ocbcDigital):
- return true
- case (.grabPay, .grabPay):
- return true
- case (.grabPayRms, .grabPayRms):
- return true
- case (.boost, .boost):
- return true
- case (.shopeePay, .shopeePay):
- return true
- case (.shopeePayJumpApp, .shopeePayJumpApp):
- return true
- case (.maybankQRPay, .maybankQRPay):
- return true
- case (.duitNowQR, .duitNowQR):
- return true
- case (.duitNowOBW, .duitNowOBW):
- return true
- case (.payPay, .payPay):
- return true
- case (.weChat, .weChat):
- return true
- default:
- return false
- }
- }
-}
-
-extension Capability {
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: CodingKeys.self)
-
- location = try container.decode(String.self, forKey: .location)
- countryCode = try container.decode(String.self, forKey: .countryCode)
- object = try container.decode(String.self, forKey: .object)
-
- supportedBanks = try container.decode(Set.self, forKey: .supportedBanks)
-
- var backendsContainer = try container.nestedUnkeyedContainer(forKey: .paymentBackends)
-
- var backends: [Capability.Backend] = []
-
- while !backendsContainer.isAtEnd {
- let backend = try backendsContainer.decode(Capability.Backend.self)
- backends.append(backend)
- }
-
- self.supportedBackends = backends
-
- let backendTypes = backends.compactMap { Capability.Backend.BackendType(payment: $0.payment) }
- self.backends = Dictionary(uniqueKeysWithValues: zip(backendTypes, backends))
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: CodingKeys.self)
-
- try container.encode(location, forKey: .location)
- try container.encode(countryCode, forKey: .countryCode)
- try container.encode(object, forKey: .object)
-
- try container.encode(supportedBanks, forKey: .supportedBanks)
-
- var backendsContainer = container.nestedUnkeyedContainer(forKey: .paymentBackends)
- try supportedBackends.forEach { backend in
- try backendsContainer.encode(backend)
- }
- }
-}
-
-extension Capability.Backend {
- // swiftlint:disable:next function_body_length
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: CodingKeys.self)
-
- let type = try container.decode(BackendType.self, forKey: .name)
- let provider = try container.decodeIfPresent(Provider.self, forKey: .provider)
- supportedCurrencies = try container.decode(Set.self, forKey: .supportedCurrencies)
-
- switch type {
- case .unknown(let sourceType):
- self.payment = .unknownSource(sourceType, configurations: [:])
- case .card:
- let supportedBrand = try container.decode(Set.self, forKey: .cardBrands)
- let cardBrands = supportedBrand.compactMap {
- CardBrand(rawValue: $0)
- }
- self.payment = .card(Set(cardBrands))
- case .source(let value) where value.isInstallmentSource:
- let allowedInstallmentTerms = IndexSet(try container.decode(Array.self, forKey: .allowedInstallmentTerms))
- // swiftlint:disable:next force_unwrapping
- self.payment = .installment(value.installmentBrand!, availableNumberOfTerms: allowedInstallmentTerms)
- case .source(.alipay):
- self.payment = .alipay
- case .source(.alipayCN):
- self.payment = .alipayCN
- case .source(.alipayHK):
- self.payment = .alipayHK
- case .source(.atome):
- self.payment = .atome
- case .source(.dana):
- self.payment = .dana
- case .source(.gcash):
- self.payment = .gcash
- case .source(.kakaoPay):
- self.payment = .kakaoPay
- case .source(.touchNGo):
- switch provider {
- case .alipayPlus:
- self.payment = .touchNGoAlipayPlus
- default:
- self.payment = .touchNGo
- }
- case .source(let value) where value.isInternetBankingSource:
- // swiftlint:disable:next force_unwrapping
- self.payment = .internetBanking(value.internetBankingSource!)
- case .source(let value) where value.isMobileBankingSource:
- // swiftlint:disable:next force_unwrapping
- self.payment = .mobileBanking(value.mobileBankingSource!)
- case .source(.promptPay):
- self.payment = .promptpay
- case .source(.payNow):
- self.payment = .paynow
- case .source(.trueMoney):
- self.payment = .truemoney
- case .source(.trueMoneyJumpApp):
- self.payment = .truemoneyJumpApp
- case .source(.pointsCiti):
- self.payment = .points(.citiPoints)
- case .source(.billPaymentTescoLotus):
- self.payment = .billPayment(.tescoLotus)
- case .source(.eContext):
- self.payment = .eContext
- case .source(.fpx):
- self.payment = .fpx
- case .source(.rabbitLinepay):
- self.payment = .rabbitLinepay
- case .source(.mobileBankingOCBC):
- self.payment = .ocbcDigital
- case .source(.grabPay):
- switch provider {
- case .rms:
- self.payment = .grabPayRms
- default:
- self.payment = .grabPay
- }
- case .source(.boost):
- self.payment = .boost
- case .source(.shopeePay):
- self.payment = .shopeePay
- case .source(.shopeePayJumpApp):
- self.payment = .shopeePayJumpApp
- case .source(.maybankQRPay):
- self.payment = .maybankQRPay
- case .source(.duitNowQR):
- self.payment = .duitNowQR
- case .source(.duitNowOBW):
- self.payment = .duitNowOBW
- case .source(.payPay):
- self.payment = .payPay
- case .source(.weChat):
- self.payment = .weChat
- case .source(let value):
- let configurations = try container.decodeJSONDictionary()
- self.payment = .unknownSource(value.rawValue, configurations: configurations)
- }
-
- banks = try? container.decode([Bank].self, forKey: .banks)
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: CodingKeys.self)
-
- try container.encode(BackendType(payment: payment), forKey: .name)
-
- switch payment {
- case .card(let brands):
- try container.encode(brands, forKey: .cardBrands)
- try container.encode(Array(supportedCurrencies), forKey: .supportedCurrencies)
- case .installment(_, availableNumberOfTerms: let availableNumberOfTerms):
- try container.encode(Array(availableNumberOfTerms), forKey: .allowedInstallmentTerms)
- try container.encode(Array(supportedCurrencies), forKey: .supportedCurrencies)
- case .internetBanking, .alipay, .alipayCN, .alipayHK, .atome, .dana, .gcash, .kakaoPay, .touchNGoAlipayPlus, .touchNGo, .promptpay, .paynow, .truemoney, .truemoneyJumpApp, .points, .billPayment, .eContext, .mobileBanking, .fpx, .rabbitLinepay, .ocbcDigital, .grabPay, .grabPayRms, .boost, .shopeePay, .shopeePayJumpApp, .maybankQRPay, .duitNowQR, .duitNowOBW, .payPay, .weChat:
- // swiftlint:disable:previous line_length
- try container.encode(Array(supportedCurrencies), forKey: .supportedCurrencies)
- case .unknownSource(_, configurations: let configurations):
- try encoder.encodeJSONDictionary(configurations)
- try container.encode(Array(supportedCurrencies), forKey: .supportedCurrencies)
- }
- }
-}
-
-private let creditCardBackendTypeValue = "card"
-extension Capability.Backend {
- fileprivate enum BackendType: Codable, Hashable {
- case card
- case source(SourceTypeValue)
- case unknown(sourceType: String)
-
- init(from decoder: Decoder) throws {
- let container = try decoder.singleValueContainer()
- switch try container.decode(String.self) {
- case creditCardBackendTypeValue:
- self = .card
- case let value:
- if let sourceType = SourceTypeValue(value) {
- self = .source(sourceType)
- } else {
- self = .unknown(sourceType: value)
- }
- }
- }
-
- func encode(to encoder: Encoder) throws {
- var container = encoder.singleValueContainer()
- let type: String
- switch self {
- case .unknown(let sourceType):
- type = sourceType
- case .card:
- type = creditCardBackendTypeValue
- case .source(let sourceType):
- type = sourceType.rawValue
- }
-
- try container.encode(type)
- }
-
- init?(sourceType string: String) {
- if let sourceType = SourceTypeValue(string) {
- self = .source(sourceType)
- } else {
- return nil
- }
- }
-
- // swiftlint:disable:next function_body_length
- init?(payment: Capability.Backend.Payment) {
- switch payment {
- case .card:
- self = .card
- case .alipay:
- self = .source(.alipay)
- case .alipayCN:
- self = .source(.alipayCN)
- case .alipayHK:
- self = .source(.alipayHK)
- case .atome:
- self = .source(.atome)
- case .dana:
- self = .source(.dana)
- case .gcash:
- self = .source(.gcash)
- case .kakaoPay:
- self = .source(.kakaoPay)
- case .touchNGoAlipayPlus:
- self = .source(.touchNGoAlipayPlus)
- case .touchNGo:
- self = .source(.touchNGo)
- case .installment(let brand, availableNumberOfTerms: _):
- self.init(sourceType: brand.type)
- case .internetBanking(let banking):
- self.init(sourceType: banking.type)
- case .mobileBanking(let banking):
- self.init(sourceType: banking.type)
- case .billPayment(let billPayment):
- self.init(sourceType: billPayment.type)
- case .promptpay:
- self = .source(.promptPay)
- case .paynow:
- self = .source(.payNow)
- case .truemoney:
- self = .source(.trueMoney)
- case .truemoneyJumpApp:
- self = .source(.trueMoneyJumpApp)
- case .points(let points):
- self.init(sourceType: points.type)
- case .eContext:
- self = .source(.eContext)
- case .fpx:
- self = .source(.fpx)
- case .rabbitLinepay:
- self = .source(.rabbitLinepay)
- case .ocbcDigital:
- self = .source(.mobileBankingOCBC)
- case .grabPay:
- self = .source(.grabPay)
- case .grabPayRms:
- self = .source(.grabPayRms)
- case .boost:
- self = .source(.boost)
- case .shopeePay:
- self = .source(.shopeePay)
- case .shopeePayJumpApp:
- self = .source(.shopeePayJumpApp)
- case .maybankQRPay:
- self = .source(.maybankQRPay)
- case .duitNowQR:
- self = .source(.duitNowQR)
- case .duitNowOBW:
- self = .source(.duitNowOBW)
- case .payPay:
- self = .source(.payPay)
- case .weChat:
- self = .source(.weChat)
- case .unknownSource(let sourceType, configurations: _):
- self.init(sourceType: sourceType)
- }
- }
-
- var type: String {
- switch self {
- case .unknown(let sourceType):
- return sourceType
- case .card:
- return "card"
- case .source(let sourceType):
- let sourceTypeValuePrefix = sourceType.sourceTypePrefix
- if sourceTypeValuePrefix.hasSuffix("_") {
- return sourceTypeValuePrefix
- .lastIndex(of: "_")
- .map(sourceTypeValuePrefix.prefix(upTo:))
- .map(String.init) ?? sourceTypeValuePrefix
- } else {
- return sourceTypeValuePrefix
- }
- }
- }
- }
-}
-
-extension Capability.Backend {
- fileprivate enum Provider: String, Codable, Hashable {
- case alipayPlus = "Alipay_plus"
- case rms = "RMS"
- }
-}
diff --git a/OmiseSDK/Client.swift b/OmiseSDK/Client.swift
deleted file mode 100644
index 40cda5dd..00000000
--- a/OmiseSDK/Client.swift
+++ /dev/null
@@ -1,420 +0,0 @@
-import UIKit
-import os
-
-// swiftlint:disable file_length
-public class Client: NSObject {
- // Shared latest capability requested from API
- static var sharedCapability: Capability? {
- didSet {
- if let countryCode = sharedCapability?.countryCode {
- CountryInfo.setDefaultCountryCode(countryCode)
- }
- }
- }
-
- let session: URLSession
- let queue: OperationQueue
- let publicKey: String
-
- var userAgent: String?
-
- enum HTTPHeaders: String {
- case authorization = "Authorization"
- case userAgent = "User-Agent"
- case contentType = "Content-Type"
- case omiseVersion = "Omise-Version"
- }
-
- struct HTTPHeaderss {
- let authorization = "Authorization"
- }
- /// Initializes a new Client with the given Public Key and Operating OperationQueue
- ///
- /// - Parameters:
- /// - publicKey: Public Key for this Client used for calling the Omise API. The key must have `pkey` prefix
- /// - queue: OperationQueue which the client uses for the network related operations
- public init(publicKey: String, queue: OperationQueue) {
- if publicKey.hasPrefix("pkey_") {
- self.publicKey = publicKey
- } else {
- os_log("Refusing to initialize sdk client with a non-public key: %{private}@", log: sdkLogObject, type: .error, publicKey)
- assertionFailure("Refusing to initialize sdk client with a non-public key.")
- self.publicKey = ""
- }
-
- self.queue = queue
- self.session = URLSession(
- configuration: URLSessionConfiguration.ephemeral,
- delegate: nil,
- delegateQueue: queue
- )
- }
-
- /// Initializes a new Client with the given Public Key
- ///
- /// - Parameters:
- /// - publicKey: Public Key for this Client used for calling the Omise API. The key must have `pkey` prefix
- public convenience init(publicKey: String) {
- self.init(publicKey: publicKey, queue: OperationQueue())
- }
-
- /// Create a new Reqeust Task with the given request and compleation handler closure
- ///
- /// - Parameters:
- /// - request: A Request to create a requrest task
- /// - completionHandler: Compleation Handler closure that will be called when the request task is finished.
- /// The completion handler will be called on the main queue
- /// - Returns: A new Request Task
- public func requestTask(with request: Request, completionHandler: Request.Callback?) -> RequestTask {
- let dataTask = session.dataTask(with: buildURLRequest(for: request)) { (data, response, error) in
- DispatchQueue.main.async {
- Client.completeRequest(request, callback: completionHandler)(data, response, error)
- }
- }
- return RequestTask(request: request, dataTask: dataTask)
- }
-
- /// Send the given Request to Omise API
- ///
- /// - Parameters:
- /// - request: Request with a parameter to create a new Omise API object
- /// - completionHandler: Compleation Handler closure that will be called when the request task is finished
- /// - Returns: A new Request Task
- @discardableResult
- public func send(_ request: Request, completionHandler: Request.Callback?) -> RequestTask {
- let task = requestTask(with: request, completionHandler: completionHandler)
- defer {
- task.resume()
- }
- return task
- }
-
- // swiftlint:disable:next function_body_length
- public func capabilityDataWithCompletionHandler(_ completionHandler: ((RequestResult) -> Void)?) {
- // swiftlint:disable:next closure_body_length
- let dataTask = session.dataTask(with: buildCapabilityAPIURLRequest()) { (data, response, error) in
- guard let completionHandler = completionHandler else { return } // nobody around to hear the leaf falls
-
- var result: RequestResult
- defer {
- switch result {
- case .success:
- os_log("Request succeed: Capability", log: sdkLogObject, type: .debug)
- case .failure(let error):
- os_log("Request failed %{public}@", log: sdkLogObject, type: .info, error.localizedDescription)
- }
-
- DispatchQueue.main.async {
- completionHandler(result)
- }
- }
-
- if let error = error {
- result = .failure(error)
- return
- }
-
- guard let httpResponse = response as? HTTPURLResponse else {
- let error = OmiseError.unexpected(error: .noErrorNorResponse, underlying: nil)
- result = .failure(error)
- return
- }
-
- let decoder = JSONDecoder()
- decoder.dateDecodingStrategy = .formatted(Client.jsonDateFormatter)
-
- switch httpResponse.statusCode {
- case 400..<600:
- guard let data = data else {
- let error = OmiseError.unexpected(error: .httpErrorWithNoData, underlying: nil)
- result = .failure(error)
- return
- }
-
- do {
- result = .failure(try decoder.decode(OmiseError.self, from: data))
- } catch {
- let omiseError = OmiseError.unexpected(error: .httpErrorResponseWithInvalidData, underlying: error)
- result = .failure(omiseError)
- }
-
- case 200..<300:
- guard let data = data else {
- let error = OmiseError.unexpected(error: .httpSuccessWithNoData, underlying: nil)
- result = .failure(error)
- return
- }
-
- do {
- let capability = try decoder.decode(Capability.self, from: data)
- Self.sharedCapability = capability
- result = .success(capability)
- } catch {
- let omiseError = OmiseError.unexpected(error: .httpSuccessWithInvalidData, underlying: error)
- result = .failure(omiseError)
- }
-
- default:
- let error = OmiseError.unexpected(error: .unrecognizedHTTPStatusCode(code: httpResponse.statusCode), underlying: nil)
- result = .failure(error)
- }
- }
- dataTask.resume()
- }
-
- public func retrieveChargeStatusWithCompletionHandler(from tokenID: String, completionHandler: @escaping ((Result) -> Void)) {
- // swiftlint:disable:next closure_body_length
- let dataTask = session.dataTask(with: buildRetrieveTokenURLRequest(from: tokenID)) { (data, response, error) in
- var result: Result
- defer {
- DispatchQueue.main.async {
- completionHandler(result)
- }
- }
-
- if let error = error {
- result = .failure(error)
- return
- }
-
- guard let httpResponse = response as? HTTPURLResponse else {
- let error = OmiseError.unexpected(error: .noErrorNorResponse, underlying: nil)
- result = .failure(error)
- return
- }
-
- let decoder = JSONDecoder()
- decoder.dateDecodingStrategy = .formatted(Client.jsonDateFormatter)
-
- switch httpResponse.statusCode {
- case 400..<600:
- guard let data = data else {
- let error = OmiseError.unexpected(error: .httpErrorWithNoData, underlying: nil)
- result = .failure(error)
- return
- }
-
- do {
- result = .failure(try decoder.decode(OmiseError.self, from: data))
- } catch {
- let omiseError = OmiseError.unexpected(error: .httpErrorResponseWithInvalidData, underlying: error)
- result = .failure(omiseError)
- }
-
- case 200..<300:
- guard let data = data else {
- let error = OmiseError.unexpected(error: .httpSuccessWithNoData, underlying: nil)
- result = .failure(error)
- return
- }
-
- do {
- let token = try decoder.decode(Token.self, from: data)
- result = .success(token.chargeStatus)
- } catch {
- let omiseError = OmiseError.unexpected(error: .httpSuccessWithInvalidData, underlying: error)
- result = .failure(omiseError)
- }
-
- default:
- let error = OmiseError.unexpected(error: .unrecognizedHTTPStatusCode(code: httpResponse.statusCode), underlying: nil)
- result = .failure(error)
- }
- }
- dataTask.resume()
- }
-
- public func pollingChargeStatusWithCompletionHandler(from tokenID: String, completionHandler: @escaping (Result) -> Void) {
- let maximumNumberOfPollingAttempts = 10
- var currentPollingAttempt = 0
-
- var isPolling = true
-
- let timer = Timer.scheduledTimer(withTimeInterval: 3.0, repeats: true) { (timer) in
- if !isPolling {
- firePolling(with: timer)
- }
- }
-
- func firePolling(with timer: Timer) {
- currentPollingAttempt += 1
- isPolling = true
-
- retrieveChargeStatusWithCompletionHandler(from: tokenID) { (result) in
- isPolling = false
-
- switch result {
- case .success(let latestChargeStatus):
- switch latestChargeStatus {
- case .successful, .failed, .expired, .reversed:
- timer.invalidate()
- completionHandler(.success(latestChargeStatus))
- default:
- break
- }
-
- if currentPollingAttempt == maximumNumberOfPollingAttempts {
- timer.invalidate()
- completionHandler(.success(latestChargeStatus))
- }
- case .failure(let error):
- timer.invalidate()
- completionHandler(.failure(error))
- }
- }
- }
-
- // Start polling
- firePolling(with: timer)
- }
-}
-
-// MARK: - URL Request related methods
-extension Client {
-
- private static let omiseAPIContentType = "application/json; charset=utf8"
- private static let omiseAPIVersion = "2019-05-29"
-
- private func buildURLRequest(for request: Request) -> URLRequest {
- var urlRequest = URLRequest(url: T.postURL)
- urlRequest.httpMethod = "POST"
- let encoder = Client.makeJSONEncoder()
- urlRequest.httpBody = try? encoder.encode(request.parameter)
- urlRequest.setValue(Client.encodeAuthorizationHeader(publicKey), forHTTPHeaderField: HTTPHeaders.authorization.rawValue)
- urlRequest.setValue(userAgent ?? Client.defaultUserAgent, forHTTPHeaderField: HTTPHeaders.userAgent.rawValue)
- urlRequest.setValue(Client.omiseAPIContentType, forHTTPHeaderField: HTTPHeaders.contentType.rawValue)
- urlRequest.setValue(Client.omiseAPIVersion, forHTTPHeaderField: HTTPHeaders.omiseVersion.rawValue)
- return urlRequest
- }
-
- private func buildCapabilityAPIURLRequest() -> URLRequest {
- var urlRequest = URLRequest(url: Configuration.default.environment.capabilityURL)
- urlRequest.httpMethod = "GET"
- urlRequest.setValue(Client.encodeAuthorizationHeader(publicKey), forHTTPHeaderField: HTTPHeaders.authorization.rawValue)
- urlRequest.setValue(userAgent ?? Client.defaultUserAgent, forHTTPHeaderField: HTTPHeaders.userAgent.rawValue)
- urlRequest.setValue(Client.omiseAPIContentType, forHTTPHeaderField: HTTPHeaders.contentType.rawValue)
- urlRequest.setValue(Client.omiseAPIVersion, forHTTPHeaderField: HTTPHeaders.omiseVersion.rawValue)
- return urlRequest
- }
-
- private func buildRetrieveTokenURLRequest(from tokenID: String) -> URLRequest {
- var urlRequest = URLRequest(url: Configuration.default.environment.tokenURL.appendingPathComponent(tokenID))
- urlRequest.httpMethod = "GET"
- urlRequest.setValue(Client.encodeAuthorizationHeader(publicKey), forHTTPHeaderField: HTTPHeaders.authorization.rawValue)
- urlRequest.setValue(userAgent ?? Client.defaultUserAgent, forHTTPHeaderField: HTTPHeaders.userAgent.rawValue)
- urlRequest.setValue(Client.omiseAPIContentType, forHTTPHeaderField: HTTPHeaders.contentType.rawValue)
- urlRequest.setValue(Client.omiseAPIVersion, forHTTPHeaderField: HTTPHeaders.omiseVersion.rawValue)
- return urlRequest
- }
-
- private static func encodeAuthorizationHeader(_ publicKey: String) -> String {
- let data = publicKey.data(using: String.Encoding.utf8, allowLossyConversion: false)
- let base64 = data?.base64EncodedString()
- return "Basic \(base64 ?? "")"
- }
-
- static func makeJSONEncoder() -> JSONEncoder {
- let encoder = JSONEncoder()
- encoder.dateEncodingStrategy = .formatted(Client.jsonDateFormatter)
- return encoder
- }
-
- static func makeJSONDecoder(for request: Request?) -> JSONDecoder {
- let decoder = JSONDecoder()
- if let request = request as? Request {
- decoder.userInfo[sourceParameterCodingsUserInfoKey] = request.parameter
- }
- decoder.dateDecodingStrategy = .formatted(Client.jsonDateFormatter)
- return decoder
- }
-
- // swiftlint:disable:next function_body_length
- private static func completeRequest(_ request: Request, callback: Request.Callback?) -> ((Data?, URLResponse?, Error?) -> Void) {
- // swiftlint:disable:next closure_body_length
- return { (data: Data?, response: URLResponse?, error: Error?) in
- guard let callback = callback else { return } // nobody around to hear the leaf falls
-
- var result: RequestResult
- defer {
- switch result {
- case .success(let value):
- os_log("Request succeed %{private}@", log: sdkLogObject, type: .debug, value.id)
- case .failure(let error):
- os_log("Request failed %{public}@", log: sdkLogObject, type: .info, error.localizedDescription)
- }
-
- callback(result)
- }
-
- if let error = error {
- result = .failure(error)
- return
- }
-
- guard let httpResponse = response as? HTTPURLResponse else {
- let error = OmiseError.unexpected(error: .noErrorNorResponse, underlying: nil)
- result = .failure(error)
- return
- }
-
- switch httpResponse.statusCode {
- case 400..<600:
- guard let data = data else {
- let error = OmiseError.unexpected(error: .httpErrorWithNoData, underlying: nil)
- result = .failure(error)
- return
- }
-
- do {
- let decoder = makeJSONDecoder(for: request)
- result = .failure(try decoder.decode(OmiseError.self, from: data))
- } catch {
- let omiseError = OmiseError.unexpected(error: .httpErrorResponseWithInvalidData, underlying: error)
- result = .failure(omiseError)
- }
-
- case 200..<300:
- guard let data = data else {
- let error = OmiseError.unexpected(error: .httpSuccessWithNoData, underlying: nil)
- result = .failure(error)
- return
- }
-
- do {
- let decoder = makeJSONDecoder(for: request)
- result = .success(try decoder.decode(T.self, from: data))
- } catch {
- let omiseError = OmiseError.unexpected(error: .httpSuccessWithInvalidData, underlying: error)
- result = .failure(omiseError)
- }
-
- default:
- let error = OmiseError.unexpected(error: .unrecognizedHTTPStatusCode(code: httpResponse.statusCode), underlying: nil)
- result = .failure(error)
- }
- }
- }
-}
-
-// MARK: - Constants
-extension Client {
- static let sdkVersion: String = "5.0.0"
- static let currentPlatform: String = ProcessInfo.processInfo.operatingSystemVersionString
- static let currentDevice: String = UIDevice.current.model
-
- static let jsonDateFormatter: DateFormatter = {
- let formatter = DateFormatter()
- formatter.locale = Locale(identifier: "en_US_POSIX")
- formatter.timeZone = TimeZone(identifier: "UTC")
- formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
- return formatter
- }()
-
- static var defaultUserAgent: String {
- return """
- OmiseIOS/\(sdkVersion) \
- iOS/\(currentPlatform) \
- Apple/\(currentDevice)
- """ // OmiseIOSSDK/3.0.0 iOS/12.0.0 Apple/iPhone
- }
-}
diff --git a/OmiseSDK/Configuration.swift b/OmiseSDK/Configuration.swift
deleted file mode 100644
index a0a4c9cc..00000000
--- a/OmiseSDK/Configuration.swift
+++ /dev/null
@@ -1,49 +0,0 @@
-import Foundation
-
-public enum Environment {
- case dev(vaultURL: URL, apiURL: URL)
- case production
-
- var tokenURL: URL {
- return vaultBaseURL.appendingPathComponent("tokens")
- }
-
- var sourceURL: URL {
- return apiBaseURL.appendingPathComponent("sources")
- }
-
- var capabilityURL: URL {
- return apiBaseURL.appendingPathComponent("capability")
- }
-}
-
-private extension Environment {
- var vaultBaseURL: URL {
- switch self {
- case .dev(let url, _): return url
- // swiftlint:disable:next force_unwrapping
- case .production: return URL(string: "https://vault.omise.co")!
- }
- }
-
- var apiBaseURL: URL {
- switch self {
- case .dev(_, let url): return url
- // swiftlint:disable:next force_unwrapping
- case .production: return URL(string: "https://api.omise.co")!
- }
- }
-}
-
-public struct Configuration {
- private(set) static var `default` = Configuration()
- let environment: Environment
-
- public init(environment: Environment = .production) {
- self.environment = environment
- }
-
- public static func setDefault(_ config: Configuration) {
- `default` = config
- }
-}
diff --git a/OmiseSDK/CreditCardFormViewModel.swift b/OmiseSDK/CreditCardFormViewModel.swift
deleted file mode 100644
index 2bf6f7c2..00000000
--- a/OmiseSDK/CreditCardFormViewModel.swift
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// CreditCardFormViewModel.swift
-// OmiseSDK
-//
-// Created by Andrei Solovev on 19/6/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
-import Foundation
-import os.log
-
-class CreditCardFormViewModel: CreditCardFormViewModelProtocol, CountryListViewModelProtocol {
- var addressFields: [AddressField] = [.address, .city, .state, .postalCode]
-
- var fieldForShippingAddressHeader: AddressField?
-
- var isAddressFieldsVisible: Bool {
- selectedCountry?.isAVS ?? false
- }
-
- func title(for field: AddressField) -> String? {
- field.title
- }
-
- var countryListViewModel: CountryListViewModelProtocol { return self }
-
- // MARK: CountryListViewModelProtocol
- lazy var countries: [CountryInfo] = CountryInfo.sortedAll
-
- lazy var selectedCountry: CountryInfo? = CountryInfo.default {
- didSet {
- if let selectedCountry = selectedCountry {
- onSelectCountry(selectedCountry)
- }
- }
- }
- var onSelectCountry: (CountryInfo) -> Void = { _ in }
-
- func error(for field: AddressField, validate text: String?) -> String? {
- guard isAddressFieldsVisible else { return nil }
- let result = (text?.isEmpty ?? true) ? field.error : nil
- return result
- }
-
- func onSubmitButtonPressed(_ viewContext: ViewContext, publicKey: String?, onComplete: @escaping (RequestResult) -> Void) {
-
- guard let publicKey = publicKey else {
- os_log("Missing or invalid public key information - %{private}@", log: uiLogObject, type: .error, publicKey ?? "")
- assertionFailure("Missing public key information. Please set the public key before request token.")
- return
- }
-
- os_log("Requesting to create token", log: uiLogObject, type: .info)
-
- let request = Request(
- name: viewContext.name,
- pan: viewContext.pan,
- expirationMonth: viewContext.expirationMonth,
- expirationYear: viewContext.expirationYear,
- securityCode: viewContext.securityCode,
- countryCode: viewContext.countryCode,
- city: viewContext[.city],
- state: viewContext[.state],
- street1: viewContext[.address],
- postalCode: viewContext[.postalCode]
- )
-
- let client = Client(publicKey: publicKey)
- client.send(request) { (result) in
- onComplete(result)
- }
- }
-
-}
diff --git a/OmiseSDK/Currency.swift b/OmiseSDK/Currency.swift
deleted file mode 100644
index 2160e7d8..00000000
--- a/OmiseSDK/Currency.swift
+++ /dev/null
@@ -1,137 +0,0 @@
-import Foundation
-
-public let centBasedCurrencyFactor = 100
-public let identicalBasedCurrencyFactor = 1
-
-public enum Currency: Codable, Hashable {
-
- enum CurrencyCode: String {
- case aud = "AUD"
- case cad = "CAD"
- case chf = "CHF"
- case cny = "CNY"
- case dkk = "DKK"
- case eur = "EUR"
- case gbp = "GBP"
- case hkd = "HKD"
- case idr = "IDR"
- case jpy = "JPY"
- case myr = "MYR"
- case sgd = "SGD"
- case thb = "THB"
- case usd = "USD"
- }
-
- case aud
- case cad
- case chf
- case cny
- case dkk
- case eur
- case gbp
- case hkd
- case idr
- case jpy
- case myr
- case sgd
- case thb
- case usd
-
- case custom(code: String, factor: Int)
-
- static let main: Currency = .thb
-
- public var code: String {
- switch self {
- case .thb: return CurrencyCode.thb.rawValue
- case .jpy: return CurrencyCode.jpy.rawValue
- case .idr: return CurrencyCode.idr.rawValue
- case .sgd: return CurrencyCode.sgd.rawValue
- case .usd: return CurrencyCode.usd.rawValue
- case .gbp: return CurrencyCode.gbp.rawValue
- case .eur: return CurrencyCode.eur.rawValue
- case .myr: return CurrencyCode.myr.rawValue
- case .aud: return CurrencyCode.aud.rawValue
- case .cad: return CurrencyCode.cad.rawValue
- case .chf: return CurrencyCode.chf.rawValue
- case .cny: return CurrencyCode.cny.rawValue
- case .dkk: return CurrencyCode.dkk.rawValue
- case .hkd: return CurrencyCode.hkd.rawValue
- case.custom(code: let code, factor: _): return code
- }
- }
-
- /// Create a currency with the given `ISO 4217` currency code
- ///
- /// - Parameter code: The ISO 4217 currency code for the creating Currency that will be created
- public init(code: String?) {
- guard let code = code else {
- self = Currency.main
- return
- }
-
- switch code.uppercased() {
- case CurrencyCode.thb.rawValue: self = .thb
- case CurrencyCode.jpy.rawValue: self = .jpy
- case CurrencyCode.idr.rawValue: self = .idr
- case CurrencyCode.sgd.rawValue: self = .sgd
- case CurrencyCode.usd.rawValue: self = .usd
- case CurrencyCode.gbp.rawValue: self = .gbp
- case CurrencyCode.eur.rawValue: self = .eur
- case CurrencyCode.myr.rawValue: self = .myr
- case CurrencyCode.aud.rawValue: self = .aud
- case CurrencyCode.cad.rawValue: self = .cad
- case CurrencyCode.chf.rawValue: self = .chf
- case CurrencyCode.cny.rawValue: self = .cny
- case CurrencyCode.dkk.rawValue: self = .dkk
- case CurrencyCode.hkd.rawValue: self = .hkd
- case let currencyCode:
- let numberFormatter = NumberFormatter()
- numberFormatter.numberStyle = .currency
- numberFormatter.currencyCode = currencyCode
- let factor = Int(pow(10, Double(numberFormatter.maximumFractionDigits)))
- self = .custom(code: currencyCode, factor: factor)
- }
- }
-
- /// A conversion factor represents how much Omise amount equals to 1 unit of this currency. eg. THB's factor is equals to 100.
- public var factor: Int {
- switch self {
- case .thb, .idr, .sgd, .usd, .gbp, .eur, .myr, .aud, .cad, .chf, .cny, .dkk, .hkd:
- return centBasedCurrencyFactor
- case .jpy:
- return identicalBasedCurrencyFactor
- case .custom(code: _, factor: let factor):
- return factor
- }
- }
-
- /// Convert the given subunit amount to the unit amount
- ///
- /// - Parameter value: Value in subunit (Satang in THB for example)
- /// - Returns: Value in unit (Baht in THB for example)
- public func convert(fromSubunit value: Int64) -> Double {
- return Double(value) / Double(factor)
- }
-
- /// Convert the given unit amount to the subunit amount
- ///
- /// - Parameter value: Value in unit (Baht in THB for example)
- /// - Returns: Value in subunit (Satang in THB for example)
- public func convert(toSubunit value: Double) -> Int64 {
- return Int64(value * Double(factor))
- }
-}
-
-extension Currency {
- public func encode(to encoder: Encoder) throws {
- var container = encoder.singleValueContainer()
- try container.encode(code.uppercased())
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.singleValueContainer()
- let code = try container.decode(String.self)
- self.init(code: code)
- }
-}
diff --git a/OmiseSDK/DuitNowOBWBankChooserViewController.swift b/OmiseSDK/DuitNowOBWBankChooserViewController.swift
deleted file mode 100644
index 80991f6a..00000000
--- a/OmiseSDK/DuitNowOBWBankChooserViewController.swift
+++ /dev/null
@@ -1,131 +0,0 @@
-import UIKit
-import os
-
-class DuitNowOBWBankChooserViewController: AdaptableStaticTableViewController,
- PaymentSourceChooser,
- PaymentChooserUI {
- var flowSession: PaymentCreatorFlowSession?
-
- override var showingValues: [PaymentInformation.DuitNowOBW.Bank] {
- didSet {
- os_log("DuitNow OBW Bank Chooser: Showing options - %{private}@",
- log: uiLogObject,
- type: .info,
- showingValues.map { $0.description }.joined(separator: ", "))
- }
- }
-
- @IBOutlet private var bankNameLabels: [UILabel]!
-
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
- applyPrimaryColor()
- applySecondaryColor()
-
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
- }
-
- override func staticIndexPath(forValue value: PaymentInformation.DuitNowOBW.Bank) -> IndexPath {
- switch value {
- case .affin:
- return IndexPath(row: 0, section: 0)
- case .alliance:
- return IndexPath(row: 1, section: 0)
- case .agro:
- return IndexPath(row: 2, section: 0)
- case .ambank:
- return IndexPath(row: 3, section: 0)
- case .cimb:
- return IndexPath(row: 4, section: 0)
- case .islam:
- return IndexPath(row: 5, section: 0)
- case .rakyat:
- return IndexPath(row: 6, section: 0)
- case .muamalat:
- return IndexPath(row: 7, section: 0)
- case .bsn:
- return IndexPath(row: 8, section: 0)
- case .hongleong:
- return IndexPath(row: 9, section: 0)
- case .hsbc:
- return IndexPath(row: 10, section: 0)
- case .kfh:
- return IndexPath(row: 11, section: 0)
- case .maybank2u:
- return IndexPath(row: 12, section: 0)
- case .ocbc:
- return IndexPath(row: 13, section: 0)
- case .publicBank:
- return IndexPath(row: 14, section: 0)
- case .rhb:
- return IndexPath(row: 15, section: 0)
- case .sc:
- return IndexPath(row: 16, section: 0)
- case .uob:
- return IndexPath(row: 17, section: 0)
- case .other:
- preconditionFailure("This value is not supported for built-in chooser")
- }
- }
-
- override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- let cell = super.tableView(tableView, cellForRowAt: indexPath)
-
- if let cell = cell as? PaymentOptionTableViewCell {
- cell.separatorView.backgroundColor = currentSecondaryColor
- }
- cell.accessoryView?.tintColor = currentSecondaryColor
- return cell
- }
-
- override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
- guard let cell = tableView.cellForRow(at: indexPath) else {
- return
- }
-
- let selectedBank = element(forUIIndexPath: indexPath)
- let paymentInformation = PaymentInformation.DuitNowOBW(bank: selectedBank.description)
-
- tableView.deselectRow(at: indexPath, animated: true)
-
- os_log("DuitNow OBW Bank List Chooser: %{private}@ was selected", log: uiLogObject, type: .info, selectedBank.description)
-
- let oldAccessoryView = cell.accessoryView
- let loadingIndicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.gray)
- loadingIndicator.color = currentSecondaryColor
- cell.accessoryView = loadingIndicator
- loadingIndicator.startAnimating()
- view.isUserInteractionEnabled = false
-
- flowSession?.requestCreateSource(.duitNowOBW(paymentInformation)) { _ in
- cell.accessoryView = oldAccessoryView
- self.view.isUserInteractionEnabled = true
- }
- }
-
- private func applyPrimaryColor() {
- guard isViewLoaded else {
- return
- }
-
- bankNameLabels.forEach {
- $0.textColor = currentPrimaryColor
- }
- }
-
- private func applySecondaryColor() {
- // Intentionally empty (SonarCloud warning fix)
- }
-}
diff --git a/OmiseSDK/FPXBankChooserViewController.swift b/OmiseSDK/FPXBankChooserViewController.swift
deleted file mode 100644
index 8a05f274..00000000
--- a/OmiseSDK/FPXBankChooserViewController.swift
+++ /dev/null
@@ -1,137 +0,0 @@
-import UIKit
-import os
-
-class FPXBankChooserViewController: AdaptableDynamicTableViewController, PaymentSourceChooser, PaymentChooserUI {
- var email: String?
- var flowSession: PaymentCreatorFlowSession?
- private let defaultImage: String = "FPX/unknown"
- private let message = NSLocalizedString(
- "fpx.bank-chooser.no-banks-available.text",
- bundle: .omiseSDK,
- value: "Cannot retrieve list of banks.\nPlease try again later.",
- comment: "A descriptive text telling the user when there's no banks available"
- )
-
- override var showingValues: [Capability.Backend.Bank] {
- didSet {
- os_log("FPX Bank Chooser: Showing options - %{private}@",
- log: uiLogObject,
- type: .info,
- showingValues.map { $0.name }.joined(separator: ", "))
- }
- }
-
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
- applyPrimaryColor()
- applySecondaryColor()
-
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
-
- if showingValues.isEmpty {
- displayEmptyMessage()
- } else {
- restore()
- }
- }
-
- override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)
-
- if let cell = cell as? PaymentOptionTableViewCell {
- cell.separatorView.backgroundColor = currentSecondaryColor
- }
- let bank = showingValues[indexPath.row]
- cell.accessoryView?.tintColor = currentSecondaryColor
- cell.textLabel?.text = bank.name
- cell.imageView?.image = bankImage(bank: bank.code)
- cell.textLabel?.textColor = currentPrimaryColor
-
- if !bank.isActive {
- disableCell(cell: cell)
- }
-
- return cell
- }
-
- override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
- guard let cell = tableView.cellForRow(at: indexPath) else {
- return
- }
-
- let selectedBank = element(forUIIndexPath: indexPath)
- let paymentInformation = PaymentInformation.FPX(bank: selectedBank.code, email: email)
-
- tableView.deselectRow(at: indexPath, animated: true)
-
- os_log("FPX Banking Chooser: %{private}@ was selected", log: uiLogObject, type: .info, selectedBank.name)
-
- let oldAccessoryView = cell.accessoryView
- let loadingIndicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.gray)
- loadingIndicator.color = currentSecondaryColor
- cell.accessoryView = loadingIndicator
- loadingIndicator.startAnimating()
- view.isUserInteractionEnabled = false
-
- flowSession?.requestCreateSource(.fpx(paymentInformation)) { _ in
- cell.accessoryView = oldAccessoryView
- self.view.isUserInteractionEnabled = true
- }
- }
-
- private func applyPrimaryColor() {
- guard isViewLoaded else {
- return
- }
- }
-
- private func applySecondaryColor() {
- // Intentionally empty (SonarCloud warning fix)
- }
-
- private func bankImage(bank: String) -> UIImage? {
- if let image = UIImage(named: "FPX/" + bank, in: .omiseSDK, compatibleWith: nil) {
- return image
- } else {
- return UIImage(named: defaultImage, in: .omiseSDK, compatibleWith: nil)
- }
- }
-
- private func disableCell(cell: UITableViewCell) {
- cell.selectionStyle = UITableViewCell.SelectionStyle.none
- cell.contentView.alpha = 0.5
- cell.isUserInteractionEnabled = false
- }
-
- private func displayEmptyMessage() {
- let label = UILabel(
- frame: CGRect(x: 0, y: 0, width: tableView.bounds.size.width, height: tableView.bounds.size.height)
- )
-
- label.text = message
- label.textColor = currentPrimaryColor
- label.numberOfLines = 0
- label.textAlignment = .center
- label.sizeToFit()
-
- tableView.backgroundView = label
- tableView.separatorStyle = .none
- }
-
- private func restore() {
- tableView.backgroundView = nil
- tableView.separatorStyle = .singleLine
- }
-}
diff --git a/OmiseSDK/InstallmentBankingSourceChooserViewController.swift b/OmiseSDK/InstallmentBankingSourceChooserViewController.swift
deleted file mode 100644
index ebbb5d35..00000000
--- a/OmiseSDK/InstallmentBankingSourceChooserViewController.swift
+++ /dev/null
@@ -1,113 +0,0 @@
-import UIKit
-import os
-
-// swiftlint:disable:next type_name
-class InstallmentBankingSourceChooserViewController: AdaptableStaticTableViewController,
- PaymentSourceChooser,
- PaymentChooserUI {
- var flowSession: PaymentCreatorFlowSession?
-
- override var showingValues: [PaymentInformation.Installment.Brand] {
- didSet {
- os_log("Installment Brand Chooser: Showing options - %{private}@",
- log: uiLogObject,
- type: .info,
- showingValues.map { $0.description }.joined(separator: ", "))
- }
- }
-
- @IBOutlet var bankNameLabels: [UILabel]!
-
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
- applyPrimaryColor()
- applySecondaryColor()
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
- }
-
- override func staticIndexPath(forValue value: PaymentInformation.Installment.Brand) -> IndexPath {
- switch value {
- case .bbl:
- return IndexPath(row: 0, section: 0)
- case .kBank:
- return IndexPath(row: 1, section: 0)
- case .bay:
- return IndexPath(row: 2, section: 0)
- case .firstChoice:
- return IndexPath(row: 3, section: 0)
- case .ktc:
- return IndexPath(row: 4, section: 0)
- case .mbb:
- return IndexPath(row: 5, section: 0)
- case .scb:
- return IndexPath(row: 6, section: 0)
- case .ttb:
- return IndexPath(row: 7, section: 0)
- case .uob:
- return IndexPath(row: 8, section: 0)
- case .other:
- preconditionFailure("This value is not supported for built-in chooser")
- }
- }
-
- override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- let cell = super.tableView(tableView, cellForRowAt: indexPath)
-
- if let cell = cell as? PaymentOptionTableViewCell {
- cell.separatorView.backgroundColor = currentSecondaryColor
- }
- cell.accessoryView?.tintColor = currentSecondaryColor
- return cell
- }
-
- override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
- guard let cell = tableView.cellForRow(at: indexPath) else {
- return
- }
-
- let selectedBrand = element(forUIIndexPath: indexPath)
- os_log("Installment Brand Chooser: %{private}@ was selected", log: uiLogObject, type: .info, selectedBrand.description)
-
- performSegue(withIdentifier: "GoToInstallmentTermsChooserSegue", sender: cell)
- }
-
- override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
- guard let cell = sender as? UITableViewCell, let indexPath = tableView.indexPath(for: cell) else {
- return
- }
- let selectedBrand = element(forUIIndexPath: indexPath)
- if segue.identifier == "GoToInstallmentTermsChooserSegue",
- let installmentTermsChooserViewController = segue.destination as? InstallmentsNumberOfTermsChooserViewController {
- installmentTermsChooserViewController.installmentBrand = selectedBrand
- installmentTermsChooserViewController.flowSession = self.flowSession
- installmentTermsChooserViewController.preferredPrimaryColor = self.preferredPrimaryColor
- installmentTermsChooserViewController.preferredSecondaryColor = self.preferredSecondaryColor
- }
- }
-
- private func applyPrimaryColor() {
- guard isViewLoaded else {
- return
- }
-
- bankNameLabels.forEach {
- $0.textColor = currentPrimaryColor
- }
- }
-
- private func applySecondaryColor() {
- // Intentionally empty (SonarCloud warning fix)
- }
-}
diff --git a/OmiseSDK/InstallmentsNumberOfTermsChooserViewController.swift b/OmiseSDK/InstallmentsNumberOfTermsChooserViewController.swift
deleted file mode 100644
index 23fc9bea..00000000
--- a/OmiseSDK/InstallmentsNumberOfTermsChooserViewController.swift
+++ /dev/null
@@ -1,167 +0,0 @@
-import UIKit
-
-// swiftlint:disable:next type_name
-class InstallmentsNumberOfTermsChooserViewController: UITableViewController, PaymentSourceChooser, PaymentChooserUI {
- var flowSession: PaymentCreatorFlowSession?
-
- var installmentBrand: PaymentInformation.Installment.Brand? {
- didSet {
- numberOfTerms = installmentBrand.map(PaymentInformation.Installment.availableTerms(for:)).map(Array.init) ?? []
-
- let title: String
- switch installmentBrand {
- case .bay?:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.bbl.navigation-item.title",
- bundle: .omiseSDK,
- value: "Krungsri",
- comment: "A navigation title for the choosing installment terms screen with the `Krungsri` selected"
- )
- case .firstChoice?:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.ktc.navigation-item.title",
- bundle: .omiseSDK,
- value: "Krungsri First Choice",
- comment: "A navigation title for the choosing installment terms screen with the `Krungsri First Choice` selected"
- )
- case .bbl?:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.bay.navigation-item.title",
- bundle: .omiseSDK,
- value: "Bangkok Bank",
- comment: "A navigation title for the choosing installment terms screen with the `Bangkok Bank` selected"
- )
- case .mbb?:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.mbb.navigation-item.title",
- bundle: .omiseSDK,
- value: "MBB",
- comment: "A navigation title for the choosing installment terms screen with the `MBB` selected"
- )
- case .ktc?:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.k-bank.navigation-item.title",
- bundle: .omiseSDK,
- value: "KTC",
- comment: "A navigation title for the choosing installment terms screen with the `KTC` selected"
- )
- case .kBank?:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.first-choice.navigation-item.title",
- bundle: .omiseSDK,
- value: "Kasikorn",
- comment: "A navigation title for the choosing installment terms screen with the `Kasikorn` selected"
- )
- case .scb?:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.scb.navigation-item.title",
- bundle: .omiseSDK,
- value: "SCB",
- comment: "A navigation title for the choosing installment terms screen with the `SCB` selected"
- )
- case .ttb?:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.ttb.navigation-item.title",
- bundle: .omiseSDK,
- value: "TTB",
- comment: "A navigation title for the choosing installment terms screen with the `TTB` selected"
- )
- case .uob?:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.uob.navigation-item.title",
- bundle: .omiseSDK,
- value: "UOB",
- comment: "A navigation title for the choosing installment terms screen with the `UOB` selected"
- )
- case .other?, nil:
- title = NSLocalizedString(
- "installment-number-of-terms-choosers.default.navigation-item.title",
- bundle: .omiseSDK,
- value: "Installments Terms",
- comment: "A navigation title for the choosing installment terms screen with the `Installments Terms` selected"
- )
- }
-
- navigationItem.title = title
- }
- }
-
- var numberOfTerms: [Int] = [] {
- didSet {
- if isViewLoaded {
- tableView.reloadData()
- }
- }
- }
-
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
- applyPrimaryColor()
- applySecondaryColor()
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
- }
-
- override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
- return numberOfTerms.count
- }
-
- override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- let cell = tableView.dequeueReusableCell(withIdentifier: "NumberOfTermCell", for: indexPath)
- let numberOfTermsTitleFormat = NSLocalizedString(
- "installments.number-of-terms-chooser.number-of-terms-cell.label.text",
- bundle: .omiseSDK,
- value: "%d months",
- comment: "Number of terms option text displayed as a title of the number of terms option cell in number of terms chooser scene"
- )
- cell.textLabel?.text = String.localizedStringWithFormat(numberOfTermsTitleFormat, numberOfTerms[indexPath.row])
- cell.textLabel?.textColor = currentPrimaryColor
-
- if let cell = cell as? PaymentOptionTableViewCell {
- cell.separatorView.backgroundColor = currentSecondaryColor
- }
- cell.accessoryView?.tintColor = currentSecondaryColor
-
- return cell
- }
-
- override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
- let cell = tableView.cellForRow(at: indexPath)
- tableView.deselectRow(at: indexPath, animated: true)
- guard let brand = installmentBrand else {
- return
- }
-
- let oldAccessoryView = cell?.accessoryView
- let loadingIndicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.gray)
- loadingIndicator.color = currentSecondaryColor
- cell?.accessoryView = loadingIndicator
- loadingIndicator.startAnimating()
- view.isUserInteractionEnabled = false
-
- let numberOfTerms = self.numberOfTerms[indexPath.row]
- flowSession?.requestCreateSource(.installment(PaymentInformation.Installment(brand: brand, numberOfTerms: numberOfTerms))) { _ in
- cell?.accessoryView = oldAccessoryView
- self.view.isUserInteractionEnabled = true
- }
- }
-
- private func applyPrimaryColor() {
- // Intentionally empty (SonarCloud warning fix)
- }
-
- private func applySecondaryColor() {
- // Intentionally empty (SonarCloud warning fix)
- }
-}
diff --git a/OmiseSDK/InternetBankingSourceChooserViewController.swift b/OmiseSDK/InternetBankingSourceChooserViewController.swift
deleted file mode 100644
index 30ee7386..00000000
--- a/OmiseSDK/InternetBankingSourceChooserViewController.swift
+++ /dev/null
@@ -1,94 +0,0 @@
-import UIKit
-import os
-
-// swiftlint:disable:next type_name
-class InternetBankingSourceChooserViewController: AdaptableStaticTableViewController,
- PaymentSourceChooser,
- PaymentChooserUI {
- var flowSession: PaymentCreatorFlowSession?
-
- override var showingValues: [PaymentInformation.InternetBanking] {
- didSet {
- os_log("Internet Banking Chooser: Showing options - %{private}@",
- log: uiLogObject,
- type: .info,
- showingValues.map { $0.description }.joined(separator: ", "))
- }
- }
-
- @IBOutlet var internetBankingNameLabels: [UILabel]!
-
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
- applyPrimaryColor()
- applySecondaryColor()
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
- }
-
- override func staticIndexPath(forValue value: PaymentInformation.InternetBanking) -> IndexPath {
- switch value {
- case .bbl:
- return IndexPath(row: 0, section: 0)
- case .bay:
- return IndexPath(row: 1, section: 0)
- case .other:
- preconditionFailure("This value is not supported for the built-in chooser")
- }
- }
-
- override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- let cell = super.tableView(tableView, cellForRowAt: indexPath)
-
- if let cell = cell as? PaymentOptionTableViewCell {
- cell.separatorView.backgroundColor = currentSecondaryColor
- }
- cell.accessoryView?.tintColor = currentSecondaryColor
- return cell
- }
-
- override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
- let cell = tableView.cellForRow(at: indexPath)
- tableView.deselectRow(at: indexPath, animated: true)
- let bank = element(forUIIndexPath: indexPath)
-
- os_log("Internet Banking Chooser: %{private}@ was selected", log: uiLogObject, type: .info, bank.description)
-
- let oldAccessoryView = cell?.accessoryView
- let loadingIndicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.gray)
- loadingIndicator.color = currentSecondaryColor
- cell?.accessoryView = loadingIndicator
- loadingIndicator.startAnimating()
- view.isUserInteractionEnabled = false
-
- flowSession?.requestCreateSource(.internetBanking(bank)) { _ in
- cell?.accessoryView = oldAccessoryView
- self.view.isUserInteractionEnabled = true
- }
- }
-
- private func applyPrimaryColor() {
- guard isViewLoaded else {
- return
- }
-
- internetBankingNameLabels.forEach {
- $0.textColor = currentPrimaryColor
- }
- }
-
- private func applySecondaryColor() {
- // Intentionally empty (SonarCloud warning fix)
- }
-}
diff --git a/OmiseSDK/MobileBankingSourceChooserViewController.swift b/OmiseSDK/MobileBankingSourceChooserViewController.swift
deleted file mode 100644
index 19b0632c..00000000
--- a/OmiseSDK/MobileBankingSourceChooserViewController.swift
+++ /dev/null
@@ -1,99 +0,0 @@
-import UIKit
-import os
-
-class MobileBankingSourceChooserViewController: AdaptableStaticTableViewController,
- PaymentSourceChooser,
- PaymentChooserUI {
- var flowSession: PaymentCreatorFlowSession?
-
- override var showingValues: [PaymentInformation.MobileBanking] {
- didSet {
- os_log("Mobile Banking Chooser: Showing options - %{private}@",
- log: uiLogObject,
- type: .info,
- showingValues.map { $0.description }.joined(separator: ", "))
- }
- }
-
- @IBOutlet private var mobileBankingNameLabels: [UILabel]!
-
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
- applyPrimaryColor()
- applySecondaryColor()
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
- }
-
- override func staticIndexPath(forValue value: PaymentInformation.MobileBanking) -> IndexPath {
- switch value {
- case .bay:
- return IndexPath(row: 0, section: 0)
- case .bbl:
- return IndexPath(row: 1, section: 0)
- case .kbank:
- return IndexPath(row: 2, section: 0)
- case .scb:
- return IndexPath(row: 3, section: 0)
- case .ktb:
- return IndexPath(row: 4, section: 0)
- case .other:
- preconditionFailure("This value is not supported for the built-in chooser")
- }
- }
-
- override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- let cell = super.tableView(tableView, cellForRowAt: indexPath)
-
- if let cell = cell as? PaymentOptionTableViewCell {
- cell.separatorView.backgroundColor = currentSecondaryColor
- }
- cell.accessoryView?.tintColor = currentSecondaryColor
- return cell
- }
-
- override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
- let cell = tableView.cellForRow(at: indexPath)
- tableView.deselectRow(at: indexPath, animated: true)
- let bank = element(forUIIndexPath: indexPath)
-
- os_log("Mobile Banking Chooser: %{private}@ was selected", log: uiLogObject, type: .info, bank.description)
-
- let oldAccessoryView = cell?.accessoryView
- let loadingIndicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.gray)
- loadingIndicator.color = currentSecondaryColor
- cell?.accessoryView = loadingIndicator
- loadingIndicator.startAnimating()
- view.isUserInteractionEnabled = false
-
- flowSession?.requestCreateSource(.mobileBanking(bank)) { _ in
- cell?.accessoryView = oldAccessoryView
- self.view.isUserInteractionEnabled = true
- }
- }
-
- private func applyPrimaryColor() {
- guard isViewLoaded else {
- return
- }
-
- mobileBankingNameLabels.forEach {
- $0.textColor = currentPrimaryColor
- }
- }
-
- private func applySecondaryColor() {
- // Intentionally empty (SonarCloud warning fix)
- }
-}
diff --git a/OmiseSDK/MoreInformationOnCVVViewController.swift b/OmiseSDK/MoreInformationOnCVVViewController.swift
deleted file mode 100644
index 44320b14..00000000
--- a/OmiseSDK/MoreInformationOnCVVViewController.swift
+++ /dev/null
@@ -1,317 +0,0 @@
-import UIKit
-
-// swiftlint:disable:next type_name
-protocol MoreInformationOnCVVViewControllerDelegate: AnyObject {
- func moreInformationOnCVVViewControllerDidAskToClose(_ controller: MoreInformationOnCVVViewController)
-}
-
-class MoreInformationOnCVVViewController: UIViewController {
- static let preferredWidth: CGFloat = 240
-
- @IBOutlet private var cvvLocationImageView: UIImageView!
- @IBOutlet private var cvvLocationDescriptionLabel: UILabel!
- @IBOutlet private var closeButton: ExpandedHitAreaButton!
-
- var preferredCardBrand: CardBrand? {
- didSet {
- guard isViewLoaded else {
- return
- }
- updateUI()
- }
- }
-
- weak var delegate: MoreInformationOnCVVViewControllerDelegate?
-
- // need to refactor loadView, removing super results in crash
- // swiftlint:disable:next prohibited_super_call
- override func loadView() {
- super.loadView()
-
- view.backgroundColor = .background
- cvvLocationDescriptionLabel.textColor = .body
- cvvLocationImageView.tintColor = .body
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
-
- updateUI()
- }
-
- // swiftlint:disable:next private_action
- @IBAction func askToClose(_ sender: AnyObject) {
- delegate?.moreInformationOnCVVViewControllerDidAskToClose(self)
- }
-
- private func updateUI() {
- switch preferredCardBrand {
- case .amex?:
- cvvLocationImageView.image = UIImage(named: "CVV AMEX", in: .omiseSDK, compatibleWith: nil)
- cvvLocationDescriptionLabel.text = NSLocalizedString(
- "more-info.cvv-location.amex.text",
- bundle: .omiseSDK,
- value: "4 digit number on the front of your card",
- comment: "A descriptive text telling the location of CVV on the AMEX card")
- default:
- cvvLocationImageView.image = UIImage(named: "CVV", in: .omiseSDK, compatibleWith: nil)
- cvvLocationDescriptionLabel.text = NSLocalizedString(
- "more-info.cvv-location.default.text",
- bundle: .omiseSDK,
- value: "3 digit number on the back of your card",
- comment: "A descriptive text telling the location of CVV on the typical credit card")
- }
- }
-}
-
-class ExpandedHitAreaButton: UIButton {
- var hitAreaSize = CGSize(width: 44, height: 44)
-
- override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
- let horizontalInset = max(0, (hitAreaSize.width - bounds.width)) / 2
- let verticalInset = max(0, (hitAreaSize.height - bounds.height)) / 2
- return bounds.insetBy(dx: -horizontalInset, dy: -verticalInset).contains(point)
- }
-}
-
-class OverlayPanelTransitioningDelegate: NSObject, UIViewControllerTransitioningDelegate {
- var alertPresentationController: OverlayPanelPresentationController?
-
- func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
- alertPresentationController = OverlayPanelPresentationController(presentedViewController: presented, presenting: presenting)
- return alertPresentationController
- }
-
- func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
- alertPresentationController?.isPresenting = true
- return alertPresentationController
- }
-
- func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
- alertPresentationController?.isPresenting = false
- return alertPresentationController
- }
-}
-
-class OverlayPanelPresentationController: UIPresentationController {
- var isPresenting = false
- let dismissTapGestureRecognizer = UITapGestureRecognizer()
-
- private static let defaultDimmingViewColor: UIColor = {
- let defaultLightAppearanceColor = UIColor(red: 0.26, green: 0.27, blue: 0.28, alpha: 0.5)
- #if compiler(>=5.1)
- if #available(iOS 13, *) {
- return UIColor.black.withAlphaComponent(0.5)
- } else {
- return defaultLightAppearanceColor
- }
- #else
- return defaultLightAppearanceColor
- #endif
- }()
-
- fileprivate let dimmingView: UIView = {
- let view = UIView()
- view.translatesAutoresizingMaskIntoConstraints = false
- view.backgroundColor = OverlayPanelPresentationController.defaultDimmingViewColor
- view.alpha = 0.0
-
- return view
- }()
-
- override var frameOfPresentedViewInContainerView: CGRect {
- guard let containerView = containerView else {
- return super.frameOfPresentedViewInContainerView
- }
- let presentedViewSize = size(forChildContentContainer: presentedViewController, withParentContainerSize: containerView.bounds.size)
- return containerView.bounds.centeredRectWithSize(presentedViewSize)
- }
-
- override init(presentedViewController: UIViewController, presenting presentingViewController: UIViewController?) {
- super.init(presentedViewController: presentedViewController, presenting: presentingViewController)
- dismissTapGestureRecognizer.addTarget(self, action: #selector(requestToDismiss(_:)))
- dimmingView.addGestureRecognizer(dismissTapGestureRecognizer)
- dismissTapGestureRecognizer.isEnabled = false
- }
-
- override func presentationTransitionWillBegin() {
- guard let containerView = containerView else {
- return
- }
-
- if dimmingView.superview !== containerView {
- containerView.insertSubview(dimmingView, at: 0)
-
- NSLayoutConstraint.activate([
- dimmingView.topAnchor.constraint(equalTo: containerView.topAnchor),
- dimmingView.bottomAnchor.constraint(equalTo: containerView.bottomAnchor),
- dimmingView.leadingAnchor.constraint(equalTo: containerView.leadingAnchor),
- dimmingView.trailingAnchor.constraint(equalTo: containerView.trailingAnchor)
- ])
- }
-
- guard let coordinator = presentedViewController.transitionCoordinator else {
- dimmingView.alpha = 1.0
- return
- }
-
- coordinator.animate { _ in
- self.dimmingView.alpha = 1.0
- }
-
- dismissTapGestureRecognizer.isEnabled = true
- }
-
- override func dismissalTransitionWillBegin() {
- guard let coordinator = presentedViewController.transitionCoordinator else {
- dimmingView.alpha = 0.0
- return
- }
-
- coordinator.animate { _ in
- self.dimmingView.alpha = 0.0
- }
- dismissTapGestureRecognizer.isEnabled = false
- }
-
- override func containerViewWillLayoutSubviews() {
- guard let presentedView = self.presentedView else {
- return
- }
-
- let frameOfPresentedViewInContainerView = self.frameOfPresentedViewInContainerView
-
- presentedView.frame = frameOfPresentedViewInContainerView
-
- let presentedLayer: CALayer = presentedView.layer
- presentedLayer.cornerRadius = 10
- presentedLayer.shadowOffset = CGSize(width: 0, height: 2)
- presentedLayer.shadowRadius = 4
- presentedLayer.shadowOpacity = 1.0
- if #available(iOS 13, *) {
- switch traitCollection.userInterfaceStyle {
- case .dark:
- presentedLayer.shadowColor = UIColor.black.cgColor
- default:
- presentedLayer.shadowColor = UIColor(red: 0.27, green: 0.29, blue: 0.32, alpha: 0.25).cgColor
- }
- } else {
- presentedLayer.shadowColor = UIColor(red: 0.27, green: 0.29, blue: 0.32, alpha: 0.25).cgColor
- }
- presentedLayer.shadowPath = UIBezierPath(
- roundedRect: CGRect(origin: .zero, size: frameOfPresentedViewInContainerView.size),
- cornerRadius: 10).cgPath
- }
-
- override func size(forChildContentContainer container: UIContentContainer, withParentContainerSize parentSize: CGSize) -> CGSize {
- guard let viewController = container as? UIViewController, viewController === presentedViewController else {
- return super.size(forChildContentContainer: container, withParentContainerSize: parentSize)
- }
-
- let preferredContentSizeWidth = MoreInformationOnCVVViewController.preferredWidth
-
- let calculatedPreferredContentSize = viewController.view.systemLayoutSizeFitting(
- CGSize(width: min(preferredContentSizeWidth, parentSize.width), height: UIView.layoutFittingCompressedSize.height),
- withHorizontalFittingPriority: UILayoutPriority.required,
- verticalFittingPriority: UILayoutPriority.fittingSizeLevel)
- let preferredContentSizeHeight = min(
- ceil(calculatedPreferredContentSize.height),
- parentSize.height)
-
- return CGSize(width: preferredContentSizeWidth, height: preferredContentSizeHeight)
- }
-
- override func preferredContentSizeDidChange(forChildContentContainer container: UIContentContainer) {
- super.preferredContentSizeDidChange(forChildContentContainer: container)
- guard let container = container as? UIViewController, container === presentedViewController,
- let containerView = containerView, container.view.isDescendant(of: containerView) else {
- return
- }
-
- UIView.animate(withDuration: 0.18) {
- container.view.frame = self.frameOfPresentedViewInContainerView
- }
- }
-
- override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
- super.traitCollectionDidChange(previousTraitCollection)
-
- if #available(iOS 13, *), let presentedView = self.presentedView {
- switch traitCollection.userInterfaceStyle {
- case .dark:
- presentedView.layer.shadowColor = UIColor.black.cgColor
- default:
- presentedView.layer.shadowColor = UIColor(red: 0.27, green: 0.29, blue: 0.32, alpha: 0.25).cgColor
- }
- }
- }
-
- @objc func requestToDismiss(_ sender: AnyObject) {
- if let presentedViewController = presentedViewController as? MoreInformationOnCVVViewController {
- presentedViewController.askToClose(sender)
- } else {
- presentingViewController.dismiss(animated: true, completion: nil)
- }
- }
-}
-
-extension OverlayPanelPresentationController: UIAdaptivePresentationControllerDelegate {
- func adaptivePresentationStyle(for controller: UIPresentationController, traitCollection: UITraitCollection) -> UIModalPresentationStyle {
- return .overCurrentContext
- }
-}
-
-extension OverlayPanelPresentationController: UIViewControllerAnimatedTransitioning {
- func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
- return 0.18
- }
-
- func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
- let key = isPresenting ? UITransitionContextViewControllerKey.to : UITransitionContextViewControllerKey.from
-
- guard let controller = transitionContext.viewController(forKey: key) else {
- return
- }
-
- if isPresenting {
- transitionContext.containerView.addSubview(controller.view)
- }
-
- let presentedFrame = transitionContext.finalFrame(for: controller)
- var dismissedFrame = presentedFrame
- dismissedFrame.origin.y += 100
-
- let initialFrame = isPresenting ? dismissedFrame : presentedFrame
- let finalFrame = isPresenting ? presentedFrame : dismissedFrame
-
- let initialAlpha: CGFloat = isPresenting ? 0.0 : 1.0
- let finalAlpha: CGFloat = isPresenting ? 1.0 : 0.0
-
- let animationDuration = transitionDuration(using: transitionContext)
- controller.view.frame = initialFrame
- controller.view.alpha = initialAlpha
-
- let animationBlock: () -> Void = {
- controller.view.frame = finalFrame
- controller.view.alpha = finalAlpha
- }
-
- let animator = UIViewPropertyAnimator(duration: animationDuration, timingParameters: UISpringTimingParameters())
- animator.addAnimations(animationBlock)
- animator.addCompletion { position in
- transitionContext.completeTransition(position == UIViewAnimatingPosition.end)
- }
- animator.startAnimation()
- }
-}
-
-extension CGRect {
- func centeredRectWithSize(_ size: CGSize) -> CGRect {
- let origin = CGPoint(
- x: midX - (size.width / 2),
- y: midY - (size.height / 2)
- )
-
- return CGRect(origin: origin, size: size)
- }
-}
diff --git a/OmiseSDK/Object.swift b/OmiseSDK/Object.swift
deleted file mode 100644
index 447ce6d5..00000000
--- a/OmiseSDK/Object.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import Foundation
-
-public protocol Object: Decodable {
- var object: String { get }
-}
-
-public protocol CreatableObject: Object {
- associatedtype CreateParameter: Encodable
-
- static var postURL: URL { get }
-
- var id: String { get }
-}
diff --git a/OmiseSDK/PaymentChooserViewController.swift b/OmiseSDK/PaymentChooserViewController.swift
deleted file mode 100644
index 6d0d94dc..00000000
--- a/OmiseSDK/PaymentChooserViewController.swift
+++ /dev/null
@@ -1,651 +0,0 @@
-// swiftlint:disable file_length
-import UIKit
-import os
-
-enum PaymentChooserOption: CaseIterable, Equatable, CustomStringConvertible {
- case alipay
- case alipayCN
- case alipayHK
- case atome
- case boost
- case citiPoints
- case conbini
- case creditCard
- case dana
- case duitNowOBW
- case duitNowQR
- case fpx
- case gcash
- case grabPay
- case grabPayRms
- case installment
- case internetBanking
- case kakaoPay
- case maybankQRPay
- case mobileBanking
- case netBanking
- case ocbcDigital
- case payEasy
- case paynow
- case payPay
- case promptpay
- case rabbitLinepay
- case shopeePay
- case shopeePayJumpApp
- case tescoLotus
- case touchNGo
- case touchNGoAlipayPlus
- case truemoney
- case truemoneyJumpApp
- case weChat
-
- static var alphabetical: [PaymentChooserOption] {
- PaymentChooserOption.allCases.sorted {
- $0.description.localizedCaseInsensitiveCompare($1.description) == .orderedAscending
- }
- }
-
- static let topList: [PaymentChooserOption] = [
- .creditCard,
- .paynow,
- .promptpay,
- .truemoney,
- .truemoneyJumpApp,
- .mobileBanking,
- .internetBanking,
- .alipay,
- .installment,
- .ocbcDigital,
- .rabbitLinepay,
- .shopeePay,
- .shopeePayJumpApp,
- .alipayCN,
- .alipayHK
- ]
-
- static var sorting: [PaymentChooserOption] {
- var sorted = topList
- for item in alphabetical where !sorted.contains(item) {
- sorted.append(item)
- }
- return sorted
- }
-
- var description: String {
- switch self {
- case .creditCard:
- return "Credit Card"
- case .installment:
- return "Installment"
- case .internetBanking:
- return "InternetBanking"
- case .mobileBanking:
- return "MobileBanking"
- case .tescoLotus:
- return "Tesco Lotus"
- case .conbini:
- return "Conbini"
- case .payEasy:
- return "PayEasy"
- case .netBanking:
- return "NetBanking"
- case .alipay:
- return "Alipay"
- case .alipayCN:
- return "Alipay CN"
- case .alipayHK:
- return "Alipay HK"
- case .atome:
- return "Atome"
- case .dana:
- return "DANA"
- case .gcash:
- return "GCash"
- case .kakaoPay:
- return "Kakao Pay"
- case .touchNGoAlipayPlus:
- return "TNG eWallet"
- case .promptpay:
- return "PromptPay"
- case .paynow:
- return "PayNow"
- case .truemoney:
- return "TrueMoney Wallet"
- case .truemoneyJumpApp:
- return "TrueMoney"
- case .citiPoints:
- return "CitiPoints"
- case .fpx:
- return "FPX"
- case .rabbitLinepay:
- return "Rabbit LINE Pay"
- case .ocbcDigital:
- return "OCBC Digital"
- case .grabPay:
- return "Grab"
- case .boost:
- return "Boost"
- case .shopeePay:
- return "ShopeePay"
- case .shopeePayJumpApp:
- return "ShopeePay"
- case .maybankQRPay:
- return "Maybank QRPay"
- case .duitNowQR:
- return "DuitNow QR"
- case .duitNowOBW:
- return "DuitNow OBW"
- case .touchNGo:
- return "Touch 'n Go"
- case .grabPayRms:
- return "GrabPay"
- case .payPay:
- return "PayPay"
- case .weChat:
- return "WeChat Pay"
- }
- }
-}
-
-extension PaymentChooserOption {
- // swiftlint:disable:next function_body_length
- fileprivate static func paymentOptions(for sourceType: SourceTypeValue) -> [PaymentChooserOption] {
- switch sourceType {
- case .trueMoney:
- return [.truemoney]
- case .trueMoneyJumpApp:
- return [.truemoneyJumpApp]
- case .installmentFirstChoice, .installmentMBB, .installmentKBank, .installmentKTC,
- .installmentBBL, .installmentBAY, .installmentSCB, .installmentTTB, .installmentUOB:
- return [.installment]
- case .billPaymentTescoLotus:
- return [.tescoLotus]
- case .eContext:
- return [.conbini, .payEasy, .netBanking]
- case .alipay:
- return [.alipay]
- case .alipayCN:
- return [.alipayCN]
- case .alipayHK:
- return [.alipayHK]
- case .atome:
- return [.atome]
- case .dana:
- return [.dana]
- case .gcash:
- return [.gcash]
- case .kakaoPay:
- return [.kakaoPay]
- case .touchNGoAlipayPlus:
- return [.touchNGoAlipayPlus]
- case .touchNGo:
- return [.touchNGo]
- case .internetBankingBAY, .internetBankingBBL:
- return [.internetBanking]
- case .mobileBankingSCB, .mobileBankingKBank, .mobileBankingBAY, .mobileBankingBBL, .mobileBankingKTB:
- return [.mobileBanking]
- case .payNow:
- return [.paynow]
- case .promptPay:
- return [.promptpay]
- case .pointsCiti:
- return [.citiPoints]
- case .barcodeAlipay:
- return []
- case .fpx:
- return [.fpx]
- case .rabbitLinepay:
- return [.rabbitLinepay]
- case .mobileBankingOCBC:
- return [.ocbcDigital]
- case .grabPay:
- return [.grabPay]
- case .grabPayRms:
- return [.grabPayRms]
- case .boost:
- return [.boost]
- case .shopeePay:
- return [.shopeePay]
- case .shopeePayJumpApp:
- return [.shopeePayJumpApp]
- case .maybankQRPay:
- return [.maybankQRPay]
- case .duitNowQR:
- return [.duitNowQR]
- case .duitNowOBW:
- return [.duitNowOBW]
- case .payPay:
- return [.payPay]
- case .weChat:
- return [.weChat]
- }
- }
-}
-
-// swiftlint:disable:next type_body_length
-class PaymentChooserViewController: AdaptableStaticTableViewController,
- PaymentSourceChooser,
- PaymentChooserUI {
- var capability: Capability?
- var flowSession: PaymentCreatorFlowSession?
- var duitNowOBWBanks: [PaymentInformation.DuitNowOBW.Bank] = PaymentInformation.DuitNowOBW.Bank.allCases
-
- var showsCreditCardPayment = true {
- didSet {
- updateShowingValues()
- }
- }
- var allowedPaymentMethods: [SourceTypeValue] = [] {
- didSet {
- updateShowingValues()
- }
- }
-
- @IBOutlet private var paymentMethodNameLables: [UILabel]!
-
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
-
- applyPrimaryColor()
- applySecondaryColor()
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
- applyNavigationBarStyle()
- updateShowingValues()
- }
-
- // swiftlint:disable:next function_body_length
- override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
- switch (segue.identifier, segue.destination) {
- case ("GoToCreditCardFormSegue"?, let controller as CreditCardFormViewController):
- controller.publicKey = flowSession?.client?.publicKey
- controller.delegate = flowSession
- controller.navigationItem.rightBarButtonItem = nil
- case ("GoToInternetBankingChooserSegue"?, let controller as InternetBankingSourceChooserViewController):
- controller.showingValues = allowedPaymentMethods.compactMap({ $0.internetBankingSource })
- controller.flowSession = self.flowSession
- case ("GoToMobileBankingChooserSegue"?, let controller as MobileBankingSourceChooserViewController):
- controller.showingValues = allowedPaymentMethods.compactMap({ $0.mobileBankingSource })
- controller.flowSession = self.flowSession
- case ("GoToInstallmentBrandChooserSegue"?, let controller as InstallmentBankingSourceChooserViewController):
- controller.showingValues = allowedPaymentMethods.compactMap({ $0.installmentBrand })
- controller.flowSession = self.flowSession
- case (_, let controller as EContextInformationInputViewController):
- controller.flowSession = self.flowSession
- if let element = (sender as? UITableViewCell).flatMap(tableView.indexPath(for:)).map(element(forUIIndexPath:)) {
- switch element {
- case .conbini:
- controller.navigationItem.title = NSLocalizedString(
- "econtext.convenience-store.navigation-item.title",
- bundle: .omiseSDK,
- value: "Konbini",
- comment: "A navigaiton title for the EContext screen when the `Konbini` is selected"
- )
- case .netBanking:
- controller.navigationItem.title = NSLocalizedString(
- "econtext.netbanking.navigation-item.title",
- bundle: .omiseSDK,
- value: "Net Bank",
- comment: "A navigaiton title for the EContext screen when the `Net Bank` is selected"
- )
- case .payEasy:
- controller.navigationItem.title = NSLocalizedString(
- "econtext.pay-easy.navigation-item.title",
- bundle: .omiseSDK,
- value: "Pay-easy",
- comment: "A navigaiton title for the EContext screen when the `Pay-easy` is selected"
- )
- default: break
- }
- }
- case ("GoToTrueMoneyFormSegue"?, let controller as TrueMoneyFormViewController):
- controller.flowSession = self.flowSession
- case ("GoToFPXFormSegue"?, let controller as FPXFormViewController):
- controller.showingValues = capability?[.fpx]?.banks ?? []
- controller.flowSession = self.flowSession
- case ("GoToDuitNowOBWBankChooserSegue"?, let controller as DuitNowOBWBankChooserViewController):
- controller.showingValues = duitNowOBWBanks
- controller.flowSession = self.flowSession
- default:
- break
- }
-
- if let paymentShourceChooserUI = segue.destination as? PaymentChooserUI {
- paymentShourceChooserUI.preferredPrimaryColor = self.preferredPrimaryColor
- paymentShourceChooserUI.preferredSecondaryColor = self.preferredSecondaryColor
- }
- }
-
- override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
- let cell = super.tableView(tableView, cellForRowAt: indexPath)
-
- if let cell = cell as? PaymentOptionTableViewCell {
- cell.separatorView.backgroundColor = currentSecondaryColor
- }
- cell.accessoryView?.tintColor = currentSecondaryColor
- return cell
- }
-
- // swiftlint:disable:next function_body_length
- override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
- let cell = tableView.cellForRow(at: indexPath)
- tableView.deselectRow(at: indexPath, animated: true)
- let payment: PaymentInformation
-
- let selectedType = element(forUIIndexPath: indexPath)
-
- os_log("Payment Chooser: %{private}@ was selected", log: uiLogObject, type: .info, selectedType.description)
- switch selectedType {
- case .alipay:
- payment = .alipay
- case .alipayCN:
- payment = .alipayCN
- case .alipayHK:
- payment = .alipayHK
- case .dana:
- payment = .dana
- case .gcash:
- payment = .gcash
- case .kakaoPay:
- payment = .kakaoPay
- case .touchNGoAlipayPlus, .touchNGo:
- payment = .touchNGo
- case .tescoLotus:
- payment = .billPayment(.tescoLotus)
- case .promptpay:
- payment = .promptpay
- case .paynow:
- payment = .paynow
- case .citiPoints:
- payment = .points(.citiPoints)
- case .rabbitLinepay:
- payment = .rabbitLinepay
- case .ocbcDigital:
- payment = .ocbcDigital
- case .grabPay, .grabPayRms:
- payment = .grabPay
- case .boost:
- payment = .boost
- case .shopeePay:
- payment = .shopeePay
- case .shopeePayJumpApp:
- payment = .shopeePayJumpApp
- case .maybankQRPay:
- payment = .maybankQRPay
- case .duitNowQR:
- payment = .duitNowQR
- case .payPay:
- payment = .payPay
- case .atome:
- goToAtome()
- return
- case .truemoneyJumpApp:
- payment = .truemoneyJumpApp
- case .weChat:
- payment = .weChat
- default:
- return
- }
-
- let oldAccessoryView = cell?.accessoryView
- let loadingIndicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.gray)
- loadingIndicator.color = currentSecondaryColor
- cell?.accessoryView = loadingIndicator
- loadingIndicator.startAnimating()
- view.isUserInteractionEnabled = false
-
- flowSession?.requestCreateSource(payment) { _ in
- cell?.accessoryView = oldAccessoryView
- self.view.isUserInteractionEnabled = true
- }
- }
-
- func goToAtome() {
- let vc = AtomeFormViewController(viewModel: AtomeFormViewModel(flowSession: flowSession))
- vc.preferredPrimaryColor = self.preferredPrimaryColor
- vc.preferredSecondaryColor = self.preferredSecondaryColor
-
- navigationController?.pushViewController(vc, animated: true)
- }
-
- // swiftlint:disable:next function_body_length
- override func staticIndexPath(forValue value: PaymentChooserOption) -> IndexPath {
- switch value {
- case .creditCard:
- return IndexPath(row: 0, section: 0)
- case .installment:
- return IndexPath(row: 1, section: 0)
- case .truemoney:
- return IndexPath(row: 2, section: 0)
- case .promptpay:
- return IndexPath(row: 3, section: 0)
- case .citiPoints:
- return IndexPath(row: 4, section: 0)
- case .alipay:
- return IndexPath(row: 5, section: 0)
- case .internetBanking:
- return IndexPath(row: 6, section: 0)
- case .tescoLotus:
- return IndexPath(row: 7, section: 0)
- case .paynow:
- return IndexPath(row: 8, section: 0)
- case .conbini:
- return IndexPath(row: 9, section: 0)
- case .payEasy:
- return IndexPath(row: 10, section: 0)
- case .netBanking:
- return IndexPath(row: 11, section: 0)
- case .mobileBanking:
- return IndexPath(row: 12, section: 0)
- case .fpx:
- return IndexPath(row: 13, section: 0)
- case .alipayCN:
- return IndexPath(row: 14, section: 0)
- case .alipayHK:
- return IndexPath(row: 15, section: 0)
- case .dana:
- return IndexPath(row: 16, section: 0)
- case .gcash:
- return IndexPath(row: 17, section: 0)
- case .kakaoPay:
- return IndexPath(row: 18, section: 0)
- case .touchNGoAlipayPlus:
- return IndexPath(row: 19, section: 0)
- case .rabbitLinepay:
- return IndexPath(row: 20, section: 0)
- case .ocbcDigital:
- return IndexPath(row: 21, section: 0)
- case .grabPay:
- return IndexPath(row: 22, section: 0)
- case .boost:
- return IndexPath(row: 23, section: 0)
- case .shopeePay, .shopeePayJumpApp:
- return IndexPath(row: 24, section: 0)
- case .maybankQRPay:
- return IndexPath(row: 25, section: 0)
- case .duitNowQR:
- return IndexPath(row: 26, section: 0)
- case .duitNowOBW:
- return IndexPath(row: 27, section: 0)
- case .touchNGo:
- return IndexPath(row: 28, section: 0)
- case .grabPayRms:
- return IndexPath(row: 29, section: 0)
- case .atome:
- return IndexPath(row: 30, section: 0)
- case .payPay:
- return IndexPath(row: 31, section: 0)
- case .truemoneyJumpApp:
- return IndexPath(row: 32, section: 0)
- case .weChat:
- return IndexPath(row: 33, section: 0)
- }
- }
-
- // swiftlint:disable:next function_body_length
- func applyPaymentMethods(from capability: Capability) {
- self.capability = capability
- showsCreditCardPayment = capability.creditCardBackend != nil
-
- // swiftlint:disable:next closure_body_length
- allowedPaymentMethods = capability.supportedBackends.compactMap {
- switch $0.payment {
- case .alipay:
- return SourceTypeValue.alipay
- case .alipayCN:
- return SourceTypeValue.alipayCN
- case .alipayHK:
- return SourceTypeValue.alipayHK
- case .atome:
- return SourceTypeValue.atome
- case .dana:
- return SourceTypeValue.dana
- case .gcash:
- return SourceTypeValue.gcash
- case .kakaoPay:
- return SourceTypeValue.kakaoPay
- case .touchNGoAlipayPlus:
- return SourceTypeValue.touchNGoAlipayPlus
- case .touchNGo:
- return SourceTypeValue.touchNGo
- case .promptpay:
- return SourceTypeValue.promptPay
- case .paynow:
- return SourceTypeValue.payNow
- case .truemoney:
- return SourceTypeValue.trueMoney
- case .truemoneyJumpApp:
- return SourceTypeValue.trueMoneyJumpApp
- case .points(let points):
- return SourceTypeValue(points.type)
- case .installment(let brand, availableNumberOfTerms: _):
- return SourceTypeValue(brand.type)
- case .internetBanking(let bank):
- return SourceTypeValue(bank.type)
- case .billPayment(let billPayment):
- return SourceTypeValue(billPayment.type)
- case .eContext:
- return SourceTypeValue.eContext
- case .mobileBanking(let bank):
- return SourceTypeValue(bank.type)
- case .fpx:
- return SourceTypeValue.fpx
- case .rabbitLinepay:
- return SourceTypeValue.rabbitLinepay
- case .ocbcDigital:
- return SourceTypeValue.mobileBankingOCBC
- case .grabPay:
- return SourceTypeValue.grabPay
- case .grabPayRms:
- return SourceTypeValue.grabPayRms
- case .boost:
- return SourceTypeValue.boost
- case .shopeePay:
- // using ShopeePay Jump app as first priority ShopeePay source
- let isShopeePayJumpAppExist = capability.supportedBackends.contains(
- where: { $0.payment == Capability.Backend.Payment.shopeePayJumpApp }
- )
- if !isShopeePayJumpAppExist {
- return SourceTypeValue.shopeePay
- }
- return nil
- case .shopeePayJumpApp:
- return SourceTypeValue.shopeePayJumpApp
- case .maybankQRPay:
- return SourceTypeValue.maybankQRPay
- case .duitNowQR:
- return SourceTypeValue.duitNowQR
- case .duitNowOBW:
- return SourceTypeValue.duitNowOBW
- case .payPay:
- return SourceTypeValue.payPay
- case .weChat:
- return SourceTypeValue.weChat
- case .card, .unknownSource:
- return nil
- }
- }
-
- updateShowingValues()
- }
-
- private func loadCapabilityData() {
- flowSession?.client?.capabilityDataWithCompletionHandler { (result) in
- switch result {
- case .success(let capability):
- self.applyPaymentMethods(from: capability)
- case .failure:
- break
- }
- }
- }
-
- private func applyPrimaryColor() {
- guard isViewLoaded else {
- return
- }
-
- paymentMethodNameLables.forEach {
- $0.textColor = currentPrimaryColor
- }
- }
-
- private func applySecondaryColor() {
- // Intentionally empty (SonarCloud warning fix)
- }
-
- private func updateShowingValues() {
- var paymentMethodsToShow = paymentOptions(from: allowedPaymentMethods)
- paymentMethodsToShow = appendCreditCardPayment(paymentOptions: paymentMethodsToShow)
- paymentMethodsToShow = filterTrueMoney(paymentOptions: paymentMethodsToShow)
- showingValues = paymentMethodsToShow.reorder(by: PaymentChooserOption.sorting)
-
- os_log("Payment Chooser: Showing options - %{private}@",
- log: uiLogObject,
- type: .info,
- showingValues.map { $0.description }.joined(separator: ", "))
- }
-
- @IBAction private func requestToClose(_ sender: Any) {
- flowSession?.requestToCancel()
- }
-}
-
-private extension PaymentChooserViewController {
- func paymentOptions(from sourceTypes: [SourceTypeValue]) -> [PaymentChooserOption] {
- let paymentOptions: [PaymentChooserOption] = sourceTypes.reduce(into: []) { (result, sourceType) in
- let paymentOptions = PaymentChooserOption.paymentOptions(for: sourceType)
- for paymentOption in paymentOptions where !result.contains(paymentOption) {
- result.append(paymentOption)
- }
- }
- return paymentOptions
- }
-
- func appendCreditCardPayment(paymentOptions: [PaymentChooserOption]) -> [PaymentChooserOption] {
- var filter = paymentOptions
- if showsCreditCardPayment {
- filter.insert(.creditCard, at: 0)
- }
- return filter
- }
-
- func filterTrueMoney(paymentOptions: [PaymentChooserOption]) -> [PaymentChooserOption] {
- var filter = paymentOptions
- if filter.contains(.truemoney) && filter.contains(.truemoneyJumpApp) {
- filter.removeAll { $0 == .truemoney }
- }
- return filter
- }
-}
diff --git a/OmiseSDK/PaymentInformation.Atome.swift b/OmiseSDK/PaymentInformation.Atome.swift
deleted file mode 100644
index 762f43aa..00000000
--- a/OmiseSDK/PaymentInformation.Atome.swift
+++ /dev/null
@@ -1,103 +0,0 @@
-import Foundation
-
-public extension PaymentInformation {
- var isAtome: Bool {
- switch self {
- case .atome: return true
- default: return false
- }
- }
-
- var atomeData: Atome? {
- switch self {
- case .atome(let data): return data
- default: return nil
- }
-
- }
-
- struct Atome: PaymentMethod {
-
- public static var paymentMethodTypePrefix: String = SourceTypeValue.atome.rawValue
-
- public var type: String = SourceTypeValue.atome.rawValue
-
- /// The customers phone number. Contains only digits and has 10 or 11 characters
- public let phoneNumber: String
- public let name: String?
- public let email: String?
- public let items: [Item]
- public let shippingAddress: ShippingAddress
-
- private enum CodingKeys: String, CodingKey {
- case name
- case email
- case phoneNumber = "phone_number"
- case items = "items"
- case shippingAddress = "shipping"
- }
-
- /// Creates a new Atome source with the given customer information
- ///
- /// - Parameters:
- /// - phoneNumber: The customers phone number
- public init(phoneNumber: String, name: String? = nil, email: String? = nil, shippingAddress: ShippingAddress, items: [Item]) {
- self.name = name
- self.email = email
- self.phoneNumber = phoneNumber
- self.shippingAddress = shippingAddress
- self.items = items
- }
- }
-}
-
-public extension PaymentInformation.Atome {
- struct Item: Codable, Equatable {
- public let sku: String
- public let category: String?
- public let name: String
- public let quantity: Int
- public let amount: Int64
- public let itemUri: String?
- public let imageUri: String?
- public let brand: String?
-
- private enum CodingKeys: String, CodingKey {
- case sku
- case amount
- case name
- case quantity
- case category
- case brand
- case imageUri = "image_uri"
- case itemUri = "item_uri"
- }
- }
-
- struct ShippingAddress: Codable, Equatable {
- public let country: String
- public let city: String
- public let postalCode: String
- public let state: String
- public let street1: String
- public let street2: String
-
- private enum CodingKeys: String, CodingKey {
- case country
- case city
- case postalCode = "postal_code"
- case state
- case street1
- case street2
- }
-
- init(country: String, city: String, postalCode: String, state: String, street1: String, street2: String) {
- self.country = country
- self.city = city
- self.postalCode = postalCode
- self.state = state
- self.street1 = street1
- self.street2 = street2
- }
- }
-}
diff --git a/OmiseSDK/PaymentInformation.swift b/OmiseSDK/PaymentInformation.swift
deleted file mode 100644
index 92bca343..00000000
--- a/OmiseSDK/PaymentInformation.swift
+++ /dev/null
@@ -1,1221 +0,0 @@
-// swiftlint:disable file_length
-
-import Foundation
-
-public protocol PaymentMethod: Equatable, Codable {
- static var paymentMethodTypePrefix: String { get }
- var type: String { get }
-}
-
-// swiftlint:disable:next static_operator operator_whitespace
-func ~=(methodType: T.Type, type: String) -> Bool {
- return type.hasPrefix(methodType.paymentMethodTypePrefix)
-}
-
-/// Represents the payment information of a Source
-public enum PaymentInformation: Codable, Equatable {
-// swiftlint:disable:previous type_body_length
-
- /// The code of the bank for the Internet Bankning Payment
- public enum InternetBanking: PaymentMethod {
- public static let paymentMethodTypePrefix: String = "internet_banking_"
-
- case bay
- case bbl
- case other(String)
- }
- /// Internet Banking Payment Source
- case internetBanking(InternetBanking)
-
- /// Online Alipay Payment Source
- case alipay
-
- /// Online Alipay + China Wallet Payment Source
- case alipayCN
-
- /// Online Alipay + Hongkong Wallet Payment Source
- case alipayHK
-
- /// Online Atome Payment Source
- case atome(Atome)
-
- /// Online Alipay + Dana Wallet Payment Source
- case dana
-
- /// Online Alipay + Gcash Wallet Payment Source
- case gcash
-
- /// Online Alipay + KakaoPay Wallet Payment Source
- case kakaoPay
-
- /// Online Alipay + Touch N Go Wallet Payment Source
- case touchNGo
-
- /// The name of the supported services to process the Bill Payment
- public enum BillPayment: PaymentMethod {
- public static let paymentMethodTypePrefix: String = "bill_payment_"
-
- case tescoLotus
- case other(String)
- }
- /// Bill Payment Payment Source
- case billPayment(BillPayment)
-
- /// The name of the supported Barcode Payment services
- public enum Barcode: PaymentMethod {
- public static let paymentMethodTypePrefix: String = "barcode_"
-
- case alipay(AlipayBarcode)
- case other(String, parameters: [String: Any])
-
- public var type: String {
- switch self {
- case .alipay:
- return SourceTypeValue.barcodeAlipay.rawValue
- case .other(let value, _):
- return Barcode.paymentMethodTypePrefix + value
- }
- }
- }
- /// Barcode Payment Source
- case barcode(Barcode)
-
- /// The Installments information
- public struct Installment: PaymentMethod {
- public static let paymentMethodTypePrefix: String = "installment_"
-
- /// The code of the supported Installment payment banks
- public enum Brand: Equatable {
- case bay
- case firstChoice
- case bbl
- case mbb
- case ktc
- case kBank
- case scb
- case ttb
- case uob
- case other(String)
- }
-
- /// The brand of the bank of the installment
- public let brand: Brand
- /// A number of terms to do the installment
- public let numberOfTerms: Int
-
- /// Method for query the default list of the brand's available number of terms
- ///
- /// - Parameter brand: The brand that want to query ask
- /// - Returns: The numbers of available terms for installment payment
- static func availableTerms(for brand: Brand) -> IndexSet {
- switch brand {
- case .bay:
- return IndexSet([ 3, 4, 6, 9, 10 ])
- case .firstChoice:
- return IndexSet([ 3, 4, 6, 9, 10, 12, 18, 24, 36 ])
- case .bbl:
- return IndexSet([ 4, 6, 8, 9, 10 ])
- case .mbb:
- return IndexSet([ 6, 12, 18, 24 ])
- case .ktc:
- return IndexSet([ 3, 4, 5, 6, 7, 8, 9, 10 ])
- case .kBank:
- return IndexSet([ 3, 4, 6, 10 ])
- case .scb:
- return IndexSet([ 3, 4, 6, 9, 10 ])
- case .ttb:
- return IndexSet([ 3, 4, 6, 10, 12 ])
- case .uob:
- return IndexSet([ 3, 4, 6, 10 ])
- case .other:
- return IndexSet(1...60)
- }
- }
-
- public init(brand: Brand, numberOfTerms: Int) {
- self.brand = brand
- self.numberOfTerms = numberOfTerms
- }
- }
- /// Installments Payment Source
- case installment(Installment)
-
- /// The EContext customer information
- public struct EContext: PaymentMethod, Codable, Equatable {
- public static var paymentMethodTypePrefix: String = SourceTypeValue.eContext.rawValue
-
- public let type: String = SourceTypeValue.eContext.rawValue
-
- /// Customer name. The name cannot be longer than 10 characters
- public let name: String
- /// Customer email
- public let email: String
- /// Customer phone number. The phone number must contains only digit characters and has 10 or 11 characters
- public let phoneNumber: String
-
- private enum CodingKeys: String, CodingKey {
- case name
- case email
- case phoneNumber = "phone_number"
- }
-
- /// Creates a new EContext customer information with the given info
- ///
- /// - Parameters:
- /// - name: Customer name
- /// - email: Customer email
- /// - phoneNumber: Customer phone number
- public init(name: String, email: String, phoneNumber: String) {
- self.name = name
- self.email = email
- self.phoneNumber = phoneNumber
- }
- }
- /// E-Context Payment Source
- case eContext(EContext)
-
- /// PromptPay Payment Source
- case promptpay
-
- /// PayNow Payment Source
- case paynow
-
- /// WeChat Payment Source
- case weChat
-
- /// The TrueMoney customer information
- public struct TrueMoney: PaymentMethod {
-
- public static var paymentMethodTypePrefix: String = SourceTypeValue.trueMoney.rawValue
-
- public var type: String = SourceTypeValue.trueMoney.rawValue
-
- /// The customers phone number. Contains only digits and has 10 or 11 characters
- public let phoneNumber: String
-
- private enum CodingKeys: String, CodingKey {
- case phoneNumber = "phone_number"
- }
-
- /// Creates a new TrueMoney source with the given customer information
- ///
- /// - Parameters:
- /// - phoneNumber: The customers phone number
- public init(phoneNumber: String) {
- self.phoneNumber = phoneNumber
- }
-
- }
-
- /// TrueMoney Payment Source
- case truemoney(TrueMoney)
- case truemoneyJumpApp
-
- /// The name of the supported services to process the Points Payment
- public enum Points: PaymentMethod {
- public static let paymentMethodTypePrefix: String = "points_"
-
- case citiPoints
- case other(String)
- }
-
- /// Points Payment Source
- case points(Points)
-
- /// The code of the bank for the Internet Bankning Payment
- public enum MobileBanking: PaymentMethod {
- public static let paymentMethodTypePrefix: String = "mobile_banking_"
-
- case scb
- case kbank
- case bay
- case bbl
- case ktb
- case other(String)
- }
-
- /// Mobile Banking Payment Source
- case mobileBanking(MobileBanking)
-
- /// Internet Banking FPX
- public struct FPX: PaymentMethod {
- public static var paymentMethodTypePrefix: String = SourceTypeValue.fpx.rawValue
-
- public var type: String = SourceTypeValue.fpx.rawValue
-
- /// The customer's bank name
- public let bank: String
-
- /// Customer email
- public let email: String?
-
- private enum CodingKeys: String, CodingKey {
- case bank
- case email
- }
-
- /// Creates a new FPX source with the given bank name
- ///
- /// - Parameters:
- /// - bank: Internet banking name e.g. uob
- /// - email: Customer email
- public init(bank: String, email: String?) {
- self.bank = bank
- self.email = email
- }
- }
-
- /// Internet Banking FPX
- case fpx(FPX)
-
- // Rabbit LINE Pay
- case rabbitLinepay
-
- /// OCBC Digital Payment Source
- case ocbcDigital
-
- /// Boost Payment Source
- case boost
-
- /// ShopeePay Payment Source
- case shopeePay
-
- /// ShopeePayJumpApp Payment Source
- case shopeePayJumpApp
-
- /// Maybank QRPay Payment Source
- case maybankQRPay
-
- /// DuitNow QR Payment Source
- case duitNowQR
-
- /// DuitNow OBW
- public struct DuitNowOBW: PaymentMethod {
- public static var paymentMethodTypePrefix: String = SourceTypeValue.duitNowOBW.rawValue
-
- public var type: String = SourceTypeValue.duitNowOBW.rawValue
-
- /// The code of the supported Installment payment banks
- public enum Bank: Equatable {
- case affin
- case alliance
- case agro
- case ambank
- case cimb
- case islam
- case rakyat
- case muamalat
- case bsn
- case hongleong
- case hsbc
- case kfh
- case maybank2u
- case ocbc
- case publicBank
- case rhb
- case sc
- case uob
- case other(String)
- }
-
- /// The customer's bank name
- public let bank: String
-
- private enum CodingKeys: String, CodingKey {
- case bank
- }
-
- /// Creates a new DuitNow OBW source with the given bank name
- ///
- /// - Parameters:
- /// - bank: bank name e.g. affin
- public init(bank: String) {
- self.bank = bank
- }
- }
-
- /// DuitNow OBW Payment Source
- case duitNowOBW(DuitNowOBW)
-
- // GrabPay
- case grabPay
-
- // PayPay
- case payPay
-
- /// Other Payment Source
- case other(type: String, parameters: [String: Any])
-
- fileprivate enum CodingKeys: String, CodingKey {
- case type
- }
-
- // swiftlint:disable:next function_body_length
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: CodingKeys.self)
- let typeValue = try container.decode(String.self, forKey: .type)
-
- switch typeValue {
- case PaymentInformation.InternetBanking.self:
- self = .internetBanking(try PaymentInformation.InternetBanking(from: decoder))
- case PaymentInformation.BillPayment.self:
- self = .billPayment(try BillPayment(from: decoder))
- case PaymentInformation.Barcode.self:
- self = .barcode(try Barcode(from: decoder))
- case PaymentInformation.Installment.self:
- self = .installment(try Installment(from: decoder))
- case PaymentInformation.EContext.self:
- self = .eContext(try EContext(from: decoder))
- case SourceTypeValue.alipay.rawValue:
- self = .alipay
- case SourceTypeValue.alipayCN.rawValue:
- self = .alipayCN
- case SourceTypeValue.alipayHK.rawValue:
- self = .alipayHK
- case SourceTypeValue.atome.rawValue:
- self = .atome(try Atome(from: decoder))
- case SourceTypeValue.dana.rawValue:
- self = .dana
- case SourceTypeValue.gcash.rawValue:
- self = .gcash
- case SourceTypeValue.kakaoPay.rawValue:
- self = .kakaoPay
- case SourceTypeValue.touchNGo.rawValue:
- self = .touchNGo
- case SourceTypeValue.promptPay.rawValue:
- self = .promptpay
- case SourceTypeValue.payNow.rawValue:
- self = .paynow
- case SourceTypeValue.trueMoney.rawValue:
- self = .truemoney(try TrueMoney(from: decoder))
- case SourceTypeValue.rabbitLinepay.rawValue:
- self = .rabbitLinepay
- case SourceTypeValue.grabPay.rawValue:
- self = .grabPay
- case SourceTypeValue.boost.rawValue:
- self = .boost
- case SourceTypeValue.shopeePay.rawValue:
- self = .shopeePay
- case SourceTypeValue.shopeePayJumpApp.rawValue:
- self = .shopeePayJumpApp
- case SourceTypeValue.maybankQRPay.rawValue:
- self = .maybankQRPay
- case SourceTypeValue.duitNowQR.rawValue:
- self = .duitNowQR
- case PaymentInformation.Points.self:
- self = .points(try Points(from: decoder))
- case PaymentInformation.MobileBanking.self:
- self = .mobileBanking(try PaymentInformation.MobileBanking(from: decoder))
- case PaymentInformation.FPX.self:
- self = .fpx(try FPX(from: decoder))
- case PaymentInformation.DuitNowOBW.self:
- self = .duitNowOBW(try DuitNowOBW(from: decoder))
- case SourceTypeValue.payPay.rawValue:
- self = .payPay
- case let value:
- self = .other(type: value, parameters: try decoder.decodeJSONDictionary().filter({ (key, _) -> Bool in
- switch key {
- case CodingKeys.type.stringValue, Source.CodingKeys.object.stringValue,
- Source.CodingKeys.id.stringValue, Source.CodingKeys.flow.stringValue,
- Source.CodingKeys.currency.stringValue, Source.CodingKeys.amount.stringValue,
- "livemode", "location":
- return false
- default: return true
- }
- }))
- }
- }
-
- // swiftlint:disable:next function_body_length
- public func encode(to encoder: Encoder) throws {
- switch self {
- case .internetBanking(let value):
- try value.encode(to: encoder)
- case .billPayment(let value):
- try value.encode(to: encoder)
- case .barcode(let value):
- try value.encode(to: encoder)
- case .installment(let value):
- try value.encode(to: encoder)
- case .alipay:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.alipay.rawValue, forKey: .type)
- case .alipayCN:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.alipayCN.rawValue, forKey: .type)
- case .alipayHK:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.alipayHK.rawValue, forKey: .type)
- case .atome:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.atome.rawValue, forKey: .type)
- case .dana:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.dana.rawValue, forKey: .type)
- case .gcash:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.gcash.rawValue, forKey: .type)
- case .kakaoPay:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.kakaoPay.rawValue, forKey: .type)
- case .touchNGo:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.touchNGo.rawValue, forKey: .type)
- case .eContext(let eContext):
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.eContext.rawValue, forKey: .type)
- try eContext.encode(to: encoder)
- case .promptpay:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.promptPay.rawValue, forKey: .type)
- case .paynow:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.payNow.rawValue, forKey: .type)
- case .truemoney(let trueMoney):
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.trueMoney.rawValue, forKey: .type)
- try trueMoney.encode(to: encoder)
- case .truemoneyJumpApp:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.trueMoneyJumpApp.rawValue, forKey: .type)
- case .points(let points):
- try points.encode(to: encoder)
- case .mobileBanking(let value):
- try value.encode(to: encoder)
- case .fpx(let fpx):
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.fpx.rawValue, forKey: .type)
- try fpx.encode(to: encoder)
- case .rabbitLinepay:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.rabbitLinepay.rawValue, forKey: .type)
- case .ocbcDigital:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.mobileBankingOCBC.rawValue, forKey: .type)
- case .grabPay:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.grabPay.rawValue, forKey: .type)
- case .boost:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.boost.rawValue, forKey: .type)
- case .shopeePay:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.shopeePay.rawValue, forKey: .type)
- case .shopeePayJumpApp:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.shopeePayJumpApp.rawValue, forKey: .type)
- case .maybankQRPay:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.maybankQRPay.rawValue, forKey: .type)
- case .duitNowQR:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.duitNowQR.rawValue, forKey: .type)
- case .duitNowOBW(let duitNowOBW):
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.duitNowOBW.rawValue, forKey: .type)
- try duitNowOBW.encode(to: encoder)
- case .payPay:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.payPay.rawValue, forKey: .type)
- case .weChat:
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(SourceTypeValue.weChat.rawValue, forKey: .type)
- case .other(type: let type, parameters: let parameters):
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(type, forKey: .type)
- try encoder.encodeJSONDictionary(parameters)
- }
- }
-
- // swiftlint:disable:next function_body_length
- public static func == (lhs: PaymentInformation, rhs: PaymentInformation) -> Bool {
- switch (lhs, rhs) {
- case (.internetBanking(let lhsValue), .internetBanking(let rhsValue)):
- return lhsValue == rhsValue
- case (.alipay, .alipay):
- return true
- case (.alipayCN, .alipayCN):
- return true
- case (.alipayHK, .alipayHK):
- return true
- case (.atome, .atome):
- return true
- case (.dana, .dana):
- return true
- case (.gcash, .gcash):
- return true
- case (.kakaoPay, .kakaoPay):
- return true
- case (.touchNGo, .touchNGo):
- return true
- case (.promptpay, .promptpay), (.paynow, .paynow):
- return true
- case (.rabbitLinepay, .rabbitLinepay):
- return true
- case (.grabPay, .grabPay):
- return true
- case (.boost, .boost):
- return true
- case (.shopeePay, .shopeePay):
- return true
- case (.shopeePayJumpApp, .shopeePayJumpApp):
- return true
- case (.maybankQRPay, .maybankQRPay):
- return true
- case (.duitNowQR, .duitNowQR):
- return true
- case (.truemoney(let lhsValue), .truemoney(let rhsValue)):
- return lhsValue == rhsValue
- case (.billPayment(let lhsValue), .billPayment(let rhsValue)):
- return lhsValue == rhsValue
- case (.barcode(let lhsValue), .barcode(let rhsValue)):
- return lhsValue == rhsValue
- case (.installment(let lhsValue), .installment(let rhsValue)):
- return lhsValue == rhsValue
- case (.eContext(let lhsValue), .eContext(let rhsValue)):
- return lhsValue == rhsValue
- case (.points(let lhsValue), .points(let rhsValue)):
- return lhsValue == rhsValue
- case (.mobileBanking(let lhsValue), .mobileBanking(let rhsValue)):
- return lhsValue == rhsValue
- case (.fpx(let lhsValue), .fpx(let rhsValue)):
- return lhsValue == rhsValue
- case (.duitNowOBW(let lhsValue), .duitNowOBW(let rhsValue)):
- return lhsValue == rhsValue
- case (.payPay, .payPay):
- return true
- case (.weChat, .weChat):
- return true
- case (.other(let lhsType, let lhsParameters), .other(let rhsType, let rhsParameters)):
- return lhsType == rhsType &&
- Set(lhsParameters.keys) == Set(rhsParameters.keys)
- default: return false
- }
- }
-
-}
-
-extension Request where T == Source {
- /// Initializes a new Source Request
- public init (paymentInformation: PaymentInformation, amount: Int64, currency: Currency) {
- self.init(
- parameter: CreateSourceParameter(paymentInformation: paymentInformation, amount: amount, currency: currency)
- )
- }
-}
-
-extension PaymentInformation {
- /// Omise Source Type value using in the Omise API
- public var sourceType: String {
- switch self {
- case .alipay:
- return SourceTypeValue.alipay.rawValue
- case .alipayCN:
- return SourceTypeValue.alipayCN.rawValue
- case .alipayHK:
- return SourceTypeValue.alipayHK.rawValue
- case .atome:
- return SourceTypeValue.atome.rawValue
- case .dana:
- return SourceTypeValue.dana.rawValue
- case .gcash:
- return SourceTypeValue.gcash.rawValue
- case .kakaoPay:
- return SourceTypeValue.kakaoPay.rawValue
- case .touchNGo:
- return SourceTypeValue.touchNGo.rawValue
- case .barcode(let barcode):
- return barcode.type
- case .billPayment(let billPayment):
- return billPayment.type
- case .installment(let installment):
- return installment.type
- case .internetBanking(let bank):
- return bank.type
- case .eContext:
- return SourceTypeValue.eContext.rawValue
- case .promptpay:
- return SourceTypeValue.promptPay.rawValue
- case .paynow:
- return SourceTypeValue.payNow.rawValue
- case .truemoney:
- return SourceTypeValue.trueMoney.rawValue
- case .truemoneyJumpApp:
- return SourceTypeValue.trueMoneyJumpApp.rawValue
- case .rabbitLinepay:
- return SourceTypeValue.rabbitLinepay.rawValue
- case .ocbcDigital:
- return SourceTypeValue.mobileBankingOCBC.rawValue
- case .grabPay:
- return SourceTypeValue.grabPay.rawValue
- case .boost:
- return SourceTypeValue.boost.rawValue
- case .shopeePay:
- return SourceTypeValue.shopeePay.rawValue
- case .shopeePayJumpApp:
- return SourceTypeValue.shopeePayJumpApp.rawValue
- case .maybankQRPay:
- return SourceTypeValue.maybankQRPay.rawValue
- case .duitNowQR:
- return SourceTypeValue.duitNowQR.rawValue
- case .points(let points):
- return points.type
- case .mobileBanking(let bank):
- return bank.type
- case .fpx(let bank):
- return bank.type
- case .duitNowOBW(let bank):
- return bank.type
- case .payPay:
- return SourceTypeValue.payPay.rawValue
- case .weChat:
- return SourceTypeValue.weChat.rawValue
- case .other(let value, _):
- return value
- }
- }
-}
-
-extension PaymentInformation.InternetBanking: CaseIterable, CustomStringConvertible {
- public typealias AllCases = [PaymentInformation.InternetBanking]
- public static var allCases: PaymentInformation.InternetBanking.AllCases = [
- .bay, .bbl
- ]
-
- /// Omise Source Type value using in the Omise API
- public var type: String {
- switch self {
- case .bay:
- return SourceTypeValue.internetBankingBAY.rawValue
- case .bbl:
- return SourceTypeValue.internetBankingBBL.rawValue
- case .other(let value):
- return PaymentInformation.InternetBanking.paymentMethodTypePrefix + value
- }
- }
-
- public var description: String {
- switch self {
- case .bay:
- return "BAY"
- case .bbl:
- return "BBL"
- case .other(let value):
- return value
- }
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- let type = try container.decode(String.self, forKey: .type)
-
- guard type.hasPrefix(PaymentInformation.InternetBanking.paymentMethodTypePrefix),
- let typePrefixRange = type.range(of: PaymentInformation.InternetBanking.paymentMethodTypePrefix) else {
- throw DecodingError.dataCorruptedError(
- forKey: .type,
- in: container,
- debugDescription: "Invalid internet banking source type value"
- )
- }
-
- switch type[typePrefixRange.upperBound...] {
- case "bay":
- self = .bay
- case "bbl":
- self = .bbl
- case let value:
- self = .other(String(value))
- }
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- try container.encode(type, forKey: .type)
- }
-}
-
-extension PaymentInformation.Installment {
- /// Omise Source Type value using in the Omise API
- public var type: String {
- switch brand {
- case .bay:
- return SourceTypeValue.installmentBAY.rawValue
- case .firstChoice:
- return SourceTypeValue.installmentFirstChoice.rawValue
- case .bbl:
- return SourceTypeValue.installmentBBL.rawValue
- case .mbb:
- return SourceTypeValue.installmentMBB.rawValue
- case .ktc:
- return SourceTypeValue.installmentKTC.rawValue
- case .kBank:
- return SourceTypeValue.installmentKBank.rawValue
- case .scb:
- return SourceTypeValue.installmentSCB.rawValue
- case .ttb:
- return SourceTypeValue.installmentTTB.rawValue
- case .uob:
- return SourceTypeValue.installmentUOB.rawValue
- case .other(let value):
- return PaymentInformation.Installment.paymentMethodTypePrefix + value
- }
- }
-
- private enum CodingKeys: String, CodingKey {
- case installmentTerms = "installment_term"
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- let type = try container.decode(String.self, forKey: .type)
-
- guard type.hasPrefix(PaymentInformation.Installment.paymentMethodTypePrefix),
- let typePrefixRange = type.range(of: PaymentInformation.Installment.paymentMethodTypePrefix) else {
- throw DecodingError.dataCorruptedError(
- forKey: .type,
- in: container,
- debugDescription: "Invalid installments source type value"
- )
- }
-
- let brand: Brand
- switch type[typePrefixRange.upperBound...] {
- case "bay":
- brand = .bay
- case "first_choice":
- brand = .firstChoice
- case "bbl":
- brand = .bbl
- case "mbb":
- brand = .mbb
- case "ktc":
- brand = .ktc
- case "kbank":
- brand = .kBank
- case "scb":
- brand = .scb
- case "ttb":
- brand = .ttb
- case "uob":
- brand = .uob
- case let value:
- brand = .other(String(value))
- }
-
- let installmentContainer = try decoder.container(keyedBy: CodingKeys.self)
- self.init(brand: brand, numberOfTerms: try installmentContainer.decode(Int.self, forKey: .installmentTerms))
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- try container.encode(type, forKey: .type)
- var installmentsContainer = encoder.container(keyedBy: CodingKeys.self)
- try installmentsContainer.encode(numberOfTerms, forKey: .installmentTerms)
- }
-}
-
-extension PaymentInformation.Installment.Brand: CaseIterable, CustomStringConvertible {
- public typealias AllCases = [PaymentInformation.Installment.Brand]
- public static var allCases: PaymentInformation.Installment.Brand.AllCases = [
- .bay, .firstChoice, .bbl, .ktc, .kBank, .scb
- ]
-
- public var description: String {
- switch self {
- case .bay:
- return "BAY"
- case .firstChoice:
- return "First Choice"
- case .bbl:
- return "BBL"
- case .mbb:
- return "MBB"
- case .ktc:
- return "KTC"
- case .kBank:
- return "K-Bank"
- case .scb:
- return "SCB"
- case .ttb:
- return "TTB"
- case .uob:
- return "UOB"
- case .other(let value):
- return value
- }
- }
-
- public var type: String {
- switch self {
- case .bay:
- return SourceTypeValue.installmentBAY.rawValue
- case .firstChoice:
- return SourceTypeValue.installmentFirstChoice.rawValue
- case .bbl:
- return SourceTypeValue.installmentBBL.rawValue
- case .mbb:
- return SourceTypeValue.installmentMBB.rawValue
- case .ktc:
- return SourceTypeValue.installmentKTC.rawValue
- case .kBank:
- return SourceTypeValue.installmentKBank.rawValue
- case .scb:
- return SourceTypeValue.installmentSCB.rawValue
- case .ttb:
- return SourceTypeValue.installmentTTB.rawValue
- case .uob:
- return SourceTypeValue.installmentUOB.rawValue
- case .other(let value):
- return value
- }
- }
-}
-
-extension PaymentInformation.BillPayment {
- /// Omise Source Type value using in the Omise API
- public var type: String {
- switch self {
- case .tescoLotus:
- return SourceTypeValue.billPaymentTescoLotus.rawValue
- case .other(let value):
- return PaymentInformation.BillPayment.paymentMethodTypePrefix + value
- }
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- let type = try container.decode(String.self, forKey: .type)
-
- guard type.hasPrefix(PaymentInformation.BillPayment.paymentMethodTypePrefix),
- let typePrefixRange = type.range(of: PaymentInformation.BillPayment.paymentMethodTypePrefix) else {
- throw DecodingError.dataCorruptedError(
- forKey: .type,
- in: container,
- debugDescription: "Invalid bill payment source type value"
- )
- }
-
- switch type[typePrefixRange.upperBound...] {
- case "tesco_lotus":
- self = .tescoLotus
- case let value:
- self = .other(String(value))
- }
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- try container.encode(type, forKey: .type)
- }
-}
-
-extension PaymentInformation.Barcode {
- /// Alipay Barcode Payment Information
- public struct AlipayBarcode: Codable, Equatable {
- /// Barcode value generated by the customer's Alipay app
- public let barcode: String
-
- /// The Store Information for the Alipay Barcode Payement
- public struct StoreInformation: Codable, Equatable {
- /// Store ID registering with Omise or Alipay
- public let storeID: String
- /// Store Name registering with Omise or Alipay
- public let storeName: String
-
- public init(storeID: String, storeName: String) {
- self.storeID = storeID
- self.storeName = storeName
- }
- }
-
- /// Store Information where the source is being created, optional.
- public let storeInformation: StoreInformation?
-
- /// Store ID registering with Omise or Alipay
- public var storeID: String? {
- return storeInformation?.storeID
- }
-
- /// Store Name registering with Omise or Alipay
- public var storeName: String? {
- return storeInformation?.storeName
- }
-
- /// ID of the Terminal where the source is being created
- public let terminalID: String?
- private enum CodingKeys: String, CodingKey {
- case barcode
- case storeID = "store_id"
- case storeName = "store_name"
- case terminalID = "terminal_id"
- }
-
- public init(barcode: String, storeInformation: StoreInformation? = nil, terminalID: String? = nil) {
- self.storeInformation = storeInformation
- self.terminalID = terminalID
- self.barcode = barcode
- }
-
- public init(barcode: String, storeID: String, storeName: String, terminalID: String?) {
- self.init(barcode: barcode, storeInformation: StoreInformation(storeID: storeID, storeName: storeName), terminalID: terminalID)
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: CodingKeys.self)
-
- let barcode = try container.decode(String.self, forKey: .barcode)
-
- let storeID = try container.decodeIfPresent(String.self, forKey: .storeID)
- let storeName = try container.decodeIfPresent(String.self, forKey: .storeName)
-
- let terminalID = try container.decodeIfPresent(String.self, forKey: .terminalID)
-
- let storeInformation: StoreInformation?
- switch (storeID, storeName) {
- case let (storeID?, storeName?):
- storeInformation = StoreInformation(storeID: storeID, storeName: storeName)
- case (nil, nil):
- storeInformation = nil
- case (nil, .some):
- let context = DecodingError.Context(
- codingPath: container.codingPath,
- debugDescription: "Alipay Barcode store name is present but store id informaiton is missing"
- )
- throw DecodingError.keyNotFound(CodingKeys.storeID, context)
- case (.some, nil):
- let context = DecodingError.Context(
- codingPath: container.codingPath,
- debugDescription: "Alipay Barcode store id is present but store name informaiton is missing"
- )
- throw DecodingError.keyNotFound(CodingKeys.storeName, context)
- }
-
- self.init(barcode: barcode, storeInformation: storeInformation, terminalID: terminalID)
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: CodingKeys.self)
-
- try container.encode(barcode, forKey: .barcode)
-
- try container.encodeIfPresent(storeInformation?.storeID, forKey: .storeID)
- try container.encodeIfPresent(storeInformation?.storeName, forKey: .storeName)
- try container.encodeIfPresent(terminalID, forKey: .terminalID)
- }
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- let type = try container.decode(String.self, forKey: .type)
-
- guard type.hasPrefix(PaymentInformation.Barcode.paymentMethodTypePrefix),
- let typePrefixRange = type.range(of: PaymentInformation.Barcode.paymentMethodTypePrefix) else {
- throw DecodingError.dataCorruptedError(forKey: .type, in: container, debugDescription: "Invalid barcode source type value")
- }
- switch String(type[typePrefixRange.upperBound...]) {
- case SourceTypeValue.alipay.rawValue:
- self = .alipay(try AlipayBarcode(from: decoder))
- case let value:
- self = .other(String(value), parameters: try decoder.decodeJSONDictionary().filter({ (key, _) -> Bool in
- switch key {
- case PaymentInformation.CodingKeys.type.stringValue, Source.CodingKeys.object.stringValue,
- Source.CodingKeys.id.stringValue, Source.CodingKeys.flow.stringValue,
- Source.CodingKeys.currency.stringValue, Source.CodingKeys.amount.stringValue,
- "livemode", "location":
- return false
- default: return true
- }
- }))
- }
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- try container.encode(type, forKey: .type)
-
- switch self {
- case .alipay(let alipay):
- try alipay.encode(to: encoder)
- case .other:
- break
- }
- }
-
- public static func == (lhs: PaymentInformation.Barcode, rhs: PaymentInformation.Barcode) -> Bool {
- switch (lhs, rhs) {
- case let (.alipay(lhsValue), .alipay(rhsValue)):
- return lhsValue == rhsValue
- case (.other(let lhsType, let lhsParameters), .other(let rhsType, let rhsParameters)):
- return lhsType == rhsType &&
- Set(lhsParameters.keys) == Set(rhsParameters.keys)
- default:
- return false
- }
- }
-}
-
-extension PaymentInformation.Points {
- /// Omise Source Type value using in the Omise API
- public var type: String {
- switch self {
- case .citiPoints:
- return SourceTypeValue.pointsCiti.rawValue
- case .other(let value):
- return PaymentInformation.Points.paymentMethodTypePrefix + value
- }
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- let type = try container.decode(String.self, forKey: .type)
-
- guard type.hasPrefix(PaymentInformation.Points.paymentMethodTypePrefix),
- let typePrefixRange = type.range(of: PaymentInformation.Points.paymentMethodTypePrefix) else {
- throw DecodingError.dataCorruptedError(
- forKey: .type,
- in: container,
- debugDescription: "Invalid points payment source type value"
- )
- }
-
- switch type[typePrefixRange.upperBound...] {
- case "citi":
- self = .citiPoints
- case let value:
- self = .other(String(value))
- }
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- try container.encode(type, forKey: .type)
- }
-
-}
-
-extension PaymentInformation.MobileBanking: CaseIterable, CustomStringConvertible {
- public typealias AllCases = [PaymentInformation.MobileBanking]
- public static var allCases: PaymentInformation.MobileBanking.AllCases = [
- .scb, .kbank, .bay, .bbl, .ktb
- ]
-
- /// Omise Source Type value using in the Omise API
- public var type: String {
- switch self {
- case .scb:
- return SourceTypeValue.mobileBankingSCB.rawValue
- case .kbank:
- return SourceTypeValue.mobileBankingKBank.rawValue
- case .bay:
- return SourceTypeValue.mobileBankingBAY.rawValue
- case .bbl:
- return SourceTypeValue.mobileBankingBBL.rawValue
- case .ktb:
- return SourceTypeValue.mobileBankingKTB.rawValue
- case .other(let value):
- return PaymentInformation.MobileBanking.paymentMethodTypePrefix + value
- }
- }
-
- public var description: String {
- switch self {
- case .scb:
- return "SCB"
- case .kbank:
- return "KBank"
- case .bay:
- return "BAY"
- case .bbl:
- return "BBL"
- case .ktb:
- return "KTB"
- case .other(let value):
- return value
- }
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- let type = try container.decode(String.self, forKey: .type)
-
- guard type.hasPrefix(PaymentInformation.MobileBanking.paymentMethodTypePrefix),
- let typePrefixRange = type.range(of: PaymentInformation.MobileBanking.paymentMethodTypePrefix) else {
- throw DecodingError.dataCorruptedError(
- forKey: .type,
- in: container,
- debugDescription: "Invalid mobile banking source type value"
- )
- }
-
- switch type[typePrefixRange.upperBound...] {
- case "scb":
- self = .scb
- case "kbank":
- self = .kbank
- case "bay":
- self = .bay
- case "bbl":
- self = .bbl
- case "ktb":
- self = .ktb
- case let value:
- self = .other(String(value))
- }
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: PaymentInformation.CodingKeys.self)
- try container.encode(type, forKey: .type)
- }
-}
-
-extension PaymentInformation.DuitNowOBW.Bank: CaseIterable, CustomStringConvertible {
- public typealias AllCases = [PaymentInformation.DuitNowOBW.Bank]
- public static var allCases: PaymentInformation.DuitNowOBW.Bank.AllCases = [
- .affin, .alliance, .agro, .ambank, .cimb, .islam, .rakyat, .muamalat, .bsn,
- .hongleong, .hsbc, .kfh, .maybank2u, .ocbc, .publicBank, .rhb, .sc, .uob
- ]
-
- public var description: String {
- switch self {
- case .affin:
- return "affin"
- case .alliance:
- return "alliance"
- case .agro:
- return "agro"
- case .ambank:
- return "ambank"
- case .cimb:
- return "cimb"
- case .islam:
- return "islam"
- case .rakyat:
- return "rakyat"
- case .muamalat:
- return "muamalat"
- case .bsn:
- return "bsn"
- case .hongleong:
- return "hongleong"
- case .hsbc:
- return "hsbc"
- case .kfh:
- return "kfh"
- case .maybank2u:
- return "maybank2u"
- case .ocbc:
- return "ocbc"
- case .publicBank:
- return "public"
- case .rhb:
- return "rhb"
- case .sc:
- return "sc"
- case .uob:
- return "uob"
- case .other(let value):
- return value
- }
- }
-}
diff --git a/OmiseSDK/PaymentOptionTableViewCell.swift b/OmiseSDK/PaymentOptionTableViewCell.swift
deleted file mode 100644
index f489dda8..00000000
--- a/OmiseSDK/PaymentOptionTableViewCell.swift
+++ /dev/null
@@ -1,42 +0,0 @@
-import UIKit
-
-class PaymentOptionTableViewCell: UITableViewCell {
-
- let separatorView = UIView()
- @IBInspectable var separatorHeight: CGFloat = 1
-
- override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
- super.init(style: style, reuseIdentifier: reuseIdentifier)
- initializeInstance()
- }
-
- required init?(coder aDecoder: NSCoder) {
- super.init(coder: aDecoder)
- initializeInstance()
- }
-
- private func initializeInstance() {
- addSubview(separatorView)
-
- let selectedBackgroundView = UIView()
- selectedBackgroundView.backgroundColor = UIColor.selectedCellBackgroundColor
- self.selectedBackgroundView = selectedBackgroundView
- }
-
- override func layoutSubviews() {
- super.layoutSubviews()
-
- contentView.frame.size.height = bounds.height - separatorHeight
- var separatorFrame = bounds
- if let textLabel = self.textLabel {
- let textLabelFrame = self.convert(textLabel.frame, from: contentView)
- (_, separatorFrame) = separatorFrame.divided(atDistance: textLabelFrame.minX, from: .minXEdge)
- } else {
- (_, separatorFrame) = separatorFrame.divided(atDistance: layoutMargins.left, from: .minXEdge)
- }
- separatorFrame.origin.y = bounds.height - separatorHeight
- separatorFrame.size.height = separatorHeight
- separatorView.frame = separatorFrame
- }
-
-}
diff --git a/OmiseSDK/Request.swift b/OmiseSDK/Request.swift
deleted file mode 100644
index dd8f7112..00000000
--- a/OmiseSDK/Request.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-import Foundation
-
-public typealias RequestResult = Swift.Result
-
-/// Request object for describing a request with the creating parameters
-public struct Request {
- public typealias Callback = (RequestResult) -> Void
-
- /// Parameter of this request
- public let parameter: T.CreateParameter
-
- public init(parameter: T.CreateParameter) {
- self.parameter = parameter
- }
-}
diff --git a/OmiseSDK/RequestTask.swift b/OmiseSDK/RequestTask.swift
deleted file mode 100644
index 69dfe1bd..00000000
--- a/OmiseSDK/RequestTask.swift
+++ /dev/null
@@ -1,18 +0,0 @@
-import Foundation
-import os
-
-/// The class represents the task of a request to the Omise API
-public class RequestTask {
- public let request: Request
- let dataTask: URLSessionDataTask
-
- init(request: Request, dataTask: URLSessionDataTask) {
- self.request = request
- self.dataTask = dataTask
- }
-
- public func resume() {
- dataTask.resume()
- os_log("Starting/Resuming Request %{public}@", log: sdkLogObject, type: .debug, String(describing: type(of: T.self)))
- }
-}
diff --git a/OmiseSDK/Resources/Assets.xcassets/Method/Conbini.imageset/Contents.json b/OmiseSDK/Resources/Assets.xcassets/Method/Konbini.imageset/Contents.json
similarity index 100%
rename from OmiseSDK/Resources/Assets.xcassets/Method/Conbini.imageset/Contents.json
rename to OmiseSDK/Resources/Assets.xcassets/Method/Konbini.imageset/Contents.json
diff --git a/OmiseSDK/Resources/Assets.xcassets/Method/Conbini.imageset/konbini.pdf b/OmiseSDK/Resources/Assets.xcassets/Method/Konbini.imageset/konbini.pdf
similarity index 100%
rename from OmiseSDK/Resources/Assets.xcassets/Method/Conbini.imageset/konbini.pdf
rename to OmiseSDK/Resources/Assets.xcassets/Method/Konbini.imageset/konbini.pdf
diff --git a/OmiseSDK/Resources/Base.lproj/OmiseSDK.storyboard b/OmiseSDK/Resources/Base.lproj/OmiseSDK.storyboard
deleted file mode 100644
index beeb73df..00000000
--- a/OmiseSDK/Resources/Base.lproj/OmiseSDK.storyboard
+++ /dev/null
@@ -1,3788 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/OmiseSDK/Resources/en.lproj/Localizable.strings b/OmiseSDK/Resources/en.lproj/Localizable.strings
index 90c4bcd0..e87c2448 100644
--- a/OmiseSDK/Resources/en.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/en.lproj/Localizable.strings
@@ -56,3 +56,5 @@
"more-info.cvv-location.default.text" = "3 digit number on the back of your card";
"fpx.bank-chooser.no-banks-available.text" = "Cannot retrieve list of banks.\nPlease try again later.";
+
+"paymentMethods.title" = "Payment Methods";
diff --git a/OmiseSDK/Resources/en.lproj/Localizable.stringsdict b/OmiseSDK/Resources/en.lproj/Localizable.stringsdict
index 55e466cf..cec030ed 100644
--- a/OmiseSDK/Resources/en.lproj/Localizable.stringsdict
+++ b/OmiseSDK/Resources/en.lproj/Localizable.stringsdict
@@ -2,7 +2,7 @@
- installments.number-of-terms-chooser.number-of-terms-cell.label.text
+ installments.number-of-terms.text
NSStringLocalizedFormatKey
%#@MONTHs@
diff --git a/OmiseSDK/Resources/en.lproj/OmiseSDK.strings b/OmiseSDK/Resources/en.lproj/OmiseSDK.strings
deleted file mode 100644
index 1da28158..00000000
--- a/OmiseSDK/Resources/en.lproj/OmiseSDK.strings
+++ /dev/null
@@ -1,216 +0,0 @@
-
-/* Class = "UILabel"; text = "Email"; ObjectID = "0JH-Mm-x0b"; */
-"0JH-Mm-x0b.text" = "Email";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "134-RW-VCo"; */
-"134-RW-VCo.text" = "-";
-
-/* Class = "UIButton"; normalTitle = "Next"; ObjectID = "1dv-2d-6Zi"; */
-"1dv-2d-6Zi.normalTitle" = "Next";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "3TR-eT-NNR"; */
-"3TR-eT-NNR.text" = "-";
-
-/* Class = "UILabel"; text = "Label"; ObjectID = "4KR-9k-5qs"; */
-"4KR-9k-5qs.text" = "Label";
-
-/* Class = "UINavigationItem"; title = "Installments"; ObjectID = "5nI-An-cjo"; */
-"5nI-An-cjo.title" = "Installments";
-
-/* Class = "UINavigationItem"; title = "Internet Banking"; ObjectID = "6eY-CH-eim"; */
-"6eY-CH-eim.title" = "Internet Banking";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "7Ox-gC-WRb"; */
-"7Ox-gC-WRb.text" = "-";
-
-/* Class = "UILabel"; text = "PayNow"; ObjectID = "8kj-Ed-2eS"; */
-"8kj-Ed-2eS.text" = "PayNow";
-
-/* Class = "UILabel"; text = "Bangkok Bank"; ObjectID = "8lH-Rp-Dhb"; */
-"8lH-Rp-Dhb.text" = "Bangkok Bank";
-
-/* Class = "UILabel"; text = "Pay-easy"; ObjectID = "A0v-NW-KLo"; */
-"A0v-NW-KLo.text" = "Pay-easy";
-
-/* Class = "UITextField"; placeholder = " "; ObjectID = "CD2-gj-4i6"; */
-"CD2-gj-4i6.placeholder" = " ";
-
-/* Class = "UILabel"; text = "Card number"; ObjectID = "CKR-Pl-Ix5"; */
-"CKR-Pl-Ix5.text" = "Card number";
-
-/* Class = "UILabel"; text = "Siam Commercial Bank"; ObjectID = "EQF-26-ssb"; */
-"EQF-26-ssb.text" = "SCB EASY";
-
-/* Class = "UILabel"; text = "Krungthai NEXT"; ObjectID = "SaV-b4-qjD"; */
-"SaV-b4-qjD.text" = "Krungthai NEXT";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "EWE-r0-1RF"; */
-"EWE-r0-1RF.text" = "-";
-
-/* Class = "UILabel"; text = "Krungthai Bank"; ObjectID = "EbR-kz-Obr"; */
-"EbR-kz-Obr.text" = "Krungthai Bank";
-
-/* Class = "UINavigationItem"; title = "Konbini"; ObjectID = "GZJ-TR-erg"; */
-"GZJ-TR-erg.title" = "Konbini";
-
-/* Class = "UILabel"; text = "Phone number"; ObjectID = "Ify-gZ-e2F"; */
-"Ify-gZ-e2F.text" = "Phone number";
-
-/* Class = "UILabel"; text = "PromptPay"; ObjectID = "JmT-Us-3lW"; */
-"JmT-Us-3lW.text" = "PromptPay";
-
-/* Class = "UILabel"; text = "Lotus's Bill Payment"; ObjectID = "LpC-UH-uPc"; */
-"LpC-UH-uPc.text" = "Lotus's Bill Payment";
-
-/* Class = "UITextField"; placeholder = " "; ObjectID = "OTm-3S-Jk9"; */
-"OTm-3S-Jk9.placeholder" = " ";
-
-/* Class = "UITextField"; placeholder = "MM/YY"; ObjectID = "Par-EA-T3D"; */
-"Par-EA-T3D.placeholder" = "MM/YY";
-
-/* Class = "UILabel"; text = "3 Months"; ObjectID = "Pqt-3W-dy1"; */
-"Pqt-3W-dy1.text" = "3 Months";
-
-/* Class = "UILabel"; text = "Konbini"; ObjectID = "Qzd-8E-gal"; */
-"Qzd-8E-gal.text" = "Konbini";
-
-/* Class = "UINavigationItem"; title = "TrueMoney Wallet"; ObjectID = "TBH-7l-kiP"; */
-"TBH-7l-kiP.title" = "TrueMoney Wallet";
-
-/* Class = "UILabel"; text = "Krungsri"; ObjectID = "V59-D4-sqA"; */
-"V59-D4-sqA.text" = "Krungsri";
-
-/* Class = "UILabel"; text = "Credit Card"; ObjectID = "WSh-Xk-FbG"; */
-"WSh-Xk-FbG.text" = "Credit Card";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "XGf-ji-5is"; */
-"XGf-ji-5is.text" = "-";
-
-/* Class = "UILabel"; text = "Bangkok Bank"; ObjectID = "XnR-SW-SnL"; */
-"XnR-SW-SnL.text" = "Bangkok Bank";
-
-/* Class = "UINavigationItem"; title = "Authorizing Payment"; ObjectID = "YAC-7f-Gdj"; */
-"YAC-7f-Gdj.title" = "Authorizing Payment";
-
-/* Class = "UIButton"; normalTitle = "Pay"; ObjectID = "ZPa-NN-y1M"; */
-"ZPa-NN-y1M.normalTitle" = "Pay";
-
-/* Class = "UILabel"; text = "Full name"; ObjectID = "aL6-Ey-d8I"; */
-"aL6-Ey-d8I.text" = "Full name";
-
-/* Class = "UINavigationItem"; title = "Mobile Banking"; ObjectID = "agh-p8-Mln"; */
-"agh-p8-Mln.title" = "Mobile Banking";
-
-/* Class = "UILabel"; text = "Name on card"; ObjectID = "bEE-yU-zna"; */
-"bEE-yU-zna.text" = "Name on card";
-
-/* Class = "UILabel"; text = "Net Bank"; ObjectID = "cSc-cs-8vb"; */
-"cSc-cs-8vb.text" = "Net Bank";
-
-/* Class = "UILabel"; text = "Krungsri First Choice"; ObjectID = "ccD-Ly-DnI"; */
-"ccD-Ly-DnI.text" = "Krungsri First Choice";
-
-/* Class = "UILabel"; text = "KTC"; ObjectID = "d1t-A5-fA9"; */
-"d1t-A5-fA9.text" = "KTC";
-
-/* Class = "UILabel"; text = "Please input the mobile number connected to your TrueMoney Wallet account"; ObjectID = "diJ-Qj-8Op"; */
-"diJ-Qj-8Op.text" = "Please input the mobile number connected to your TrueMoney Wallet account";
-
-/* Class = "UILabel"; text = "Mobile Banking"; ObjectID = "drr-nc-RA8"; */
-"drr-nc-RA8.text" = "Mobile Banking";
-
-/* Class = "UILabel"; text = "TrueMoney Wallet"; ObjectID = "ewt-LA-vRb"; */
-"ewt-LA-vRb.text" = "TrueMoney Wallet";
-
-/* Class = "UILabel"; text = "TrueMoney"; ObjectID = "ext-Bd-tya"; */
-"ext-Bd-tya.text" = "TrueMoney";
-
-/* Class = "UILabel"; text = "Label"; ObjectID = "hNq-jM-xs4"; */
-"hNq-jM-xs4.text" = "Label";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "iAF-XE-M8X"; */
-"iAF-XE-M8X.text" = "-";
-
-/* Class = "UILabel"; text = "Siam Commercial Bank"; ObjectID = "iiE-Ff-NCh"; */
-"iiE-Ff-NCh.text" = "Siam Commercial Bank";
-
-/* Class = "UINavigationItem"; title = "Credit Card"; ObjectID = "jOQ-fG-jaE"; */
-"jOQ-fG-jaE.title" = "Credit Card";
-
-/* Class = "UILabel"; text = "Bank of Ayudhya"; ObjectID = "kUY-b1-dmD"; */
-"kUY-b1-dmD.text" = "Bank of Ayudhya";
-
-/* Class = "UILabel"; text = "Bank of Ayudhya"; ObjectID = "eci-dP-WLC"; */
-"eci-dP-WLC.text" = "KMA";
-
-/* Class = "UIButton"; normalTitle = "Next"; ObjectID = "mE3-3u-rvg"; */
-"mE3-3u-rvg.normalTitle" = "Next";
-
-/* Class = "UINavigationItem"; title = "Payment Methods"; ObjectID = "opb-54-CDJ"; */
-"opb-54-CDJ.title" = "Payment Methods";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "ozY-Yg-Xy1"; */
-"ozY-Yg-Xy1.text" = "-";
-
-/* Class = "UILabel"; text = "Internet Banking"; ObjectID = "pFQ-Pc-BCP"; */
-"pFQ-Pc-BCP.text" = "Internet Banking";
-
-/* Class = "UILabel"; text = "Siam Commercial Bank"; ObjectID = "r9n-CR-zhg"; */
-"r9n-CR-zhg.text" = "Siam Commercial Bank";
-
-/* Class = "UILabel"; text = "Alipay"; ObjectID = "tXy-nx-P4n"; */
-"tXy-nx-P4n.text" = "Alipay";
-
-/* Class = "UILabel"; text = "Phone"; ObjectID = "uG7-np-PQF"; */
-"uG7-np-PQF.text" = "Phone";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "ubw-ZT-CVl"; */
-"ubw-ZT-CVl.text" = "-";
-
-/* Class = "UILabel"; text = "Expiry date"; ObjectID = "uuR-9N-gze"; */
-"uuR-9N-gze.text" = "Expiry date";
-
-/* Class = "UILabel"; text = "Security code"; ObjectID = "vMc-kJ-Ncs"; */
-"vMc-kJ-Ncs.text" = "Security code";
-
-/* Class = "UITextField"; placeholder = " "; ObjectID = "wXP-YQ-VDL"; */
-"wXP-YQ-VDL.placeholder" = " ";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "ws5-ue-ec8"; */
-"ws5-ue-ec8.text" = "-";
-
-/* Class = "UITextField"; placeholder = " "; ObjectID = "y98-SD-aEV"; */
-"y98-SD-aEV.placeholder" = " ";
-
-/* Class = "UILabel"; text = "Kasikorn Bank"; ObjectID = "yHg-il-ZhG"; */
-"yHg-il-ZhG.text" = "Kasikorn Bank";
-
-/* Class = "UILabel"; text = "Kasikorn Bank"; ObjectID = "bDJ-ih-QYr"; */
-"bDJ-ih-QYr.text" = "K PLUS";
-
-/* Class = "UILabel"; text = "Bangkok Bank"; ObjectID = "Hk2-sB-8C8"; */
-"Hk2-sB-8C8.text" = "Bualuang mBanking";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "yQ7-lv-7H1"; */
-"yQ7-lv-7H1.text" = "-";
-
-/* Class = "UILabel"; text = "3-4 digit number on the back of your card"; ObjectID = "yfq-Iv-IBe"; */
-"yfq-Iv-IBe.text" = "3-4 digit number on the back of your card";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "zj7-kT-7a4"; */
-"zj7-kT-7a4.text" = "-";
-
-/* Class = "UILabel"; text = "Installments"; ObjectID = "zli-mo-sUQ"; */
-"zli-mo-sUQ.text" = "Installments";
-
-/* Class = "UILabel"; text = "Pay with Citi Rewards Points"; ObjectID = "zmw-2Y-WAX"; */
-"zmw-2Y-WAX.text" = "Pay with Citi Rewards Points";
-
-/* Class = "UILabel"; text = "Citibank"; ObjectID = "ZWa-M2-fVM"; */
-"zmw-2Y-WAX.text" = "Citibank";
-
-/* Class = "UILabel"; text = "TMBThanachart Bank"; ObjectID = "NkN-Zz-kdw"; */
-"NkN-Zz-kdw.text" = "TMBThanachart Bank";
-
-/* Class = "UILabel"; text = "United Overseas Bank"; ObjectID = "pV0-oM-DuD; */
-"pV0-oM-DuD.text" = "United Overseas Bank";
diff --git a/OmiseSDK/Resources/ja.lproj/Localizable.strings b/OmiseSDK/Resources/ja.lproj/Localizable.strings
index 7abc88b3..eecc5b7a 100644
--- a/OmiseSDK/Resources/ja.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/ja.lproj/Localizable.strings
@@ -74,3 +74,4 @@
"more-info.cvv-location.amex.text" = "カード表面の4桁の番号";
"more-info.cvv-location.default.text" = "カード裏面の3桁の番号";
+"paymentMethods.title" = "決済方法";
diff --git a/OmiseSDK/Resources/ja.lproj/Localizable.stringsdict b/OmiseSDK/Resources/ja.lproj/Localizable.stringsdict
index 61405533..638d9b12 100644
--- a/OmiseSDK/Resources/ja.lproj/Localizable.stringsdict
+++ b/OmiseSDK/Resources/ja.lproj/Localizable.stringsdict
@@ -2,7 +2,7 @@
- installments.number-of-terms-chooser.number-of-terms-cell.label.text
+ installments.number-of-terms.text
MONTHs
diff --git a/OmiseSDK/Resources/ja.lproj/OmiseSDK.strings b/OmiseSDK/Resources/ja.lproj/OmiseSDK.strings
deleted file mode 100644
index 6df289dd..00000000
--- a/OmiseSDK/Resources/ja.lproj/OmiseSDK.strings
+++ /dev/null
@@ -1,173 +0,0 @@
-/* Class = "UILabel"; text = "Email"; ObjectID = "0JH-Mm-x0b"; */
-"0JH-Mm-x0b.text" = "メール";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "3TR-eT-NNR"; */
-"3TR-eT-NNR.text" = "-";
-
-/* Class = "UINavigationItem"; title = "Installments"; ObjectID = "5nI-An-cjo"; */
-"5nI-An-cjo.title" = "分割払い";
-
-/* Class = "UINavigationItem"; title = "Internet Banking"; ObjectID = "6eY-CH-eim"; */
-"6eY-CH-eim.title" = "インターネットバンク";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "7Ox-gC-WRb"; */
-"7Ox-gC-WRb.text" = "-";
-
-/* Class = "UILabel"; text = "Bangkok Bank"; ObjectID = "8lH-Rp-Dhb"; */
-"8lH-Rp-Dhb.text" = "バンコク銀行";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "134-RW-VCo"; */
-"134-RW-VCo.text" = "-";
-
-/* Class = "UILabel"; text = "Pay-easy"; ObjectID = "A0v-NW-KLo"; */
-"A0v-NW-KLo.text" = "ペイジー";
-
-/* Class = "UILabel"; text = "Full name"; ObjectID = "aL6-Ey-d8I"; */
-"aL6-Ey-d8I.text" = "氏名";
-
-/* Class = "UILabel"; text = "Name on card"; ObjectID = "bEE-yU-zna"; */
-"bEE-yU-zna.text" = "カード名義";
-
-/* Class = "UILabel"; text = "Krungsri First Choice"; ObjectID = "ccD-Ly-DnI"; */
-"ccD-Ly-DnI.text" = "クルンシィ・ファーストチョイス";
-
-/* Class = "UILabel"; text = "Card number"; ObjectID = "CKR-Pl-Ix5"; */
-"CKR-Pl-Ix5.text" = "カード番号";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "Cmp-y6-FKF"; */
-"Cmp-y6-FKF.text" = "-";
-
-/* Class = "UILabel"; text = "Net Bank"; ObjectID = "cSc-cs-8vb"; */
-"cSc-cs-8vb.text" = "ネットバンク";
-
-/* Class = "UILabel"; text = "KTC"; ObjectID = "d1t-A5-fA9"; */
-"d1t-A5-fA9.text" = "クルンタイカード";
-
-/* Class = "UILabel"; text = "Krungthai Bank"; ObjectID = "EbR-kz-Obr"; */
-"EbR-kz-Obr.text" = "クルンタイ銀行";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "EWE-r0-1RF"; */
-"EWE-r0-1RF.text" = "-";
-
-/* Class = "UINavigationItem"; title = "Konbini"; ObjectID = "GZJ-TR-erg"; */
-"GZJ-TR-erg.title" = "コンビニ";
-
-/* Class = "UILabel"; text = "Siam Commercial Bank"; ObjectID = "iiE-Ff-NCh"; */
-"iiE-Ff-NCh.text" = "サイアム・コマーシャル銀行";
-
-/* Class = "UINavigationItem"; title = "Credit Card"; ObjectID = "jOQ-fG-jaE"; */
-"jOQ-fG-jaE.title" = "クレジットカード";
-
-/* Class = "UILabel"; text = "Bank of Ayudhya"; ObjectID = "kUY-b1-dmD"; */
-"kUY-b1-dmD.text" = "アユタヤ銀行";
-
-/* Class = "UILabel"; text = "Bank of Ayudhya"; ObjectID = "eci-dP-WLC"; */
-"eci-dP-WLC.text" = "KMA";
-
-/* Class = "UILabel"; text = "Lotus's Bill Payment"; ObjectID = "LpC-UH-uPc"; */
-"LpC-UH-uPc.text" = "ロータス";
-
-/* Class = "UIButton"; normalTitle = "Next"; ObjectID = "mE3-3u-rvg"; */
-"mE3-3u-rvg.normalTitle" = "次";
-
-/* Class = "UINavigationItem"; title = "Payment Methods"; ObjectID = "opb-54-CDJ"; */
-"opb-54-CDJ.title" = "決済方法";
-
-/* Class = "UILabel"; text = "Internet Banking"; ObjectID = "pFQ-Pc-BCP"; */
-"pFQ-Pc-BCP.text" = "インターネットバンク";
-
-/* Class = "UILabel"; text = "3 Months"; ObjectID = "Pqt-3W-dy1"; */
-"Pqt-3W-dy1.text" = "3ヶ月";
-
-/* Class = "UILabel"; text = "Konbini"; ObjectID = "Qzd-8E-gal"; */
-"Qzd-8E-gal.text" = "コンビニ";
-
-/* Class = "UILabel"; text = "Alipay"; ObjectID = "tXy-nx-P4n"; */
-"tXy-nx-P4n.text" = "アリペイ";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "ubw-ZT-CVl"; */
-"ubw-ZT-CVl.text" = "-";
-
-/* Class = "UILabel"; text = "Phone"; ObjectID = "uG7-np-PQF"; */
-"uG7-np-PQF.text" = "電話";
-
-/* Class = "UILabel"; text = "Expiry date"; ObjectID = "uuR-9N-gze"; */
-"uuR-9N-gze.text" = "有効期限";
-
-/* Class = "UILabel"; text = "Krungsri"; ObjectID = "V59-D4-sqA"; */
-"V59-D4-sqA.text" = "クルンシィ";
-
-/* Class = "UILabel"; text = "Security code"; ObjectID = "vMc-kJ-Ncs"; */
-"vMc-kJ-Ncs.text" = "セキュリティコード";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "ws5-ue-ec8"; */
-"ws5-ue-ec8.text" = "-";
-
-/* Class = "UILabel"; text = "Credit Card"; ObjectID = "WSh-Xk-FbG"; */
-"WSh-Xk-FbG.text" = "クレジットカード";
-
-/* Class = "UILabel"; text = "Bangkok Bank"; ObjectID = "XnR-SW-SnL"; */
-"XnR-SW-SnL.text" = "バンコク銀行";
-
-/* Class = "UINavigationItem"; title = "Authorizing Payment"; ObjectID = "YAC-7f-Gdj"; */
-"YAC-7f-Gdj.title" = "決済の認可";
-
-/* Class = "UILabel"; text = "3-4 digit number on the back of your card"; ObjectID = "yfq-Iv-IBe"; */
-"yfq-Iv-IBe.text" = "クレジットカード裏面に記載された3-4桁の番号";
-
-/* Class = "UILabel"; text = "Kasikorn Bank"; ObjectID = "yHg-il-ZhG"; */
-"yHg-il-ZhG.text" = "カシコン銀行";
-
-/* Class = "UILabel"; text = "Kasikorn Bank"; ObjectID = "bDJ-ih-QYr"; */
-"bDJ-ih-QYr.text" = "K PLUS";
-
-/* Class = "UILabel"; text = "Bangkok Bank"; ObjectID = "Hk2-sB-8C8"; */
-"Hk2-sB-8C8.text" = "Bualuang mBanking";
-
-/* Class = "UILabel"; text = "Siam Commercial Bank"; ObjectID = "EQF-26-ssb"; */
-"EQF-26-ssb.text" = "SCB EASY";
-
-/* Class = "UILabel"; text = "Krungthai NEXT"; ObjectID = "SaV-b4-qjD"; */
-"SaV-b4-qjD.text" = "Krungthai NEXT";
-
-/* Class = "UILabel"; text = "Installments"; ObjectID = "zli-mo-sUQ"; */
-"zli-mo-sUQ.text" = "分割払い";
-
-/* Class = "UIButton"; normalTitle = "Pay"; ObjectID = "ZPa-NN-y1M"; */
-"ZPa-NN-y1M.normalTitle" = "支払う";
-
-/* Class = "UINavigationItem"; title = "TrueMoney Wallet"; ObjectID = "TBH-7l-kiP"; */
-"TBH-7l-kiP.title" = "TrueMoneyウォレット";
-
-/* Class = "UILabel"; text = "Please input mobile number connected to your TrueMoney Wallet account"; ObjectID = "diJ-Qj-8Op"; */
-"diJ-Qj-8Op.text" = "TrueMoney ウォレットアカウントに登録されている携帯電話番号を入力してください";
-
-/* Class = "UILabel"; text = "Phone"; ObjectID = "Ify-gZ-e2F"; */
-"Ify-gZ-e2F.text" = "電話";
-
-/* Class = "UIButton"; normalTitle = "Next"; ObjectID = "1dv-2d-6Zi"; */
-"1dv-2d-6Zi.normalTitle" = "次";
-
-/* Class = "UILabel"; text = "TrueMoney Wallet"; ObjectID = "ewt-LA-vRb"; */
-"ewt-LA-vRb.text" = "TrueMoneyウォレット";
-
-/* Class = "UILabel"; text = "TrueMoney"; ObjectID = "ext-Bd-tya"; */
-"ext-Bd-tya.text" = "TrueMoney";
-
-/* Class = "UILabel"; text = "Pay with Citi Rewards Points"; ObjectID = "zmw-2Y-WAX"; */
-"zmw-2Y-WAX.text" = "Citi Rewardsポイント";
-
-/* Class = "UILabel"; text = "PromptPay"; ObjectID = "JmT-Us-3lW"; */
-"JmT-Us-3lW.text" = "プロンプトペイ";
-
-/* Class = "UILabel"; text = "PayNow"; ObjectID = "8kj-Ed-2eS"; */
-"8kj-Ed-2eS.text" = "PayNow";
-
-/* Class = "UILabel"; text = "Citibank"; ObjectID = "ZWa-M2-fVM"; */
-"ZWa-M2-fVM.text" = "シティバンク";
-
-/* Class = "UILabel"; text = "TMBThanachart Bank"; ObjectID = "NkN-Zz-kdw"; */
-"NkN-Zz-kdw.text" = "TMBタナチャート銀行";
-
-/* Class = "UILabel"; text = "United Overseas Bank"; ObjectID = "pV0-oM-DuD; */
-"pV0-oM-DuD.text" = "ユナイテッド・オーバーシーズ銀行";
diff --git a/OmiseSDK/Resources/th.lproj/Localizable.strings b/OmiseSDK/Resources/th.lproj/Localizable.strings
index e745a44a..91e4ab53 100644
--- a/OmiseSDK/Resources/th.lproj/Localizable.strings
+++ b/OmiseSDK/Resources/th.lproj/Localizable.strings
@@ -74,3 +74,5 @@
"more-info.cvv-location.amex.text" = "หมายเลข 4 หลักบนหน้าบัตร";
"more-info.cvv-location.default.text" = "หมายเลข 3 หลักด้านหลังบัตร";
+
+"paymentMethods.title" = "ช่องทางชำระเงิน";
diff --git a/OmiseSDK/Resources/th.lproj/Localizable.stringsdict b/OmiseSDK/Resources/th.lproj/Localizable.stringsdict
index 15817174..39cff015 100644
--- a/OmiseSDK/Resources/th.lproj/Localizable.stringsdict
+++ b/OmiseSDK/Resources/th.lproj/Localizable.stringsdict
@@ -2,7 +2,7 @@
- installments.number-of-terms-chooser.number-of-terms-cell.label.text
+ installments.number-of-terms.text
MONTHs
diff --git a/OmiseSDK/Resources/th.lproj/OmiseSDK.strings b/OmiseSDK/Resources/th.lproj/OmiseSDK.strings
deleted file mode 100644
index 94793186..00000000
--- a/OmiseSDK/Resources/th.lproj/OmiseSDK.strings
+++ /dev/null
@@ -1,194 +0,0 @@
-/* Class = "UILabel"; text = "Email"; ObjectID = "0JH-Mm-x0b"; */
-"0JH-Mm-x0b.text" = "อีเมล์";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "3TR-eT-NNR"; */
-"3TR-eT-NNR.text" = "-";
-
-/* Class = "UINavigationItem"; title = "Installments"; ObjectID = "5nI-An-cjo"; */
-"5nI-An-cjo.title" = "ผ่อนชำระ";
-
-/* Class = "UINavigationItem"; title = "Internet Banking"; ObjectID = "6eY-CH-eim"; */
-"6eY-CH-eim.title" = "อินเทอร์เน็ตแบงก์กิ้ง";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "7Ox-gC-WRb"; */
-"7Ox-gC-WRb.text" = "-";
-
-/* Class = "UILabel"; text = "Bangkok Bank"; ObjectID = "8lH-Rp-Dhb"; */
-"8lH-Rp-Dhb.text" = "ธนาคารกรุงเทพ";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "134-RW-VCo"; */
-"134-RW-VCo.text" = "-";
-
-/* Class = "UILabel"; text = "Pay-easy"; ObjectID = "A0v-NW-KLo"; */
-"A0v-NW-KLo.text" = "เพย์อีซี";
-
-/* Class = "UILabel"; text = "Full name"; ObjectID = "aL6-Ey-d8I"; */
-"aL6-Ey-d8I.text" = "ชื่อ-สกุล";
-
-/* Class = "UINavigationItem"; title = "Mobile Banking"; ObjectID = "agh-p8-Mln"; */
-"agh-p8-Mln.title" = "โมบายล์แบงก์กิ้ง";
-
-/* Class = "UILabel"; text = "Mobile Banking"; ObjectID = "drr-nc-RA8"; */
-"drr-nc-RA8.text" = "โมบายล์แบงก์กิ้ง";
-
-/* Class = "UILabel"; text = "Name on card"; ObjectID = "bEE-yU-zna"; */
-"bEE-yU-zna.text" = "ชื่อบนบัตร";
-
-/* Class = "UILabel"; text = "Krungsri First Choice"; ObjectID = "ccD-Ly-DnI"; */
-"ccD-Ly-DnI.text" = "กรุงศรีเฟิร์สช้อยส์";
-
-/* Class = "UILabel"; text = "Card number"; ObjectID = "CKR-Pl-Ix5"; */
-"CKR-Pl-Ix5.text" = "หมายเลขบัตร";
-
-/* Class = "UILabel"; text = "Net Bank"; ObjectID = "cSc-cs-8vb"; */
-"cSc-cs-8vb.text" = "เน็ตแบงก์";
-
-/* Class = "UILabel"; text = "KTC"; ObjectID = "d1t-A5-fA9"; */
-"d1t-A5-fA9.text" = "เคทีซี";
-
-/* Class = "UILabel"; text = "Krungthai Bank"; ObjectID = "EbR-kz-Obr"; */
-"EbR-kz-Obr.text" = "ธนาคารกรุงไทย";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "EWE-r0-1RF"; */
-"EWE-r0-1RF.text" = "-";
-
-/* Class = "UINavigationItem"; title = "Konbini"; ObjectID = "GZJ-TR-erg"; */
-"GZJ-TR-erg.title" = "ร้านสะดวกซื้อ";
-
-/* Class = "UILabel"; text = "Siam Commercial Bank"; ObjectID = "iiE-Ff-NCh"; */
-"iiE-Ff-NCh.text" = "ธนาคารไทยพาณิชย์";
-
-/* Class = "UINavigationItem"; title = "Credit Card"; ObjectID = "jOQ-fG-jaE"; */
-"jOQ-fG-jaE.title" = "บัตรเครดิต";
-
-/* Class = "UILabel"; text = "Bank of Ayudhya"; ObjectID = "kUY-b1-dmD"; */
-"kUY-b1-dmD.text" = "ธนาคารกรุงศรีอยุธยา";
-
-/* Class = "UILabel"; text = "Bank of Ayudhya"; ObjectID = "eci-dP-WLC"; */
-"eci-dP-WLC.text" = "KMA";
-
-/* Class = "UILabel"; text = "Lotus's Bill Payment"; ObjectID = "LpC-UH-uPc"; */
-"LpC-UH-uPc.text" = "โลตัสบิลเพย์เมนต์";
-
-/* Class = "UIButton"; normalTitle = "Next"; ObjectID = "mE3-3u-rvg"; */
-"mE3-3u-rvg.normalTitle" = "ถัดไป";
-
-/* Class = "UINavigationItem"; title = "Payment Methods"; ObjectID = "opb-54-CDJ"; */
-"opb-54-CDJ.title" = "ช่องทางชำระเงิน";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "ozY-Yg-Xy1"; */
-"ozY-Yg-Xy1.text" = "-";
-
-/* Class = "UITextField"; placeholder = "MM/YY"; ObjectID = "Par-EA-T3D"; */
-"Par-EA-T3D.placeholder" = "ดด/ปป";
-
-/* Class = "UITextField"; placeholder = "1234567890123456"; ObjectID = "PBr-uW-pM8"; */
-"PBr-uW-pM8.placeholder" = "1234567890123456";
-
-/* Class = "UILabel"; text = "Internet Banking"; ObjectID = "pFQ-Pc-BCP"; */
-"pFQ-Pc-BCP.text" = "อินเทอร์เน็ตแบงก์กิ้ง";
-
-/* Class = "UILabel"; text = "3 Months"; ObjectID = "Pqt-3W-dy1"; */
-"Pqt-3W-dy1.text" = "3 เดือน";
-
-/* Class = "UILabel"; text = "Konbini"; ObjectID = "Qzd-8E-gal"; */
-"Qzd-8E-gal.text" = "ร้านสะดวกซื้อ";
-
-/* Class = "UILabel"; text = "Alipay"; ObjectID = "tXy-nx-P4n"; */
-"tXy-nx-P4n.text" = "อาลีเพย์";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "ubw-ZT-CVl"; */
-"ubw-ZT-CVl.text" = "-";
-
-/* Class = "UILabel"; text = "Phone"; ObjectID = "uG7-np-PQF"; */
-"uG7-np-PQF.text" = "โทร.";
-
-/* Class = "UILabel"; text = "Expiry date"; ObjectID = "uuR-9N-gze"; */
-"uuR-9N-gze.text" = "หมดอายุ";
-
-/* Class = "UILabel"; text = "Krungsri"; ObjectID = "V59-D4-sqA"; */
-"V59-D4-sqA.text" = "ธนาคารกรุงศรี";
-
-/* Class = "UILabel"; text = "Security code"; ObjectID = "vMc-kJ-Ncs"; */
-"vMc-kJ-Ncs.text" = "รหัสความปลอดภัย";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "ws5-ue-ec8"; */
-"ws5-ue-ec8.text" = "-";
-
-/* Class = "UILabel"; text = "Credit Card"; ObjectID = "WSh-Xk-FbG"; */
-"WSh-Xk-FbG.text" = "บัตรเครดิต";
-
-/* Class = "UILabel"; text = "Bangkok Bank"; ObjectID = "XnR-SW-SnL"; */
-"XnR-SW-SnL.text" = "ธนาคารกรุงเทพ";
-
-/* Class = "UITextField"; placeholder = "749"; ObjectID = "Y1l-QK-aPc"; */
-"Y1l-QK-aPc.placeholder" = "749";
-
-/* Class = "UINavigationItem"; title = "Authorizing Payment"; ObjectID = "YAC-7f-Gdj"; */
-"YAC-7f-Gdj.title" = "กำลังอนุมัติวงเงิน";
-
-/* Class = "UILabel"; text = "3-4 digit number on the back of your card"; ObjectID = "yfq-Iv-IBe"; */
-"yfq-Iv-IBe.text" = "หมายเลข CVV ด้านหลังบัตร";
-
-/* Class = "UILabel"; text = "Siam Commercial Bank"; ObjectID = "EQF-26-ssb"; */
-"EQF-26-ssb.text" = "SCB EASY";
-
-/* Class = "UILabel"; text = "Krungthai NEXT"; ObjectID = "SaV-b4-qjD"; */
-"SaV-b4-qjD.text" = "Krungthai NEXT";
-
-/* Class = "UILabel"; text = "Kasikorn Bank"; ObjectID = "yHg-il-ZhG"; */
-"yHg-il-ZhG.text" = "ธนาคารกสิกรไทย";
-
-/* Class = "UILabel"; text = "Kasikorn Bank"; ObjectID = "bDJ-ih-QYr"; */
-"bDJ-ih-QYr.text" = "K PLUS";
-
-/* Class = "UILabel"; text = "Bangkok Bank"; ObjectID = "Hk2-sB-8C8"; */
-"Hk2-sB-8C8.text" = "Bualuang mBanking";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "yQ7-lv-7H1"; */
-"yQ7-lv-7H1.text" = "-";
-
-/* Class = "UILabel"; text = "-"; ObjectID = "zj7-kT-7a4"; */
-"zj7-kT-7a4.text" = "-";
-
-/* Class = "UILabel"; text = "Installments"; ObjectID = "zli-mo-sUQ"; */
-"zli-mo-sUQ.text" = "ผ่อนชำระ";
-
-/* Class = "UIButton"; normalTitle = "Pay"; ObjectID = "ZPa-NN-y1M"; */
-"ZPa-NN-y1M.normalTitle" = "ชำระเงิน";
-
-/* Class = "UINavigationItem"; title = "TrueMoney Wallet"; ObjectID = "TBH-7l-kiP"; */
-"TBH-7l-kiP.title" = "ทรูมันนี่วอลเล็ท";
-
-/* Class = "UILabel"; text = "Please input mobile number connected to your TrueMoney Wallet account"; ObjectID = "diJ-Qj-8Op"; */
-"diJ-Qj-8Op.text" = "กรุณากรอกหมายเลขโทรศัพท์ที่ผูกกับบัญชีทรูมันนี่วอลเล็ท";
-
-/* Class = "UILabel"; text = "Phone"; ObjectID = "Ify-gZ-e2F"; */
-"Ify-gZ-e2F.text" = "โทร.";
-
-/* Class = "UIButton"; normalTitle = "Next"; ObjectID = "1dv-2d-6Zi"; */
-"1dv-2d-6Zi.normalTitle" = "ถัดไป";
-
-/* Class = "UILabel"; text = "TrueMoney Wallet"; ObjectID = "ewt-LA-vRb"; */
-"ewt-LA-vRb.text" = "ทรูมันนี่วอลเล็ท";
-
-/* Class = "UILabel"; text = "TrueMoney"; ObjectID = "ext-Bd-tya"; */
-"ext-Bd-tya.text" = "ทรูมันนี่";
-
-/* Class = "UILabel"; text = "Pay with Citi Rewards Points"; ObjectID = "zmw-2Y-WAX"; */
-"zmw-2Y-WAX.text" = "ชำระด้วยคะแนนซิตี้รีวอร์ด";
-
-/* Class = "UILabel"; text = "PromptPay"; ObjectID = "JmT-Us-3lW"; */
-"JmT-Us-3lW.text" = "พร้อมเพย์";
-
-/* Class = "UILabel"; text = "PayNow"; ObjectID = "8kj-Ed-2eS"; */
-"8kj-Ed-2eS.text" = "เพย์นาว";
-
-/* Class = "UILabel"; text = "Citibank"; ObjectID = "ZWa-M2-fVM"; */
-"ZWa-M2-fVM.text" = "ธนาคารซิตี้แบงก์";
-
-/* Class = "UILabel"; text = "TMBThanachart Bank"; ObjectID = "NkN-Zz-kdw"; */
-"NkN-Zz-kdw.text" = "ธนาคารทีเอ็มบีธนชาต";
-
-/* Class = "UILabel"; text = "United Overseas Bank"; ObjectID = "pV0-oM-DuD; */
-"pV0-oM-DuD.text" = "ธนาคารยูโอบี";
diff --git a/OmiseSDK/Source.swift b/OmiseSDK/Source.swift
deleted file mode 100644
index 581880d6..00000000
--- a/OmiseSDK/Source.swift
+++ /dev/null
@@ -1,163 +0,0 @@
-import Foundation
-
-/// Represents an Omise Source object
-public struct Source: CreatableObject {
- public typealias CreateParameter = CreateSourceParameter
-
- public static let postURL: URL = Configuration.default.environment.sourceURL
-
- public let object: String
- /// Omise Source ID
- public let id: String
-
- /// The payment information of this source describes how the payment is processed
- public let paymentInformation: PaymentInformation
-
- /// Processing Flow of this source
- /// - SeeAlso: Flow
- public let flow: Flow
-
- /// Payment amount of this Source
- public let amount: Int64
- /// Payment currency of this Source
- public let currency: Currency
-
- enum CodingKeys: String, CodingKey {
- case object
- case id
- case flow
- case currency
- case amount
- case platformType = "platform_type"
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.container(keyedBy: CodingKeys.self)
-
- paymentInformation = try PaymentInformation(from: decoder)
- object = try container.decode(String.self, forKey: .object)
- id = try container.decode(String.self, forKey: .id)
- flow = try container.decode(Flow.self, forKey: .flow)
- currency = try container.decode(Currency.self, forKey: .currency)
- amount = try container.decode(Int64.self, forKey: .amount)
- }
-}
-
-/// Parameter for creating a new `Source`
-/// - SeeAlso: Source
-public struct CreateSourceParameter: Encodable {
- /// The payment information that is used to create a new Source
- public let paymentInformation: PaymentInformation
- /// The amount of the creating Source
- public let amount: Int64
- /// The currench of the creating Source
- public let currency: Currency
-
- private let platformType: String
-
- // Atome required fields
- private let shippingAddress: PaymentInformation.Atome.ShippingAddress?
- private let items: [PaymentInformation.Atome.Item]?
- private let phoneNumber: String?
- private let name: String?
- private let email: String?
-
- private enum CodingKeys: String, CodingKey {
- case amount
- case currency
- case platformType = "platform_type"
- case shippingAddress = "shipping"
- case items
- case name
- case email
- case phoneNumber = "phone_number"
-
- }
-
- /// Create a new `Create Source Parameter` that will be used to create a new Source
- ///
- /// - Parameters:
- /// - paymentInformation: The payment informaiton of the creating Source
- /// - amount: The amount of the creating Source
- /// - currency: The currency of the creating Source
- public init(paymentInformation: PaymentInformation, amount: Int64, currency: Currency) {
- self.paymentInformation = paymentInformation
- self.amount = amount
- self.currency = currency
- self.platformType = "IOS"
-
- if let atomeData = paymentInformation.atomeData {
- shippingAddress = atomeData.shippingAddress
- items = atomeData.items
- name = atomeData.name
- email = atomeData.email
- phoneNumber = atomeData.phoneNumber
-
- } else {
- shippingAddress = nil
- items = nil
- name = nil
- email = nil
- phoneNumber = nil
- }
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.container(keyedBy: CodingKeys.self)
- try container.encode(amount, forKey: .amount)
- try container.encode(currency, forKey: .currency)
- try container.encode(platformType, forKey: .platformType)
- try container.encode(shippingAddress, forKey: .shippingAddress)
- try container.encode(items, forKey: .items)
- try container.encode(name, forKey: .name)
- try container.encode(phoneNumber, forKey: .phoneNumber)
- try container.encode(email, forKey: .email)
- try paymentInformation.encode(to: encoder)
- }
-}
-
-/// The processing flow of a Source
-///
-/// - redirect: The customer need to be redirected to another URL in order to process the source
-/// - offline: The customer need to do something in offline in order to process the source
-/// - other: Other processing flow
-public enum Flow: RawRepresentable, Decodable, Equatable {
- case redirect
- case offline
- case appRedirect
- case other(String)
-
- public typealias RawValue = String
-
- public var rawValue: String {
- switch self {
- case .offline:
- return "offline"
- case .redirect:
- return "redirect"
- case .appRedirect:
- return "app_redirect"
- case .other(let value):
- return value
- }
- }
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.singleValueContainer()
- let flow = try container.decode(String.self)
- self.init(rawValue: flow)! // swiftlint:disable:this force_unwrapping
- }
-
- public init?(rawValue: String) {
- switch rawValue {
- case "redirect":
- self = .redirect
- case "offline":
- self = .offline
- case "app_redirect":
- self = .appRedirect
- default:
- self = .other(rawValue)
- }
- }
-}
diff --git a/OmiseSDK/SourceTypeValue.swift b/OmiseSDK/SourceTypeValue.swift
deleted file mode 100644
index 50384dee..00000000
--- a/OmiseSDK/SourceTypeValue.swift
+++ /dev/null
@@ -1,66 +0,0 @@
-//
-// SourceTypeValue.swift
-// OmiseSDK
-//
-// Created by Andrei Solovev on 4/10/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
-import Foundation
-
-public enum SourceTypeValue: String {
- case internetBankingBAY = "internet_banking_bay"
- case internetBankingBBL = "internet_banking_bbl"
- case mobileBankingSCB = "mobile_banking_scb"
- case mobileBankingOCBC = "mobile_banking_ocbc"
- case mobileBankingKBank = "mobile_banking_kbank"
- case mobileBankingBAY = "mobile_banking_bay"
- case mobileBankingBBL = "mobile_banking_bbl"
- case mobileBankingKTB = "mobile_banking_ktb"
- case alipay = "alipay"
- case alipayCN = "alipay_cn"
- case alipayHK = "alipay_hk"
- case dana = "dana"
- case gcash = "gcash"
- case kakaoPay = "kakaopay"
- case touchNGo = "touch_n_go"
- case touchNGoAlipayPlus = "touch_n_go_alipay_plus"
- case billPaymentTescoLotus = "bill_payment_tesco_lotus"
- case barcodeAlipay = "barcode_alipay"
- case installmentBAY = "installment_bay"
- case installmentFirstChoice = "installment_first_choice"
- case installmentBBL = "installment_bbl"
- case installmentMBB = "installment_mbb"
- case installmentKTC = "installment_ktc"
- case installmentKBank = "installment_kbank"
- case installmentSCB = "installment_scb"
- case installmentTTB = "installment_ttb"
- case installmentUOB = "installment_uob"
- case eContext = "econtext"
- case promptPay = "promptpay"
- case payNow = "paynow"
- case trueMoney = "truemoney"
- case trueMoneyJumpApp = "truemoney_jumpapp"
- case pointsCiti = "points_citi"
- case fpx = "fpx"
- case rabbitLinepay = "rabbit_linepay"
- case grabPay = "grabpay"
- case grabPayRms = "grabpay_rms"
- case boost = "boost"
- case shopeePay = "shopeepay"
- case shopeePayJumpApp = "shopeepay_jumpapp"
- case maybankQRPay = "maybank_qr"
- case duitNowQR = "duitnow_qr"
- case duitNowOBW = "duitnow_obw"
- case atome = "atome"
- case payPay = "paypay"
- case weChat = "wechat_pay"
-
- public init?(_ rawValue: String) {
- if let value = SourceTypeValue(rawValue: rawValue) {
- self = value
- } else {
- return nil
- }
- }
-}
diff --git a/OmiseSDK/Sources/Components/Assets.swift b/OmiseSDK/Sources/Components/Assets.swift
new file mode 100644
index 00000000..2b5537f6
--- /dev/null
+++ b/OmiseSDK/Sources/Components/Assets.swift
@@ -0,0 +1,16 @@
+import Foundation
+import UIKit.UIImage
+
+enum Assets {
+ enum Icon: String {
+ case next = "Next"
+ case redirect = "Redirect"
+ }
+}
+
+extension UIImage {
+ convenience init?(_ icon: Assets.Icon?) {
+ guard let icon = icon else { return nil }
+ self.init(named: icon.rawValue, in: .omiseSDK, compatibleWith: nil)
+ }
+}
diff --git a/OmiseSDK/Helpers/Bundle+OmiseSDK.swift b/OmiseSDK/Sources/Components/Bundle+OmiseSDK.swift
similarity index 83%
rename from OmiseSDK/Helpers/Bundle+OmiseSDK.swift
rename to OmiseSDK/Sources/Components/Bundle+OmiseSDK.swift
index 3f62818e..a3c12c6b 100644
--- a/OmiseSDK/Helpers/Bundle+OmiseSDK.swift
+++ b/OmiseSDK/Sources/Components/Bundle+OmiseSDK.swift
@@ -1,6 +1,6 @@
import Foundation
-// Unique named class to use as a reference with Bundle()
+// Unique named class to use as a reference to create a current Bundle
private final class OmiseSDK216d048c5feca16469a7a71566256537 {
}
diff --git a/OmiseSDK/Sources/Components/Calendar+CreditCard.swift b/OmiseSDK/Sources/Components/Calendar+CreditCard.swift
new file mode 100644
index 00000000..fe30c7f8
--- /dev/null
+++ b/OmiseSDK/Sources/Components/Calendar+CreditCard.swift
@@ -0,0 +1,11 @@
+import Foundation
+
+extension Calendar {
+ /// Calendar used in the Credit Card information which is Gregorian Calendar
+ static let creditCardInformationCalendar = Calendar(identifier: .gregorian)
+ /// Range contains the valid range of the expiration month value
+ static let validExpirationMonthRange: Range = {
+ // swiftlint:disable:next force_unwrapping
+ Calendar.creditCardInformationCalendar.maximumRange(of: .month)!
+ }()
+}
diff --git a/OmiseSDK/Sources/Components/Configuration.swift b/OmiseSDK/Sources/Components/Configuration.swift
new file mode 100644
index 00000000..25d58531
--- /dev/null
+++ b/OmiseSDK/Sources/Components/Configuration.swift
@@ -0,0 +1,11 @@
+import Foundation
+
+public struct Configuration {
+ public let vaultURL: URL
+ public let apiURL: URL
+
+ public init(vaultURL: URL, apiURL: URL) {
+ self.vaultURL = vaultURL
+ self.apiURL = apiURL
+ }
+}
diff --git a/OmiseSDK/Sources/Components/Globals.swift b/OmiseSDK/Sources/Components/Globals.swift
new file mode 100644
index 00000000..a727624b
--- /dev/null
+++ b/OmiseSDK/Sources/Components/Globals.swift
@@ -0,0 +1,5 @@
+import UIKit
+import os
+
+let sdkLogObject = OSLog(subsystem: "co.omise.ios.sdk", category: "SDK")
+let uiLogObject = OSLog(subsystem: "co.omise.ios.sdk", category: "UI")
diff --git a/OmiseSDK/Sources/Components/Localized+Omise.swift b/OmiseSDK/Sources/Components/Localized+Omise.swift
new file mode 100644
index 00000000..7e439b68
--- /dev/null
+++ b/OmiseSDK/Sources/Components/Localized+Omise.swift
@@ -0,0 +1,5 @@
+import Foundation
+
+func localized(_ code: String, text: String = "", _ comment: String = "") -> String {
+ NSLocalizedString(code, bundle: .omiseSDK, value: text, comment: comment)
+}
diff --git a/OmiseSDK/Sources/Components/UIImage+Omise.swift b/OmiseSDK/Sources/Components/UIImage+Omise.swift
new file mode 100644
index 00000000..9327634e
--- /dev/null
+++ b/OmiseSDK/Sources/Components/UIImage+Omise.swift
@@ -0,0 +1,7 @@
+import UIKit
+
+extension UIImage {
+ convenience init?(omise: String) {
+ self.init(named: omise, in: .omiseSDK, compatibleWith: nil)
+ }
+}
diff --git a/OmiseSDK/CardBrand.swift b/OmiseSDK/Sources/Models/CardBrand.swift
similarity index 100%
rename from OmiseSDK/CardBrand.swift
rename to OmiseSDK/Sources/Models/CardBrand.swift
diff --git a/OmiseSDK/CountryInfo.swift b/OmiseSDK/Sources/Models/Country.swift
similarity index 94%
rename from OmiseSDK/CountryInfo.swift
rename to OmiseSDK/Sources/Models/Country.swift
index 81c75518..1c58c9e0 100644
--- a/OmiseSDK/CountryInfo.swift
+++ b/OmiseSDK/Sources/Models/Country.swift
@@ -1,38 +1,38 @@
-//
-// CountryInfo.swift
-// OmiseSDK
-//
-// Created by Andrei Solovev on 8/6/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
import Foundation
-struct CountryInfo: Codable, Equatable {
- let name: String
- let code: String
-}
-
-extension CountryInfo {
+public struct Country: Codable, Equatable {
+ public let name: String
+ public let code: String
- static var `default`: CountryInfo?
-
- static func setDefaultCountryCode(_ code: String) {
- self.default = CountryInfo.all.first { $0.code == code }
+ public var isAVS: Bool {
+ Self.avsCodes.contains(code)
}
- static var avsCodes: [String] = ["US", "CA", "GB"]
- var isAVS: Bool {
- Self.avsCodes.contains(code)
+ public init(name: String, code: String) {
+ self.name = name
+ self.code = code
}
+
+ public init?(code: String?) {
+ guard let code = code, let country = Self.all.first(where: { $0.code == code }) else {
+ return nil
+ }
+ self = country
+ }
+}
- static var sortedAll: [CountryInfo] = {
- CountryInfo.all.sorted {
+extension Country {
+ public static var avsCodes: [String] = ["US", "CA", "GB"]
+
+ public static var sortedAll: [Country] = {
+ Country.all.sorted {
$0.name.localizedCompare($1.name) == .orderedAscending
}
}()
+}
- static var all: [CountryInfo] = [
+extension Country {
+ public static var all: [Country] = [
.init(name: "Afghanistan", code: "AF"),
.init(name: "Åland Islands", code: "AX"),
.init(name: "Albania", code: "AL"),
diff --git a/OmiseSDK/Sources/Models/Currency.swift b/OmiseSDK/Sources/Models/Currency.swift
new file mode 100644
index 00000000..ce0b7182
--- /dev/null
+++ b/OmiseSDK/Sources/Models/Currency.swift
@@ -0,0 +1,76 @@
+import Foundation
+
+public let centBasedCurrencyFactor = 100
+public let identicalBasedCurrencyFactor = 1
+
+public enum Currency: String, Codable, Hashable {
+ case aud = "AUD"
+ case cad = "CAD"
+ case chf = "CHF"
+ case cny = "CNY"
+ case dkk = "DKK"
+ case eur = "EUR"
+ case gbp = "GBP"
+ case hkd = "HKD"
+ case idr = "IDR"
+ case jpy = "JPY"
+ case myr = "MYR"
+ case sgd = "SGD"
+ case thb = "THB"
+ case usd = "USD"
+
+ static let main: Currency = .thb
+
+ public var code: String {
+ rawValue
+ }
+
+ /// Create a currency with the given `ISO 4217` currency code
+ ///
+ /// - Parameter code: The ISO 4217 currency code for the creating Currency that will be created
+ public init(code: String?) {
+ if let code = code {
+ self = Currency(rawValue: code) ?? .main
+ } else {
+ self = .main
+ }
+ }
+
+ /// A conversion factor represents how much Omise amount equals to 1 unit of this currency. eg. THB's factor is equals to 100.
+ public var factor: Int {
+ if case .jpy = self {
+ return identicalBasedCurrencyFactor
+ } else {
+ return centBasedCurrencyFactor
+ }
+ }
+
+ /// Convert the given subunit amount to the unit amount
+ ///
+ /// - Parameter value: Value in subunit (Satang in THB for example)
+ /// - Returns: Value in unit (Baht in THB for example)
+ public func convert(fromSubunit value: Int64) -> Double {
+ return Double(value) / Double(factor)
+ }
+
+ /// Convert the given unit amount to the subunit amount
+ ///
+ /// - Parameter value: Value in unit (Baht in THB for example)
+ /// - Returns: Value in subunit (Satang in THB for example)
+ public func convert(toSubunit value: Double) -> Int64 {
+ return Int64(value * Double(factor))
+ }
+}
+
+extension Currency {
+ public func encode(to encoder: Encoder) throws {
+ var container = encoder.singleValueContainer()
+ try container.encode(code.uppercased())
+ }
+
+ public init(from decoder: Decoder) throws {
+ let container = try decoder.singleValueContainer()
+ let code = try container.decode(String.self)
+ self.init(code: code)
+ }
+}
diff --git a/OmiseSDK/Globals.swift b/OmiseSDK/Sources/Models/OmiseError+LocalizedDescription.swift
similarity index 69%
rename from OmiseSDK/Globals.swift
rename to OmiseSDK/Sources/Models/OmiseError+LocalizedDescription.swift
index 6d2e8871..9416805f 100644
--- a/OmiseSDK/Globals.swift
+++ b/OmiseSDK/Sources/Models/OmiseError+LocalizedDescription.swift
@@ -1,373 +1,16 @@
-// swiftlint:disable file_length
+//
+// OmiseError+LocalizedDescription.swift
+// OmiseSDK
+//
+// Created by Andrei Solovev on 14/2/24.
+// Copyright © 2024 Omise. All rights reserved.
+//
-import UIKit
-import os
+import Foundation
-let sdkLogObject = OSLog(subsystem: "co.omise.ios.sdk", category: "SDK")
-let uiLogObject = OSLog(subsystem: "co.omise.ios.sdk", category: "UI")
-
-extension Optional where Wrapped == String {
- public var isNilOrEmpty: Bool {
- return self?.isEmpty ?? true
- }
-}
-
-struct JSONCodingKeys: CodingKey {
- var stringValue: String
-
- init?(stringValue: String) {
- self.init(key: stringValue)
- }
-
- init(key: String) {
- self.stringValue = key
- }
-
- var intValue: Int?
-
- init?(intValue: Int) {
- self.init(stringValue: "\(intValue)")
- self.intValue = intValue
- }
-}
-
-enum CombineCodingKeys: CodingKey {
- var stringValue: String {
- switch self {
- case .left(let left):
- return left.stringValue
- case .right(let right):
- return right.stringValue
- }
- }
-
- var intValue: Int? {
- switch self {
- case .left(let left):
- return left.intValue
- case .right(let right):
- return right.intValue
- }
- }
-
- init?(stringValue: String) {
- if let left = Left(stringValue: stringValue) {
- self = .left(left)
- } else if let right = Right(stringValue: stringValue) {
- self = .right(right)
- } else {
- return nil
- }
- }
-
- init?(intValue: Int) {
- if let left = Left(intValue: intValue) {
- self = .left(left)
- } else if let right = Right(intValue: intValue) {
- self = .right(right)
- } else {
- return nil
- }
- }
-
- case left(Left)
- case right(Right)
-}
-
-struct SkippingKeyCodingKeys: CodingKey {
- let stringValue: String
-
- init?(stringValue: String) {
- guard Key(stringValue: stringValue) == nil else {
- return nil
- }
-
- self.stringValue = stringValue
- self.intValue = Int(stringValue)
- }
-
- let intValue: Int?
-
- init?(intValue: Int) {
- guard Key(intValue: intValue) == nil else {
- return nil
- }
-
- self.intValue = intValue
- self.stringValue = String(intValue)
- }
-}
-
-extension SourceTypeValue {
- var sourceTypePrefix: String {
- switch self {
- case .internetBankingBAY, .internetBankingBBL:
- return "internet_banking"
- case .mobileBankingSCB, .mobileBankingKBank, .mobileBankingBAY, .mobileBankingBBL, .mobileBankingKTB:
- return "mobile_banking"
- case .alipay:
- return "alipay"
- case .atome:
- return "atome"
- case .billPaymentTescoLotus:
- return "bill_payment"
- case .barcodeAlipay:
- return "barcode"
- case .installmentBAY, .installmentMBB, .installmentFirstChoice, .installmentBBL,
- .installmentKTC, .installmentKBank, .installmentSCB, .installmentTTB, .installmentUOB:
- return "installment"
- case .eContext:
- return "econtext"
- case .promptPay:
- return "promptpay"
- case .payNow:
- return "paynow"
- case .trueMoney, .trueMoneyJumpApp:
- return "truemoney"
- case .pointsCiti:
- return "points"
- case .fpx:
- return "fpx"
- case .alipayCN:
- return "alipay_cn"
- case .alipayHK:
- return "alipay_hk"
- case .dana:
- return "dana"
- case .gcash:
- return "gcash"
- case .kakaoPay:
- return "kakaopay"
- case .touchNGo, .touchNGoAlipayPlus:
- return "touch_n_go"
- case .rabbitLinepay:
- return "rabbit_linepay"
- case .mobileBankingOCBC:
- return "mobile_banking_ocbc"
- case .grabPay, .grabPayRms:
- return "grabpay"
- case .boost:
- return "boost"
- case .shopeePay:
- return "shopeepay"
- case .shopeePayJumpApp:
- return "shopeepay_jumpapp"
- case .maybankQRPay:
- return "maybank_qr"
- case .duitNowQR:
- return "duitnow_qr"
- case .duitNowOBW:
- return "duitnow_obw"
- case .payPay:
- return "paypay"
- case .weChat:
- return "wechat_pay"
- }
- }
-}
-
-extension Decoder {
- func decodeJSONDictionary() throws -> [String: Any] {
- let container = try self.container(keyedBy: JSONCodingKeys.self)
- return try container.decodeJSONDictionary()
- }
-}
-
-extension KeyedDecodingContainerProtocol {
- func decode(_ type: [String: Any].Type, forKey key: Key) throws -> [String: Any] {
- let container = try self.nestedContainer(keyedBy: JSONCodingKeys.self, forKey: key)
- return try container.decodeJSONDictionary()
- }
-
- func decodeIfPresent(_ type: [String: Any].Type, forKey key: Key) throws -> [String: Any]? {
- guard contains(key) else {
- return nil
- }
- return try decode(type, forKey: key)
- }
-
- func decode(_ type: [Any].Type, forKey key: Key) throws -> [Any] {
- var container = try self.nestedUnkeyedContainer(forKey: key)
- return try container.decodeJSONArray()
- }
-
- func decodeIfPresent(_ type: [Any].Type, forKey key: Key) throws -> [Any]? {
- guard contains(key) else {
- return nil
- }
- return try decode(type, forKey: key)
- }
-
- func decodeJSONDictionary() throws -> [String: Any] {
- var dictionary = [String: Any]()
-
- for key in allKeys {
- if let boolValue = try? decode(Bool.self, forKey: key) {
- dictionary[key.stringValue] = boolValue
- } else if let stringValue = try? decode(String.self, forKey: key) {
- dictionary[key.stringValue] = stringValue
- } else if let intValue = try? decode(Int.self, forKey: key) {
- dictionary[key.stringValue] = intValue
- } else if let doubleValue = try? decode(Double.self, forKey: key) {
- dictionary[key.stringValue] = doubleValue
- } else if let nestedDictionary = try? decode(Dictionary.self, forKey: key) {
- dictionary[key.stringValue] = nestedDictionary
- } else if let nestedArray = try? decode(Array.self, forKey: key) {
- dictionary[key.stringValue] = nestedArray
- } else if try decodeNil(forKey: key) {
- dictionary[key.stringValue] = String?.none as Any
- }
- }
- return dictionary
- }
-}
-
-extension UnkeyedDecodingContainer {
- mutating func decodeJSONArray() throws -> [Any] {
- var array: [Any] = []
- while isAtEnd == false {
- if let value = try? decode(Bool.self) {
- array.append(value)
- } else if let value = try? decode(Double.self) {
- array.append(value)
- } else if let value = try? decode(String.self) {
- array.append(value)
- } else if let nestedDictionary = try? decode([String: Any].self) {
- array.append(nestedDictionary)
- } else if let nestedArray = try? decodeArrayElement() {
- array.append(nestedArray)
- }
- }
- return array
- }
-
- private mutating func decodeArrayElement() throws -> [Any] {
- var nestedContainer = try self.nestedUnkeyedContainer()
- return try nestedContainer.decodeJSONArray()
- }
-
- mutating func decode(_ type: [String: Any].Type) throws -> [String: Any] {
- let nestedContainer = try self.nestedContainer(keyedBy: JSONCodingKeys.self)
- return try nestedContainer.decodeJSONDictionary()
- }
-}
-
-extension Encoder {
- func encodeJSONDictionary(_ jsonDictionary: [String: Any]) throws {
- var container = self.container(keyedBy: JSONCodingKeys.self)
- try container.encodeJSONDictionary(jsonDictionary)
- }
-}
-
-extension KeyedEncodingContainerProtocol where Key == JSONCodingKeys {
- mutating func encodeJSONDictionary(_ value: [String: Any]) throws {
- try value.forEach { (key, value) in
- let key = JSONCodingKeys(key: key)
- switch value {
- case let value as Bool:
- try encode(value, forKey: key)
- case let value as Int:
- try encode(value, forKey: key)
- case let value as String:
- try encode(value, forKey: key)
- case let value as Double:
- try encode(value, forKey: key)
- case let value as [String: Any]:
- try encode(value, forKey: key)
- case let value as [Any]:
- try encode(value, forKey: key)
- case Optional.none:
- try encodeNil(forKey: key)
- default:
- let context = EncodingError.Context(codingPath: codingPath + [key], debugDescription: "Invalid JSON value")
- throw EncodingError.invalidValue(value, context)
- }
- }
- }
-}
-
-extension KeyedEncodingContainerProtocol {
- mutating func encode(_ value: [String: Any], forKey key: Key) throws {
- var container = self.nestedContainer(keyedBy: JSONCodingKeys.self, forKey: key)
- try container.encodeJSONDictionary(value)
- }
-
- mutating func encodeIfPresent(_ value: [String: Any]?, forKey key: Key) throws {
- if let value = value {
- try encode(value, forKey: key)
- }
- }
-
- mutating func encode(_ value: [Any], forKey key: Key) throws {
- var container = self.nestedUnkeyedContainer(forKey: key)
- try container.encodeJSONArray(value)
- }
-
- mutating func encodeIfPresent(_ value: [Any]?, forKey key: Key) throws {
- if let value = value {
- try encode(value, forKey: key)
- }
- }
-}
-
-extension UnkeyedEncodingContainer {
- mutating func encodeJSONArray(_ value: [Any]) throws {
- try value.enumerated().forEach { (index, value) in
- switch value {
- case let value as Bool:
- try encode(value)
- case let value as Int:
- try encode(value)
- case let value as String:
- try encode(value)
- case let value as Double:
- try encode(value)
- case let value as [String: Any]:
- try encodeJSONDictionary(value)
- case let value as [Any]:
- try encodeArrayElement(value)
- case Optional.none:
- try encodeNil()
- default:
- let keys = JSONCodingKeys(intValue: index).map({ [ $0 ] }) ?? []
- let context = EncodingError.Context(codingPath: codingPath + keys, debugDescription: "Invalid JSON value")
- throw EncodingError.invalidValue(value, context)
- }
- }
- }
-
- private mutating func encodeArrayElement(_ value: [Any]) throws {
- var nestedContainer = self.nestedUnkeyedContainer()
- try nestedContainer.encodeJSONArray(value)
- }
-
- mutating func encodeJSONDictionary(_ value: [String: Any]) throws {
- var nestedContainer = self.nestedContainer(keyedBy: JSONCodingKeys.self)
- try nestedContainer.encodeJSONDictionary(value)
- }
-}
-
-extension UIControl.State: Hashable {
- public func hash(into hasher: inout Hasher) {
- hasher.combine(rawValue)
- }
-}
-
-extension NumberFormatter {
- static func makeAmountFormatter(for currency: Currency?) -> NumberFormatter {
- let formatter = NumberFormatter()
- formatter.numberStyle = .currency
- formatter.currencyCode = currency?.code
- if currency == .thb {
- formatter.currencySymbol = "฿"
- }
- return formatter
- }
-}
-
-// swiftlint:disable line_length
+// swiftlint:disable line_length file_length
extension OmiseError {
- var bannerErrorDescription: String {
+ var localizedDescription: String {
switch self {
case .api(code: let code, message: _, location: _):
switch code {
@@ -578,8 +221,7 @@ extension OmiseError {
}
}
- var bannerErrorRecoverySuggestion: String {
-
+ var localizedRecoverySuggestion: String {
enum CommonStrings: String {
case tryAgainLater = "Please try again later"
}
@@ -782,6 +424,5 @@ extension OmiseError {
)
}
}
-
-// swiftlint:enable line_length
}
+// swiftlint:enable line_length
diff --git a/OmiseSDK/OmiseError.swift b/OmiseSDK/Sources/Models/OmiseError.swift
similarity index 98%
rename from OmiseSDK/OmiseError.swift
rename to OmiseSDK/Sources/Models/OmiseError.swift
index 156b6d2c..c8a7f05f 100644
--- a/OmiseSDK/OmiseError.swift
+++ b/OmiseSDK/Sources/Models/OmiseError.swift
@@ -18,6 +18,18 @@ public enum ErrorUserInfoKey: String, CodingKey {
case message
}
+extension NumberFormatter {
+ static func makeAmountFormatter(for currency: Currency?) -> NumberFormatter {
+ let formatter = NumberFormatter()
+ formatter.numberStyle = .currency
+ formatter.currencyCode = currency?.code
+ if currency == .thb {
+ formatter.currencySymbol = "฿"
+ }
+ return formatter
+ }
+}
+
/// Represent errors from the Omise iOS SDK.
public enum OmiseError: CustomNSError, LocalizedError, Decodable {
public static let errorDomain: String = "co.omise.ios"
@@ -328,8 +340,9 @@ extension OmiseError.APIErrorCode: Decodable {
case "invalid_card":
self = .invalidCard(try OmiseError.APIErrorCode.InvalidCardReason.parseInvalidCardReasonsFromMessage(message))
case "bad_request":
- let sourceParameter = decoder.userInfo[sourceParameterCodingsUserInfoKey] as? CreateSourceParameter
- self = .badRequest(try OmiseError.APIErrorCode.BadRequestReason.parseBadRequestReasonsFromMessage(message, currency: sourceParameter?.currency))
+// let sourceParameter = decoder.userInfo[sourceParameterCodingsUserInfoKey] as? CreateSourceParameter
+// self = .badRequest(try OmiseError.APIErrorCode.BadRequestReason.parseBadRequestReasonsFromMessage(message, currency: sourceParameter?.currency))
+ self = .badRequest(try OmiseError.APIErrorCode.BadRequestReason.parseBadRequestReasonsFromMessage(message, currency: .main))
case "authentication_failure":
self = .authenticationFailure
case "service_not_found":
@@ -536,9 +549,9 @@ extension OmiseError.APIErrorCode.BadRequestReason: Decodable {
public init(from decoder: Decoder) throws {
let container = try decoder.singleValueContainer()
- let sourceParameter = decoder.userInfo[sourceParameterCodingsUserInfoKey] as? CreateSourceParameter
+// let sourceParameter = decoder.userInfo[sourceParameterCodingsUserInfoKey] as? CreateSourceParameter
- try self.init(message: try container.decode(String.self), currency: sourceParameter?.currency)
+ try self.init(message: try container.decode(String.self), currency: .main)
}
var defaultLocalizedErrorDescription: String? {
diff --git a/OmiseSDK/PAN.swift b/OmiseSDK/Sources/Models/PAN.swift
similarity index 100%
rename from OmiseSDK/PAN.swift
rename to OmiseSDK/Sources/Models/PAN.swift
diff --git a/OmiseSDK/Sources/OmiseAPI/Client.swift b/OmiseSDK/Sources/OmiseAPI/Client.swift
new file mode 100644
index 00000000..3ae0a6b0
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/Client.swift
@@ -0,0 +1,102 @@
+import Foundation
+import os
+
+/// Network Client to communicate with Omise APIs
+public class Client {
+ public typealias RequestResultClosure = (Result) -> Void
+
+ let version: String
+ let publicKey: String
+ var customApiURL: URL?
+ var customVaultURL: URL?
+
+ let network: NetworkServiceProtocol
+ private let pollingAttemptsCount = 10
+ private let pollingTimeInterval = 3
+
+ /// Latest capability loaded with `capability()`
+ public private(set) var latestLoadedCapability: Capability?
+
+ /// Creates a new Client item with given public key
+ ///
+ /// - Parameters:
+ /// - publicKey: Omise public key, should starts with "pkey_"
+ /// - network: Optional network communication service is used for testing
+ /// - apiURL: Custom URL for Omise API Server is used for testing
+ /// - vaultURL: Custom URL for Omise Vault Server is used for testing
+ init(publicKey: String, version: String, network: NetworkServiceProtocol = NetworkService(), apiURL: URL? = nil, vaultURL: URL? = nil) {
+
+ if publicKey.hasPrefix("pkey_") {
+ self.publicKey = publicKey
+ } else {
+ self.publicKey = ""
+ os_log("Refusing to initialize sdk client with a non-public key: %{private}@", log: sdkLogObject, type: .error, publicKey)
+ assertionFailure("Refusing to initialize sdk client with a non-public key.")
+ }
+
+ self.version = version
+ self.network = network
+ self.customApiURL = apiURL
+ self.customVaultURL = vaultURL
+ }
+
+ /// Perform Capability API Request
+ /// - returns Capability
+ public func capability(_ completion: @escaping RequestResultClosure) {
+ performRequest(api: OmiseAPI.capability) { [weak self] (result: Result) in
+ if let capability = try? result.get() {
+ self?.latestLoadedCapability = capability
+ }
+ completion(result)
+ }
+ }
+
+ /// Sends Create a Source API request with given Payment Payload
+ ///
+ /// - Parameters:
+ /// - payload: Information required to perform Create a Source API request
+ /// - completion: Returns `Source` object on success and `Error` on request failed
+ public func createSource(payload: CreateSourcePayload, _ completion: @escaping RequestResultClosure) {
+ performRequest(api: OmiseAPI.createSource(payload: payload), completion: completion)
+ }
+
+ /// Send Create a Token API request with given Card Payment
+ ///
+ /// - Parameters:
+ /// - payload: Information required to perform Create a Token API request
+ /// - completion: Returns `Token`object on success and `Error` on request failed
+ public func createToken(payload: CreateTokenPayload, _ completion: @escaping RequestResultClosure) {
+ performRequest(api: OmiseAPI.createToken(payload: payload), completion: completion)
+ }
+
+ /// Request a Token from API with given Token ID
+ ///
+ /// - Parameters:
+ /// - tokenID: Token identifier
+ /// - completion: Returns `Token`object on success and `Error` on request failed
+ public func token(tokenID: String, _ completion: @escaping RequestResultClosure) {
+ performRequest(api: OmiseAPI.token(tokenID: tokenID), completion: completion)
+ }
+
+ /// Observe Token Charge Status until it changes
+ /// Sends API request every `timeInterval` with number of`maxAttempt`attempts.
+ ///
+ /// - Parameters:
+ /// - tokenID: Token identifier
+ /// - completion: Returns `Token.ChargeStatus`object with token charge status value on success and `Error` on request failed
+ public func observeChargeStatus(tokenID: String, _ completion: @escaping RequestResultClosure) {
+ observeUntilChargeStatusIsFinal(
+ tokenID: tokenID,
+ timeInterval: pollingTimeInterval,
+ attemp: 0,
+ maxAttempt: pollingAttemptsCount,
+ completion
+ )
+ }
+}
+
+extension Client {
+ func setLatestLoadedCapability(_ capability: Capability) {
+ latestLoadedCapability = capability
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/Helpers/APIProtocol.swift b/OmiseSDK/Sources/OmiseAPI/Helpers/APIProtocol.swift
new file mode 100644
index 00000000..d0226d1c
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/Helpers/APIProtocol.swift
@@ -0,0 +1,25 @@
+import Foundation
+
+protocol APIProtocol {
+ var omiseAPIVersion: String { get }
+ var server: OmiseServerType { get }
+ var path: String { get }
+ var method: HTTPMethod { get }
+ var contentType: ContentType { get }
+ var dateFormatter: DateFormatter { get }
+ var httpBody: Data? { get }
+}
+
+enum HTTPMethod: String {
+ case get = "GET"
+ case post = "POST"
+}
+
+enum ContentType: String {
+ case json = "application/json; charset=utf8"
+}
+
+enum OmiseServerType {
+ case api
+ case vault
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/Helpers/Client+NetworkService.swift b/OmiseSDK/Sources/OmiseAPI/Helpers/Client+NetworkService.swift
new file mode 100644
index 00000000..322f5060
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/Helpers/Client+NetworkService.swift
@@ -0,0 +1,58 @@
+import Foundation
+
+extension Client {
+ /// Creates urlRequest and performs API request with currenly used Network Service
+ /// - returns Generic Decodable from JSON string
+ func performRequest(api: APIProtocol, completion: @escaping RequestResultClosure) {
+ let urlRequest = urlRequest(publicKey: publicKey, api: api)
+ network.send(
+ urlRequest: urlRequest,
+ dateFormatter: api.dateFormatter,
+ completion: completion
+ )
+ }
+
+ /// Observe Token Charge Status until it changes
+ /// Sends API request every `timeInterval` with number of`maxAttempt`attempts.
+ /// - Parameters:
+ /// - tokenId: Token ID
+ /// - timeInterval: TimeInterval between polling requests
+ /// - attemp: Current attemp
+ /// - maxAttempt: Maximum number of attemps
+ func observeUntilChargeStatusIsFinal(
+ tokenID: String,
+ timeInterval: Int,
+ attemp: Int,
+ maxAttempt: Int,
+ _ completion: @escaping RequestResultClosure
+ ) {
+ guard maxAttempt > attemp else {
+ return
+ }
+ token(tokenID: tokenID) { [weak self] (result: (Result)) in
+ switch result {
+ case .success(let token) where token.chargeStatus.isFinal:
+ completion(.success(token.chargeStatus))
+ case .success(let token):
+ guard attemp + 1 < maxAttempt else {
+ completion(.success(token.chargeStatus))
+ return
+ }
+
+ let queue = DispatchQueue.global(qos: .background)
+ queue.asyncAfter(deadline: .now() + .seconds(timeInterval)) {
+ self?.observeUntilChargeStatusIsFinal(
+ tokenID: tokenID,
+ timeInterval: timeInterval,
+ attemp: attemp + 1,
+ maxAttempt: maxAttempt,
+ completion
+ )
+ }
+
+ case .failure(let error):
+ completion(.failure(error))
+ }
+ }
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/Helpers/Client+URLRequest.swift b/OmiseSDK/Sources/OmiseAPI/Helpers/Client+URLRequest.swift
new file mode 100644
index 00000000..c9b2a7ae
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/Helpers/Client+URLRequest.swift
@@ -0,0 +1,78 @@
+import Foundation
+import UIKit.UIDevice
+
+extension Client {
+ func url(api: APIProtocol) -> URL {
+ let customURL = {
+ switch api.server {
+ case .api: return customApiURL
+ case .vault: return customVaultURL
+ }
+ }()
+
+ return customURL ?? api.server.url
+ }
+
+ func urlRequest(publicKey: String, api: APIProtocol)
+ -> URLRequest {
+ let url = url(api: api).appendingPathComponent(api.path)
+ let headers = httpHeaders(
+ publicKey: publicKey,
+ userAgent: userAgent(),
+ apiVersion: api.omiseAPIVersion,
+ contentType: api.contentType.rawValue
+ )
+
+ var urlRequest = URLRequest(url: url)
+ urlRequest.httpMethod = api.method.rawValue
+ urlRequest.httpBody = api.httpBody
+ for (key, value) in headers {
+ urlRequest.setValue(value, forHTTPHeaderField: key)
+ }
+ return urlRequest
+ }
+}
+
+// MARK: User Agent
+extension Client {
+ func userAgent(
+ sdkVersion: String? = nil,
+ platform: String = ProcessInfo.processInfo.operatingSystemVersionString,
+ device: String = UIDevice.current.model
+ ) -> String {
+ let sdkVersion = sdkVersion ?? version
+ return "OmiseIOS/\(sdkVersion) iOS/\(platform) Apple/\(device)"
+ }
+}
+
+// MARK: HTTP Headers
+extension Client {
+ enum HTTPHeaders: String {
+ case authorization = "Authorization"
+ case userAgent = "User-Agent"
+ case contentType = "Content-Type"
+ case omiseVersion = "Omise-Version"
+ }
+
+ func httpHeaders(
+ publicKey: String,
+ userAgent: String,
+ apiVersion: String,
+ contentType: String
+ ) -> [String: String] {
+ [
+ HTTPHeaders.authorization.rawValue: encodeAuthorizationHTTPHeader(publicKey),
+ HTTPHeaders.userAgent.rawValue: userAgent,
+ HTTPHeaders.contentType.rawValue: contentType,
+ HTTPHeaders.omiseVersion.rawValue: apiVersion
+ ]
+ }
+
+ func encodeAuthorizationHTTPHeader(_ publicKey: String) -> String {
+ guard let data = publicKey.data(using: String.Encoding.utf8, allowLossyConversion: false) else {
+ return ""
+ }
+ let base64 = data.base64EncodedString()
+ return "Basic \(base64)"
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift b/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift
new file mode 100644
index 00000000..991b5bb5
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/Helpers/NetworkService.swift
@@ -0,0 +1,125 @@
+import Foundation
+import os
+
+protocol NetworkServiceProtocol {
+ typealias RequestResultClosure = (Result) -> Void
+
+ func send(
+ urlRequest: URLRequest,
+ dateFormatter: DateFormatter?,
+ completion: @escaping RequestResultClosure
+ )
+}
+
+class NetworkService {
+ let session: URLSession
+ let queue: OperationQueue
+
+ init(queue: OperationQueue = OperationQueue()) {
+ self.queue = queue
+ self.session = URLSession(
+ configuration: URLSessionConfiguration.ephemeral,
+ delegate: nil,
+ delegateQueue: queue
+ )
+ }
+}
+
+extension NetworkService: NetworkServiceProtocol {
+ func send(
+ urlRequest: URLRequest,
+ dateFormatter: DateFormatter?,
+ completion: @escaping RequestResultClosure
+ ) {
+ let dataTask = session.dataTask(with: urlRequest) { [weak self] (data, response, error) in
+ guard let self = self else { return }
+
+ var result: Result
+ if let error = error {
+ result = .failure(error)
+ } else if let httpResponse = response as? HTTPURLResponse {
+ result = self.processResponse(
+ dateFormatter: dateFormatter,
+ data: data,
+ statusCode: httpResponse.statusCode,
+ error: error,
+ type: T.self
+ )
+ } else {
+ let error = OmiseError.unexpected(error: .noErrorNorResponse, underlying: nil)
+ result = .failure(error)
+ }
+
+ self.logResponse(result: result)
+
+ DispatchQueue.main.async {
+ completion(result)
+ }
+ }
+ dataTask.resume()
+
+ os_log(
+ "Starting/Resuming Request %{public}@",
+ log: sdkLogObject,
+ type: .debug,
+ String(describing: type(of: T.self))
+ )
+
+ }
+}
+
+private extension NetworkService {
+ func logResponse(result: Result) {
+ switch result {
+ case .success:
+ os_log("Request succeed", log: sdkLogObject, type: .debug)
+ case .failure(let error):
+ os_log("Request failed %{public}@", log: sdkLogObject, type: .info, error.localizedDescription)
+ }
+ }
+
+ func processResponse(dateFormatter: DateFormatter?, data: Data?, statusCode: Int, error: Error?, type: T.Type) -> Result {
+ let decoder = JSONDecoder()
+ if let dateFormatter = dateFormatter {
+ decoder.dateDecodingStrategy = .formatted(dateFormatter)
+ }
+
+ switch statusCode {
+ case 400..<600:
+ return .failure(parseError(decoder: decoder, data: data))
+
+ case 200..<300:
+ guard let data = data else {
+ let omiseError = OmiseError.unexpected(error: .httpSuccessWithNoData, underlying: nil)
+ return .failure(omiseError)
+ }
+
+ do {
+ let object = try decoder.decode(T.self, from: data)
+ return .success(object)
+ } catch {
+ let omiseError = OmiseError.unexpected(error: .httpSuccessWithInvalidData, underlying: error)
+ return .failure(omiseError)
+ }
+
+ default:
+ let unexpectedError = OmiseError.UnexpectedError.unrecognizedHTTPStatusCode(code: statusCode)
+ let error = OmiseError.unexpected(error: unexpectedError, underlying: nil)
+ return .failure(error)
+ }
+ }
+
+ func parseError(decoder: JSONDecoder, data: Data?) -> Error {
+ guard let data = data else {
+ return OmiseError.unexpected(error: .httpErrorWithNoData, underlying: nil)
+ }
+
+ do {
+ return try decoder.decode(OmiseError.self, from: data)
+ } catch {
+ return OmiseError.unexpected(
+ error: .httpErrorResponseWithInvalidData, underlying: error
+ )
+ }
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.PaymentMethod.Bank.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.PaymentMethod.Bank.swift
new file mode 100644
index 00000000..bfb4e677
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.PaymentMethod.Bank.swift
@@ -0,0 +1,18 @@
+import Foundation
+
+extension Capability.PaymentMethod {
+ /// Represents Capability.PaymentMethod.Bank JSON object for communication with Omise API
+ public struct Bank: Hashable {
+ public let name: String
+ public let code: String
+ public let isActive: Bool
+ }
+}
+
+extension Capability.PaymentMethod.Bank: Codable {
+ enum CodingKeys: String, CodingKey {
+ case name
+ case code
+ case isActive = "active"
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.PaymentMethod.Provider.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.PaymentMethod.Provider.swift
new file mode 100644
index 00000000..f1607472
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.PaymentMethod.Provider.swift
@@ -0,0 +1,16 @@
+import Foundation
+
+extension Capability.PaymentMethod {
+ /// Represents Capability.PaymentMethod.Provider JSON object for communication with Omise API
+ public enum Provider: String, Hashable {
+ case alipayPlus = "Alipay_plus"
+ case rms = "RMS"
+ case unknown
+ }
+}
+
+extension Capability.PaymentMethod.Provider: Codable {
+ public init(from decoder: Decoder) throws {
+ self = try Self(rawValue: decoder.singleValueContainer().decode(RawValue.self)) ?? .unknown
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.PaymentMethod.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.PaymentMethod.swift
new file mode 100644
index 00000000..b5d15461
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.PaymentMethod.swift
@@ -0,0 +1,41 @@
+import Foundation
+
+extension Capability {
+ /// Represents Capability.PaymentMethod JSON object for communication with Omise API
+ public struct PaymentMethod: Equatable {
+ public let name: String
+ public let currencies: Set
+ public let cardBrands: Set?
+ public let installmentTerms: Set?
+ public let banks: Set?
+ private let provider: Provider?
+
+ public init(name: String, currencies: Set, cardBrands: Set?, installmentTerms: Set?, banks: Set?, provider: Provider?) {
+ self.name = name
+ self.currencies = currencies
+ self.cardBrands = cardBrands
+ self.installmentTerms = installmentTerms
+ self.banks = banks
+ self.provider = provider
+ }
+
+ var isCardType: Bool {
+ name == "card"
+ }
+
+ var sourceType: SourceType? {
+ SourceType(rawValue: name)
+ }
+ }
+}
+
+extension Capability.PaymentMethod: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case name
+ case currencies
+ case installmentTerms = "installment_terms"
+ case cardBrands = "card_brands"
+ case banks
+ case provider
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.swift
new file mode 100644
index 00000000..77308013
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Capabilities/Capability.swift
@@ -0,0 +1,32 @@
+import Foundation
+
+/// Represents Capability JSON object for communication with Omise API
+public struct Capability {
+ public let countryCode: String
+ public let paymentMethods: [Capability.PaymentMethod]
+ public let banks: Set
+}
+
+extension Capability {
+ /// Returns payment information by given Source Type if presents
+ func paymentMethod(for sourceType: SourceType) -> Capability.PaymentMethod? {
+ paymentMethods.first { method in
+ method.name == sourceType.rawValue
+ }
+ }
+
+ /// Returns payment information for Card payment method if presents
+ var cardPaymentMethod: Capability.PaymentMethod? {
+ paymentMethods.first { method in
+ method.name == "card"
+ }
+ }
+}
+
+extension Capability: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case countryCode = "country"
+ case paymentMethods = "payment_methods"
+ case banks
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Address.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Address.swift
new file mode 100644
index 00000000..389c64ac
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Address.swift
@@ -0,0 +1,49 @@
+import Foundation
+
+extension Source.Payment {
+ /// `Shipping` or `Billing` address
+ /// https://docs.opn.ooo/sources-api
+ public struct Address: Equatable {
+ /// Address country as two-letter ISO 3166 code
+ public let countryCode: String
+ /// Address city
+ public let city: String
+ /// Address state
+ public let state: String
+ /// Address street #1
+ public let street1: String
+ /// Address street #2
+ public let street2: String?
+ /// Address postal code
+ public let postalCode: String
+
+ /// Creates a new Shipping or Billing address source with the given details
+ ///
+ /// - Parameters:
+ /// - country: Address country as two-letter ISO 3166 code
+ /// - city: Address city
+ /// - postalCode: Address postal code
+ /// - state: Address state
+ /// - street1: Address street #1
+ /// - street2: Address street #2
+ public init(countryCode: String, city: String, state: String, street1: String, street2: String?, postalCode: String) {
+ self.countryCode = countryCode
+ self.city = city
+ self.postalCode = postalCode
+ self.state = state
+ self.street1 = street1
+ self.street2 = street2
+ }
+ }
+}
+
+extension Source.Payment.Address: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case countryCode = "country"
+ case city
+ case postalCode = "postal_code"
+ case state
+ case street1
+ case street2
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Atome.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Atome.swift
new file mode 100644
index 00000000..fa4af64b
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Atome.swift
@@ -0,0 +1,56 @@
+import Foundation
+
+extension Source.Payment {
+ /// Payment for `Atome App Redirection` payment method
+ /// https://docs.opn.ooo/atome
+ public struct Atome: Equatable {
+ /// Customer mobile number with a country code (example: +66876543210 or 0876543210)
+ public let phoneNumber: String
+ /// Customer name
+ public let name: String?
+ /// Customer email
+ public let email: String?
+ /// Shipping address
+ public let shipping: Source.Payment.Address
+ /// Billing address
+ public let billing: Source.Payment.Address?
+ /// Information about items included in the order
+ public let items: [Source.Payment.Item]
+
+ /// Creates a new Atome payment method payload
+ ///
+ /// - Parameters:
+ /// - phoneNumber: Customer mobile number
+ /// - name: Customer name
+ /// - email: Customer email
+ /// - shipping: Shipping address
+ /// - billing: Billing address
+ /// - items: Items details
+ public init(phoneNumber: String, name: String? = nil, email: String? = nil, shipping: Address, billing: Source.Payment.Address?, items: [Source.Payment.Item]) {
+ self.name = name
+ self.email = email
+ self.phoneNumber = phoneNumber
+ self.shipping = shipping
+ self.billing = billing
+ self.items = items
+ }
+ }
+}
+
+extension Source.Payment.Atome: SourceTypeContainerProtocol {
+ /// Payment method identifier
+ public static let sourceType: SourceType = .atome
+ public var sourceType: SourceType { Self.sourceType }
+}
+
+/// Encoding/decoding JSON string
+extension Source.Payment.Atome: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case name
+ case email
+ case phoneNumber = "phone_number"
+ case shipping = "shipping"
+ case billing = "billing"
+ case items = "items"
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.BarcodeAlipay.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.BarcodeAlipay.swift
new file mode 100644
index 00000000..6b1413fc
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.BarcodeAlipay.swift
@@ -0,0 +1,43 @@
+import Foundation
+
+extension Source.Payment {
+ /// Payment for `Alipay In-Store` payment method
+ /// https://docs.opn.ooo/alipay-barcode
+ public struct BarcodeAlipay: Equatable {
+ /// Alipay barcode number
+ public let barcode: String
+ /// Store identifier.
+ /// If store identifier is already configured on your account, this parameter must not be present.
+ /// Please consult our support team to check if this parameter is required
+ public let storeID: String?
+ /// Store name.
+ /// If store name is already configured on your account, this parameter must not be present.
+ /// Please consult our support team to check if this parameter is required.
+ public let storeName: String?
+ /// Terminal identifier
+ public let terminalID: String?
+
+ public init(barcode: String, storeID: String?, storeName: String?, terminalID: String?) {
+ self.barcode = barcode
+ self.storeID = storeID
+ self.storeName = storeName
+ self.terminalID = terminalID
+ }
+ }
+}
+
+extension Source.Payment.BarcodeAlipay: SourceTypeContainerProtocol {
+ /// Payment method identifier
+ public static let sourceType: SourceType = .barcodeAlipay
+ public var sourceType: SourceType { Self.sourceType }
+}
+
+/// Encoding/decoding JSON string
+extension Source.Payment.BarcodeAlipay: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case barcode
+ case storeID = "store_id"
+ case storeName = "store_name"
+ case terminalID = "terminal_id"
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.DuitNowOBW.Bank.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.DuitNowOBW.Bank.swift
new file mode 100644
index 00000000..7129b1d3
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.DuitNowOBW.Bank.swift
@@ -0,0 +1,48 @@
+import Foundation
+import UIKit.UIImage
+
+extension Source.Payment.DuitNowOBW {
+ /// Bank code selected by customer
+ public enum Bank: String, Codable, CaseIterable, CustomStringConvertible {
+ public var description: String {
+ self.rawValue
+ }
+
+ /// Affin Bank
+ case affin
+ /// Alliance Bank (Personal)
+ case alliance
+ /// AGRONet
+ case agro
+ /// AmBank
+ case ambank
+ /// Bank Islam
+ case islam
+ /// Bank Muamalat
+ case muamalat
+ /// Bank Rakyat
+ case rakyat
+ /// BSN
+ case bsn
+ /// CIMB Clicks
+ case cimb
+ /// Hong Leong Bank
+ case hongleong
+ /// HSBC Bank
+ case hsbc
+ /// KFH
+ case kfh
+ /// Maybank2U
+ case maybank2u
+ /// OCBC Bank
+ case ocbc
+ /// Public Bank
+ case publicBank = "public"
+ /// RHB Bank
+ case rhb
+ /// Standard Chartered
+ case sc
+ /// UOB Bank
+ case uob
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.DuitNowOBW.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.DuitNowOBW.swift
new file mode 100644
index 00000000..a7aa5e46
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.DuitNowOBW.swift
@@ -0,0 +1,39 @@
+import Foundation
+import UIKit
+
+extension Source.Payment {
+ /// Payment for `DuitNow Online Banking/Wallets` payment method
+ /// https://docs.opn.ooo/duitnow-obw
+ public struct DuitNowOBW: Equatable {
+ /// Bank code selected by customer
+ public let bank: Bank
+
+ /// Creates a new DuitNowOBW payment method payload
+ ///
+ /// - Parameters:
+ /// - bank: Bank code selected by customer
+ public init(bank: Bank) {
+ self.bank = bank
+ }
+
+ /// Convenient static function to create a new DuitNowOBW instance
+ static func bank(_ bank: Bank) -> Self {
+ Self(bank: bank)
+ }
+ }
+}
+
+/// Payment method identifier
+extension Source.Payment.DuitNowOBW: SourceTypeContainerProtocol {
+ public static let sourceType: SourceType = .duitNowOBW
+ public var sourceType: SourceType { Self.sourceType }
+}
+
+/// Encoding/decoding JSON string
+extension Source.Payment.DuitNowOBW: Codable {
+ // Decode DuitNowOBW object from JSON string
+ public init(from decoder: Decoder) throws {
+ let container = try decoder.container(keyedBy: CodingKeys.self)
+ self.bank = try container.decode(Bank.self, forKey: .bank)
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.EContext.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.EContext.swift
new file mode 100644
index 00000000..9f0f0fbb
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.EContext.swift
@@ -0,0 +1,29 @@
+import Foundation
+
+extension Source.Payment {
+ /// Payment for Konbini, Pay-easy, and Online Banking payment method
+ /// https://docs.opn.ooo/konbini-pay-easy-online-banking
+ public struct EContext: Equatable {
+ /// Customer name. The name cannot be longer than 10 characters
+ public let name: String
+ /// Customer email
+ public let email: String
+ /// Customer mobile number with a country code (example: +66876543210 or 0876543210)
+ public let phoneNumber: String
+ }
+}
+
+extension Source.Payment.EContext: SourceTypeContainerProtocol {
+ /// Source payment method identifier
+ static let sourceType: SourceType = .eContext
+ var sourceType: SourceType { Self.sourceType }
+}
+
+/// Encoding/decoding JSON string
+extension Source.Payment.EContext: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case name
+ case email
+ case phoneNumber = "phone_number"
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.FPX.Bank.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.FPX.Bank.swift
new file mode 100644
index 00000000..7527a8f0
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.FPX.Bank.swift
@@ -0,0 +1,48 @@
+import Foundation
+
+extension Source.Payment.FPX {
+ /// Bank code selected by customer
+ public enum Bank: String, Codable, CaseIterable {
+ /// Affin Bank
+ case affin
+ /// Alliance Bank (Personal)
+ case alliance
+ /// AGRONet
+ case agro
+ /// AmBank
+ case ambank
+ /// Bank Islam
+ case islam
+ /// Bank Muamalat
+ case muamalat
+ /// Bank Rakyat
+ case rakyat
+ /// Bank Of China
+ case bocm
+ /// BSN
+ case bsn
+ /// CIMB Clicks
+ case cimb
+ /// Hong Leong Bank
+ case hongleong
+ /// HSBC Bank
+ case hsbc
+ /// KFH
+ case kfh
+ /// Maybank2E
+ case maybank2e
+ /// Maybank2U
+ case maybank2u
+ /// OCBC Bank
+ case ocbc
+ /// Public Bank
+ case publicBank = "public"
+ /// RHB Bank
+ case rhb
+ /// Standard Chartered
+ case sc
+ /// UOB Bank
+ case uob
+ /// Other bank
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.FPX.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.FPX.swift
new file mode 100644
index 00000000..a6dcb09b
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.FPX.swift
@@ -0,0 +1,43 @@
+import Foundation
+
+extension Source.Payment {
+ /// Payment for Malaysia FPX payment method
+ /// https://docs.opn.ooo/fpx
+ public struct FPX: Equatable {
+ /// Bank code selected by customer
+ public let bank: String
+ /// Customer email
+ public let email: String?
+
+ /// Creates a new FPX payment method payload
+ ///
+ /// - Parameters:
+ /// - bank: Bank code selected by customer
+ /// - email: Customer email
+ public init(bank: String, email: String?) {
+ self.bank = bank
+ self.email = email
+ }
+
+ /// Convenient static function to create a new DuitNowOBW instance
+ static func bank(_ bank: String, email: String?) -> Self {
+ Self(bank: bank, email: email)
+ }
+ }
+}
+
+extension Source.Payment.FPX: SourceTypeContainerProtocol {
+ /// Source payment method identifier
+ static let sourceType: SourceType = .fpx
+ var sourceType: SourceType { Self.sourceType }
+}
+
+/// Encoding/decoding JSON string
+extension Source.Payment.FPX: Codable {
+ /// Decode DuitNowOBW object from JSON string
+ public init(from decoder: Decoder) throws {
+ let container = try decoder.container(keyedBy: CodingKeys.self)
+ self.bank = try container.decode(String.self, forKey: .bank)
+ self.email = try container.decodeIfPresent(String.self, forKey: .email)
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift
new file mode 100644
index 00000000..91ba0a5c
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Installment.swift
@@ -0,0 +1,67 @@
+import Foundation
+
+extension Source.Payment {
+ /// Payloads for Installment payment methods
+ /// https://docs.opn.ooo/installment-payments
+ public struct Installment: Equatable {
+ /// Valid installment term length in months
+ let installmentTerm: Int
+ /// Whether customer or merchant absorbs interest. true when merchant absorbs interest
+ let zeroInterestInstallments: Bool?
+ // swiftlint:disable:previous discouraged_optional_boolean
+ /// Source type of payment
+ var sourceType: SourceType
+ }
+}
+
+/// Encoding/decoding JSON string
+extension Source.Payment.Installment: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case sourceType = "type"
+ case installmentTerm = "installment_term"
+ case zeroInterestInstallments = "zero_interest_installments"
+ }
+}
+
+extension Source.Payment.Installment {
+ /// List of sourceTypes belongs to Installment payment type
+ public static var sourceTypes: [SourceType] {
+ [
+ .installmentBAY,
+ .installmentBBL,
+ .installmentFirstChoice,
+ .installmentKBank,
+ .installmentKTC,
+ .installmentMBB,
+ .installmentSCB,
+ .installmentTTB,
+ .installmentUOB
+ ]
+ }
+
+ /// Available Installments terms (months) for given sourceType
+ public static func availableTerms(for sourceType: SourceType) -> [Int] {
+ switch sourceType {
+ case .installmentBAY:
+ return [ 3, 4, 6, 9, 10 ]
+ case .installmentFirstChoice:
+ return [ 3, 4, 6, 9, 10, 12, 18, 24, 36 ]
+ case .installmentBBL:
+ return [ 4, 6, 8, 9, 10 ]
+ case .installmentMBB:
+ return [ 6, 12, 18, 24 ]
+ case .installmentKTC:
+ return [ 3, 4, 5, 6, 7, 8, 9, 10 ]
+ case .installmentKBank:
+ return [ 3, 4, 6, 10 ]
+ case .installmentSCB:
+ return [ 3, 4, 6, 9, 10 ]
+ case .installmentTTB:
+ return [ 3, 4, 6, 10, 12 ]
+ case .installmentUOB:
+ return [ 3, 4, 6, 10 ]
+ default:
+ return []
+ }
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Item.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Item.swift
new file mode 100644
index 00000000..a0a29025
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.Item.swift
@@ -0,0 +1,59 @@
+import Foundation
+
+extension Source.Payment {
+ /// Information about items included in the order
+ /// https://docs.opn.ooo/sources-api
+ public struct Item: Equatable {
+ /// SKU/product id of the item
+ public let sku: String
+ /// Category of the item
+ public let category: String?
+ /// Name of the item
+ public let name: String
+ /// Quantity of the item
+ public let quantity: Int
+ /// Selling price of the item in smallest unit of currency
+ public let amount: Int64
+ /// URI of the item
+ public let itemUri: String?
+ /// Image URI of the item
+ public let imageUri: String?
+ /// Brand of the item
+ public let brand: String?
+
+ /// Creates a new item with the given details
+ ///
+ /// - Parameters:
+ /// - sku: SKU/product id of the item
+ /// - category: Category of the item
+ /// - name: Name of the item
+ /// - quantity: Quantity of the item
+ /// - amount: Selling price of the item in smallest unit of currency
+ /// - itemUri: URI of the item
+ /// - imageUri: Image URI of the item
+ /// - brand: Brand of the item
+ public init(sku: String, category: String?, name: String, quantity: Int, amount: Int64, itemUri: String?, imageUri: String?, brand: String?) {
+ self.sku = sku
+ self.category = category
+ self.name = name
+ self.quantity = quantity
+ self.amount = amount
+ self.itemUri = itemUri
+ self.imageUri = imageUri
+ self.brand = brand
+ }
+ }
+}
+
+extension Source.Payment.Item: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case sku
+ case amount
+ case name
+ case quantity
+ case category
+ case brand
+ case imageUri = "image_uri"
+ case itemUri = "item_uri"
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.TrueMoney.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.TrueMoney.swift
new file mode 100644
index 00000000..64377356
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.TrueMoney.swift
@@ -0,0 +1,23 @@
+import Foundation
+
+extension Source.Payment {
+ /// Payment for `TrueMoney Wallet` payment method
+ /// https://docs.opn.ooo/truemoney-wallet
+ public struct TrueMoneyWallet: Equatable {
+ /// Phone number
+ public let phoneNumber: String
+ }
+}
+
+extension Source.Payment.TrueMoneyWallet: SourceTypeContainerProtocol {
+ /// Source payment method identifier
+ static let sourceType: SourceType = .trueMoneyWallet
+ var sourceType: SourceType { Self.sourceType }
+}
+
+/// Encoding/decoding JSON string
+extension Source.Payment.TrueMoneyWallet: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case phoneNumber = "phone_number"
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.swift
new file mode 100644
index 00000000..1e7eda3c
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.Payment.swift
@@ -0,0 +1,111 @@
+import Foundation
+
+/// Protocol to group payment methods by it's source type
+protocol SourceTypeContainerProtocol: Codable {
+ static var sourceType: SourceType { get }
+ var sourceType: SourceType { get }
+}
+
+extension Source {
+ /// Information details about source payment
+ /// There are some payment methods that has additional parameters like "phoneNumber" and some requires only Source`type`
+ /// This enum groups all supported payment methods details together.
+ public enum Payment: Equatable {
+ /// Atome
+ case atome(_ details: Atome)
+ /// Barcode
+ case barcodeAlipay(_ details: BarcodeAlipay)
+ /// DuitNow Online Banking/Wallets
+ case duitNowOBW(_ details: DuitNowOBW)
+ /// Konbini, Pay-easy, and Online Banking
+ case eContext(_ payloadetailsd: EContext)
+ /// Malaysia FPX
+ case fpx(_ details: FPX)
+ /// Installment Payments
+ case installment(_ details: Installment)
+ /// TrueMoney Wallet
+ case trueMoneyWallet(_ details: TrueMoneyWallet)
+ /// Payment menthods without additional payment parameters
+ case sourceType(_ sourceType: SourceType)
+
+ /// SourceType of current payment
+ /// Used for encoding sourceType parameter into flat JSON string
+ public var sourceType: SourceType {
+ switch self {
+ case .sourceType(let sourceType): return sourceType
+ case .atome(let details): return details.sourceType
+ case .barcodeAlipay(let details): return details.sourceType
+ case .duitNowOBW(let details): return details.sourceType
+ case .eContext(let details): return details.sourceType
+ case .fpx(let details): return details.sourceType
+ case .installment(let details): return details.sourceType
+ case .trueMoneyWallet(let details): return details.sourceType
+ }
+ }
+ }
+}
+
+/// Encoding/decoding JSON string
+extension Source.Payment: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case sourceType = "type"
+ }
+
+ /// Encodes Source information and additional details if presents into JSON string
+ public func encode(to encoder: Encoder) throws {
+ var container = encoder.container(keyedBy: CodingKeys.self)
+ switch self {
+ case .atome(let details as Encodable),
+ .barcodeAlipay(let details as Encodable),
+ .duitNowOBW(let details as Encodable),
+ .eContext(let details as Encodable),
+ .fpx(let details as Encodable),
+ .installment(let details as Encodable),
+ .trueMoneyWallet(let details as Encodable):
+ try details.encode(to: encoder)
+ default:
+ break
+ }
+ try container.encode(sourceType, forKey: .sourceType)
+ }
+
+ /// Creates new instance from JSON string
+ public init(from decoder: Decoder) throws {
+ let container = try decoder.container(keyedBy: CodingKeys.self)
+ let sourceType = try container.decode(SourceType.self, forKey: .sourceType)
+
+ switch sourceType {
+ case Atome.sourceType:
+ self = try .atome(Atome(from: decoder))
+ case BarcodeAlipay.sourceType:
+ self = try .barcodeAlipay(BarcodeAlipay(from: decoder))
+ case DuitNowOBW.sourceType:
+ self = try .duitNowOBW(DuitNowOBW(from: decoder))
+ case EContext.sourceType:
+ self = try .eContext(EContext(from: decoder))
+ case TrueMoneyWallet.sourceType:
+ self = try .trueMoneyWallet(TrueMoneyWallet(from: decoder))
+ case FPX.sourceType:
+ self = try .fpx(FPX(from: decoder))
+ case _ where Installment.sourceTypes.contains(sourceType):
+ self = try .installment(Installment(from: decoder))
+ default:
+ self = .sourceType(sourceType)
+ }
+ }
+}
+
+extension Source.Payment {
+ static func requiresAdditionalDetails(sourceType: SourceType) -> Bool {
+ let requiresDetails: [SourceType] = [
+ Atome.sourceType,
+ BarcodeAlipay.sourceType,
+ DuitNowOBW.sourceType,
+ EContext.sourceType,
+ TrueMoneyWallet.sourceType,
+ FPX.sourceType
+ ] + Installment.sourceTypes
+
+ return requiresDetails.contains(sourceType)
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.swift
new file mode 100644
index 00000000..a8b4da8d
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Source/Source.swift
@@ -0,0 +1,55 @@
+import Foundation
+
+/// Represents Source JSON object for communication with Omise API
+/// Sources are methods for accepting payments through non-credit-card channels
+/// https://docs.opn.ooo/sources-api
+public struct Source {
+ /// The processing flow of a Source
+ public let id: String
+ /// Whether this is a live (true) or test (false) source
+ public let isLiveMode: Bool
+ /// Source amount in smallest unit of source currency
+ public let amount: Int64
+ /// Currency for source as three-letter ISO 4217 code
+ public let currency: String
+ /// The payment information of this source describes how the payment is processed
+ public let paymentInformation: Payment
+ /// The payment flow payers need to go through to complete the payment
+ public let flow: Flow
+
+ /// The payment flow payers need to go through to complete the payment
+ public enum Flow: String, Codable {
+ /// Payer must be redirected to external website (charge.authorize_uri) to complete payment
+ case redirect
+ /// Payer will receive payment information to complete payment offline (charge.source.references)
+ case offline
+ /// appRedirect: Payer must be redirected to an app (charge.authorize_uri) to complete payment
+ case appRedirect = "app_redirect"
+ /// Any other unknown flow
+ case unknown
+
+ /// Decodes from JSON string and uses `unknown` state as a default state if casting from string value is failed
+ public init(from decoder: Decoder) throws {
+ self = try Self(rawValue: decoder.singleValueContainer().decode(RawValue.self)) ?? .unknown
+ }
+ }
+}
+
+extension Source: Decodable {
+ /// Mapping keys to encode/decode JSON string
+ private enum CodingKeys: String, CodingKey {
+ case id, flow, amount, currency
+ case isLiveMode = "livemode"
+ }
+
+ /// Creates Source instance from JSON String
+ public init(from decoder: Decoder) throws {
+ let container = try decoder.container(keyedBy: CodingKeys.self)
+ id = try container.decode(String.self, forKey: .id)
+ flow = try container.decode(Flow.self, forKey: .flow)
+ currency = try container.decode(String.self, forKey: .currency)
+ amount = try container.decode(Int64.self, forKey: .amount)
+ isLiveMode = try container.decode(Bool.self, forKey: .isLiveMode)
+ paymentInformation = try Payment(from: decoder)
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Token/Token.Card.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Token/Token.Card.swift
new file mode 100644
index 00000000..702f6234
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Token/Token.Card.swift
@@ -0,0 +1,57 @@
+import Foundation
+
+extension Token {
+ /// Represents Token.Card JSON object for communication with Omise API
+ public struct Card {
+ /// Card's ID.
+ public let id: String
+ /// Boolean flag indicating wether this card is a live card or a test card.
+ public let isLiveMode: Bool
+ /// Card brand. (e.g. Visa, Mastercard, ...)
+ public let brand: String?
+ /// Card bank name.
+ public let bank: String?
+ /// Card holder's full name.
+ public let name: String?
+ /// Last 4 digits of the card number.
+ public let lastDigits: String?
+ /// Card expiration month (1-12)
+ public let expirationMonth: Int?
+ /// Card expiration year (Gregrorian)
+ public let expirationYear: Int?
+ /// Unique card-based fingerprint. Allows detection of identical cards without
+ /// exposing card numbers directly.
+ public let fingerprint: String?
+ /// Credit card financing type. (debit or credit)
+ public let financing: String?
+ /// Boolean indicates that whether that the card is passed the security code check
+ public let securityCodeCheck: Bool
+ /// ISO3166 Country code based on the card number.
+ /// - note: This is informational only and may not always be 100% accurate.
+ public let countryCode: String?
+ /// Issuing city.
+ /// - note: This is informational only and may not always be 100% accurate.
+ public let city: String?
+ /// Postal code.
+ public let postalCode: String?
+ }
+}
+
+extension Token.Card: Decodable {
+ private enum CodingKeys: String, CodingKey {
+ case id
+ case isLiveMode = "livemode"
+ case brand
+ case bank
+ case name
+ case lastDigits = "last_digits"
+ case expirationMonth = "expiration_month"
+ case expirationYear = "expiration_year"
+ case fingerprint
+ case financing
+ case securityCodeCheck = "security_code_check"
+ case countryCode = "country"
+ case city
+ case postalCode = "postal_code"
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Token/Token.ChargeStatus.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Token/Token.ChargeStatus.swift
new file mode 100644
index 00000000..9dc73533
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Token/Token.ChargeStatus.swift
@@ -0,0 +1,23 @@
+import Foundation
+
+extension Token {
+ /// Represents Token.ChargeStatus JSON object for communication with Omise API
+ public enum ChargeStatus: String {
+ case failed
+ case expired
+ case pending
+ case reversed
+ case successful
+ case unknown
+
+ public static let finalStates: [Self] = [.successful, .failed, .expired, .reversed]
+ public var isFinal: Bool { Self.finalStates.contains(self) }
+ }
+}
+
+extension Token.ChargeStatus: Decodable {
+ /// Creates a new Token.ChargeStatus from JSON String
+ public init(from decoder: Decoder) throws {
+ self = try Self(rawValue: decoder.singleValueContainer().decode(RawValue.self)) ?? .unknown
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/JSON Models/Token/Token.swift b/OmiseSDK/Sources/OmiseAPI/JSON Models/Token/Token.swift
new file mode 100644
index 00000000..d93547bf
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/JSON Models/Token/Token.swift
@@ -0,0 +1,25 @@
+import Foundation
+
+/// Represents Token JSON object for communication with Omise API
+public struct Token {
+ /// Omise ID of the token
+ public let id: String
+ /// Boolean indicates that if this Token is in the live mode
+ public let isLiveMode: Bool
+ /// Boolean indicates that if this token is already used for creating a charge already
+ public var isUsed: Bool
+ /// Card that is used for creating this Token
+ public let card: Token.Card?
+ /// Status of charge created using this token
+ public let chargeStatus: ChargeStatus
+}
+
+extension Token: Decodable {
+ private enum CodingKeys: String, CodingKey {
+ case id
+ case isLiveMode = "livemode"
+ case isUsed = "used"
+ case card
+ case chargeStatus = "charge_status"
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/OmiseAPI.swift b/OmiseSDK/Sources/OmiseAPI/OmiseAPI.swift
new file mode 100644
index 00000000..95d53314
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/OmiseAPI.swift
@@ -0,0 +1,90 @@
+import Foundation
+
+extension OmiseServerType {
+ // swiftlint:disable force_unwrapping
+ private var apiServerURL: String { "https://vault.omise.co" }
+ private var vaultServerURL: String { "https://vault.omise.co" }
+
+ var url: URL {
+ switch self {
+ case .api: return URL(string: apiServerURL)!
+ case .vault: return URL(string: vaultServerURL)!
+ }
+ }
+ // swiftlint:enable force_unwrapping
+}
+
+enum OmiseAPI {
+ case capability
+ case token(tokenID: String)
+ case createToken(payload: CreateTokenPayload)
+ case createSource(payload: CreateSourcePayload)
+}
+
+extension OmiseAPI: APIProtocol {
+ var omiseAPIVersion: String {
+ "2019-05-29"
+ }
+
+ var server: OmiseServerType {
+ switch self {
+ case .capability, .createSource:
+ return .api
+ case .token, .createToken:
+ return .vault
+ }
+ }
+
+ var path: String {
+ switch self {
+ case .capability:
+ return "capability"
+ case .token(let tokenID):
+ return "tokens/\(tokenID)"
+ case .createToken:
+ return "tokens"
+ case .createSource:
+ return "sources"
+ }
+ }
+
+ var method: HTTPMethod {
+ switch self {
+ case .capability, .token:
+ return .get
+ case .createToken, .createSource:
+ return .post
+ }
+ }
+
+ var contentType: ContentType {
+ .json
+ }
+
+ var httpBody: Data? {
+ switch self {
+ case .createToken(let payload):
+ return try? jsonEncoder.encode(payload)
+ case .createSource(let sourcePayment):
+ return try? jsonEncoder.encode(sourcePayment)
+ default:
+ return nil
+ }
+ }
+
+ var dateFormatter: DateFormatter {
+ let formatter = DateFormatter()
+ formatter.locale = Locale(identifier: "en_US_POSIX")
+ formatter.timeZone = TimeZone(identifier: "UTC")
+ formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
+ return formatter
+ }
+}
+
+extension OmiseAPI {
+ var jsonEncoder: JSONEncoder {
+ let encoder = JSONEncoder()
+ encoder.dateEncodingStrategy = .formatted(dateFormatter)
+ return encoder
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/Payloads/CreateSourcePayload.swift b/OmiseSDK/Sources/OmiseAPI/Payloads/CreateSourcePayload.swift
new file mode 100644
index 00000000..deb82ec0
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/Payloads/CreateSourcePayload.swift
@@ -0,0 +1,45 @@
+import Foundation
+
+/// Information to create payment source
+/// Sources are methods for accepting payments through non-credit-card channels
+public struct CreateSourcePayload: Equatable {
+ /// Source amount in smallest unit of source currency
+ let amount: Int64
+ /// Currency for source as three-letter ISO 4217 code
+ let currency: String
+ /// The payment details of this source describes how the payment is processed
+ let details: Source.Payment
+ /// Current SDK platform type
+ let platform = "IOS"
+
+ init(amount: Int64, currency: String, details: Source.Payment) {
+ self.amount = amount
+ self.currency = currency
+ self.details = details
+ }
+}
+
+extension CreateSourcePayload: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case amount
+ case currency
+ case platform = "platform_type"
+ }
+
+ /// Encode information to create payment source to JSON string
+ public func encode(to encoder: Encoder) throws {
+ var container = encoder.container(keyedBy: CodingKeys.self)
+ try container.encode(platform, forKey: .platform)
+ try container.encode(amount, forKey: .amount)
+ try container.encode(currency, forKey: .currency)
+ try details.encode(to: encoder)
+ }
+
+ // Decode CreateSourcePayload object from JSON string
+ public init(from decoder: Decoder) throws {
+ let container = try decoder.container(keyedBy: CodingKeys.self)
+ self.amount = try container.decode(Int64.self, forKey: .amount)
+ self.currency = try container.decode(String.self, forKey: .currency)
+ self.details = try Source.Payment(from: decoder)
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/Payloads/CreateTokenPayload.swift b/OmiseSDK/Sources/OmiseAPI/Payloads/CreateTokenPayload.swift
new file mode 100644
index 00000000..ee22f5fa
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/Payloads/CreateTokenPayload.swift
@@ -0,0 +1,73 @@
+import Foundation
+
+/// Card Information to create a token container
+/// Used as payload in createToken API
+public struct CreateTokenPayload: Codable, Equatable {
+ public let card: Card
+
+ public init(card: Card) {
+ self.card = card
+ }
+
+ /// Card Information to create a token
+ /// A token represents a credit or debit card
+ /// https://docs.opn.ooo/tokens-api
+ public struct Card: Equatable {
+ /// Card holder's full name
+ public let name: String
+ /// Card number
+ public let number: String
+ /// Card expiration month (1-12)
+ public let expirationMonth: Int
+ /// Card expiration year (Gregorian)
+ public let expirationYear: Int
+ /// Security code (CVV, CVC, etc) printed on the back of the card
+ public let securityCode: String
+ /// Phone Numeber
+ public let phoneNumber: String?
+ /// Address country as two-letter ISO 3166 code
+ public let countryCode: String?
+ /// Address city
+ public let city: String?
+ /// Address state
+ public let state: String?
+ /// Address street #1
+ public let street1: String?
+ /// Address street #2
+ public let street2: String?
+ /// Address postal code
+ public let postalCode: String?
+
+ public init(name: String, number: String, expirationMonth: Int, expirationYear: Int, securityCode: String, phoneNumber: String? = nil, countryCode: String? = nil, city: String? = nil, state: String? = nil, street1: String? = nil, street2: String? = nil, postalCode: String? = nil) {
+ self.name = name
+ self.number = number
+ self.expirationMonth = expirationMonth
+ self.expirationYear = expirationYear
+ self.securityCode = securityCode
+ self.phoneNumber = phoneNumber
+ self.countryCode = countryCode
+ self.city = city
+ self.postalCode = postalCode
+ self.state = state
+ self.street1 = street1
+ self.street2 = street2
+ }
+ }
+}
+
+extension CreateTokenPayload.Card: Codable {
+ private enum CodingKeys: String, CodingKey {
+ case name
+ case number
+ case expirationMonth = "expiration_month"
+ case expirationYear = "expiration_year"
+ case securityCode = "security_code"
+ case phoneNumber = "phone_number"
+ case countryCode = "country"
+ case city
+ case postalCode = "postal_code"
+ case state
+ case street1
+ case street2
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Collections.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Collections.swift
new file mode 100644
index 00000000..165c00b8
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Collections.swift
@@ -0,0 +1,51 @@
+import Foundation
+
+extension SourceType {
+ public static let availableByDefaultInThailand: [SourceType] =
+ [
+ .internetBankingBAY,
+ .internetBankingBBL,
+ .mobileBankingSCB,
+ .mobileBankingKBank,
+ .mobileBankingBAY,
+ .mobileBankingBBL,
+ .mobileBankingKTB,
+ .alipay,
+ .billPaymentTescoLotus,
+ .installmentBAY,
+ .installmentFirstChoice,
+ .installmentBBL,
+ .installmentKTC,
+ .installmentKBank,
+ .installmentSCB,
+ .installmentTTB,
+ .installmentUOB,
+ .promptPay,
+ .trueMoneyWallet,
+ .pointsCiti,
+ .shopeePayJumpApp
+ ]
+
+ public static let availableByDefaultInJapan: [SourceType] = [
+ .eContext,
+ .payPay
+ ]
+
+ public static let availableByDefaultSingapore: [SourceType] = [
+ .payNow,
+ .shopeePayJumpApp
+ ]
+
+ public static let availableByDefaultMalaysia: [SourceType] = [
+ .fpx,
+ .installmentMBB,
+ .touchNGo,
+ .grabPay,
+ .boost,
+ .shopeePay,
+ .shopeePayJumpApp,
+ .maybankQRPay,
+ .duitNowQR,
+ .duitNowOBW
+ ]
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Helpers.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Helpers.swift
new file mode 100644
index 00000000..4b96e6c8
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Helpers.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+extension SourceType {
+ var requiresAdditionalDetails: Bool {
+ Source.Payment.requiresAdditionalDetails(sourceType: self)
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
new file mode 100644
index 00000000..74e3e886
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+Installments.swift
@@ -0,0 +1,21 @@
+import Foundation
+
+extension SourceType {
+ public static var installments: [SourceType] {
+ [
+ .installmentBAY,
+ .installmentBBL,
+ .installmentFirstChoice,
+ .installmentKBank,
+ .installmentKTC,
+ .installmentMBB,
+ .installmentSCB,
+ .installmentTTB,
+ .installmentUOB
+ ]
+ }
+
+ var isInstallment: Bool {
+ Self.installments.contains(self)
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+InternetBanking.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+InternetBanking.swift
new file mode 100644
index 00000000..77b65b92
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+InternetBanking.swift
@@ -0,0 +1,14 @@
+import Foundation
+
+extension SourceType {
+ public static var internetBanking: [SourceType] {
+ [
+ .internetBankingBAY,
+ .internetBankingBBL
+ ]
+ }
+
+ var isInternetBanking: Bool {
+ Self.internetBanking.contains(self)
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+MobileBanking.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+MobileBanking.swift
new file mode 100644
index 00000000..57c39d08
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType+MobileBanking.swift
@@ -0,0 +1,17 @@
+import Foundation
+
+extension SourceType {
+ public static var mobileBanking: [SourceType] {
+ [
+ .mobileBankingSCB,
+ .mobileBankingKBank,
+ .mobileBankingBAY,
+ .mobileBankingBBL,
+ .mobileBankingKTB
+ ]
+ }
+
+ var isMobileBanking: Bool {
+ Self.mobileBanking.contains(self)
+ }
+}
diff --git a/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
new file mode 100644
index 00000000..4985486f
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseAPI/SourceType/SourceType.swift
@@ -0,0 +1,98 @@
+import Foundation
+
+/// Source type of payment
+public enum SourceType: String, Codable, CaseIterable {
+ /// Alipay (Online) https://docs.opn.ooo/alipay
+ case alipay = "alipay"
+ /// Alipay CN https://docs.opn.ooo/alipay-cn
+ case alipayCN = "alipay_cn"
+ /// Alipay Hongkong https://docs.opn.ooo/alipay-hk
+ case alipayHK = "alipay_hk"
+ /// Atome App Redirection https://docs.opn.ooo/atome
+ case atome = "atome"
+ /// Alipay In-Store https://docs.opn.ooo/alipay-barcode
+ case barcodeAlipay = "barcode_alipay" // Not available to select in UI
+ /// Lotus's Bill Payment https://docs.opn.ooo/bill-payment
+ case billPaymentTescoLotus = "bill_payment_tesco_lotus"
+ /// Boost https://docs.opn.ooo/boost
+ case boost = "boost"
+ /// DANA https://docs.opn.ooo/dana
+ case dana = "dana"
+ /// DuitNow Online Banking/Wallets https://docs.opn.ooo/duitnow-obw
+ case duitNowOBW = "duitnow_obw"
+ /// DuitNow QR https://docs.opn.ooo/duitnow-qr
+ case duitNowQR = "duitnow_qr"
+ /// Konbini, Pay-easy, and Online Banking https://docs.opn.ooo/konbini-pay-easy-online-banking
+ case eContext = "econtext"
+ /// Malaysia FPX https://docs.opn.ooo/fpx
+ case fpx = "fpx"
+ /// GCash https://docs.opn.ooo/gcash
+ case gcash = "gcash"
+ /// GrabPay https://docs.opn.ooo/grabpay
+ case grabPay = "grabpay"
+ /// - warning Information not found
+ case grabPayRms = "grabpay_rms"
+ /// Bank of Ayudhya (Krungsri) https://docs.opn.ooo/installment-payments
+ case installmentBAY = "installment_bay"
+ /// Bangkok Bank https://docs.opn.ooo/installment-payments
+ case installmentBBL = "installment_bbl"
+ /// Krungsri First Choice https://docs.opn.ooo/installment-payments
+ case installmentFirstChoice = "installment_first_choice"
+ /// Kasikorn Bank https://docs.opn.ooo/installment-payments
+ case installmentKBank = "installment_kbank"
+ /// Krungthai Card (KTC) https://docs.opn.ooo/installment-payments
+ case installmentKTC = "installment_ktc"
+ /// Maybank https://docs.opn.ooo/installment-payments
+ case installmentMBB = "installment_mbb"
+ /// Siam Commercial Bank https://docs.opn.ooo/installment-payments
+ case installmentSCB = "installment_scb"
+ /// TMBThanachart Bank (TTB) https://docs.opn.ooo/installment-payments
+ case installmentTTB = "installment_ttb"
+ /// United Overseas Bank (UOB) https://docs.opn.ooo/installment-payments
+ case installmentUOB = "installment_uob"
+ /// Bank of Ayudhya (Krungsri) https://docs.opn.ooo/internet-banking
+ case internetBankingBAY = "internet_banking_bay"
+ /// Bangkok Bank https://docs.opn.ooo/internet-banking
+ case internetBankingBBL = "internet_banking_bbl"
+ /// KakaoPay https://docs.opn.ooo/kakaopay
+ case kakaoPay = "kakaopay"
+ /// Maybank QR https://docs.opn.ooo/maybank-qr
+ case maybankQRPay = "maybank_qr"
+ /// Krungsri (KMA) https://docs.opn.ooo/mobile-banking-bay
+ case mobileBankingBAY = "mobile_banking_bay"
+ /// Bangkok Bank (Bualuang mBanking) https://docs.opn.ooo/mobile-banking-bbl
+ case mobileBankingBBL = "mobile_banking_bbl"
+ /// KBank (K PLUS) https://docs.opn.ooo/mobile-banking-kbank
+ case mobileBankingKBank = "mobile_banking_kbank"
+ /// Krung Thai (KTB NEXT) https://docs.opn.ooo/mobile-banking-ktb
+ case mobileBankingKTB = "mobile_banking_ktb"
+ /// OCBC Digital https://docs.opn.ooo/mobile-banking-ocbc
+ /// - note: "Most of SG customers recognize it as OCBC PAO, not a part of mobile banking"
+ case ocbcDigital = "mobile_banking_ocbc"
+ /// SCB (SCB Easy) https://docs.opn.ooo/mobile-banking-scb
+ case mobileBankingSCB = "mobile_banking_scb"
+ /// PayNow https://docs.opn.ooo/paynow
+ case payNow = "paynow"
+ /// PayPay https://docs.opn.ooo/paypay
+ case payPay = "paypay"
+ /// Pay with Points https://docs.opn.ooo/pay-with-points
+ case pointsCiti = "points_citi"
+ /// PromptPay https://docs.opn.ooo/promptpay
+ case promptPay = "promptpay"
+ /// Rabbit LINE Pay https://docs.opn.ooo/rabbit-linepay
+ case rabbitLinepay = "rabbit_linepay"
+ /// ShopeePay QR https://docs.opn.ooo/shopeepay-qr
+ case shopeePay = "shopeepay"
+ /// ShopeePay App Redirection https://docs.opn.ooo/shopeepay-jumpapp
+ case shopeePayJumpApp = "shopeepay_jumpapp"
+ /// Touch 'n Go https://docs.opn.ooo/rms-touch-n-go
+ case touchNGo = "touch_n_go"
+ /// - warning Information not found
+ case touchNGoAlipayPlus = "touch_n_go_alipay_plus"
+ /// TrueMoney Wallet https://docs.opn.ooo/truemoney-wallet
+ case trueMoneyWallet = "truemoney"
+ /// TrueMoney App Redirection https://docs.opn.ooo/truemoney-jumpapp
+ case trueMoneyJumpApp = "truemoney_jumpapp"
+ /// WeChat Pay App Redirection https://docs.opn.ooo/wechat-pay-online
+ case weChat = "wechat_pay"
+}
diff --git a/OmiseSDK/Sources/OmiseSDK.swift b/OmiseSDK/Sources/OmiseSDK.swift
new file mode 100644
index 00000000..316d5e78
--- /dev/null
+++ b/OmiseSDK/Sources/OmiseSDK.swift
@@ -0,0 +1,200 @@
+import Foundation
+import UIKit
+
+/// Omise Payment delegate protocol is required to process payment results
+public protocol ChoosePaymentMethodDelegate: AnyObject {
+ func choosePaymentMethodDidComplete(with source: Source)
+ func choosePaymentMethodDidComplete(with token: Token)
+ func choosePaymentMethodDidComplete(with error: Error)
+ func choosePaymentMethodDidCancel()
+}
+
+/// Payment Results
+public enum PaymentResult {
+ /// Payment completed with Card payment and contains Token object
+ case token(Token)
+ /// Payment completed with Source payment and contains Source object
+ case source(Source)
+ /// Payment completed with Error
+ case error(Error)
+ /// Payment was cancelled by user
+ case cancel
+}
+
+public class OmiseSDK {
+ /// Static container that allows to assign a shared instance of OmiseSDK to be used as a Singleton object
+ public static var shared = OmiseSDK(publicKey: "pkey_")
+
+ /// OmiseSDK version
+ public let version: String = "5.0.0"
+
+ /// Public Key associated with this instance of OmiseSDK
+ public let publicKey: String
+
+ /// Client is used to communicate with Omise API
+ public let client: Client
+
+ /// Latest capability loaded with `client.capability()`
+ var latestLoadedCapability: Capability? { client.latestLoadedCapability }
+
+ /// Country associated with `latestLoadedCapability`
+ var country: Country? {
+ Country(code: latestLoadedCapability?.countryCode)
+ }
+
+ /// Creates a new instance of Omise SDK that provides interface to functionallity that SDK provides
+ ///
+ /// - Parameters:
+ /// - publicKey: Omise public key
+ /// - configuration: Optional configuration is used for testing
+ public init(publicKey: String, configuration: Configuration? = nil) {
+ self.publicKey = publicKey
+ self.client = Client(
+ publicKey: publicKey,
+ version: version,
+ network: NetworkService(),
+ apiURL: configuration?.apiURL,
+ vaultURL: configuration?.vaultURL
+ )
+
+ let color = UIColor(red: 0.26, green: 0.27, blue: 0.28, alpha: 0.5)
+ print(color.hexString)
+ client.capability { _ in }
+ }
+
+ /// Creates a Payment controller with given payment methods details comes in UINavigationController stack
+ ///
+ /// - Parameters:
+ /// - amount: Payment amount
+ /// - currency: Payment currency code
+ /// - allowedPaymentMethods: Custom list of payment methods to be shown in the list. If value is nill then SDK will load list from Capability API
+ /// - allowedCardPayment: Should present Card Payment Method in the list
+ /// - handleErrors: If `true` the controller will show an error alerts in the UI, if `false` the controller will notify delegate
+ /// - completion: Completion handler triggered when payment completes with Token, Source, Error or was Cancelled
+ public func choosePaymentMethodController(
+ amount: Int64,
+ currency: String,
+ allowedPaymentMethods: [SourceType],
+ allowedCardPayment: Bool,
+ handleErrors: Bool = true,
+ delegate: ChoosePaymentMethodDelegate
+ ) -> UINavigationController {
+ let paymentFlow = ChoosePaymentCoordinator(
+ client: client,
+ amount: amount,
+ currency: currency,
+ currentCountry: country,
+ handleErrors: handleErrors
+ )
+ let viewController = paymentFlow.createChoosePaymentMethodController(
+ allowedPaymentMethods: allowedPaymentMethods,
+ allowedCardPayment: allowedCardPayment,
+ usePaymentMethodsFromCapability: false,
+ delegate: delegate
+ )
+
+ let navigationController = UINavigationController(rootViewController: viewController)
+ navigationController.delegate = paymentFlow
+ return navigationController
+ }
+
+ /// Creates a Payment controller with payment methods loaded from Capability API comes in UINavigationController stack
+ ///
+ /// - Parameters:
+ /// - from: ViewController is used as a base to present UINavigationController
+ /// - allowedPaymentMethods: Custom list of payment methods to be shown in the list. If value is nill then SDK will load list from Capability API
+ /// - allowedCardPayment: Should present Card Payment Method in the list
+ /// - handleErrors: If `true` the controller will show an error alerts in the UI, if `false` the controller will notify delegate
+ /// - delegate: Delegate to be notified when Source or Token is created
+ public func choosePaymentMethodFromCapabilityController(
+ amount: Int64,
+ currency: String,
+ handleErrors: Bool = true,
+ delegate: ChoosePaymentMethodDelegate
+ ) -> UINavigationController {
+ let paymentFlow = ChoosePaymentCoordinator(
+ client: client,
+ amount: amount,
+ currency: currency,
+ currentCountry: country,
+ handleErrors: handleErrors
+ )
+ let viewController = paymentFlow.createChoosePaymentMethodController(
+ usePaymentMethodsFromCapability: true,
+ delegate: delegate
+ )
+
+ let navigationController = UINavigationController(rootViewController: viewController)
+ if #available(iOSApplicationExtension 11.0, *) {
+ navigationController.navigationBar.prefersLargeTitles = true
+ }
+
+ navigationController.delegate = paymentFlow
+ return navigationController
+ }
+
+ /// Creates a Credit Card Controller comes in UINavigationController stack
+ ///
+ /// - Parameters:
+ /// - countryCode: Delegate to be notified when Source or Token is created
+ /// - handleErrors: If `true` the controller will show an error alerts in the UI, if `false` the controller will notify delegate
+ /// - delegate: Delegate to be notified when Source or Token is created
+ public func creditCardController(
+ countryCode: String? = nil,
+ handleErrors: Bool = true,
+ delegate: ChoosePaymentMethodDelegate
+ ) -> UINavigationController {
+ let paymentFlow = ChoosePaymentCoordinator(
+ client: client,
+ amount: 0,
+ currency: "",
+ currentCountry: Country(code: countryCode) ?? self.country,
+ handleErrors: handleErrors
+ )
+ let viewController = paymentFlow.createCreditCardPaymentController(delegate: delegate)
+
+ let navigationController = UINavigationController(rootViewController: viewController)
+ if #available(iOSApplicationExtension 11.0, *) {
+ navigationController.navigationBar.prefersLargeTitles = true
+ }
+
+ navigationController.delegate = paymentFlow
+ return navigationController
+ }
+
+ /// Creates a authorizing payment view controller comes in UINavigationController stack.
+ ///
+ /// - parameter authorizedURL: The authorized URL given in `Charge` object
+ /// - parameter expectedReturnURLPatterns: The expected return URL patterns.
+ /// - parameter delegate: A delegate object that will recieved authorizing payment events.
+ ///
+ /// - returns: A UINavigationController with `AuthorizingPaymentViewController` as its root view controller
+ @available(iOSApplicationExtension, unavailable)
+ public func authorizedController(
+ authorizedURL: URL,
+ expectedReturnURLPatterns: [URLComponents],
+ delegate: AuthorizingPaymentViewControllerDelegate
+ ) -> UINavigationController {
+ let viewController = AuthorizingPaymentViewController(nibName: nil, bundle: .omiseSDK)
+ viewController.authorizedURL = authorizedURL
+ viewController.expectedReturnURLPatterns = expectedReturnURLPatterns
+ viewController.delegate = delegate
+ viewController.applyNavigationBarStyle()
+
+ let navigationController = UINavigationController(rootViewController: viewController)
+ navigationController.navigationBar.isTranslucent = false
+ navigationController.navigationBar.backgroundColor = .white
+
+ if #available(iOSApplicationExtension 11.0, *) {
+ navigationController.navigationBar.prefersLargeTitles = true
+ }
+
+ return navigationController
+ }
+}
+
+private extension OmiseSDK {
+ private func preloadCapabilityAPI() {
+ client.capability { _ in }
+ }
+}
diff --git a/OmiseSDK/Helpers/Extensions/Array+Helpers.swift b/OmiseSDK/Sources/ToolKit/Extensions/Array+Helpers.swift
similarity index 100%
rename from OmiseSDK/Helpers/Extensions/Array+Helpers.swift
rename to OmiseSDK/Sources/ToolKit/Extensions/Array+Helpers.swift
diff --git a/OmiseSDK/Sources/ToolKit/Extensions/Optional+Helpers.swift b/OmiseSDK/Sources/ToolKit/Extensions/Optional+Helpers.swift
new file mode 100644
index 00000000..19507f7c
--- /dev/null
+++ b/OmiseSDK/Sources/ToolKit/Extensions/Optional+Helpers.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+extension Optional where Wrapped == String {
+ public var isNilOrEmpty: Bool {
+ return self?.isEmpty ?? true
+ }
+}
diff --git a/OmiseSDK/Helpers/Extensions/String+Helpers.swift b/OmiseSDK/Sources/ToolKit/Extensions/String+Helpers.swift
similarity index 100%
rename from OmiseSDK/Helpers/Extensions/String+Helpers.swift
rename to OmiseSDK/Sources/ToolKit/Extensions/String+Helpers.swift
diff --git a/OmiseSDK/Helpers/Property Wrappers/ProxyProperty.swift b/OmiseSDK/Sources/ToolKit/Property Wrappers/ProxyProperty.swift
similarity index 100%
rename from OmiseSDK/Helpers/Property Wrappers/ProxyProperty.swift
rename to OmiseSDK/Sources/ToolKit/Property Wrappers/ProxyProperty.swift
diff --git a/OmiseSDK/Helpers/UI Extensions/UIButton+Helpers.swift b/OmiseSDK/Sources/ToolKit/UI Extensions/UIButton+Helpers.swift
similarity index 100%
rename from OmiseSDK/Helpers/UI Extensions/UIButton+Helpers.swift
rename to OmiseSDK/Sources/ToolKit/UI Extensions/UIButton+Helpers.swift
diff --git a/OmiseSDK/Helpers/UI Extensions/UIColor+Helpers.swift b/OmiseSDK/Sources/ToolKit/UI Extensions/UIColor+Helpers.swift
similarity index 71%
rename from OmiseSDK/Helpers/UI Extensions/UIColor+Helpers.swift
rename to OmiseSDK/Sources/ToolKit/UI Extensions/UIColor+Helpers.swift
index b9ee2e6d..723186ec 100644
--- a/OmiseSDK/Helpers/UI Extensions/UIColor+Helpers.swift
+++ b/OmiseSDK/Sources/ToolKit/UI Extensions/UIColor+Helpers.swift
@@ -33,4 +33,20 @@ extension UIColor {
UIGraphicsEndImageContext()
return image
}
+
+ var hexString: String {
+ let components = self.cgColor.components
+ let r: CGFloat = components?[0] ?? 0.0
+ let g: CGFloat = components?[1] ?? 0.0
+ let b: CGFloat = components?[2] ?? 0.0
+
+ let hexString = String(
+ format: "#%02lX%02lX%02lX",
+ lroundf(Float(r * 255)),
+ lroundf(Float(g * 255)),
+ lroundf(Float(b * 255))
+ )
+ return hexString
+ }
+
}
diff --git a/OmiseSDK/Sources/ToolKit/UI Extensions/UIControl.State+Hashable.swift b/OmiseSDK/Sources/ToolKit/UI Extensions/UIControl.State+Hashable.swift
new file mode 100644
index 00000000..2500e514
--- /dev/null
+++ b/OmiseSDK/Sources/ToolKit/UI Extensions/UIControl.State+Hashable.swift
@@ -0,0 +1,7 @@
+import UIKit
+
+extension UIControl.State: Hashable {
+ public func hash(into hasher: inout Hasher) {
+ hasher.combine(rawValue)
+ }
+}
diff --git a/OmiseSDK/Helpers/UI Extensions/UIImage+Helpers.swift b/OmiseSDK/Sources/ToolKit/UI Extensions/UIImage+Helpers.swift
similarity index 100%
rename from OmiseSDK/Helpers/UI Extensions/UIImage+Helpers.swift
rename to OmiseSDK/Sources/ToolKit/UI Extensions/UIImage+Helpers.swift
diff --git a/OmiseSDK/Helpers/UI Extensions/UILabel+Helpers.swift b/OmiseSDK/Sources/ToolKit/UI Extensions/UILabel+Helpers.swift
similarity index 100%
rename from OmiseSDK/Helpers/UI Extensions/UILabel+Helpers.swift
rename to OmiseSDK/Sources/ToolKit/UI Extensions/UILabel+Helpers.swift
diff --git a/OmiseSDK/Helpers/UI Extensions/UIScrollView+Helpers.swift b/OmiseSDK/Sources/ToolKit/UI Extensions/UIScrollView+Helpers.swift
similarity index 100%
rename from OmiseSDK/Helpers/UI Extensions/UIScrollView+Helpers.swift
rename to OmiseSDK/Sources/ToolKit/UI Extensions/UIScrollView+Helpers.swift
diff --git a/OmiseSDK/Helpers/UI Extensions/UIStackView+Helpers.swift b/OmiseSDK/Sources/ToolKit/UI Extensions/UIStackView+Helpers.swift
similarity index 100%
rename from OmiseSDK/Helpers/UI Extensions/UIStackView+Helpers.swift
rename to OmiseSDK/Sources/ToolKit/UI Extensions/UIStackView+Helpers.swift
diff --git a/OmiseSDK/Helpers/UI Extensions/UIView+Helpers.swift b/OmiseSDK/Sources/ToolKit/UI Extensions/UIView+Helpers.swift
similarity index 100%
rename from OmiseSDK/Helpers/UI Extensions/UIView+Helpers.swift
rename to OmiseSDK/Sources/ToolKit/UI Extensions/UIView+Helpers.swift
diff --git a/OmiseSDK/Sources/Views/Components/ClosureBarButtonItem.swift b/OmiseSDK/Sources/Views/Components/ClosureBarButtonItem.swift
new file mode 100644
index 00000000..d3e65380
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Components/ClosureBarButtonItem.swift
@@ -0,0 +1,28 @@
+import UIKit
+
+class ClosureBarButtonItem: UIBarButtonItem {
+ typealias CompletionHandler = (UIBarButtonItem) -> Void
+ private var completionHandler: CompletionHandler?
+
+ convenience init(image: UIImage?, style: UIBarButtonItem.Style, completionHandler: CompletionHandler?) {
+ self.init(image: image, style: style, target: nil, action: #selector(barButtonItemPressed(sender:)))
+ self.completionHandler = completionHandler
+ self.target = self
+ }
+
+ convenience init(title: String?, style: UIBarButtonItem.Style, completionHandler: CompletionHandler?) {
+ self.init(title: title, style: style, target: nil, action: #selector(barButtonItemPressed(sender:)))
+ self.completionHandler = completionHandler
+ self.target = self
+ }
+
+ convenience init(barButtonSystemItem systemItem: UIBarButtonItem.SystemItem, completionHandler: CompletionHandler?) {
+ self.init(barButtonSystemItem: systemItem, target: nil, action: #selector(barButtonItemPressed(sender:)))
+ self.completionHandler = completionHandler
+ self.target = self
+ }
+
+ @objc func barButtonItemPressed(sender: UIBarButtonItem) {
+ completionHandler?(sender)
+ }
+}
diff --git a/OmiseSDK/Colors.swift b/OmiseSDK/Sources/Views/Components/Colors.swift
similarity index 100%
rename from OmiseSDK/Colors.swift
rename to OmiseSDK/Sources/Views/Components/Colors.swift
diff --git a/OmiseSDK/CountryListViewController.swift b/OmiseSDK/Sources/Views/Components/CountryListController/CountryListViewController.swift
similarity index 89%
rename from OmiseSDK/CountryListViewController.swift
rename to OmiseSDK/Sources/Views/Components/CountryListController/CountryListViewController.swift
index 131df0d2..149dc66e 100644
--- a/OmiseSDK/CountryListViewController.swift
+++ b/OmiseSDK/Sources/Views/Components/CountryListController/CountryListViewController.swift
@@ -1,14 +1,6 @@
-//
-// CountryListViewController.swift
-// OmiseSDK
-//
-// Created by Andrei Solovev on 8/6/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
import UIKit
-class CountryListViewController: UIViewController, PaymentChooserUI {
+class CountryListController: UIViewController {
typealias ViewModel = CountryListViewModelProtocol
private struct Style {
@@ -74,7 +66,7 @@ class CountryListViewController: UIViewController, PaymentChooserUI {
}
}
-extension CountryListViewController: UITableViewDelegate, UITableViewDataSource {
+extension CountryListController: UITableViewDelegate, UITableViewDataSource {
func numberOfSections(in tableView: UITableView) -> Int {
return 1
}
@@ -88,7 +80,7 @@ extension CountryListViewController: UITableViewDelegate, UITableViewDataSource
let country = viewModel?.countries.at(indexPath.row)
cell.textLabel?.text = country?.name ?? ""
- cell.textLabel?.textColor = currentPrimaryColor
+ cell.textLabel?.textColor = UIColor.omisePrimary
cell.accessoryType = (viewModel?.selectedCountry == country) ? .checkmark : .none
return cell
}
@@ -100,7 +92,7 @@ extension CountryListViewController: UITableViewDelegate, UITableViewDataSource
}
// MARK: Setups
-private extension CountryListViewController {
+private extension CountryListController {
func setupViews() {
if #available(iOS 11, *) {
navigationItem.largeTitleDisplayMode = .never
@@ -149,7 +141,7 @@ struct CountryListViewController_Previews: PreviewProvider {
static var previews: some View {
UIKitViewControllerPresentable(
viewController:
- CountryListViewController(
+ CountryListController(
viewModel: CountryListViewModelMockup()
)
)
diff --git a/OmiseSDK/CountryListViewModelProtocol.swift b/OmiseSDK/Sources/Views/Components/CountryListController/CountryListViewModelProtocol.swift
similarity index 58%
rename from OmiseSDK/CountryListViewModelProtocol.swift
rename to OmiseSDK/Sources/Views/Components/CountryListController/CountryListViewModelProtocol.swift
index 44308a6b..d37ab3a1 100644
--- a/OmiseSDK/CountryListViewModelProtocol.swift
+++ b/OmiseSDK/Sources/Views/Components/CountryListController/CountryListViewModelProtocol.swift
@@ -9,7 +9,7 @@
import Foundation
protocol CountryListViewModelProtocol {
- var countries: [CountryInfo] { get }
- var selectedCountry: CountryInfo? { get set }
- var onSelectCountry: (CountryInfo) -> Void { get set }
+ var countries: [Country] { get }
+ var selectedCountry: Country? { get set }
+ var onSelectCountry: (Country) -> Void { get set }
}
diff --git a/OmiseSDK/MainActionButton.swift b/OmiseSDK/Sources/Views/Components/MainActionButton.swift
similarity index 100%
rename from OmiseSDK/MainActionButton.swift
rename to OmiseSDK/Sources/Views/Components/MainActionButton.swift
diff --git a/OmiseSDK/SpacerView.swift b/OmiseSDK/Sources/Views/Components/SpacerView.swift
similarity index 88%
rename from OmiseSDK/SpacerView.swift
rename to OmiseSDK/Sources/Views/Components/SpacerView.swift
index 1edab523..4101794d 100644
--- a/OmiseSDK/SpacerView.swift
+++ b/OmiseSDK/Sources/Views/Components/SpacerView.swift
@@ -1,11 +1,3 @@
-//
-// SpacerView.swift
-// OmiseSDK
-//
-// Created by Andrei Solovev on 30/5/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
import UIKit
class SpacerView: UIView {
diff --git a/OmiseSDK/Sources/Views/Components/TapGestureHandler.swift b/OmiseSDK/Sources/Views/Components/TapGestureHandler.swift
new file mode 100644
index 00000000..7fa037ab
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Components/TapGestureHandler.swift
@@ -0,0 +1,16 @@
+import UIKit
+
+class TapGestureHandler: UITapGestureRecognizer {
+
+ private var action: (() -> Void)?
+
+ convenience init(action: (() -> Void)?) {
+ self.init()
+ self.action = action
+ self.addTarget(self, action: #selector(handleTapGesture))
+ }
+
+ @objc private func handleTapGesture() {
+ action?()
+ }
+}
diff --git a/OmiseSDK/TextFieldView.swift b/OmiseSDK/Sources/Views/Components/TextFieldView.swift
similarity index 95%
rename from OmiseSDK/TextFieldView.swift
rename to OmiseSDK/Sources/Views/Components/TextFieldView.swift
index 3549bc6b..89cc2b9a 100644
--- a/OmiseSDK/TextFieldView.swift
+++ b/OmiseSDK/Sources/Views/Components/TextFieldView.swift
@@ -45,12 +45,12 @@ class TextFieldView: UIView {
return label
}()
private lazy var contentView: UIStackView = {
- let stackView = UIStackView()
- stackView.axis = .vertical
- stackView.distribution = .equalSpacing
- stackView.alignment = .fill
- stackView.spacing = 4
- return stackView
+ let verticalContainerStack = UIStackView()
+ verticalContainerStack.axis = .vertical
+ verticalContainerStack.distribution = .equalSpacing
+ verticalContainerStack.alignment = .fill
+ verticalContainerStack.spacing = 4
+ return verticalContainerStack
}()
var onTextFieldShouldReturn: () -> (Bool) = { return false }
diff --git a/OmiseSDK/CardCVVTextField.swift b/OmiseSDK/Sources/Views/Components/TextFields/CardCVVTextField.swift
similarity index 100%
rename from OmiseSDK/CardCVVTextField.swift
rename to OmiseSDK/Sources/Views/Components/TextFields/CardCVVTextField.swift
diff --git a/OmiseSDK/CardExpiryDatePicker.swift b/OmiseSDK/Sources/Views/Components/TextFields/CardExpiryDatePicker.swift
similarity index 100%
rename from OmiseSDK/CardExpiryDatePicker.swift
rename to OmiseSDK/Sources/Views/Components/TextFields/CardExpiryDatePicker.swift
diff --git a/OmiseSDK/CardExpiryDateTextField.swift b/OmiseSDK/Sources/Views/Components/TextFields/CardExpiryDateTextField.swift
similarity index 100%
rename from OmiseSDK/CardExpiryDateTextField.swift
rename to OmiseSDK/Sources/Views/Components/TextFields/CardExpiryDateTextField.swift
diff --git a/OmiseSDK/CardNameTextField.swift b/OmiseSDK/Sources/Views/Components/TextFields/CardNameTextField.swift
similarity index 100%
rename from OmiseSDK/CardNameTextField.swift
rename to OmiseSDK/Sources/Views/Components/TextFields/CardNameTextField.swift
diff --git a/OmiseSDK/CardNumberTextField.swift b/OmiseSDK/Sources/Views/Components/TextFields/CardNumberTextField.swift
similarity index 99%
rename from OmiseSDK/CardNumberTextField.swift
rename to OmiseSDK/Sources/Views/Components/TextFields/CardNumberTextField.swift
index 27fd9698..82cec6e4 100644
--- a/OmiseSDK/CardNumberTextField.swift
+++ b/OmiseSDK/Sources/Views/Components/TextFields/CardNumberTextField.swift
@@ -65,8 +65,8 @@ public class CardNumberTextField: OmiseTextField {
super.delegate = self
- placeholder = placeholder
-
+ updatePlaceholderTextColor()
+
textContentType = .creditCardNumber
}
diff --git a/OmiseSDK/OmiseTextField.swift b/OmiseSDK/Sources/Views/Components/TextFields/OmiseTextField.swift
similarity index 99%
rename from OmiseSDK/OmiseTextField.swift
rename to OmiseSDK/Sources/Views/Components/TextFields/OmiseTextField.swift
index 6576337e..e730b489 100644
--- a/OmiseSDK/OmiseTextField.swift
+++ b/OmiseSDK/Sources/Views/Components/TextFields/OmiseTextField.swift
@@ -21,7 +21,8 @@ public class OmiseTextField: UITextField {
}
public var onTextFieldShouldReturn: () -> (Bool) = { return false }
-
+ public var onValueChanged: () -> Void = { }
+
@IBInspectable var borderWidth: CGFloat {
get {
switch style {
@@ -170,7 +171,7 @@ public class OmiseTextField: UITextField {
}
@objc func textDidChange() {
- // Intentionally empty (SonarCloud warning fix)
+ onValueChanged()
}
public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
diff --git a/OmiseSDK/Sources/Views/Helpers/TableCellContext.swift b/OmiseSDK/Sources/Views/Helpers/TableCellContext.swift
new file mode 100644
index 00000000..3213ecf7
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Helpers/TableCellContext.swift
@@ -0,0 +1,15 @@
+import UIKit
+
+struct TableCellContext: Equatable {
+ let icon: UIImage?
+ let title: String
+ let subtitle: String?
+ let accessoryIcon: UIImage?
+
+ init(title: String, subtitle: String? = nil, icon: UIImage? = nil, accessoryIcon: UIImage? = nil) {
+ self.title = title
+ self.subtitle = subtitle
+ self.icon = icon
+ self.accessoryIcon = accessoryIcon
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Helpers/UIBarButtonItem+Helpers.swift b/OmiseSDK/Sources/Views/Helpers/UIBarButtonItem+Helpers.swift
new file mode 100644
index 00000000..26f0747f
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Helpers/UIBarButtonItem+Helpers.swift
@@ -0,0 +1,5 @@
+import UIKit
+
+extension UIBarButtonItem {
+ static var empty = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+}
diff --git a/OmiseSDK/Sources/Views/Helpers/UIColor+Omise.swift b/OmiseSDK/Sources/Views/Helpers/UIColor+Omise.swift
new file mode 100644
index 00000000..d9093011
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Helpers/UIColor+Omise.swift
@@ -0,0 +1,35 @@
+import Foundation
+import UIKit
+
+extension UIColor {
+ enum Omise: Int {
+ case primary = 0x3C414D
+ case secondary = 0xE4E7ED
+ case darkBackground = 0x1C1C1E
+ case lightBackground = 0xFFFFFF
+ }
+
+ static var omiseBackground: UIColor {
+ UIColor(.lightBackground, dark: .darkBackground)
+ }
+
+ static var omisePrimary: UIColor {
+ UIColor(.primary, dark: .secondary)
+ }
+
+ static var omiseSecondary: UIColor {
+ UIColor(.secondary, dark: .primary)
+ }
+
+ convenience init(_ light: Omise, dark: Omise) {
+ if #available(iOS 13, *) {
+ // swiftlint:disable trailing_closure
+ self.init(dynamicProvider: { (trait) -> UIColor in
+ return trait.userInterfaceStyle == .dark ? UIColor(dark.rawValue) : UIColor(light.rawValue)
+ })
+ // swiftlint:enable trailing_closure
+ } else {
+ self.init(light.rawValue)
+ }
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Helpers/UITableViewCell+ActivityIndicator.swift b/OmiseSDK/Sources/Views/Helpers/UITableViewCell+ActivityIndicator.swift
new file mode 100644
index 00000000..0e760b04
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Helpers/UITableViewCell+ActivityIndicator.swift
@@ -0,0 +1,16 @@
+import UIKit
+
+extension UITableViewCell {
+ func startAccessoryActivityIndicator() {
+ let loadingIndicator = UIActivityIndicatorView(style: UIActivityIndicatorView.Style.gray)
+ loadingIndicator.color = UIColor.omiseSecondary
+ accessoryView = loadingIndicator
+ loadingIndicator.startAnimating()
+ isUserInteractionEnabled = false
+ }
+
+ func stopAccessoryActivityIndicator(_ accessoryView: UIView? = nil) {
+ self.accessoryView = accessoryView
+ isUserInteractionEnabled = false
+ }
+}
diff --git a/OmiseSDK/UIViewController+NavigationBarStyle.swift b/OmiseSDK/Sources/Views/Helpers/UIViewController+NavigationBarStyle.swift
similarity index 100%
rename from OmiseSDK/UIViewController+NavigationBarStyle.swift
rename to OmiseSDK/Sources/Views/Helpers/UIViewController+NavigationBarStyle.swift
diff --git a/OmiseSDK/Sources/Views/Helpers/ViewAttachable.swift b/OmiseSDK/Sources/Views/Helpers/ViewAttachable.swift
new file mode 100644
index 00000000..67ea5df7
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Helpers/ViewAttachable.swift
@@ -0,0 +1,18 @@
+import UIKit.UIView
+
+/// Explicit mark a class that will be store inside another View to retain a life circle
+/// and be deallocated together with the view it's attached
+protocol ViewAttachable {
+}
+
+extension UIView {
+ func attach(_ object: ViewAttachable) {
+ addSubview(ViewContainer(object))
+ }
+}
+
+extension UIViewController {
+ func attach(_ object: ViewAttachable) {
+ view.addSubview(ViewContainer(object))
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Helpers/ViewContainer.swift b/OmiseSDK/Sources/Views/Helpers/ViewContainer.swift
new file mode 100644
index 00000000..ac23b2f3
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Helpers/ViewContainer.swift
@@ -0,0 +1,15 @@
+import UIKit.UIView
+
+class ViewContainer: UIView {
+ let object: Any
+ init(_ object: Any) {
+ self.object = object
+ super.init(frame: .zero)
+ backgroundColor = .clear
+ isUserInteractionEnabled = false
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+}
diff --git a/OmiseSDK/AuthorizingPaymentViewController.swift b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.swift
similarity index 72%
rename from OmiseSDK/AuthorizingPaymentViewController.swift
rename to OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.swift
index 0c3ae202..7e43bf4f 100644
--- a/OmiseSDK/AuthorizingPaymentViewController.swift
+++ b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.swift
@@ -2,9 +2,7 @@ import Foundation
import WebKit
import os
-/// Delegate to receive authorizing payment events.
@available(iOSApplicationExtension, unavailable)
-// swiftlint:disable:next attributes
public protocol AuthorizingPaymentViewControllerDelegate: AnyObject {
/// A delegation method called when the authorizing payment process is completed.
/// - parameter viewController: The authorizing payment controller that call this method.
@@ -23,10 +21,9 @@ public protocol AuthorizingPaymentViewControllerDelegate: AnyObject {
This is still an experimental API. If you encountered with any problem with this API, please feel free to report to Omise.
*/
@available(iOSApplicationExtension, unavailable)
-// swiftlint:disable:next attributes
public class AuthorizingPaymentViewController: UIViewController {
/// Authorized URL given from Omise in the created `Charge` object.
- public var authorizedURL: URL? {
+ var authorizedURL: URL? {
didSet {
guard isViewLoaded else {
return
@@ -40,79 +37,35 @@ public class AuthorizingPaymentViewController: UIViewController {
///
/// The rule is the scheme and host must be matched and must have the path as a prefix.
/// Example: if the return URL is `https://www.example.com/products/12345` the expected return URL should have a URLComponents with scheme of `https`, host of `www.example.com` and the path of `/products/`
- public var expectedReturnURLPatterns: [URLComponents] = []
+ var expectedReturnURLPatterns: [URLComponents] = []
/// A delegate object that will recieved the authorizing payment events.
- public weak var delegate: AuthorizingPaymentViewControllerDelegate?
+ weak var delegate: AuthorizingPaymentViewControllerDelegate?
let webView = WKWebView(frame: CGRect.zero, configuration: WKWebViewConfiguration())
let okButtonTitle = NSLocalizedString("OK", comment: "OK button for JavaScript panel")
let confirmButtonTitle = NSLocalizedString("Confirm", comment: "Confirm button for JavaScript panel")
let cancelButtonTitle = NSLocalizedString("Cancel", comment: "Cancel button for JavaScript panel")
-
- /// A factory method for creating a authorizing payment view controller comes in UINavigationController stack.
- ///
- /// - parameter authorizedURL: The authorized URL given in `Charge` object that will be set to `OmiseAuthorizingPaymentViewController`
- /// - parameter expectedReturnURLPatterns: The expected return URL patterns.
- /// - parameter delegate: A delegate object that will recieved authorizing payment events.
- ///
- /// - returns: A UINavigationController with `OmiseAuthorizingPaymentViewController` as its root view controller
- public static func makeAuthorizingPaymentViewControllerNavigationWithAuthorizedURL(_ authorizedURL: URL, expectedReturnURLPatterns: [URLComponents], delegate: AuthorizingPaymentViewControllerDelegate) -> UINavigationController {
- let storyboard = UIStoryboard(name: "OmiseSDK", bundle: .omiseSDK)
- let navigationController = storyboard.instantiateViewController(
- withIdentifier: "DefaultAuthorizingPaymentViewControllerWithNavigation"
- ) as! UINavigationController // swiftlint:disable:this force_cast
-
- navigationController.navigationBar.isTranslucent = false
- navigationController.navigationBar.backgroundColor = .white
-
- // swiftlint:disable:next force_cast
- let viewController = navigationController.topViewController as! AuthorizingPaymentViewController
- viewController.authorizedURL = authorizedURL
- viewController.expectedReturnURLPatterns = expectedReturnURLPatterns
- viewController.delegate = delegate
- viewController.applyNavigationBarStyle()
-
- return navigationController
- }
- /// A factory method for creating a authorizing payment view controller comes in UINavigationController stack.
- ///
- /// - parameter authorizedURL: The authorized URL given in `Charge` object that will be set to `OmiseAuthorizingPaymentViewController`
- /// - parameter expectedReturnURLPatterns: The expected return URL patterns.
- /// - parameter delegate: A delegate object that will recieved authorizing payment events.
- ///
- /// - returns: An `OmiseAuthorizingPaymentViewController` with given authorized URL and delegate.
- public static func makeAuthorizingPaymentViewControllerWithAuthorizedURL(_ authorizedURL: URL, expectedReturnURLPatterns: [URLComponents], delegate: AuthorizingPaymentViewControllerDelegate) -> AuthorizingPaymentViewController {
- let storyboard = UIStoryboard(name: "OmiseSDK", bundle: .omiseSDK)
- let viewController = storyboard.instantiateViewController(
- withIdentifier: "DefaultAuthorizingPaymentViewController"
- ) as! AuthorizingPaymentViewController // swiftlint:disable:this force_cast
- viewController.authorizedURL = authorizedURL
- viewController.expectedReturnURLPatterns = expectedReturnURLPatterns
- viewController.delegate = delegate
-
- return viewController
- }
-
- // need to refactor loadView, removing super results in crash
- // swiftlint:disable:next prohibited_super_call
- public override func loadView() {
- super.loadView()
-
+ public override func viewDidLoad() {
+ super.viewDidLoad()
webView.translatesAutoresizingMaskIntoConstraints = false
view.addSubview(webView)
-
+
webView.topAnchor.constraint(equalTo: topLayoutGuide.bottomAnchor).isActive = true
webView.bottomAnchor.constraint(equalTo: bottomLayoutGuide.topAnchor).isActive = true
webView.leadingAnchor.constraint(equalTo: view.leadingAnchor).isActive = true
webView.trailingAnchor.constraint(equalTo: view.trailingAnchor).isActive = true
- }
-
- public override func viewDidLoad() {
- super.viewDidLoad()
+
webView.navigationDelegate = self
webView.uiDelegate = self
+
+ let cancelButtonItem = UIBarButtonItem(
+ barButtonSystemItem: .cancel,
+ target: self,
+ action: #selector(cancelAuthorizingPaymentProcess)
+ )
+ navigationItem.rightBarButtonItem = cancelButtonItem
}
public override func viewDidAppear(_ animated: Bool) {
diff --git a/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.xib b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.xib
new file mode 100644
index 00000000..3ca6f73e
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Authorizing Payment/AuthorizingPaymentViewController.xib
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift
new file mode 100644
index 00000000..7b667a60
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator+Helpers.swift
@@ -0,0 +1,172 @@
+import UIKit
+
+extension ChoosePaymentCoordinator {
+ func navigate(to viewController: UIViewController) {
+ rootViewController?.navigationController?.pushViewController(
+ viewController,
+ animated: true
+ )
+ }
+
+ func processError(_ error: Error) {
+ if handleErrors {
+ if let error = error as? OmiseError {
+ displayErrorWith(title: error.localizedDescription,
+ message: error.localizedRecoverySuggestion,
+ animated: true,
+ sender: self)
+ } else if let error = error as? LocalizedError {
+ displayErrorWith(title: error.localizedDescription,
+ message: error.recoverySuggestion,
+ animated: true,
+ sender: self)
+ } else {
+ displayErrorWith(title: error.localizedDescription,
+ message: nil,
+ animated: true,
+ sender: self)
+ }
+ } else {
+ choosePaymentMethodDelegate?.choosePaymentMethodDidComplete(with: error)
+ }
+ }
+
+ func processPayment(_ card: CreateTokenPayload.Card, completion: @escaping () -> Void) {
+ guard let delegate = choosePaymentMethodDelegate else { return }
+ let tokenPayload = CreateTokenPayload(card: card)
+
+ client.createToken(payload: tokenPayload) { [weak self, weak delegate] result in
+ switch result {
+ case .success(let token):
+ delegate?.choosePaymentMethodDidComplete(with: token)
+ case .failure(let error):
+ self?.processError(error)
+ }
+ completion()
+ }
+ }
+
+ func processPayment(_ payment: Source.Payment, completion: @escaping () -> Void) {
+ guard let delegate = choosePaymentMethodDelegate else { return }
+ let sourcePayload = CreateSourcePayload(
+ amount: amount,
+ currency: currency,
+ details: payment
+ )
+
+ client.createSource(payload: sourcePayload) { [weak self, weak delegate] result in
+ switch result {
+ case .success(let source):
+ delegate?.choosePaymentMethodDidComplete(with: source)
+ case .failure(let error):
+ self?.processError(error)
+ }
+ completion()
+ }
+ }
+}
+
+extension ChoosePaymentCoordinator {
+ func setupErrorView() {
+ errorViewHeightConstraint = errorView.heightAnchor.constraint(equalToConstant: 0)
+ errorViewHeightConstraint?.isActive = true
+
+ let dismissErrorBannerTapGestureRecognizer = UITapGestureRecognizer(target: self,
+ action: #selector(self.dismissErrorMessageBanner(_:)))
+ errorView.addGestureRecognizer(dismissErrorBannerTapGestureRecognizer)
+ }
+
+ /// Displays an error banner at the top of the UI with the given error message.
+ ///
+ /// - Parameters:
+ /// - title: Title message to be displayed in the banner
+ /// - message: Subtitle message to be displayed in the banner
+ /// - animated: Pass true to animate the presentation; otherwise, pass false
+ /// - sender: The object that initiated the request
+ func displayErrorWith(title: String, message: String?, animated: Bool, sender: Any?) {
+ guard let navController = rootViewController?.navigationController else { return }
+
+ errorView.titleLabel.text = title
+ errorView.detailLabel.text = message
+ navController.view.insertSubview(self.errorView, belowSubview: navController.navigationBar)
+
+ NSLayoutConstraint.activate([
+ errorView.topAnchor.constraint(equalTo: navController.navigationBar.bottomAnchor),
+ errorView.leadingAnchor.constraint(equalTo: navController.view.leadingAnchor),
+ errorView.trailingAnchor.constraint(equalTo: navController.view.trailingAnchor)
+ ])
+
+ errorViewHeightConstraint?.isActive = true
+ navController.view.layoutIfNeeded()
+
+ let animationBlock = { [weak navController] in
+ guard let navController = navController else { return }
+ self.errorViewHeightConstraint?.isActive = false
+ navController.view.layoutIfNeeded()
+ if #available(iOS 13, *) {
+ navController.topViewController?.additionalSafeAreaInsets.top = self.errorView.bounds.height
+ } else if #available(iOS 11, *) {
+ navController.additionalSafeAreaInsets.top = self.errorView.bounds.height
+ }
+ }
+
+ if animated {
+ UIView.animate(withDuration: TimeInterval(UINavigationController.hideShowBarDuration) + 0.07,
+ delay: 0.0,
+ options: [.layoutSubviews, .beginFromCurrentState],
+ animations: animationBlock)
+ } else {
+ animationBlock()
+ }
+ }
+
+ @objc func dismissErrorMessageBanner(_ sender: AnyObject) {
+ dismissErrorMessage(animated: true, sender: sender)
+ }
+
+ func dismissErrorMessage(animated: Bool, sender: Any?) {
+ guard errorView.superview != nil, let navController = rootViewController?.navigationController else {
+ return
+ }
+
+ let animationBlock = { [weak navController] in
+ self.errorViewHeightConstraint?.isActive = true
+ navController?.view.layoutIfNeeded()
+ if #available(iOS 13, *) {
+ navController?.topViewController?.additionalSafeAreaInsets.top = 0
+ } else if #available(iOS 11, *) {
+ navController?.topViewController?.additionalSafeAreaInsets.top = 0
+ }
+ }
+
+ if animated {
+ UIView.animate(
+ withDuration: TimeInterval(UINavigationController.hideShowBarDuration),
+ delay: 0.0,
+ options: [.layoutSubviews],
+ animations: animationBlock
+ ) { [weak navController] _ in
+ var isCompleted: Bool {
+ if #available(iOS 13, *) {
+ return navController?.topViewController?.additionalSafeAreaInsets.top == 0
+ } else if #available(iOS 11, *) {
+ return navController?.topViewController?.additionalSafeAreaInsets.top == 0
+ } else {
+ return true
+ }
+ }
+ guard isCompleted else { return }
+ self.errorView.removeFromSuperview()
+ }
+ } else {
+ animationBlock()
+ self.errorView.removeFromSuperview()
+ }
+ }
+}
+
+extension ChoosePaymentCoordinator: UINavigationControllerDelegate {
+ func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) {
+ dismissErrorMessage(animated: animated, sender: nil)
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift
new file mode 100644
index 00000000..314abb6e
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ChoosePaymentCoordinator.swift
@@ -0,0 +1,261 @@
+import UIKit
+
+class ChoosePaymentCoordinator: NSObject, ViewAttachable {
+ let client: Client
+ let amount: Int64
+ let currency: String
+ let currentCountry: Country?
+ let handleErrors: Bool
+
+ enum ResultState {
+ case cancelled
+ case selectedPaymentMethod(PaymentMethod)
+ }
+
+ weak var choosePaymentMethodDelegate: ChoosePaymentMethodDelegate?
+ weak var rootViewController: UIViewController?
+
+ var errorViewHeightConstraint: NSLayoutConstraint?
+ let errorView: NoticeView = {
+ let noticeViewNib = UINib(nibName: "NoticeView", bundle: .omiseSDK)
+ let noticeView = noticeViewNib.instantiate(withOwner: nil, options: nil).first as! NoticeView // swiftlint:disable:this force_cast
+ noticeView.translatesAutoresizingMaskIntoConstraints = false
+ noticeView.backgroundColor = .error
+ return noticeView
+ }()
+
+ init(client: Client, amount: Int64, currency: String, currentCountry: Country?, handleErrors: Bool) {
+ self.client = client
+ self.amount = amount
+ self.currency = currency
+ self.currentCountry = currentCountry
+ self.handleErrors = handleErrors
+ super.init()
+
+ self.setupErrorView()
+ }
+
+ /// Creates SelectPaymentController and attach current flow object inside created controller to be deallocated together
+ ///
+ /// - Parameters:
+ /// - allowedPaymentMethods: List of Payment Methods to be presented in the list if `usePaymentMethodsFromCapability` is `false`
+ /// - allowedCardPayment: Shows credit card payment option if `true` and `usePaymentMethodsFromCapability` is `false`
+ /// - usePaymentMethodsFromCapability: If `true`then it loads list of Payment Methods from Capability API and ignores previous parameters
+ /// - delegate: Payment method delegate
+ func createChoosePaymentMethodController(
+ allowedPaymentMethods paymentMethods: [SourceType] = [],
+ allowedCardPayment isCardEnabled: Bool = true,
+ usePaymentMethodsFromCapability useCapability: Bool,
+ delegate: ChoosePaymentMethodDelegate
+ ) -> SelectPaymentController {
+ let viewModel = SelectPaymentMethodViewModel(client: client, delegate: self)
+ if useCapability {
+ viewModel.setupCapability()
+ } else {
+ viewModel.setupAllowedPaymentMethods(paymentMethods, isCardEnabled: isCardEnabled)
+ }
+
+ let listController = SelectPaymentController(viewModel: viewModel)
+ listController.attach(self)
+
+ self.choosePaymentMethodDelegate = delegate
+ self.rootViewController = listController
+
+ return listController
+ }
+
+ /// Creates CreditCardController and attach current flow object inside created controller to be deallocated together
+ ///
+ /// - Parameters:
+ /// - delegate: Payment method delegate
+ func createCreditCardPaymentController(delegate: ChoosePaymentMethodDelegate) -> CreditCardPaymentController {
+ let viewController = createCreditCardPaymentController()
+ viewController.attach(self)
+
+ self.choosePaymentMethodDelegate = delegate
+ self.rootViewController = viewController
+
+ return viewController
+ }
+
+ /// Creates Credit Carc Payment screen and attach current flow object inside created controller to be deallocated together
+ func createCreditCardPaymentController() -> CreditCardPaymentController {
+ let viewModel = CreditCardPaymentViewModel(currentCountry: currentCountry, delegate: self)
+ let viewController = CreditCardPaymentController(nibName: nil, bundle: .omiseSDK)
+ viewController.viewModel = viewModel
+ viewController.title = PaymentMethod.creditCard.localizedTitle
+ return viewController
+ }
+
+ /// Creates Mobile Banking screen and attach current flow object inside created controller to be deallocated together
+ func createMobileBankingController() -> SelectPaymentController {
+ let viewModel = SelectSourceTypePaymentViewModel(
+ title: PaymentMethod.mobileBanking.localizedTitle,
+ sourceTypes: SourceType.mobileBanking,
+ delegate: self
+ )
+
+ let listController = SelectPaymentController(viewModel: viewModel)
+ return listController
+ }
+
+ /// Creates Mobile Banking screen and attach current flow object inside created controller to be deallocated together
+ func createInternetBankingController() -> SelectPaymentController {
+ let viewModel = SelectSourceTypePaymentViewModel(
+ title: PaymentMethod.internetBanking.localizedTitle,
+ sourceTypes: SourceType.internetBanking,
+ delegate: self
+ )
+
+ let listController = SelectPaymentController(viewModel: viewModel)
+ return listController
+ }
+
+ /// Creates Installement screen and attach current flow object inside created controller to be deallocated together
+ func createInstallmentController() -> SelectPaymentController {
+ let viewModel = SelectSourceTypePaymentViewModel(
+ title: PaymentMethod.installment.localizedTitle,
+ sourceTypes: SourceType.installments,
+ delegate: self
+ )
+
+ let listController = SelectPaymentController(viewModel: viewModel)
+ return listController
+ }
+
+ /// Creates Installement screen and attach current flow object inside created controller to be deallocated together
+ func createInstallmentTermsController(sourceType: SourceType) -> SelectPaymentController {
+ let viewModel = SelectInstallmentTermsViewModel(sourceType: sourceType, delegate: self)
+ let listController = SelectPaymentController(viewModel: viewModel)
+ return listController
+ }
+
+ /// Creates Atome screen and attach current flow object inside created controller to be deallocated together
+ func createAtomeController() -> AtomePaymentInputsFormController {
+ let viewModel = AtomePaymentFormViewModel(amount: amount, currentCountry: currentCountry, delegate: self)
+ let viewController = AtomePaymentInputsFormController(viewModel: viewModel)
+ viewController.title = SourceType.atome.localizedTitle
+ return viewController
+ }
+
+ /// Creates EContext screen and attach current flow object inside created controller to be deallocated together
+ func createEContextController(title: String) -> EContextPaymentFormController {
+ let viewController = EContextPaymentFormController(nibName: nil, bundle: .omiseSDK)
+ viewController.title = title
+ viewController.delegate = self
+ return viewController
+ }
+
+ /// Creates FPX screen and attach current flow object inside created controller to be deallocated together
+ func createFPXController() -> FPXPaymentFormController {
+ let viewController = FPXPaymentFormController(nibName: nil, bundle: .omiseSDK)
+ viewController.title = SourceType.fpx.localizedTitle
+ viewController.delegate = self
+ return viewController
+ }
+
+ /// Creates FPX Banks screen and attach current flow object inside created controller to be deallocated together
+ func createFPXBanksController(email: String?) -> SelectPaymentController {
+ let fpx = client.latestLoadedCapability?.paymentMethods.first { $0.name == SourceType.fpx.rawValue }
+ let banks: [Capability.PaymentMethod.Bank] = Array(fpx?.banks ?? [])
+ let viewModel = SelectFPXBankViewModel(email: email, banks: banks, delegate: self)
+ let listController = SelectPaymentController(viewModel: viewModel)
+
+ listController.customizeCellAtIndexPathClosure = { [banks] cell, indexPath in
+ guard let bank = banks.at(indexPath.row) else { return }
+ if !bank.isActive {
+ cell.selectionStyle = UITableViewCell.SelectionStyle.none
+ cell.contentView.alpha = 0.5
+ cell.isUserInteractionEnabled = false
+ }
+ }
+ return listController
+ }
+
+ /// Creates Installement screen and attach current flow object inside created controller to be deallocated together
+ func createDuitNowOBWBanksController() -> SelectPaymentController {
+ let banks = Source.Payment.DuitNowOBW.Bank.allCases.sorted {
+ $0.localizedTitle.localizedCompare($1.localizedTitle) == .orderedAscending
+ }
+
+ let viewModel = SelectDuitNowOBWBankViewModel(banks: banks, delegate: self)
+ let listController = SelectPaymentController(viewModel: viewModel)
+ return listController
+ }
+
+ /// Creates Installement screen and attach current flow object inside created controller to be deallocated together
+ func createTrueMoneyWalletController() -> TrueMoneyPaymentFormController {
+ let viewController = TrueMoneyPaymentFormController(nibName: nil, bundle: .omiseSDK)
+ viewController.delegate = self
+ return viewController
+ }
+}
+
+extension ChoosePaymentCoordinator: FPXPaymentFormControllerDelegate {
+ func fpxDidCompleteWith(email: String?, completion: @escaping () -> Void) {
+ navigate(to: createFPXBanksController(email: email))
+ }
+}
+
+extension ChoosePaymentCoordinator: CreditCardPaymentDelegate {
+ func didSelectCardPayment(_ card: CreateTokenPayload.Card, completion: @escaping () -> Void) {
+ processPayment(card, completion: completion)
+ }
+
+ func didCancelCardPayment() {
+ didCancelPayment()
+ }
+}
+extension ChoosePaymentCoordinator: SelectPaymentMethodDelegate {
+
+ func didSelectPaymentMethod(_ paymentMethod: PaymentMethod, completion: @escaping () -> Void) {
+ if paymentMethod.requiresAdditionalDetails {
+ switch paymentMethod {
+ case .mobileBanking:
+ navigate(to: createMobileBankingController())
+ case .internetBanking:
+ navigate(to: createInternetBankingController())
+ case .installment:
+ navigate(to: createInstallmentController())
+ case .creditCard:
+ navigate(to: createCreditCardPaymentController())
+ case .sourceType(.atome):
+ navigate(to: createAtomeController())
+ case .eContextConbini, .eContextPayEasy, .eContextNetBanking:
+ navigate(to: createEContextController(title: paymentMethod.localizedTitle))
+ case .sourceType(.fpx):
+ navigate(to: createFPXController())
+ case .sourceType(.duitNowOBW):
+ navigate(to: createDuitNowOBWBanksController())
+ case .sourceType(.trueMoneyWallet):
+ navigate(to: createTrueMoneyWalletController())
+ default: break
+ }
+ } else if let sourceType = paymentMethod.sourceType {
+ processPayment(.sourceType(sourceType), completion: completion)
+ } else {
+ completion()
+ assertionFailure("Unexpected case for selected payment method: \(paymentMethod)")
+ }
+ }
+
+ func didCancelPayment() {
+ choosePaymentMethodDelegate?.choosePaymentMethodDidCancel()
+ }
+}
+
+extension ChoosePaymentCoordinator: SelectSourceTypeDelegate {
+ func didSelectSourceType(_ sourceType: SourceType, completion: @escaping () -> Void) {
+ if sourceType.isInstallment {
+ navigate(to: createInstallmentTermsController(sourceType: sourceType))
+ } else {
+ processPayment(.sourceType(sourceType), completion: completion)
+ }
+ }
+}
+
+extension ChoosePaymentCoordinator: SelectSourcePaymentDelegate {
+ func didSelectSourcePayment(_ payment: Source.Payment, completion: @escaping () -> Void) {
+ processPayment(payment, completion: completion)
+ }
+}
diff --git a/OmiseSDK/AtomeFormViewController.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormController.swift
similarity index 52%
rename from OmiseSDK/AtomeFormViewController.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormController.swift
index 74b7cad6..47e299be 100644
--- a/OmiseSDK/AtomeFormViewController.swift
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormController.swift
@@ -1,217 +1,102 @@
//
-// AtomeFormViewController.swift
+// AtomePaymentInputsFormController.swift
// OmiseSDKUITests
//
// Created by Andrei Solovev on 16/5/23.
// Copyright © 2023 Omise. All rights reserved.
//
-// swiftlint:disable file_length
-
import Foundation
import UIKit
-protocol AtomeFormViewControllerInterface {
- func onSubmitButtonTapped()
-}
-
-class AtomeFormViewController: UIViewController, PaymentChooserUI {
- struct Style {
- var backgroundColorForDisabledNextButton = UIColor(0xE4E7ED)
- var backgroundColorForEnabledNextButton = UIColor(0x1957F0)
- var textColorForNextButton = UIColor(0xFFFFFF)
- var textColor = UIColor(0x3C414D)
- var shippingAddressLabelColor = UIColor(0x9B9B9B)
- var contentSpacing = CGFloat(18)
- var stackSpacing = CGFloat(12)
- var inputsSpacing = CGFloat(10)
- var nextButtonHeight = CGFloat(47)
- }
-
- typealias ViewModel = AtomeFormViewModelProtocol
- typealias ViewContext = AtomeFormViewContext
+class AtomePaymentInputsFormController: PaymentFormController {
+ typealias ViewModel = AtomePaymentFormViewModelProtocol
+ typealias ViewContext = AtomePaymentFormViewContext
typealias Field = ViewContext.Field
- var viewModel: ViewModel? {
- didSet {
- if let newViewModel = viewModel {
- bind(to: newViewModel)
- }
- }
- }
-
- var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
- private var style = Style()
-
- private lazy var logoImageView: UIImageView = {
- let imageView = UIImageView()
- imageView.contentMode = .scaleAspectFit
- return imageView
- }()
-
- private lazy var detailsLabel: UILabel = {
- let label = UILabel()
- label.numberOfLines = 0
- label.textAlignment = .center
- label.textColor = style.textColor
- label.font = .preferredFont(forTextStyle: .body)
- return label
- }()
-
- private lazy var shippingAddressLabel: UILabel = {
+ lazy var shippingAddressLabel: UILabel = {
let label = UILabel()
label.numberOfLines = 0
label.textAlignment = .left
- label.textColor = style.shippingAddressLabelColor
+ label.textColor = style.sectionTitleColor
label.font = .preferredFont(forTextStyle: .callout)
label.text = "Atome.shippingAddress".localized()
return label
}()
- private lazy var submitButton: UIButton = {
- let button = MainActionButton()
- button.translatesAutoresizingMaskIntoConstraints = false
- button.heightAnchor.constraint(equalToConstant: style.nextButtonHeight).isActive = true
- button.titleLabel?.adjustsFontForContentSizeCategory = true
-
- button.defaultBackgroundColor = .omise
- button.disabledBackgroundColor = .line
-
- button.cornerRadius(4)
- return button
- }()
-
- private lazy var activityIndicator: UIActivityIndicatorView = {
- let indicator = UIActivityIndicatorView(style: .white)
- indicator.color = UIColor(0x3D404C)
- indicator.hidesWhenStopped = true
- return indicator
- }()
-
- private lazy var scrollView: UIScrollView = {
- let scrollView = UIScrollView()
- scrollView.showsHorizontalScrollIndicator = false
- scrollView.adjustContentInsetOnKeyboardAppear()
- return scrollView
- }()
-
- private lazy var scrollContentView: UIView = {
- let view = UIView()
- return view
- }()
-
- private lazy var stackView: UIStackView = {
- let stackView = UIStackView()
- stackView.axis = .vertical
- stackView.distribution = .equalSpacing
- stackView.alignment = .fill
- stackView.spacing = style.stackSpacing
- return stackView
- }()
+ var viewModel: ViewModel? {
+ didSet {
+ if let newViewModel = viewModel {
+ bind(to: newViewModel)
+ }
+ }
+ }
- private lazy var inputsStackView: UIStackView = {
- let stackView = UIStackView()
- stackView.axis = .vertical
- stackView.distribution = .equalSpacing
- stackView.alignment = .fill
- stackView.spacing = style.stackSpacing
- return stackView
- }()
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
init(viewModel: ViewModel? = nil) {
super.init(nibName: nil, bundle: nil)
self.viewModel = viewModel
}
- required init?(coder: NSCoder) {
- fatalError("init(coder:) has not been implemented")
- }
-
override func viewDidLoad() {
super.viewDidLoad()
- setupViews()
if let viewModel = viewModel {
bind(to: viewModel)
}
}
+
+ override func updateSubmitButtonState() {
+ let isEnabled = viewModel?.isSubmitButtonEnabled(makeViewContext()) ?? false
+ self.submitButton.isEnabled = isEnabled
+ isSubmitButtonEnabled = isEnabled
+ }
}
-// MARK: Setups
-private extension AtomeFormViewController {
- func setupViews() {
- view.backgroundColor = .background
- applyPrimaryColor()
- applySecondaryColor()
-
- if #available(iOS 11, *) {
- navigationItem.largeTitleDisplayMode = .never
+private extension AtomePaymentInputsFormController {
+
+ func onSubmitButtonHandler() {
+ let currentContext = makeViewContext()
+ guard let viewModel = self.viewModel, viewModel.isSubmitButtonEnabled(currentContext) else {
+ return
+ }
+
+ hideKeyboard()
+ startActivityIndicator()
+ viewModel.onSubmitButtonPressed(currentContext) { [weak self] in
+ self?.stopActivityIndicator()
}
- view.addSubviewAndFit(scrollView)
- scrollView.addSubviewAndFit(scrollContentView)
- scrollContentView.addSubviewAndFit(stackView, horizontal: style.contentSpacing)
- NSLayoutConstraint.activate([
- scrollContentView.widthAnchor.constraint(equalTo: view.widthAnchor)
- ])
-
- stackView.addArrangedSubview(SpacerView(vertical: 12.0))
- stackView.addArrangedSubview(logoImageView)
- stackView.addArrangedSubview(detailsLabel)
- stackView.addArrangedSubview(SpacerView(vertical: 12.0))
- stackView.addArrangedSubview(inputsStackView)
- stackView.addArrangedSubview(submitButton)
-
- navigationItem.titleView = activityIndicator
- view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(hideKeyboard)))
}
func bind(to viewModel: ViewModel) {
guard isViewLoaded else { return }
setupInputs(viewModel: viewModel)
- setupSubmitButton(viewModel: viewModel)
- detailsLabel.text = viewModel.headerText
- logoImageView.image = UIImage(named: viewModel.logoName, in: .omiseSDK, compatibleWith: nil)
+ setupSubmitButton(title: viewModel.submitButtonTitle, color: style.buttonTextColor)
+ details = viewModel.headerText
+ logoImage = UIImage(omise: viewModel.logoName)
updateSubmitButtonState()
applyPrimaryColor()
applySecondaryColor()
}
- func setupSubmitButton(viewModel: ViewModel) {
- submitButton.setTitleColor(style.textColorForNextButton, for: .normal)
- submitButton.setTitle(viewModel.submitButtonTitle, for: UIControl.State.normal)
- submitButton.addTarget(self, action: #selector(onSubmitButtonTapped), for: .touchUpInside)
- }
-
- func removeAllInputs() {
- for view in inputsStackView.arrangedSubviews {
- inputsStackView.removeArrangedSubview(view)
- }
- }
-
func setupInputs(viewModel: ViewModel) {
removeAllInputs()
let fields = viewModel.fields
for field in fields {
+ // Shipping Address section header title
if field == viewModel.fieldForShippingAddressHeader {
inputsStackView.addArrangedSubview(SpacerView(vertical: 1))
inputsStackView.addArrangedSubview(shippingAddressLabel)
}
- let input = AtomeInputView(id: field.rawValue)
+ let input = TextFieldView(id: field.rawValue)
inputsStackView.addArrangedSubview(input)
+
setupInput(input, field: field, isLast: field == fields.last, viewModel: viewModel)
if field == .country {
@@ -225,7 +110,7 @@ private extension AtomeFormViewController {
@objc func onCountryInputTapped() {
guard let viewModel = viewModel else { return }
- let vc = CountryListViewController(viewModel: viewModel.countryListViewModel)
+ let vc = CountryListController(viewModel: viewModel.countryListViewModel)
vc.title = input(for: .country)?.title ?? ""
vc.viewModel?.onSelectCountry = { [weak self] country in
guard let self = self else { return }
@@ -236,7 +121,7 @@ private extension AtomeFormViewController {
navigationController?.pushViewController(vc, animated: true)
}
- func setupInput(_ input: AtomeInputView, field: Field, isLast: Bool, viewModel: ViewModel) {
+ func setupInput(_ input: TextFieldView, field: Field, isLast: Bool, viewModel: ViewModel) {
input.title = viewModel.title(for: field)
input.placeholder = ""
input.textContentType = viewModel.contentType(for: field)
@@ -264,12 +149,10 @@ private extension AtomeFormViewController {
return
}
- detailsLabel.textColor = currentPrimaryColor
- activityIndicator.color = currentPrimaryColor
inputsStackView.arrangedSubviews.forEach {
- if let input = $0 as? AtomeInputView {
- input.textColor = currentPrimaryColor
- input.titleColor = currentPrimaryColor
+ if let input = $0 as? TextFieldView {
+ input.textColor = UIColor.omisePrimary
+ input.titleColor = UIColor.omisePrimary
}
}
}
@@ -280,16 +163,16 @@ private extension AtomeFormViewController {
}
inputsStackView.arrangedSubviews.forEach {
- if let input = $0 as? AtomeInputView {
- input.borderColor = currentSecondaryColor
- input.placeholderTextColor = currentSecondaryColor
+ if let input = $0 as? TextFieldView {
+ input.borderColor = UIColor.omiseSecondary
+ input.placeholderTextColor = UIColor.omiseSecondary
}
}
}
}
// MARK: Actions
-private extension AtomeFormViewController {
+private extension AtomePaymentInputsFormController {
func hideErrorIfNil(field: Field) {
if let viewModel = viewModel, let input = input(for: field) {
let error = viewModel.error(for: field, validate: input.text)
@@ -298,28 +181,10 @@ private extension AtomeFormViewController {
}
}
}
-
- @objc func hideKeyboard() {
- self.view.endEditing(true)
- }
-
- func startActivityIndicator() {
- activityIndicator.startAnimating()
- scrollContentView.isUserInteractionEnabled = false
- submitButton.isEnabled = false
- view.tintAdjustmentMode = .dimmed
- }
-
- func stopActivityIndicator() {
- activityIndicator.stopAnimating()
- scrollContentView.isUserInteractionEnabled = true
- updateSubmitButtonState()
- view.tintAdjustmentMode = .automatic
- }
}
// MARK: Non-private for Unit-Testing
-extension AtomeFormViewController {
+extension AtomePaymentInputsFormController {
func showAllErrors() {
guard let viewModel = self.viewModel else { return }
@@ -342,19 +207,14 @@ extension AtomeFormViewController {
return context
}
- func updateSubmitButtonState() {
- let isEnabled = viewModel?.isSubmitButtonEnabled(makeViewContext()) ?? false
- self.submitButton.isEnabled = isEnabled
- }
-
func updateError(for field: Field) {
guard let input = input(for: field) else { return }
input.error = viewModel?.error(for: field, validate: input.text)
}
- func input(for field: Field) -> AtomeInputView? {
+ func input(for field: Field) -> TextFieldView? {
for input in inputsStackView.arrangedSubviews {
- guard let input = input as? AtomeInputView, input.identifier == field.rawValue else {
+ guard let input = input as? TextFieldView, input.identifier == field.rawValue else {
continue
}
return input
@@ -362,7 +222,7 @@ extension AtomeFormViewController {
return nil
}
- func input(after input: AtomeInputView) -> AtomeInputView? {
+ func input(after input: TextFieldView) -> TextFieldView? {
guard
let inputField = Field(rawValue: input.identifier),
let viewModel = viewModel,
@@ -381,7 +241,7 @@ extension AtomeFormViewController {
}
// MARK: Input Processing
-private extension AtomeFormViewController {
+private extension AtomePaymentInputsFormController {
func onTextChanged(field: Field) {
updateSubmitButtonState()
hideErrorIfNil(field: field)
@@ -431,13 +291,13 @@ private extension AtomeFormViewController {
}
}
- func onKeboardNextTapped(input: AtomeInputView) {
+ func onKeboardNextTapped(input: TextFieldView) {
if let nextInput = self.input(after: input) {
_ = nextInput.becomeFirstResponder()
}
}
- func onKeyboardDoneTapped(input: AtomeInputView) {
+ func onKeyboardDoneTapped(input: TextFieldView) {
if submitButton.isEnabled {
onSubmitButtonTapped()
} else {
@@ -458,35 +318,3 @@ private extension AtomeFormViewController {
}
}
-
-// MARK: AtomeFormViewControllerInterface
-extension AtomeFormViewController: AtomeFormViewControllerInterface {
- @objc func onSubmitButtonTapped() {
- let currentContext = makeViewContext()
- guard let viewModel = self.viewModel, viewModel.isSubmitButtonEnabled(currentContext) else {
- return
- }
-
- hideKeyboard()
- startActivityIndicator()
- viewModel.onSubmitButtonPressed(currentContext) { [weak self] in
- self?.stopActivityIndicator()
- }
- }
-}
-
-#if SWIFTUI_ENABLED
-import SwiftUI
-
-// MARK: Preview
-struct AtomeFormViewController_Previews: PreviewProvider {
- static var previews: some View {
- UIKitViewControllerPresentable(
- viewController:
- AtomeFormViewController(
- viewModel: AtomeFormViewModelMockup().applyMockupTitles().applyMockupFields()
- )
- )
- }
-}
-#endif
diff --git a/OmiseSDK/AtomeFormViewContext.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormViewContext.swift
similarity index 90%
rename from OmiseSDK/AtomeFormViewContext.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormViewContext.swift
index 17120bd5..982ac369 100644
--- a/OmiseSDK/AtomeFormViewContext.swift
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormViewContext.swift
@@ -1,14 +1,6 @@
-//
-// AtomeFormViewContext.swift
-// OmiseSDKUITests
-//
-// Created by Andrei Solovev on 21/5/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
import UIKit
-struct AtomeFormViewContext {
+struct AtomePaymentFormViewContext {
enum Field: String, CaseIterable {
case name
case email
@@ -37,7 +29,7 @@ struct AtomeFormViewContext {
}
}
-extension AtomeFormViewContext.Field {
+extension AtomePaymentFormViewContext.Field {
var isOptional: Bool {
switch self {
case .name, .email, .street2: return true
diff --git a/OmiseSDK/AtomeFormViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormViewModel.swift
similarity index 55%
rename from OmiseSDK/AtomeFormViewModel.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormViewModel.swift
index 59de01ca..649448ab 100644
--- a/OmiseSDK/AtomeFormViewModel.swift
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormViewModel.swift
@@ -1,14 +1,6 @@
-//
-// AtomeFormViewModel.swift
-// OmiseSDK
-//
-// Created by Andrei Solovev on 31/5/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
import Foundation
-class AtomeFormViewModel: AtomeFormViewModelProtocol, CountryListViewModelProtocol {
+class AtomePaymentFormViewModel: AtomePaymentFormViewModelProtocol, CountryListViewModelProtocol {
var fields: [Field] = [
.name,
.email,
@@ -21,17 +13,21 @@ class AtomeFormViewModel: AtomeFormViewModelProtocol, CountryListViewModelProtoc
.postalCode
]
+ private weak var delegate: SelectSourcePaymentDelegate?
+ private let amount: Int64
+
// MARK: CountryListViewModelProtocol
- lazy var countries: [CountryInfo] = CountryInfo.sortedAll
+ lazy var countries: [Country] = Country.sortedAll
- lazy var selectedCountry: CountryInfo? = CountryInfo.default {
+ var selectedCountry: Country? {
didSet {
if let selectedCountry = selectedCountry {
onSelectCountry(selectedCountry)
}
}
}
- var onSelectCountry: (CountryInfo) -> Void = { _ in }
+
+ var onSelectCountry: (Country) -> Void = { _ in }
var countryListViewModel: CountryListViewModelProtocol { return self }
@@ -40,10 +36,10 @@ class AtomeFormViewModel: AtomeFormViewModelProtocol, CountryListViewModelProtoc
var headerText = "Atome.header.text".localized()
var logoName = "Atome_Big"
- private let flowSession: PaymentCreatorFlowSession?
-
- init(flowSession: PaymentCreatorFlowSession?) {
- self.flowSession = flowSession
+ init(amount: Int64, currentCountry: Country?, delegate: SelectSourcePaymentDelegate?) {
+ self.amount = amount
+ self.delegate = delegate
+ self.selectedCountry = currentCountry
}
func title(for field: Field) -> String? {
@@ -75,41 +71,39 @@ class AtomeFormViewModel: AtomeFormViewModelProtocol, CountryListViewModelProtoc
}
func onSubmitButtonPressed(_ viewContext: ViewContext, onComplete: @escaping () -> Void) {
- guard let flowSession = flowSession else {
+ guard let delegate = delegate else {
onComplete()
return
}
-
- let shippingAddress: PaymentInformation.Atome.ShippingAddress =
- .init(country: viewContext[.country],
- city: viewContext[.city],
- postalCode: viewContext[.postalCode],
- state: viewContext[.state],
- street1: viewContext[.street1],
- street2: viewContext[.street2])
-
- let items: [PaymentInformation.Atome.Item] = [
- .init(
+ let shippingAddress = Source.Payment.Address(
+ countryCode: viewContext[.country],
+ city: viewContext[.city],
+ state: viewContext[.state],
+ street1: viewContext[.street1],
+ street2: viewContext[.street2],
+ postalCode: viewContext[.postalCode]
+ )
+
+ let items: [Source.Payment.Item] = [
+ Source.Payment.Item(
sku: "3427842",
category: "Shoes",
name: "Prada shoes",
quantity: 1,
- amount: flowSession.paymentAmount ?? 0,
+ amount: amount,
itemUri: "omise.co/product/shoes",
imageUri: "omise.co/product/shoes/image",
brand: "Gucci"
)
]
- let atomeData = PaymentInformation.Atome(phoneNumber: viewContext[.phoneNumber],
- name: viewContext[.name],
- email: viewContext[.email],
- shippingAddress: shippingAddress,
- items: items)
-
- flowSession.requestCreateSource(.atome(atomeData)) { _ in
- onComplete()
- }
+ let paymentInformation = Source.Payment.Atome(
+ phoneNumber: viewContext[.phoneNumber],
+ shipping: shippingAddress,
+ billing: nil,
+ items: items
+ )
+ delegate.didSelectSourcePayment(.atome(paymentInformation), completion: onComplete)
}
}
diff --git a/OmiseSDK/AtomeFormViewModelProtocol.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormViewModelProtocol.swift
similarity index 85%
rename from OmiseSDK/AtomeFormViewModelProtocol.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormViewModelProtocol.swift
index 7d5f84b5..11c58b5c 100644
--- a/OmiseSDK/AtomeFormViewModelProtocol.swift
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/AtomePaymentFormViewModelProtocol.swift
@@ -1,15 +1,7 @@
-//
-// AtomeFormViewModelProtocol.swift
-// OmiseSDKUITests
-//
-// Created by Andrei Solovev on 21/5/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
import UIKit
-protocol AtomeFormViewModelProtocol {
- typealias ViewContext = AtomeFormViewContext
+protocol AtomePaymentFormViewModelProtocol {
+ typealias ViewContext = AtomePaymentFormViewContext
typealias Field = ViewContext.Field
var fields: [Field] { get }
var submitButtonTitle: String { get }
@@ -27,7 +19,7 @@ protocol AtomeFormViewModelProtocol {
func contentType(for: Field) -> UITextContentType
}
-extension AtomeFormViewModelProtocol {
+extension AtomePaymentFormViewModelProtocol {
func isSubmitButtonEnabled(_ viewContext: ViewContext) -> Bool {
Field.allCases.allSatisfy {
error(for: $0, validate: viewContext[$0]) == nil
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/PaymentFormController.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/PaymentFormController.swift
new file mode 100644
index 00000000..e0343a64
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/PaymentFormController.swift
@@ -0,0 +1,170 @@
+import Foundation
+import UIKit
+
+class PaymentFormController: UIViewController {
+ var onSubmitButtonTappedClosure: () -> Void = { }
+
+ @ProxyProperty(\PaymentFormController.headerTextLabel.text)
+ var details: String?
+ @ProxyProperty(\PaymentFormController.logoImageView.image)
+ var logoImage: UIImage?
+
+ var style = DefaultPaymentFormStyle()
+
+ var isSubmitButtonEnabled = false {
+ didSet {
+ submitButton.isEnabled = isSubmitButtonEnabled
+ }
+ }
+
+ // MARK: UI components of the form
+ lazy var logoImageView: UIImageView = {
+ let imageView = UIImageView()
+ imageView.contentMode = .scaleAspectFit
+ return imageView
+ }()
+
+ lazy var headerTextLabel: UILabel = {
+ let label = UILabel()
+ label.numberOfLines = 0
+ label.textAlignment = .center
+ label.textColor = style.textColor
+ label.font = .preferredFont(forTextStyle: .body)
+ return label
+ }()
+
+ lazy var submitButton: UIButton = {
+ let button = MainActionButton()
+ button.translatesAutoresizingMaskIntoConstraints = false
+ button.heightAnchor.constraint(equalToConstant: style.buttonHeight).isActive = true
+ button.titleLabel?.adjustsFontForContentSizeCategory = true
+
+ button.defaultBackgroundColor = style.buttonBackgroundColor
+ button.disabledBackgroundColor = style.buttonDisabledBackgroundColor
+ button.cornerRadius(style.buttonCornerRadius)
+ return button
+ }()
+
+ lazy var activityIndicator: UIActivityIndicatorView = {
+ let indicator = UIActivityIndicatorView(style: .white)
+ indicator.color = style.activityIndicatorColor
+ indicator.hidesWhenStopped = true
+ return indicator
+ }()
+
+ lazy var scrollView: UIScrollView = {
+ let scrollView = UIScrollView()
+ scrollView.showsHorizontalScrollIndicator = false
+ scrollView.adjustContentInsetOnKeyboardAppear()
+ return scrollView
+ }()
+
+ lazy var scrollContentView: UIView = {
+ let view = UIView()
+ return view
+ }()
+
+ lazy var verticalContainerStack: UIStackView = {
+ let verticalContainerStack = UIStackView()
+ verticalContainerStack.axis = .vertical
+ verticalContainerStack.distribution = .equalSpacing
+ verticalContainerStack.alignment = .fill
+ verticalContainerStack.spacing = style.verticalContainerStackSpacer
+ return verticalContainerStack
+ }()
+
+ lazy var inputsStackView: UIStackView = {
+ let verticalContainerStack = UIStackView()
+ verticalContainerStack.axis = .vertical
+ verticalContainerStack.distribution = .equalSpacing
+ verticalContainerStack.alignment = .fill
+ verticalContainerStack.spacing = style.verticalInputsStackSpacer
+ return verticalContainerStack
+ }()
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+ setupViews()
+ }
+
+ func updateSubmitButtonState() {
+ self.submitButton.isEnabled = false
+ }
+}
+
+// MARK: - To override by child or add delegate or ViewModel?
+extension PaymentFormController {
+ func setupViews() {
+ view.backgroundColor = .background
+
+ if #available(iOS 11, *) {
+ navigationItem.largeTitleDisplayMode = .never
+ }
+ view.addSubviewAndFit(scrollView)
+ scrollView.addSubviewAndFit(scrollContentView)
+ scrollContentView.addSubviewAndFit(verticalContainerStack, horizontal: style.containerStackSideSpacer)
+ NSLayoutConstraint.activate([
+ scrollContentView.widthAnchor.constraint(equalTo: view.widthAnchor)
+ ])
+
+ arrangeSubviews()
+
+ navigationItem.titleView = activityIndicator
+ view.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(hideKeyboard)))
+ }
+
+ func arrangeSubviews() {
+ verticalContainerStack.addArrangedSubview(SpacerView(vertical: style.verticalContainerStackSpacer))
+ verticalContainerStack.addArrangedSubview(logoImageView)
+ verticalContainerStack.addArrangedSubview(headerTextLabel)
+ verticalContainerStack.addArrangedSubview(SpacerView(vertical: style.verticalContainerStackSpacer))
+ verticalContainerStack.addArrangedSubview(inputsStackView)
+ verticalContainerStack.addArrangedSubview(submitButton)
+ }
+
+ func setupSubmitButton(title: String, color: UIColor? = nil) {
+ submitButton.setTitle(title, for: UIControl.State.normal)
+ submitButton.setTitleColor(color ?? style.buttonTextColor, for: .normal)
+ submitButton.addTarget(self, action: #selector(onSubmitButtonTapped), for: .touchUpInside)
+ }
+
+ func removeAllInputs() {
+ for view in inputsStackView.arrangedSubviews {
+ inputsStackView.removeArrangedSubview(view)
+ }
+ }
+}
+
+// MARK: Activities
+extension PaymentFormController {
+ @objc func hideKeyboard() {
+ self.view.endEditing(true)
+ }
+
+ func startActivityIndicator() {
+ activityIndicator.startAnimating()
+ scrollContentView.isUserInteractionEnabled = false
+ submitButton.isEnabled = false
+ view.tintAdjustmentMode = .dimmed
+ }
+
+ func stopActivityIndicator() {
+ activityIndicator.stopAnimating()
+ scrollContentView.isUserInteractionEnabled = true
+ updateSubmitButtonState()
+ view.tintAdjustmentMode = .automatic
+ }
+}
+
+// MARK: User Interaction
+extension PaymentFormController {
+ @objc func onSubmitButtonTapped() {
+ guard isSubmitButtonEnabled else {
+ return
+ }
+
+ hideKeyboard()
+ startActivityIndicator()
+ onSubmitButtonTappedClosure()
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/PaymentFormStyle.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/PaymentFormStyle.swift
new file mode 100644
index 00000000..82f10158
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/PaymentFormStyle.swift
@@ -0,0 +1,85 @@
+import Foundation
+import UIKit
+
+/// Payment Form Base styles that could be extended by PaymentFormController's subclasses to add additional UI elements styling
+/// by adding extentions to the protocol
+protocol PaymentFormStyle {
+ var buttonBackgroundColor: UIColor { get set }
+ var buttonDisabledBackgroundColor: UIColor { get set }
+ var buttonTextColor: UIColor { get set }
+ var buttonHeight: CGFloat { get set }
+ var buttonCornerRadius: CGFloat { get set }
+
+ var textColor: UIColor { get set }
+ var sectionTitleColor: UIColor { get set }
+ var activityIndicatorColor: UIColor { get set }
+
+ var containerStackSideSpacer: CGFloat { get set }
+ var verticalContainerStackSpacer: CGFloat { get set }
+ var verticalInputsStackSpacer: CGFloat { get set }
+}
+
+struct DefaultPaymentFormStyle: PaymentFormStyle {}
+
+// swiftlint:disable unused_setter_value
+extension PaymentFormStyle {
+ static func create() -> PaymentFormStyle {
+ return DefaultPaymentFormStyle()
+ }
+
+ var buttonBackgroundColor: UIColor {
+ get { return UIColor(0x1A56F0) }
+ set {}
+ }
+
+ var buttonDisabledBackgroundColor: UIColor {
+ get { return UIColor(0xE4E7ED) }
+ set {}
+ }
+
+ var buttonTextColor: UIColor {
+ get { return UIColor(0xFFFFFF) }
+ set {}
+ }
+
+ var buttonHeight: CGFloat {
+ get { return 48 }
+ set {}
+ }
+
+ var buttonCornerRadius: CGFloat {
+ get { return 4 }
+ set {}
+ }
+
+ var textColor: UIColor {
+ get { return .omisePrimary }
+ set {}
+ }
+
+ var sectionTitleColor: UIColor {
+ get { return UIColor(0x9B9B9B) }
+ set {}
+ }
+
+ var activityIndicatorColor: UIColor {
+ get { return .omisePrimary }
+ set {}
+ }
+
+ var containerStackSideSpacer: CGFloat {
+ get { return CGFloat(18) }
+ set {}
+ }
+
+ var verticalContainerStackSpacer: CGFloat {
+ get { return CGFloat(12) }
+ set {}
+ }
+
+ var verticalInputsStackSpacer: CGFloat {
+ get { return CGFloat(10) }
+ set {}
+ }
+}
+// swiftlint:enable unused_setter_value
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/To Be Implemented/PaymentInputProtocol.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/To Be Implemented/PaymentInputProtocol.swift
new file mode 100644
index 00000000..cb68c15c
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/To Be Implemented/PaymentInputProtocol.swift
@@ -0,0 +1,25 @@
+import Foundation
+import UIKit
+
+// protocol PaymenFormtInputProtocol {
+// var next: PaymenFormtInputProtocol? { get set }
+// var section: String? { get } // optional
+// var title: String { get }
+// var error: String { get }
+// var isError: Bool { get }
+//
+// var contentType: UITextContentType? { get } // optional
+// var capitalization: UITextAutocapitalizationType { get } // optional
+// var keyboardType: UIKeyboardType { get } // default asciiCapable
+// var validatorRegex: String? { get } // optional
+// var isOptional: Bool { get } // by default false
+// }
+//
+// extension PaymenFormtInputProtocol {
+// var section: String? { nil }
+// var contentType: UITextContentType? { nil }
+// var capitalization: UITextAutocapitalizationType { .none }
+// var keyboardType: UIKeyboardType { .asciiCapable }
+// var validatorRegex: String? { nil }
+// var isOptional: Bool { false }
+// }
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/To Be Implemented/PaymentInputsFormController.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/To Be Implemented/PaymentInputsFormController.swift
new file mode 100644
index 00000000..833463a5
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/Atome Payment/Base/To Be Implemented/PaymentInputsFormController.swift
@@ -0,0 +1,22 @@
+import UIKit
+
+/*
+class PaymentInputsFormController: PaymentFormController {
+
+ private var fields: [Field: String] = [:]
+
+ init(fields: [Field: String] = [:]) {
+ self.fields = fields
+ super.init(nibName: nil, bundle: nil)
+ }
+
+ required init?(coder: NSCoder) {
+ super.init(coder: coder)
+ }
+
+ subscript(field: Field) -> String {
+ get { fields[field] ?? "" }
+ set { fields[field] = newValue }
+ }
+}
+*/
diff --git a/OmiseSDK/EContextInformationInputViewController.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/EContext/EContextPaymentFormController.swift
similarity index 85%
rename from OmiseSDK/EContextInformationInputViewController.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/EContext/EContextPaymentFormController.swift
index ce0d5efe..8029a229 100644
--- a/OmiseSDK/EContextInformationInputViewController.swift
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/EContext/EContextPaymentFormController.swift
@@ -1,7 +1,8 @@
import UIKit
-class EContextInformationInputViewController: UIViewController, PaymentSourceChooser, PaymentChooserUI, PaymentFormUIController {
- var flowSession: PaymentCreatorFlowSession?
+class EContextPaymentFormController: UIViewController, PaymentFormUIController {
+ weak var delegate: SelectSourcePaymentDelegate?
+
var client: Client?
var paymentAmount: Int64?
var paymentCurrency: Currency?
@@ -12,18 +13,6 @@ class EContextInformationInputViewController: UIViewController, PaymentSourceCho
return formFields.allSatisfy { $0.isValid }
}
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
@IBOutlet var contentView: UIScrollView!
@IBOutlet private var fullNameTextField: OmiseTextField!
@@ -31,37 +20,42 @@ class EContextInformationInputViewController: UIViewController, PaymentSourceCho
@IBOutlet private var phoneNumberTextField: OmiseTextField!
@IBOutlet private var submitButton: MainActionButton!
@IBOutlet private var requestingIndicatorView: UIActivityIndicatorView!
-
+
+ @IBOutlet private var fullNameLabel: UILabel!
+ @IBOutlet private var emailLabel: UILabel!
+ @IBOutlet private var phoneNumberLabel: UILabel!
+
@IBOutlet private var fullNameErrorLabel: UILabel!
@IBOutlet private var emailErrorLabel: UILabel!
@IBOutlet private var phoneNumberErrorLabel: UILabel!
- @IBOutlet var formLabels: [UILabel]!
- @IBOutlet var formFields: [OmiseTextField]!
- @IBOutlet var errorLabels: [UILabel]!
+ lazy var formLabels: [UILabel]! = {
+ [fullNameLabel, emailLabel, phoneNumberLabel]
+ }()
+
+ lazy var formFields: [OmiseTextField]! = {
+ [fullNameTextField, emailTextField, phoneNumberTextField]
+ }()
+
@IBOutlet var formFieldsAccessoryView: UIToolbar!
@IBOutlet var gotoPreviousFieldBarButtonItem: UIBarButtonItem!
@IBOutlet var gotoNextFieldBarButtonItem: UIBarButtonItem!
@IBOutlet var doneEditingBarButtonItem: UIBarButtonItem!
- // need to refactor loadView, removing super results in crash
- // swiftlint:disable:next prohibited_super_call
- override func loadView() {
- super.loadView()
-
+ override func viewDidLoad() {
+ super.viewDidLoad()
+
view.backgroundColor = .background
formFieldsAccessoryView.barTintColor = .formAccessoryBarTintColor
-
+
submitButton.defaultBackgroundColor = .omise
submitButton.disabledBackgroundColor = .line
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
-
- applyPrimaryColor()
- applySecondaryColor()
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+
+ if #available(iOSApplicationExtension 11.0, *) {
+ navigationItem.largeTitleDisplayMode = .never
+ }
+
+ navigationItem.backBarButtonItem = .empty
formFields.forEach {
$0.inputAccessoryView = formFieldsAccessoryView
@@ -96,8 +90,23 @@ class EContextInformationInputViewController: UIViewController, PaymentSourceCho
fullNameTextField.validator = try? NSRegularExpression(pattern: "\\A[\\w\\s]{1,10}\\s?\\z", options: [])
emailTextField.validator = try? NSRegularExpression(pattern: "\\A[\\w\\-\\.]+@[\\w\\-\\.]+\\s?\\z", options: [])
phoneNumberTextField.validator = try? NSRegularExpression(pattern: "\\d{10,11}\\s?", options: [])
+
+ setupTextFieldHandlers()
}
-
+
+ private func setupTextFieldHandlers() {
+ self.formFields.forEach { field in
+ setupTextField(field)
+ }
+ }
+
+ private func setupTextField(_ field: OmiseTextField) {
+ field.addTarget(self, action: #selector(gotoNextField), for: .editingDidEndOnExit)
+ field.addTarget(self, action: #selector(validateFieldData), for: .editingChanged)
+ field.addTarget(self, action: #selector(updateInputAccessoryViewFor), for: .editingDidBegin)
+ field.addTarget(self, action: #selector(validateTextFieldDataOf), for: .editingDidEnd)
+ }
+
override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
@@ -120,12 +129,14 @@ class EContextInformationInputViewController: UIViewController, PaymentSourceCho
return
}
- let eContextInformation = PaymentInformation.EContext(name: fullname, email: email, phoneNumber: phoneNumber)
+ let eContextInformation = Source.Payment.EContext(name: fullname, email: email, phoneNumber: phoneNumber)
requestingIndicatorView.startAnimating()
view.isUserInteractionEnabled = false
view.tintAdjustmentMode = .dimmed
submitButton.isEnabled = false
- flowSession?.requestCreateSource(PaymentInformation.eContext(eContextInformation)) { _ in
+ let payment = Source.Payment.eContext(eContextInformation)
+ delegate?.didSelectSourcePayment(payment) { [weak self] in
+ guard let self = self else { return }
self.requestingIndicatorView.stopAnimating()
self.view.isUserInteractionEnabled = true
self.view.tintAdjustmentMode = .automatic
@@ -170,7 +181,7 @@ class EContextInformationInputViewController: UIViewController, PaymentSourceCho
options: [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState, .layoutSubviews]) {
self.validateField(sender)
}
- sender.borderColor = currentSecondaryColor
+ sender.borderColor = UIColor.omiseSecondary
}
@objc func keyboardWillChangeFrame(_ notification: NSNotification) {
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/EContext/EContextPaymentFormController.xib b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/EContext/EContextPaymentFormController.xib
new file mode 100644
index 00000000..e5ba3a90
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/EContext/EContextPaymentFormController.xib
@@ -0,0 +1,262 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OmiseSDK/FPXFormViewController.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/FPX/FPXPaymentFormController.swift
similarity index 74%
rename from OmiseSDK/FPXFormViewController.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/FPX/FPXPaymentFormController.swift
index d9af02f7..51919d9d 100644
--- a/OmiseSDK/FPXFormViewController.swift
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/FPX/FPXPaymentFormController.swift
@@ -1,10 +1,15 @@
import UIKit
-class FPXFormViewController: UIViewController, PaymentSourceChooser, PaymentChooserUI, PaymentFormUIController {
+protocol FPXPaymentFormControllerDelegate: AnyObject {
+ func fpxDidCompleteWith(email: String?, completion: @escaping () -> Void)
+}
+
+class FPXPaymentFormController: UIViewController, PaymentFormUIController {
+
+ weak var delegate: FPXPaymentFormControllerDelegate?
private let destinationSegue: String = "GoToFPXBankChooserSegue"
- var flowSession: PaymentCreatorFlowSession?
- var showingValues: [Capability.Backend.Bank]?
+ var showingValues: [Capability.PaymentMethod.Bank]?
private var emailValue: String?
private var client: Client?
@@ -17,54 +22,47 @@ class FPXFormViewController: UIViewController, PaymentSourceChooser, PaymentChoo
return emailTextField.text?.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty ?? true
}
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
var currentEditingTextField: OmiseTextField?
@IBOutlet var contentView: UIScrollView!
+ @IBOutlet private var emailLabel: UILabel!
+ @IBOutlet private var emailErrorLabel: UILabel!
@IBOutlet private var emailTextField: OmiseTextField!
@IBOutlet private var submitButton: MainActionButton!
@IBOutlet private var requestingIndicatorView: UIActivityIndicatorView!
- @IBOutlet private var errorLabel: UILabel!
+ lazy var formLabels: [UILabel]! = {
+ [emailLabel]
+ }()
+
+ lazy var formFields: [OmiseTextField]! = {
+ [emailTextField]
+ }()
- @IBOutlet var formLabels: [UILabel]!
- @IBOutlet var formFields: [OmiseTextField]!
+ lazy var errorLabels: [UILabel] = {
+ [emailErrorLabel]
+ }()
@IBOutlet var formFieldsAccessoryView: UIToolbar!
@IBOutlet var gotoPreviousFieldBarButtonItem: UIBarButtonItem!
@IBOutlet var gotoNextFieldBarButtonItem: UIBarButtonItem!
@IBOutlet var doneEditingBarButtonItem: UIBarButtonItem!
- // need to refactor loadView, removing super results in crash
- // swiftlint:disable:next prohibited_super_call
- override func loadView() {
- super.loadView()
-
+ override func viewDidLoad() {
+ super.viewDidLoad()
+
view.backgroundColor = .background
formFieldsAccessoryView.barTintColor = .formAccessoryBarTintColor
submitButton.defaultBackgroundColor = .omise
submitButton.disabledBackgroundColor = .line
- }
- override func viewDidLoad() {
- super.viewDidLoad()
+ if #available(iOSApplicationExtension 11.0, *) {
+ navigationItem.largeTitleDisplayMode = .never
+ }
- applyPrimaryColor()
- applySecondaryColor()
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+ navigationItem.backBarButtonItem = .empty
formFields.forEach {
$0.inputAccessoryView = formFieldsAccessoryView
@@ -100,6 +98,19 @@ class FPXFormViewController: UIViewController, PaymentSourceChooser, PaymentChoo
// check for 1st time
validateFieldData(emailTextField)
+ setupTextFieldHandlers()
+ }
+
+ private func setupTextFieldHandlers() {
+ self.formFields.forEach { field in
+ setupTextField(field)
+ }
+ }
+
+ private func setupTextField(_ field: OmiseTextField) {
+ field.addTarget(self, action: #selector(validateFieldData), for: .editingChanged)
+ field.addTarget(self, action: #selector(updateInputAccessoryViewFor), for: .editingDidBegin)
+ field.addTarget(self, action: #selector(validateTextFieldDataOf), for: .editingDidEnd)
}
override func viewWillLayoutSubviews() {
@@ -119,19 +130,7 @@ class FPXFormViewController: UIViewController, PaymentSourceChooser, PaymentChoo
@IBAction private func submitForm(_ sender: AnyObject) {
emailValue = emailTextField.text?.trimmingCharacters(in: CharacterSet.whitespaces)
-
- performSegue(withIdentifier: destinationSegue, sender: sender)
- }
-
- override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
- if segue.identifier == destinationSegue,
- let fpxBankChooserViewController = segue.destination as? FPXBankChooserViewController {
- fpxBankChooserViewController.email = emailValue
- fpxBankChooserViewController.showingValues = showingValues ?? []
- fpxBankChooserViewController.flowSession = self.flowSession
- fpxBankChooserViewController.preferredPrimaryColor = self.preferredPrimaryColor
- fpxBankChooserViewController.preferredSecondaryColor = self.preferredSecondaryColor
- }
+ delegate?.fpxDidCompleteWith(email: emailValue) {}
}
@IBAction private func validateFieldData(_ textField: OmiseTextField) {
@@ -145,7 +144,7 @@ class FPXFormViewController: UIViewController, PaymentSourceChooser, PaymentChoo
options: [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState, .layoutSubviews]) {
self.validateField(sender)
}
- sender.borderColor = currentSecondaryColor
+ sender.borderColor = UIColor.omiseSecondary
}
@IBAction private func updateInputAccessoryViewFor(_ sender: OmiseTextField) {
@@ -153,7 +152,7 @@ class FPXFormViewController: UIViewController, PaymentSourceChooser, PaymentChoo
UIView.animate(withDuration: duration,
delay: 0.0,
options: [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState, .layoutSubviews]) {
- self.errorLabel.alpha = 0.0
+ self.emailErrorLabel.alpha = 0.0
}
updateInputAccessoryViewWithFirstResponder(sender)
@@ -167,14 +166,14 @@ class FPXFormViewController: UIViewController, PaymentSourceChooser, PaymentChoo
private func validateField(_ textField: OmiseTextField) {
do {
try textField.validate()
- errorLabel.alpha = 0.0
+ emailErrorLabel.alpha = 0.0
} catch {
switch error {
case OmiseTextFieldValidationError.emptyText:
- errorLabel.text = "-" // We need to set the error label some string in order to have it retains its height
+ emailErrorLabel.text = "-" // We need to set the error label some string in order to have it retains its height
case OmiseTextFieldValidationError.invalidData:
- errorLabel.text = NSLocalizedString(
+ emailErrorLabel.text = NSLocalizedString(
"payment-creator.error.api.bad_request.invalid-email.message",
tableName: "Error",
bundle: .omiseSDK,
@@ -183,9 +182,9 @@ class FPXFormViewController: UIViewController, PaymentSourceChooser, PaymentChoo
)
default:
- errorLabel.text = error.localizedDescription
+ emailErrorLabel.text = error.localizedDescription
}
- errorLabel.alpha = errorLabel.text != "-" ? 1.0 : 0.0
+ emailErrorLabel.alpha = emailErrorLabel.text != "-" ? 1.0 : 0.0
}
}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/FPX/FPXPaymentFormController.xib b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/FPX/FPXPaymentFormController.xib
new file mode 100644
index 00000000..e6868a79
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/FPX/FPXPaymentFormController.xib
@@ -0,0 +1,175 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OmiseSDK/TrueMoneyFormViewController.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/TrueMoneyWallet/TrueMoneyPaymentFormController.swift
similarity index 84%
rename from OmiseSDK/TrueMoneyFormViewController.swift
rename to OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/TrueMoneyWallet/TrueMoneyPaymentFormController.swift
index fca40992..8525c268 100644
--- a/OmiseSDK/TrueMoneyFormViewController.swift
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/TrueMoneyWallet/TrueMoneyPaymentFormController.swift
@@ -1,63 +1,52 @@
import UIKit
-class TrueMoneyFormViewController: UIViewController, PaymentSourceChooser, PaymentChooserUI, PaymentFormUIController {
-
- var flowSession: PaymentCreatorFlowSession?
-
+class TrueMoneyPaymentFormController: UIViewController, PaymentFormUIController {
+ weak var delegate: SelectSourcePaymentDelegate?
+
private var client: Client?
private var isInputDataValid: Bool {
return formFields.allSatisfy { $0.isValid }
}
-
- @IBInspectable var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
-
- @IBInspectable var preferredSecondaryColor: UIColor? {
- didSet {
- applySecondaryColor()
- }
- }
-
+
var currentEditingTextField: OmiseTextField?
@IBOutlet var contentView: UIScrollView!
+ @IBOutlet private var phoneNumberLabel: UILabel!
@IBOutlet private var phoneNumberTextField: OmiseTextField!
@IBOutlet private var submitButton: MainActionButton!
@IBOutlet private var requestingIndicatorView: UIActivityIndicatorView!
@IBOutlet private var errorLabel: UILabel!
-
- @IBOutlet var formLabels: [UILabel]!
- @IBOutlet var formFields: [OmiseTextField]!
-
+
+ lazy var formLabels: [UILabel]! = {
+ [phoneNumberLabel]
+ }()
+
+ lazy var formFields: [OmiseTextField]! = {
+ [phoneNumberTextField]
+ }()
+
@IBOutlet var formFieldsAccessoryView: UIToolbar!
@IBOutlet var gotoPreviousFieldBarButtonItem: UIBarButtonItem!
@IBOutlet var gotoNextFieldBarButtonItem: UIBarButtonItem!
@IBOutlet var doneEditingBarButtonItem: UIBarButtonItem!
- // need to refactor loadView, removing super results in crash
- // swiftlint:disable:next prohibited_super_call
- override func loadView() {
- super.loadView()
-
+ override func viewDidLoad() {
+ super.viewDidLoad()
+
view.backgroundColor = .background
formFieldsAccessoryView.barTintColor = .formAccessoryBarTintColor
-
+
submitButton.defaultBackgroundColor = .omise
submitButton.disabledBackgroundColor = .line
- }
-
- override func viewDidLoad() {
- super.viewDidLoad()
- applyPrimaryColor()
- applySecondaryColor()
- navigationItem.backBarButtonItem = UIBarButtonItem(title: "", style: .plain, target: nil, action: nil)
+ if #available(iOSApplicationExtension 11.0, *) {
+ navigationItem.largeTitleDisplayMode = .never
+ }
+
+ navigationItem.backBarButtonItem = .empty
formFields.forEach {
$0.inputAccessoryView = formFieldsAccessoryView
@@ -90,8 +79,21 @@ class TrueMoneyFormViewController: UIViewController, PaymentSourceChooser, Payme
)
phoneNumberTextField.validator = try? NSRegularExpression(pattern: "\\d{10,11}\\s?", options: [])
+ setupTextFieldHandlers()
}
-
+
+ private func setupTextFieldHandlers() {
+ self.formFields.forEach { field in
+ setupTextField(field)
+ }
+ }
+
+ private func setupTextField(_ field: OmiseTextField) {
+ field.addTarget(self, action: #selector(validateFieldData), for: .editingChanged)
+ field.addTarget(self, action: #selector(updateInputAccessoryViewFor), for: .editingDidBegin)
+ field.addTarget(self, action: #selector(validateTextFieldDataOf), for: .editingDidEnd)
+ }
+
override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
@@ -112,12 +114,13 @@ class TrueMoneyFormViewController: UIViewController, PaymentSourceChooser, Payme
return
}
- let trueMoneyInformation = PaymentInformation.TrueMoney(phoneNumber: phoneNumber)
+ let paymentInformation = Source.Payment.TrueMoneyWallet(phoneNumber: phoneNumber)
requestingIndicatorView.startAnimating()
view.isUserInteractionEnabled = false
view.tintAdjustmentMode = .dimmed
submitButton.isEnabled = false
- flowSession?.requestCreateSource(.truemoney(trueMoneyInformation)) { _ in
+ delegate?.didSelectSourcePayment(.trueMoneyWallet(paymentInformation)) { [weak self] in
+ guard let self = self else { return }
self.requestingIndicatorView.stopAnimating()
self.view.isUserInteractionEnabled = true
self.view.tintAdjustmentMode = .automatic
@@ -136,7 +139,7 @@ class TrueMoneyFormViewController: UIViewController, PaymentSourceChooser, Payme
options: [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState, .layoutSubviews]) {
self.validateField(sender)
}
- sender.borderColor = currentSecondaryColor
+ sender.borderColor = UIColor.omiseSecondary
}
@IBAction private func updateInputAccessoryViewFor(_ sender: OmiseTextField) {
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/TrueMoneyWallet/TrueMoneyPaymentFormController.xib b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/TrueMoneyWallet/TrueMoneyPaymentFormController.xib
new file mode 100644
index 00000000..2932fdbc
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Other Payments/TrueMoneyWallet/TrueMoneyPaymentFormController.xib
@@ -0,0 +1,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/PaymentMethod.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/PaymentMethod.swift
new file mode 100644
index 00000000..9a3e5eb8
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/PaymentMethod.swift
@@ -0,0 +1,165 @@
+import Foundation
+import UIKit
+
+enum PaymentMethod: CaseIterable, Equatable, Hashable {
+ case creditCard
+ case installment
+ case internetBanking
+ case mobileBanking
+ case eContextConbini
+ case eContextNetBanking
+ case eContextPayEasy
+ case sourceType(_ type: SourceType)
+
+ var sourceType: SourceType? {
+ switch self {
+ case .sourceType(let sourceType):
+ return sourceType
+ default:
+ return nil
+ }
+ }
+
+ static var allCases: [PaymentMethod] = from(sourceTypes: SourceType.allCases)
+
+ /// List of payment methods to be placed above other payment methods in a given order
+ static let topList: [PaymentMethod] = [
+ .creditCard,
+ .sourceType(.payNow),
+ .sourceType(.promptPay),
+ .sourceType(.trueMoneyWallet),
+ .sourceType(.trueMoneyJumpApp),
+ .mobileBanking,
+ .internetBanking,
+ .sourceType(.alipay),
+ .installment,
+ .sourceType(.ocbcDigital),
+ .sourceType(.rabbitLinepay),
+ .sourceType(.shopeePay),
+ .sourceType(.shopeePayJumpApp),
+ .sourceType(.alipayCN),
+ .sourceType(.alipayHK)
+ ]
+
+ var requiresAdditionalDetails: Bool {
+ switch self {
+ case .creditCard,
+ .installment,
+ .internetBanking,
+ .mobileBanking,
+ .eContextConbini,
+ .eContextPayEasy,
+ .eContextNetBanking,
+ .sourceType(.atome),
+ .sourceType(.barcodeAlipay),
+ .sourceType(.duitNowOBW),
+ .sourceType(.fpx),
+ .sourceType(.trueMoneyWallet):
+ return true
+ default:
+ return false
+ }
+ }
+}
+
+extension PaymentMethod {
+ /// Creates a list of Payment Options with given list of Source Type
+ static func from(sourceTypes: [SourceType]) -> [Self] {
+ var list = Set()
+ for sourceType in sourceTypes {
+ paymentMethods(for: sourceType).forEach {
+ list.insert($0)
+ }
+ }
+ return Array(list)
+ }
+
+ static func paymentMethods(for sourceType: SourceType) -> [PaymentMethod] {
+ switch sourceType {
+ case _ where sourceType.isInstallment:
+ return [.installment]
+ case _ where sourceType.isInternetBanking:
+ return [.internetBanking]
+ case _ where sourceType.isMobileBanking:
+ return [.mobileBanking]
+ case .eContext:
+ return [.eContextConbini, .eContextNetBanking, .eContextPayEasy]
+ case .barcodeAlipay:
+ return []
+ default:
+ return [.sourceType(sourceType)]
+ }
+ }
+
+ /// List of payment methods in localized alphabetical order
+ static func alphabetical(from: [PaymentMethod]) -> [PaymentMethod] {
+ from.sorted {
+ $0.description.localizedCaseInsensitiveCompare($1.description) == .orderedAscending
+ }
+ }
+
+ static func topListed(from: [PaymentMethod]) -> [PaymentMethod] {
+ var source = from
+ var sorted = [PaymentMethod]()
+ for top in topList where source.contains(top) {
+ sorted.append(top)
+ source.removeAll { $0 == top }
+ }
+ sorted.append(contentsOf: source)
+ return sorted
+ }
+
+ /// Sorted list of all payment methods
+ static func sorted(from: [PaymentMethod]) -> [PaymentMethod] {
+ topListed(from: alphabetical(from: from))
+ }
+
+ /// Generates Payment Methods with given Capability
+ static func createPaymentMethods(with capability: Capability) -> [PaymentMethod] {
+ let sourceTypes = capability.paymentMethods.compactMap {
+ SourceType(rawValue: $0.name)
+ }
+
+ let showsCreditCard = capability.cardPaymentMethod != nil
+ let paymentMethods = createPaymentMethods(from: sourceTypes, showsCreditCard: showsCreditCard)
+ return paymentMethods
+ }
+
+ /// Generates PaymenOption list with given list of SourceType and allowedCardPayment option
+ static func createPaymentMethods(from sourceTypes: [SourceType], showsCreditCard: Bool) -> [PaymentMethod] {
+ var list = PaymentMethod.from(sourceTypes: sourceTypes)
+
+ if showsCreditCard {
+ list.append(.creditCard)
+ }
+
+ // Remove .trueMoneyWallet if .trueMoneyJumpApp is present
+ if list.contains(.sourceType(.trueMoneyJumpApp)) {
+ list.removeAll { $0 == .sourceType(.trueMoneyWallet) }
+ }
+
+ // Remove .shopeePay if .shopeePayJumpApp is present
+ if list.contains(.sourceType(.shopeePayJumpApp)) {
+ list.removeAll { $0 == .sourceType(.shopeePay) }
+ }
+
+ // Sort and filter
+ list = PaymentMethod.sorted(from: list)
+ return list
+ }
+}
+
+extension PaymentMethod {
+ static func createViewContexts(from paymentMethods: [PaymentMethod]) -> [TableCellContext] {
+ let viewContexts = paymentMethods.map {
+ TableCellContext(
+ title: $0.localizedTitle,
+ subtitle: $0.localizedSubtitle,
+ icon: UIImage(omise: $0.iconName),
+ accessoryIcon: UIImage($0.accessoryIcon)
+ )
+ }
+
+ return viewContexts
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment Delegates/SelectPaymentMethodDelegate.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment Delegates/SelectPaymentMethodDelegate.swift
new file mode 100644
index 00000000..83106302
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment Delegates/SelectPaymentMethodDelegate.swift
@@ -0,0 +1,6 @@
+import Foundation
+
+protocol SelectPaymentMethodDelegate: AnyObject {
+ func didSelectPaymentMethod(_ paymentMethod: PaymentMethod, completion: @escaping () -> Void)
+ func didCancelPayment()
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment Delegates/SelectSourcePaymentDelegate.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment Delegates/SelectSourcePaymentDelegate.swift
new file mode 100644
index 00000000..c064a217
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment Delegates/SelectSourcePaymentDelegate.swift
@@ -0,0 +1,5 @@
+import Foundation
+
+protocol SelectSourcePaymentDelegate: AnyObject {
+ func didSelectSourcePayment(_ payment: Source.Payment, completion: @escaping () -> Void)
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment Delegates/SelectSourceTypeDelegate.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment Delegates/SelectSourceTypeDelegate.swift
new file mode 100644
index 00000000..a32cd64c
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment Delegates/SelectSourceTypeDelegate.swift
@@ -0,0 +1,5 @@
+import Foundation
+
+protocol SelectSourceTypeDelegate: AnyObject {
+ func didSelectSourceType(_ sourceType: SourceType, completion: @escaping () -> Void)
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectDuitNowOBWBankViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectDuitNowOBWBankViewModel.swift
new file mode 100644
index 00000000..1fc5c7ef
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectDuitNowOBWBankViewModel.swift
@@ -0,0 +1,55 @@
+import UIKit
+
+class SelectDuitNowOBWBankViewModel {
+ private weak var delegate: SelectSourcePaymentDelegate?
+
+ private var viewOnDataReloadHandler: () -> Void = { } {
+ didSet {
+ self.viewOnDataReloadHandler()
+ }
+ }
+
+ private var banks: [Source.Payment.DuitNowOBW.Bank] = [] {
+ didSet {
+ viewOnDataReloadHandler()
+ }
+ }
+
+ init(banks: [Source.Payment.DuitNowOBW.Bank], delegate: SelectSourcePaymentDelegate) {
+ self.banks = banks
+ self.delegate = delegate
+ }
+}
+
+extension SelectDuitNowOBWBankViewModel: SelectPaymentPresentableProtocol {
+ func viewOnDataReloadHandler(_ handler: @escaping () -> Void) {
+ self.viewOnDataReloadHandler = handler
+ }
+
+ var numberOfViewContexts: Int {
+ banks.count
+ }
+
+ var viewNavigationTitle: String {
+ SourceType.duitNowOBW.localizedTitle
+ }
+
+ func viewContext(at index: Int) -> TableCellContext? {
+ guard let bank = banks.at(index) else { return nil }
+ return TableCellContext(
+ title: bank.localizedTitle,
+ icon: UIImage(omise: bank.iconName) ?? UIImage(omise: "FPX/unknown"),
+ accessoryIcon: UIImage(bank.accessoryIcon)
+ )
+ }
+
+ func viewDidSelectCell(at index: Int, completion: @escaping () -> Void) {
+ guard let bank = banks.at(index) else { return }
+ let payment: Source.Payment = .duitNowOBW(.init(bank: bank))
+ delegate?.didSelectSourcePayment(payment, completion: completion)
+ }
+
+ func viewShouldAnimateSelectedCell(at index: Int) -> Bool {
+ return true
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectFPXBankViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectFPXBankViewModel.swift
new file mode 100644
index 00000000..3b8e8ec6
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectFPXBankViewModel.swift
@@ -0,0 +1,59 @@
+import UIKit
+
+class SelectFPXBankViewModel {
+ weak var delegate: SelectSourcePaymentDelegate?
+ let email: String?
+
+ private var viewOnDataReloadHandler: () -> Void = { } {
+ didSet {
+ self.viewOnDataReloadHandler()
+ }
+ }
+
+ private var values: [Capability.PaymentMethod.Bank] = [] {
+ didSet {
+ viewOnDataReloadHandler()
+ }
+ }
+
+ init(email: String?, banks: [Capability.PaymentMethod.Bank], delegate: SelectSourcePaymentDelegate) {
+ self.email = email
+ self.values = banks
+ self.delegate = delegate
+ }
+}
+
+extension SelectFPXBankViewModel: SelectPaymentPresentableProtocol {
+ func viewOnDataReloadHandler(_ handler: @escaping () -> Void) {
+ self.viewOnDataReloadHandler = handler
+ }
+
+ var numberOfViewContexts: Int {
+ values.count
+ }
+
+ var viewNavigationTitle: String {
+ SourceType.fpx.localizedTitle
+ }
+
+ func viewContext(at index: Int) -> TableCellContext? {
+ guard let bank = values.at(index) else { return nil }
+ let fpxBank = Source.Payment.FPX.Bank(rawValue: bank.code)
+ return TableCellContext(
+ title: bank.name,
+ icon: UIImage(omise: fpxBank?.iconName ?? "FPX/unknown"),
+ accessoryIcon: UIImage(Assets.Icon.redirect)
+ )
+ }
+
+ func viewDidSelectCell(at index: Int, completion: @escaping () -> Void) {
+ guard let bank = values.at(index) else { return }
+
+ let payment = Source.Payment.FPX(bank: bank.code, email: email)
+ delegate?.didSelectSourcePayment(.fpx(payment), completion: completion)
+ }
+
+ func viewShouldAnimateSelectedCell(at index: Int) -> Bool {
+ true
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectInstallmentTermsViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectInstallmentTermsViewModel.swift
new file mode 100644
index 00000000..eaeda240
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectInstallmentTermsViewModel.swift
@@ -0,0 +1,62 @@
+import UIKit
+
+class SelectInstallmentTermsViewModel {
+ weak var delegate: SelectSourcePaymentDelegate?
+ let sourceType: SourceType
+
+ private var viewOnDataReloadHandler: () -> Void = { } {
+ didSet {
+ self.viewOnDataReloadHandler()
+ }
+ }
+
+ private var values: [Int] = [] {
+ didSet {
+ viewOnDataReloadHandler()
+ }
+ }
+
+ init(sourceType: SourceType, delegate: SelectSourcePaymentDelegate) {
+ self.sourceType = sourceType
+ self.values = Source.Payment.Installment.availableTerms(for: sourceType)
+ self.delegate = delegate
+ }
+}
+
+extension SelectInstallmentTermsViewModel: SelectPaymentPresentableProtocol {
+ func viewOnDataReloadHandler(_ handler: @escaping () -> Void) {
+ self.viewOnDataReloadHandler = handler
+ }
+
+ var numberOfViewContexts: Int {
+ values.count
+ }
+
+ var viewNavigationTitle: String {
+ sourceType.localizedTitle
+ }
+
+ func viewContext(at index: Int) -> TableCellContext? {
+ guard let value = values.at(index) else { return nil }
+ let numberOfTermsTitleFormat = localized("installments.number-of-terms.text", "%d months")
+ return TableCellContext(
+ title: String.localizedStringWithFormat(numberOfTermsTitleFormat, value),
+ icon: nil,
+ accessoryIcon: UIImage(Assets.Icon.redirect)
+ )
+ }
+
+ func viewDidSelectCell(at index: Int, completion: @escaping () -> Void) {
+ guard let value = values.at(index) else { return }
+ let payment = Source.Payment.Installment(
+ installmentTerm: value,
+ zeroInterestInstallments: nil,
+ sourceType: sourceType
+ )
+ delegate?.didSelectSourcePayment(.installment(payment), completion: completion)
+ }
+
+ func viewShouldAnimateSelectedCell(at index: Int) -> Bool {
+ true
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentController.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentController.swift
new file mode 100644
index 00000000..7ae956cb
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentController.swift
@@ -0,0 +1,122 @@
+import UIKit
+
+class SelectPaymentController: UITableViewController {
+
+ let viewModel: SelectPaymentPresentableProtocol
+
+ var customizeCellAtIndexPathClosure: (UITableViewCell, IndexPath) -> Void = { _, _ in }
+
+ init(viewModel: SelectPaymentPresentableProtocol) {
+ self.viewModel = viewModel
+ super.init(style: .plain)
+ }
+
+ required init?(coder: NSCoder) {
+ fatalError("init(coder:) has not been implemented")
+ }
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+ applyNavigationBarStyle()
+ setupNavigationItems()
+ setupTableView()
+ setupViewModel()
+ }
+
+ @objc private func didTapClose() {
+ viewModel.viewDidTapClose()
+ }
+
+ override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+ viewModel.numberOfViewContexts
+ }
+
+ override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+ let identifier = "UITableViewCell"
+ var cell: UITableViewCell! = tableView.dequeueReusableCell(withIdentifier: identifier)
+
+ if cell == nil {
+ cell = UITableViewCell(style: .subtitle, reuseIdentifier: identifier)
+ }
+
+ let viewContext = viewModel.viewContext(at: indexPath.row)
+
+ cell.textLabel?.text = viewContext?.title
+ cell.textLabel?.font = .boldSystemFont(ofSize: 14.0)
+ cell.textLabel?.textColor = UIColor.omisePrimary
+
+ cell.detailTextLabel?.text = viewContext?.subtitle
+ cell.detailTextLabel?.font = .systemFont(ofSize: 10.0)
+ cell.detailTextLabel?.textColor = UIColor(0x8B949E)
+
+ cell.imageView?.image = viewContext?.icon
+ cell.accessoryView = UIImageView(image: viewContext?.accessoryIcon)
+
+ cell.accessoryView?.tintColor = UIColor.omiseSecondary
+
+ cell.selectionStyle = .default
+ cell.selectedBackgroundView = UIView()
+ .backgroundColor(UIColor.selectedCellBackgroundColor)
+
+ customizeCellAtIndexPathClosure(cell, indexPath)
+ return cell
+ }
+
+ override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+ tableView.deselectRow(at: indexPath, animated: true)
+
+ if viewModel.viewShouldAnimateSelectedCell(at: indexPath.row) {
+ startCellActivity(at: indexPath)
+ }
+
+ viewModel.viewDidSelectCell(at: indexPath.row) { [indexPath, weak self] in
+ guard let self = self else { return }
+ self.stopCellActivity(at: indexPath)
+ self.view.isUserInteractionEnabled = true
+ }
+ }
+}
+
+extension SelectPaymentController {
+ func startCellActivity(at indexPath: IndexPath) {
+ guard let cell = tableView.cellForRow(at: indexPath) else { return }
+ cell.startAccessoryActivityIndicator()
+ view.isUserInteractionEnabled = false
+ }
+
+ func stopCellActivity(at indexPath: IndexPath) {
+ tableView.reloadRows(at: [indexPath], with: .automatic)
+ view.isUserInteractionEnabled = true
+ }
+}
+
+private extension SelectPaymentController {
+ func setupViewModel() {
+ viewModel.viewOnDataReloadHandler { [weak tableView] in
+ tableView?.reloadData()
+ }
+ }
+
+ func setupTableView() {
+ tableView.separatorColor = UIColor.omiseSecondary
+ tableView.rowHeight = 64
+ tableView.backgroundColor = .white
+ }
+
+ func setupNavigationItems() {
+ if #available(iOSApplicationExtension 11.0, *) {
+ navigationItem.largeTitleDisplayMode = viewModel.viewDisplayLargeTitle ? .always : .never
+ }
+
+ navigationItem.title = viewModel.viewNavigationTitle
+ if viewModel.viewShowsCloseButton {
+ navigationItem.rightBarButtonItem = ClosureBarButtonItem(
+ image: UIImage(omise: "Close"),
+ style: .plain,
+ target: self,
+ action: #selector(didTapClose)
+ )
+ }
+ navigationItem.backBarButtonItem = .empty
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentMethodViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentMethodViewModel.swift
new file mode 100644
index 00000000..3abb6527
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentMethodViewModel.swift
@@ -0,0 +1,100 @@
+import Foundation
+import UIKit.UIImage
+
+class SelectPaymentMethodViewModel {
+ private weak var delegate: SelectPaymentMethodDelegate?
+ private let client: Client
+
+ private var viewOnDataReloadHandler: () -> Void = { } {
+ didSet {
+ self.viewOnDataReloadHandler()
+ }
+ }
+
+ private var paymentMethods: [PaymentMethod] = [] {
+ didSet {
+ viewOnDataReloadHandler()
+ }
+ }
+
+ init(client: Client, delegate: SelectPaymentMethodDelegate) {
+ self.client = client
+ self.delegate = delegate
+ }
+
+ func setupAllowedPaymentMethods(_ paymentMethods: [SourceType], isCardEnabled: Bool) {
+ self.paymentMethods = PaymentMethod.createPaymentMethods(
+ from: paymentMethods,
+ showsCreditCard: isCardEnabled
+ )
+ }
+
+ func setupCapability() {
+ var allowedPaymentMethods: [SourceType] = []
+ var isCardEnabled = false
+
+ if let capability = client.latestLoadedCapability {
+ isCardEnabled = capability.cardPaymentMethod != nil
+ allowedPaymentMethods = capability.paymentMethods.compactMap {
+ SourceType(rawValue: $0.name)
+ }
+ } else {
+ client.capability { [weak self] result in
+ if let capability = try? result.get() {
+ self?.paymentMethods = PaymentMethod.createPaymentMethods(with: capability)
+ }
+ }
+ }
+
+ self.paymentMethods = PaymentMethod.createPaymentMethods(
+ from: allowedPaymentMethods,
+ showsCreditCard: isCardEnabled
+ )
+ }
+}
+
+extension SelectPaymentMethodViewModel: SelectPaymentPresentableProtocol {
+ func viewOnDataReloadHandler(_ handler: @escaping () -> Void) {
+ self.viewOnDataReloadHandler = handler
+ }
+
+ var numberOfViewContexts: Int {
+ paymentMethods.count
+ }
+
+ var viewNavigationTitle: String {
+ localized("paymentMethods.title", text: "Payment Methods")
+ }
+
+ var viewDisplayLargeTitle: Bool {
+ true
+ }
+
+ var viewShowsCloseButton: Bool {
+ true
+ }
+
+ func viewContext(at index: Int) -> TableCellContext? {
+ guard let payment = paymentMethods.at(index) else { return nil }
+ return TableCellContext(
+ title: payment.localizedTitle,
+ subtitle: payment.localizedSubtitle,
+ icon: UIImage(omise: payment.iconName),
+ accessoryIcon: UIImage(payment.accessoryIcon)
+ )
+ }
+
+ func viewDidSelectCell(at index: Int, completion: @escaping () -> Void) {
+ guard let paymentMethod = paymentMethods.at(index) else { return }
+ delegate?.didSelectPaymentMethod(paymentMethod, completion: completion)
+ }
+
+ func viewShouldAnimateSelectedCell(at index: Int) -> Bool {
+ guard let payment = paymentMethods.at(index) else { return false }
+ return !payment.requiresAdditionalDetails
+ }
+
+ func viewDidTapClose() {
+ delegate?.didCancelPayment()
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentPresentableProtocol.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentPresentableProtocol.swift
new file mode 100644
index 00000000..84e336dd
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectPaymentPresentableProtocol.swift
@@ -0,0 +1,21 @@
+import Foundation
+
+protocol SelectPaymentPresentableProtocol {
+ var numberOfViewContexts: Int { get }
+ var viewNavigationTitle: String { get }
+ var viewDisplayLargeTitle: Bool { get }
+ var viewShowsCloseButton: Bool { get }
+
+ func viewOnDataReloadHandler(_ handler: @escaping () -> Void)
+ func viewContext(at: Int) -> TableCellContext?
+ func viewDidSelectCell(at: Int, completion: @escaping () -> Void)
+ func viewShouldAnimateSelectedCell(at: Int) -> Bool
+ func viewDidTapClose()
+}
+
+// Default implementation for most common cases
+extension SelectPaymentPresentableProtocol {
+ var viewShowsCloseButton: Bool { false }
+ var viewDisplayLargeTitle: Bool { false }
+ func viewDidTapClose() {}
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectSourceTypePaymentViewModel.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectSourceTypePaymentViewModel.swift
new file mode 100644
index 00000000..4bf1f8a8
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/Select Payment From Lists/SelectSourceTypePaymentViewModel.swift
@@ -0,0 +1,57 @@
+import UIKit
+
+class SelectSourceTypePaymentViewModel {
+ private weak var delegate: SelectSourceTypeDelegate?
+ private let title: String
+
+ private var viewOnDataReloadHandler: () -> Void = { } {
+ didSet {
+ self.viewOnDataReloadHandler()
+ }
+ }
+
+ private var sourceTypes: [SourceType] = [] {
+ didSet {
+ viewOnDataReloadHandler()
+ }
+ }
+
+ init(title: String, sourceTypes: [SourceType], delegate: SelectSourceTypeDelegate) {
+ self.sourceTypes = sourceTypes
+ self.title = title
+ self.delegate = delegate
+ }
+}
+
+extension SelectSourceTypePaymentViewModel: SelectPaymentPresentableProtocol {
+ func viewOnDataReloadHandler(_ handler: @escaping () -> Void) {
+ self.viewOnDataReloadHandler = handler
+ }
+
+ var numberOfViewContexts: Int {
+ sourceTypes.count
+ }
+
+ var viewNavigationTitle: String {
+ title
+ }
+
+ func viewContext(at index: Int) -> TableCellContext? {
+ guard let sourceType = sourceTypes.at(index) else { return nil }
+ return TableCellContext(
+ title: sourceType.localizedTitle,
+ icon: UIImage(omise: sourceType.iconName),
+ accessoryIcon: UIImage(sourceType.accessoryIcon)
+ )
+ }
+
+ func viewDidSelectCell(at index: Int, completion: @escaping () -> Void) {
+ guard let sourceType = sourceTypes.at(index) else { return }
+ delegate?.didSelectSourceType(sourceType, completion: completion)
+ }
+
+ func viewShouldAnimateSelectedCell(at index: Int) -> Bool {
+ guard let sourceType = sourceTypes.at(index) else { return false }
+ return !sourceType.requiresAdditionalDetails
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/DuitNowOBW.Bank+ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/DuitNowOBW.Bank+ViewPresentable.swift
new file mode 100644
index 00000000..8d008c57
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/DuitNowOBW.Bank+ViewPresentable.swift
@@ -0,0 +1,88 @@
+import Foundation
+
+extension Source.Payment.DuitNowOBW.Bank: ViewPresentable {
+ var localizedTitle: String {
+ switch self {
+ case .affin:
+ return "Affin Bank"
+ case .alliance:
+ return "Alliance Bank"
+ case .agro:
+ return "Agrobank"
+ case .ambank:
+ return "AmBank"
+ case .islam:
+ return "Bank Islam"
+ case .muamalat:
+ return "Bank Muamalat"
+ case .rakyat:
+ return "Bank Rakyat"
+ case .bsn:
+ return "Bank Simpanan Nasional"
+ case .cimb:
+ return "CIMB Bank"
+ case .hongleong:
+ return "Hong Leong"
+ case .hsbc:
+ return "HSBC Bank"
+ case .kfh:
+ return "Kuwait Finance House"
+ case .maybank2u:
+ return "Maybank"
+ case .ocbc:
+ return "OCBC"
+ case .publicBank:
+ return "Public Bank"
+ case .rhb:
+ return "RHB Bank"
+ case .sc:
+ return "Standard Chartered"
+ case .uob:
+ return "United Overseas Bank"
+ }
+ }
+ var iconName: String {
+ switch self {
+ case .affin:
+ return "FPX/affin"
+ case .alliance:
+ return "FPX/alliance"
+ case .agro:
+ return "agrobank"
+ case .ambank:
+ return "FPX/ambank"
+ case .islam:
+ return "FPX/islam"
+ case .muamalat:
+ return "FPX/muamalat"
+ case .rakyat:
+ return "FPX/rakyat"
+ case .bsn:
+ return "FPX/bsn"
+ case .cimb:
+ return "FPX/cimb"
+ case .hongleong:
+ return "FPX/hong-leong"
+ case .hsbc:
+ return "FPX/hsbc"
+ case .kfh:
+ return "FPX/kfh"
+ case .maybank2u:
+ return "FPX/maybank"
+ case .ocbc:
+ return "FPX/ocbc"
+ case .publicBank:
+ return "FPX/public-bank"
+ case .rhb:
+ return "FPX/rhb"
+ case .sc:
+ return "FPX/sc"
+ case .uob:
+ return "FPX/uob"
+ }
+ }
+
+ var accessoryIcon: Assets.Icon {
+ .redirect
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/FPX.Bank+ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/FPX.Bank+ViewPresentable.swift
new file mode 100644
index 00000000..7413f0ba
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/FPX.Bank+ViewPresentable.swift
@@ -0,0 +1,96 @@
+import Foundation
+
+extension Source.Payment.FPX.Bank: ViewPresentable {
+ var localizedTitle: String {
+ switch self {
+ case .affin:
+ return "Affin Bank"
+ case .alliance:
+ return "Alliance Bank"
+ case .agro:
+ return "Agrobank"
+ case .ambank:
+ return "AmBank"
+ case .islam:
+ return "Bank Islam"
+ case .muamalat:
+ return "Bank Muamalat"
+ case .rakyat:
+ return "Bank Rakyat"
+ case .bsn:
+ return "Bank Simpanan Nasional"
+ case .cimb:
+ return "CIMB Bank"
+ case .hongleong:
+ return "Hong Leong"
+ case .hsbc:
+ return "HSBC Bank"
+ case .kfh:
+ return "Kuwait Finance House"
+ case .maybank2u:
+ return "Maybank2U"
+ case .ocbc:
+ return "OCBC"
+ case .publicBank:
+ return "Public Bank"
+ case .rhb:
+ return "RHB Bank"
+ case .sc:
+ return "Standard Chartered"
+ case .uob:
+ return "United Overseas Bank"
+ case .bocm:
+ return "Bank Of China"
+ case .maybank2e:
+ return "Maybank2E"
+ }
+ }
+ var iconName: String {
+ switch self {
+ case .affin:
+ return "FPX/affin"
+ case .alliance:
+ return "FPX/alliance"
+ case .agro:
+ return "agrobank"
+ case .ambank:
+ return "FPX/ambank"
+ case .islam:
+ return "FPX/islam"
+ case .muamalat:
+ return "FPX/muamalat"
+ case .rakyat:
+ return "FPX/rakyat"
+ case .bsn:
+ return "FPX/bsn"
+ case .cimb:
+ return "FPX/cimb"
+ case .hongleong:
+ return "FPX/hong-leong"
+ case .hsbc:
+ return "FPX/hsbc"
+ case .kfh:
+ return "FPX/kfh"
+ case .maybank2u:
+ return "FPX/maybank"
+ case .ocbc:
+ return "FPX/ocbc"
+ case .publicBank:
+ return "FPX/public-bank"
+ case .rhb:
+ return "FPX/rhb"
+ case .sc:
+ return "FPX/sc"
+ case .uob:
+ return "FPX/uob"
+ case .bocm:
+ return "FPX/bocm"
+ case .maybank2e:
+ return "FPX/unknown"
+ }
+ }
+
+ var accessoryIcon: Assets.Icon {
+ .redirect
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/PaymentMethod+ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/PaymentMethod+ViewPresentable.swift
new file mode 100644
index 00000000..3a2a7f5f
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/PaymentMethod+ViewPresentable.swift
@@ -0,0 +1,57 @@
+import Foundation
+
+extension PaymentMethod: CustomStringConvertible {
+ var description: String { localizedTitle }
+}
+
+extension PaymentMethod: ViewPresentable {
+ /// Localized title for given payment option
+ public var localizedSubtitle: String? {
+ if case .sourceType(let sourceType) = self {
+ return sourceType.localizedSubtitle
+ } else {
+ return nil
+ }
+ }
+
+ /// Localized title for given payment option
+ public var localizedTitle: String {
+ let prefixCode = "paymentMethod"
+ switch self {
+ case .creditCard:
+ return localized("\(prefixCode).creditCard", text: "Credit Card")
+ case .installment:
+ return localized("\(prefixCode).installments", text: "Installments")
+ case .internetBanking:
+ return localized("\(prefixCode).internetBanking", text: "Internet Banking")
+ case .mobileBanking:
+ return localized("\(prefixCode).mobileBanking", text: "Mobile Banking")
+ case .eContextConbini:
+ return localized("\(prefixCode).eContext.conbini", text: "Konbini")
+ case .eContextPayEasy:
+ return localized("\(prefixCode).eContext.payEasy", text: "Pay-easy")
+ case .eContextNetBanking:
+ return localized("\(prefixCode).eContext.netBanking", text: "Net Bank")
+ case .sourceType(let sourceType):
+ return sourceType.localizedTitle
+ }
+ }
+
+ /// icon for given payment option
+ public var iconName: String {
+ switch self {
+ case .creditCard: return "Card"
+ case .installment: return "Installment"
+ case .internetBanking: return "Banking"
+ case .mobileBanking: return "MobileBanking"
+ case .eContextConbini: return "Konbini"
+ case .eContextPayEasy: return "Payeasy"
+ case .eContextNetBanking: return "Netbank"
+ case .sourceType(let sourceType): return sourceType.iconName
+ }
+ }
+
+ var accessoryIcon: Assets.Icon {
+ requiresAdditionalDetails ? Assets.Icon.next : Assets.Icon.redirect
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift
new file mode 100644
index 00000000..b32d4c49
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/SourceType+ViewPresentable.swift
@@ -0,0 +1,232 @@
+import Foundation
+
+extension SourceType: CustomStringConvertible {
+ public var description: String { localizedTitle }
+}
+
+extension SourceType: ViewPresentable {
+ public var localizedTitle: String {
+ localized("SourceType.\(self.rawValue).title", text: title)
+ }
+
+ public var localizedSubtitle: String? {
+ guard let subtitle = subtitle else { return nil }
+ return localized("SourceType.\(self.rawValue).subtitle", text: subtitle)
+ }
+
+ public var title: String {
+ switch self {
+ case .billPaymentTescoLotus:
+ return "Tesco Lotus"
+ case .eContext:
+ return "" // Doesn't have specific title
+ case .alipay:
+ return "Alipay"
+ case .alipayCN:
+ return "Alipay CN"
+ case .alipayHK:
+ return "Alipay HK"
+ case .atome:
+ return "Atome"
+ case .dana:
+ return "DANA"
+ case .gcash:
+ return "GCash"
+ case .kakaoPay:
+ return "Kakao Pay"
+ case .touchNGoAlipayPlus:
+ return "TNG eWallet"
+ case .promptPay:
+ return "PromptPay"
+ case .payNow:
+ return "PayNow"
+ case .trueMoneyWallet:
+ return "TrueMoney Wallet"
+ case .trueMoneyJumpApp:
+ return "TrueMoney"
+ case .pointsCiti:
+ return "Pay with Citi Rewards Points"
+ case .fpx:
+ return "FPX"
+ case .rabbitLinepay:
+ return "Rabbit LINE Pay"
+ case .ocbcDigital:
+ return "OCBC Digital"
+ case .grabPay:
+ return "Grab"
+ case .boost:
+ return "Boost"
+ case .shopeePay:
+ return "ShopeePay"
+ case .shopeePayJumpApp:
+ return "ShopeePay"
+ case .maybankQRPay:
+ return "Maybank QRPay"
+ case .duitNowQR:
+ return "DuitNow QR"
+ case .duitNowOBW:
+ return "DuitNow Online Banking/Wallets"
+ case .touchNGo:
+ return "Touch 'n Go"
+ case .grabPayRms:
+ return "GrabPay"
+ case .payPay:
+ return "PayPay"
+ case .weChat:
+ return "WeChat Pay"
+ case .barcodeAlipay:
+ return "Alipay In-Store"
+
+ case .installmentBAY:
+ return "Krungsri"
+ case .installmentBBL:
+ return "Bangkok Bank"
+ case .installmentFirstChoice:
+ return "Krungsri First Choice"
+ case .installmentKBank:
+ return "Kasikorn"
+ case .installmentKTC:
+ return "KTC"
+ case .installmentMBB:
+ return "MayBank"
+ case .installmentSCB:
+ return "Siam Commercial Bank"
+ case .installmentTTB:
+ return "TMBThanachart Bank"
+ case .installmentUOB:
+ return "United Overseas Bank"
+
+ case .internetBankingBAY:
+ return "Bank of Ayudhya"
+ case .internetBankingBBL:
+ return "Bangkok Bank"
+
+ case .mobileBankingBAY:
+ return "KMA"
+ case .mobileBankingBBL:
+ return "Bualuang mBanking"
+ case .mobileBankingKBank:
+ return "K PLUS"
+ case .mobileBankingKTB:
+ return "Krungthai Next"
+ case .mobileBankingSCB:
+ return "SCB EASY"
+ }
+ }
+
+ public var iconName: String {
+ switch self {
+ case .billPaymentTescoLotus:
+ return "Tesco"
+ case .eContext:
+ return "" // Doesn't have specific icon
+ case .alipay:
+ return "Alipay"
+ case .alipayCN:
+ return "AlipayCN"
+ case .alipayHK:
+ return "AlipayHK"
+ case .atome:
+ return "Atome"
+ case .dana:
+ return "dana"
+ case .gcash:
+ return "gcash"
+ case .kakaoPay:
+ return "kakaopay"
+ case .touchNGoAlipayPlus:
+ return "touch-n-go"
+ case .promptPay:
+ return "PromptPay"
+ case .payNow:
+ return "PayNow"
+ case .trueMoneyWallet:
+ return "TrueMoney"
+ case .trueMoneyJumpApp:
+ return "TrueMoney"
+ case .pointsCiti:
+ return "CitiBank"
+ case .fpx:
+ return "FPX"
+ case .rabbitLinepay:
+ return "RabbitLinePay"
+ case .ocbcDigital:
+ return "ocbc-digital"
+ case .grabPay:
+ return "Grab"
+ case .boost:
+ return "Boost"
+ case .shopeePay:
+ return "Shopeepay"
+ case .shopeePayJumpApp:
+ return "Shopeepay"
+ case .maybankQRPay:
+ return "MAE-maybank"
+ case .duitNowQR:
+ return "DuitNow-QR"
+ case .duitNowOBW:
+ return "Duitnow-OBW"
+ case .touchNGo:
+ return "touch-n-go"
+ case .grabPayRms:
+ return "Grab"
+ case .payPay:
+ return "PayPay"
+ case .weChat:
+ return "wechat_pay"
+ case .barcodeAlipay:
+ return "Alipay"
+
+ case .installmentBAY:
+ return "BAY"
+ case .installmentBBL:
+ return "BBL"
+ case .installmentFirstChoice:
+ return "First Choice"
+ case .installmentKBank:
+ return "KBANK"
+ case .installmentKTC:
+ return "KTC"
+ case .installmentMBB:
+ return "FPX/maybank"
+ case .installmentSCB:
+ return "SCB"
+ case .installmentTTB:
+ return "ttb"
+ case .installmentUOB:
+ return "uob"
+
+ case .internetBankingBAY:
+ return "BAY"
+ case .internetBankingBBL:
+ return "BBL"
+
+ case .mobileBankingBAY:
+ return "KMA"
+ case .mobileBankingBBL:
+ return "BBL M"
+ case .mobileBankingKBank:
+ return "KPlus"
+ case .mobileBankingKTB:
+ return "KTB Next"
+ case .mobileBankingSCB:
+ return "SCB"
+ }
+ }
+
+ var accessoryIcon: Assets.Icon {
+ requiresAdditionalDetails ? Assets.Icon.next : Assets.Icon.redirect
+ }
+
+ public var subtitle: String? {
+ switch self {
+ case .alipayCN, .alipayHK, .dana, .gcash, .kakaoPay, .touchNGo:
+ return "(Alipay+™ Partner)"
+ case .grabPay:
+ return "(GrabPay and PayLater)"
+ default:
+ return nil
+ }
+ }
+
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/ViewPresentable.swift b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/ViewPresentable.swift
new file mode 100644
index 00000000..c070e5b1
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Choose Payment Methods/ViewPresentable/ViewPresentable.swift
@@ -0,0 +1,12 @@
+import Foundation
+
+protocol ViewPresentable {
+ var localizedTitle: String { get }
+ var iconName: String { get }
+ var accessoryIcon: Assets.Icon { get }
+ var localizedSubtitle: String? { get }
+}
+
+extension ViewPresentable {
+ var localizedSubtitle: String? { nil }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CCVInfoController.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CCVInfoController.swift
new file mode 100644
index 00000000..95c104c0
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CCVInfoController.swift
@@ -0,0 +1,67 @@
+import UIKit
+
+class CCVInfoController: UIViewController {
+ static let preferredWidth: CGFloat = 240
+
+ @IBOutlet private var containerView: UIView!
+ @IBOutlet private var cvvLocationImageView: UIImageView!
+ @IBOutlet private var cvvLocationDescriptionLabel: UILabel!
+
+ var preferredCardBrand: CardBrand? {
+ didSet {
+ guard isViewLoaded else {
+ return
+ }
+ updateUI()
+ }
+ }
+
+ var onCloseTapped: () -> Void = { }
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+
+ let layer = containerView.layer
+ layer.cornerRadius = 10
+
+ containerView.backgroundColor = UIColor.omiseBackground
+ cvvLocationDescriptionLabel.textColor = .body
+ cvvLocationImageView.tintColor = .body
+ updateUI()
+
+ let tapGesture = TapGestureHandler { [weak self] in
+ self?.onCloseTapped()
+ }
+
+ view.addGestureRecognizer(tapGesture)
+ }
+
+ private func updateUI() {
+ switch preferredCardBrand {
+ case .amex?:
+ cvvLocationImageView.image = UIImage(omise: "CVV AMEX")
+ cvvLocationDescriptionLabel.text = NSLocalizedString(
+ "more-info.cvv-location.amex.text",
+ bundle: .omiseSDK,
+ value: "4 digit number on the front of your card",
+ comment: "A descriptive text telling the location of CVV on the AMEX card")
+ default:
+ cvvLocationImageView.image = UIImage(omise: "CVV")
+ cvvLocationDescriptionLabel.text = NSLocalizedString(
+ "more-info.cvv-location.default.text",
+ bundle: .omiseSDK,
+ value: "3 digit number on the back of your card",
+ comment: "A descriptive text telling the location of CVV on the typical credit card")
+ }
+ }
+}
+
+class ExpandedHitAreaButton: UIButton {
+ var hitAreaSize = CGSize(width: 44, height: 44)
+
+ override func point(inside point: CGPoint, with event: UIEvent?) -> Bool {
+ let horizontalInset = max(0, (hitAreaSize.width - bounds.width)) / 2
+ let verticalInset = max(0, (hitAreaSize.height - bounds.height)) / 2
+ return bounds.insetBy(dx: -horizontalInset, dy: -verticalInset).contains(point)
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CCVInfoController.xib b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CCVInfoController.xib
new file mode 100644
index 00000000..e784df35
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CCVInfoController.xib
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OmiseSDK/CreditCardFormViewController.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift
similarity index 67%
rename from OmiseSDK/CreditCardFormViewController.swift
rename to OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift
index 05f485b9..62af99d3 100644
--- a/OmiseSDK/CreditCardFormViewController.swift
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.swift
@@ -3,65 +3,32 @@
import UIKit
import os.log
-public protocol CreditCardFormViewControllerDelegate: AnyObject {
- /// Delegate method for receiving token data when card tokenization succeeds.
- /// - parameter token: `OmiseToken` instance created from supplied credit card data.
- /// - seealso: [Tokens API](https://www.omise.co/tokens-api)
- func creditCardFormViewController(_ controller: CreditCardFormViewController, didSucceedWithToken token: Token)
-
- /// Delegate method for receiving error information when card tokenization failed.
- /// This allows you to have fine-grained control over error handling when setting
- /// `handleErrors` to `false`.
- /// - parameter error: The error that occurred during tokenization.
- /// - note: This delegate method will *never* be called if `handleErrors` property is set to `true`.
- func creditCardFormViewController(_ controller: CreditCardFormViewController, didFailWithError error: Error)
-
- func creditCardFormViewControllerDidCancel(_ controller: CreditCardFormViewController)
-}
-
/// Drop-in credit card input form view controller that automatically tokenizes credit
/// card information.
-public class CreditCardFormViewController: UIViewController, PaymentChooserUI, PaymentFormUIController {
+class CreditCardPaymentController: UIViewController {
// swiftlint:disable:previous type_body_length
- typealias ViewModel = CreditCardFormViewModel
- typealias ViewContext = CreditCardFormViewContext
+ typealias ViewModel = CreditCardPaymentViewModel
+ typealias ViewContext = CreditCardPaymentViewContext
typealias Field = ViewContext.Field
struct Style {
var billingStackSpacing = CGFloat(12)
}
- private var style = Style()
-
- private lazy var viewModel: ViewModel = {
- ViewModel()
- }()
- /// Omise public key for calling tokenization API.
- public var publicKey: String?
-
- /// Delegate to receive CreditCardFormController result.
- public weak var delegate: CreditCardFormViewControllerDelegate?
- /// Delegate to receive CreditCardFormController result.
-
- /// A boolean flag to enables/disables automatic error handling. Defaults to `true`.
- public var handleErrors = true
-
- @IBInspectable public var preferredPrimaryColor: UIColor? {
- didSet {
- applyPrimaryColor()
- }
- }
+ var style = Style()
- @IBInspectable public var preferredSecondaryColor: UIColor? {
+ var viewModel: ViewModel? {
didSet {
- applySecondaryColor()
+ if let newViewModel = viewModel {
+ bind(to: newViewModel)
+ }
}
}
- @IBInspectable public var errorMessageTextColor: UIColor! = CreditCardFormViewController.defaultErrorMessageTextColor {
+ @IBInspectable var errorMessageTextColor: UIColor! = CreditCardPaymentController.defaultErrorMessageTextColor {
didSet {
if errorMessageTextColor == nil {
- errorMessageTextColor = CreditCardFormViewController.defaultErrorMessageTextColor
+ errorMessageTextColor = CreditCardPaymentController.defaultErrorMessageTextColor
}
if isViewLoaded {
@@ -72,74 +39,65 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
}
}
- // swiftlint:disable:next weak_delegate
- private lazy var overlayTransitionDelegate = OverlayPanelTransitioningDelegate()
-
var isInputDataValid: Bool {
return formFields.allSatisfy { $0.isValid }
}
var currentEditingTextField: OmiseTextField?
- private var hasErrorMessage = false
+ var hasErrorMessage = false
- @IBOutlet var formFields: [OmiseTextField]!
- @IBOutlet var formLabels: [UILabel]!
- @IBOutlet var errorLabels: [UILabel]!
+ var formFields: [OmiseTextField] = []
+ var formLabels: [UILabel] = []
+ var errorLabels: [UILabel] = []
@IBOutlet var contentView: UIScrollView!
- @IBOutlet private var cardNumberTextField: CardNumberTextField!
- @IBOutlet private var cardNameTextField: CardNameTextField!
- @IBOutlet private var expiryDateTextField: CardExpiryDateTextField!
- @IBOutlet private var secureCodeTextField: CardCVVTextField!
+ @IBOutlet var cardNumberLabel: UILabel!
+ @IBOutlet var cardNameLabel: UILabel!
+ @IBOutlet var expiryDateLabel: UILabel!
+ @IBOutlet var secureCodeLabel: UILabel!
+
+ @IBOutlet var cardNumberTextField: CardNumberTextField!
+ @IBOutlet var cardNameTextField: CardNameTextField!
+ @IBOutlet var expiryDateTextField: CardExpiryDateTextField!
+ @IBOutlet var secureCodeTextField: CardCVVTextField!
- private var countryInputView = TextFieldView(id: "country")
+ let countryInputView = TextFieldView(id: "country")
- @IBOutlet private var submitButton: MainActionButton!
+ @IBOutlet var submitButton: MainActionButton!
@IBOutlet var formFieldsAccessoryView: UIToolbar!
@IBOutlet var gotoPreviousFieldBarButtonItem: UIBarButtonItem!
@IBOutlet var gotoNextFieldBarButtonItem: UIBarButtonItem!
@IBOutlet var doneEditingBarButtonItem: UIBarButtonItem!
- @IBOutlet private var creditCardNumberErrorLabel: UILabel!
- @IBOutlet private var cardHolderNameErrorLabel: UILabel!
- @IBOutlet private var cardExpiryDateErrorLabel: UILabel!
- @IBOutlet private var cardSecurityCodeErrorLabel: UILabel!
-
- @IBOutlet private var errorBannerView: UIView!
- @IBOutlet private var errorTitleLabel: UILabel!
- @IBOutlet private var errorMessageLabel: UILabel!
- @IBOutlet private var hidingErrorBannerConstraint: NSLayoutConstraint!
- @IBOutlet private var emptyErrorMessageConstraint: NSLayoutConstraint!
- @IBOutlet private var cardBrandIconImageView: UIImageView!
- @IBOutlet private var cvvInfoButton: UIButton!
- @IBOutlet private var billingStackView: UIStackView!
-
- private lazy var addressStackView: UIStackView = {
- let stackView = UIStackView()
- stackView.axis = .vertical
- stackView.distribution = .equalSpacing
- stackView.alignment = .fill
- stackView.spacing = style.billingStackSpacing
- return stackView
+ @IBOutlet var creditCardNumberErrorLabel: UILabel!
+ @IBOutlet var cardHolderNameErrorLabel: UILabel!
+ @IBOutlet var cardExpiryDateErrorLabel: UILabel!
+ @IBOutlet var cardSecurityCodeErrorLabel: UILabel!
+
+ @IBOutlet var errorBannerView: UIView!
+ @IBOutlet var errorTitleLabel: UILabel!
+ @IBOutlet var errorMessageLabel: UILabel!
+ @IBOutlet var hidingErrorBannerConstraint: NSLayoutConstraint!
+ @IBOutlet var emptyErrorMessageConstraint: NSLayoutConstraint!
+ @IBOutlet var cardBrandIconImageView: UIImageView!
+ @IBOutlet var cvvInfoButton: UIButton!
+ @IBOutlet var billingStackView: UIStackView!
+
+ lazy var addressStackView: UIStackView = {
+ let verticalContainerStack = UIStackView()
+ verticalContainerStack.axis = .vertical
+ verticalContainerStack.distribution = .equalSpacing
+ verticalContainerStack.alignment = .fill
+ verticalContainerStack.spacing = style.billingStackSpacing
+ return verticalContainerStack
}()
- @IBOutlet private var requestingIndicatorView: UIActivityIndicatorView!
- public static let defaultErrorMessageTextColor = UIColor.error
-
- /// Factory method for creating CreditCardFormController with given public key.
- /// - parameter publicKey: Omise public key.
- public static func makeCreditCardFormViewController(withPublicKey publicKey: String) -> CreditCardFormViewController {
- let storyboard = UIStoryboard(name: "OmiseSDK", bundle: .omiseSDK)
- // swiftlint:disable:next force_cast
- let creditCardForm = storyboard.instantiateInitialViewController() as! CreditCardFormViewController
- creditCardForm.publicKey = publicKey
+ @IBOutlet var requestingIndicatorView: UIActivityIndicatorView!
+ static let defaultErrorMessageTextColor = UIColor.error
- return creditCardForm
- }
-
- public func setCreditCardInformationWith(number: String?, name: String?, expiration: (month: Int, year: Int)?) {
+ func setCreditCardInformationWith(number: String?, name: String?, expiration: (month: Int, year: Int)?) {
cardNumberTextField.text = number
cardNameTextField.text = name
@@ -152,19 +110,112 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
os_log("The custom credit card information was set - %{private}@", log: uiLogObject, type: .debug, String((number ?? "").suffix(4)))
}
- // need to refactor loadView, removing super results in crash
- // swiftlint:disable:next prohibited_super_call
- public override func loadView() {
- super.loadView()
+ func setupArrays() {
+ errorLabels = [
+ cardHolderNameErrorLabel,
+ creditCardNumberErrorLabel,
+ cardSecurityCodeErrorLabel,
+ cardExpiryDateErrorLabel
+ ]
- view.backgroundColor = UIColor.background
+ formLabels = [
+ cardNameLabel,
+ cardNumberLabel,
+ secureCodeLabel,
+ expiryDateLabel
+ ]
+
+ formFields = [
+ cardNumberTextField,
+ cardNameTextField,
+ secureCodeTextField,
+ expiryDateTextField
+ ]
+ }
+
+ override func viewDidLoad() {
+ super.viewDidLoad()
+ setupArrays()
+
+ view.backgroundColor = UIColor.omiseBackground
submitButton.defaultBackgroundColor = view.tintColor
submitButton.disabledBackgroundColor = .line
cvvInfoButton.tintColor = .badgeBackground
formFieldsAccessoryView.barTintColor = .formAccessoryBarTintColor
- applyNavigationBarStyle(.shadow(color: preferredSecondaryColor ?? defaultPaymentChooserUISecondaryColor))
+ applyNavigationBarStyle(.shadow(color: .omiseSecondary))
+
+ setShowsErrorBanner(false)
+ setupBillingStackView()
+ setupAddressFields()
+
+ applyPrimaryColor()
+ applySecondaryColor()
+
+ formFields.forEach {
+ $0.inputAccessoryView = formFieldsAccessoryView
+ $0.onValueChanged = { [weak self] in
+ self?.updateAccessibilityValue()
+ }
+ }
+
+ errorLabels.forEach {
+ $0.textColor = errorMessageTextColor
+ }
+
+ updateSupplementaryUI()
+
+ configureAccessibility()
+ formFields.forEach {
+ $0.adjustsFontForContentSizeCategory = true
+ }
+ formLabels.forEach {
+ $0.adjustsFontForContentSizeCategory = true
+ }
+ submitButton.titleLabel?.adjustsFontForContentSizeCategory = true
+
+ if #unavailable(iOS 11) {
+ // We'll leave the adjusting scroll view insets job for iOS 11 and later to the layoutMargins + safeAreaInsets here
+ automaticallyAdjustsScrollViewInsets = true
+ }
+
+ cardNumberTextField.textContentType = .creditCardNumber
+ cardNumberTextField.textContentType = .creditCardNumber
+ cardNumberTextField.rightView = cardBrandIconImageView
+ secureCodeTextField.rightView = cvvInfoButton
+ secureCodeTextField.rightViewMode = .always
+
+ if let viewModel = viewModel {
+ bind(to: viewModel)
+ }
+ }
+
+ override func viewWillLayoutSubviews() {
+ super.viewWillLayoutSubviews()
+
+ if #unavailable(iOS 11) {
+ // There's a bug in iOS 10 and earlier which the text field's intrinsicContentSize is returned the value
+ // that doesn't take the result of textRect(forBounds:) method into an account for the initial value
+ // So we need to invalidate the intrinsic content size here to ask those text fields to calculate their
+ // intrinsic content size again
+
+ formFields.forEach {
+ $0.invalidateIntrinsicContentSize()
+ }
+ }
+ }
+
+ override func viewDidDisappear(_ animated: Bool) {
+ super.viewDidDisappear(animated)
+
+ NotificationCenter().removeObserver(self, name: UIResponder.keyboardWillShowNotification, object: nil)
+ }
+
+ override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
+ if previousTraitCollection?.preferredContentSizeCategory != traitCollection.preferredContentSizeCategory {
+ view.setNeedsUpdateConstraints()
+ }
}
private func setupBillingStackView() {
@@ -174,21 +225,35 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
setupCountryField()
}
- private func setupCountryField() {
+ func bind(to viewModel: ViewModel) {
+ guard isViewLoaded else { return }
+ countryInputView.text = viewModel.countryListViewModel.selectedCountry?.name
+
+ viewModel.addressFields.forEach {
+ let input = TextFieldView(id: $0.rawValue)
+ addressStackView.addArrangedSubview(input)
+ setupInput(input, field: $0, isLast: $0 == viewModel.addressFields.last, viewModel: viewModel)
+ }
+ addressStackView.isHiddenInStackView = !viewModel.isAddressFieldsVisible
+ updateSupplementaryUI()
+ }
+
+ private func setupCountryField() {
let input = countryInputView
input.title = "CreditCard.field.country".localized()
billingStackView.addArrangedSubview(input)
input.textFieldUserInteractionEnabled = false
- input.text = viewModel.countryListViewModel.selectedCountry?.name
input.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(onCountryInputTapped)))
}
- @objc private func onCountryInputTapped() {
- let vc = CountryListViewController(viewModel: viewModel.countryListViewModel)
+ @objc func onCountryInputTapped() {
+ guard let viewModel = viewModel else { return }
+
+ let vc = CountryListController(viewModel: viewModel.countryListViewModel)
vc.title = countryInputView.title
vc.viewModel?.onSelectCountry = { [weak self] country in
- guard let self = self else { return }
+ guard let self = self, let viewModel = self.viewModel else { return }
self.countryInputView.text = country.name
if let nc = self.navigationController {
@@ -197,7 +262,7 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
self.dismiss(animated: true)
}
- self.addressStackView.isHiddenInStackView = !self.viewModel.isAddressFieldsVisible
+ self.addressStackView.isHiddenInStackView = !viewModel.isAddressFieldsVisible
self.updateSubmitButtonState()
}
@@ -209,17 +274,11 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
}
}
- private func setupAddressFields() {
- viewModel.addressFields.forEach {
- let input = TextFieldView(id: $0.rawValue)
- addressStackView.addArrangedSubview(input)
- setupInput(input, field: $0, isLast: $0 == viewModel.addressFields.last, viewModel: viewModel)
- }
+ func setupAddressFields() {
billingStackView.addArrangedSubview(addressStackView)
- addressStackView.isHiddenInStackView = !viewModel.isAddressFieldsVisible
}
- private func setupInput(_ input: TextFieldView, field: Field, isLast: Bool, viewModel: ViewModel) {
+ func setupInput(_ input: TextFieldView, field: Field, isLast: Bool, viewModel: ViewModel) {
input.title = viewModel.title(for: field)
input.placeholder = ""
input.textContentType = viewModel.contentType(for: field)
@@ -242,114 +301,40 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
setupOnTextFieldShouldReturn(field: field, isLast: isLast)
}
- public override func viewDidLoad() {
- super.viewDidLoad()
- setShowsErrorBanner(false)
- setupBillingStackView()
- setupAddressFields()
-
- applyPrimaryColor()
- applySecondaryColor()
+ @IBAction private func presentCVVInfo(_ sender: UIButton) {
+ guard let targetView = view.window ?? view else { return }
- formFields.forEach {
- $0.inputAccessoryView = formFieldsAccessoryView
- }
+ let ccvInfoController = CCVInfoController(nibName: nil, bundle: .omiseSDK)
- errorLabels.forEach {
- $0.textColor = errorMessageTextColor
+ ccvInfoController.view.tintColor = view.tintColor
+ ccvInfoController.preferredCardBrand = cardNumberTextField.cardBrand
+ ccvInfoController.onCloseTapped = { [weak self, weak ccvInfoController] in
+ guard let self = self, let ccvInfoController = ccvInfoController else { return }
+ self.dismissCVVInfo(ccvInfoController)
}
- formFields.forEach(self.updateAccessibilityValue)
-
- updateSupplementaryUI()
-
- configureAccessibility()
- formFields.forEach {
- $0.adjustsFontForContentSizeCategory = true
- }
- formLabels.forEach {
- $0.adjustsFontForContentSizeCategory = true
- }
- submitButton.titleLabel?.adjustsFontForContentSizeCategory = true
-
- if #unavailable(iOS 11) {
- // We'll leave the adjusting scroll view insets job for iOS 11 and later to the layoutMargins + safeAreaInsets here
- automaticallyAdjustsScrollViewInsets = true
- }
-
- // Storyboard shows wrong warning on textContentType == .creditCardNumber
- // Set textContentType manually
- cardNumberTextField.textContentType = .creditCardNumber
-
- cardNumberTextField.textContentType = .creditCardNumber
- cardNumberTextField.rightView = cardBrandIconImageView
- secureCodeTextField.rightView = cvvInfoButton
- secureCodeTextField.rightViewMode = .always
-
- NotificationCenter.default.addObserver(
- self,
- selector: #selector(keyboardWillChangeFrame(_:)),
- name: UIResponder.keyboardWillChangeFrameNotification,
- object: nil
- )
- NotificationCenter.default.addObserver(
- self,
- selector: #selector(keyboardWillHide(_:)),
- name: UIResponder.keyboardWillHideNotification,
- object: nil
- )
- }
-
- public override func viewWillLayoutSubviews() {
- super.viewWillLayoutSubviews()
-
- if #unavailable(iOS 11) {
- // There's a bug in iOS 10 and earlier which the text field's intrinsicContentSize is returned the value
- // that doesn't take the result of textRect(forBounds:) method into an account for the initial value
- // So we need to invalidate the intrinsic content size here to ask those text fields to calculate their
- // intrinsic content size again
-
- formFields.forEach {
- $0.invalidateIntrinsicContentSize()
- }
- }
- }
-
- public override func viewDidAppear(_ animated: Bool) {
- super.viewDidAppear(animated)
-
- NotificationCenter.default.addObserver(
- self,
- selector: #selector(keyboardWillAppear(_:)),
- name: UIResponder.keyboardWillShowNotification,
- object: nil
- )
- }
-
- public override func viewDidDisappear(_ animated: Bool) {
- super.viewDidDisappear(animated)
-
- NotificationCenter().removeObserver(self, name: UIResponder.keyboardWillShowNotification, object: nil)
- }
-
- public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
- if previousTraitCollection?.preferredContentSizeCategory != traitCollection.preferredContentSizeCategory {
- view.setNeedsUpdateConstraints()
- }
+ UIView.transition(
+ with: targetView,
+ duration: 0.25,
+ options: [.transitionCrossDissolve],
+ animations: {
+ targetView.addSubviewAndFit(ccvInfoController.view)
+ }, completion: { _ in
+ self.addChild(ccvInfoController)
+ })
}
- @IBAction private func displayMoreCVVInfo(_ sender: UIButton) {
- guard let viewController = storyboard?.instantiateViewController(withIdentifier: "MoreInformationOnCVVViewController"),
- let moreInformationOnCVVViewController = viewController as? MoreInformationOnCVVViewController else {
- return
- }
+ private func dismissCVVInfo(_ ccvInfoController: CCVInfoController) {
+ guard let targetView = view.window ?? view else { return }
- moreInformationOnCVVViewController.preferredCardBrand = cardNumberTextField.cardBrand
- moreInformationOnCVVViewController.delegate = self
- moreInformationOnCVVViewController.modalPresentationStyle = .custom
- moreInformationOnCVVViewController.transitioningDelegate = overlayTransitionDelegate
- moreInformationOnCVVViewController.view.tintColor = view.tintColor
- present(moreInformationOnCVVViewController, animated: true, completion: nil)
+ UIView.transition(
+ with: targetView,
+ duration: 0.25,
+ options: [.transitionCrossDissolve],
+ animations: {
+ ccvInfoController.view.removeFromSuperview()
+ ccvInfoController.removeFromParent()
+ }, completion: nil)
}
@IBAction private func cancelForm() {
@@ -357,28 +342,15 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
}
@discardableResult
- private func performCancelingForm() -> Bool {
- os_log("Credit Card Form dismissing requested, Asking the delegate what should the form controler do",
- log: uiLogObject,
- type: .default)
-
- if let delegate = self.delegate {
- delegate.creditCardFormViewControllerDidCancel(self)
- os_log("Canceling form delegate notified", log: uiLogObject, type: .default)
- return true
- } else if let delegateMethod = delegate?.creditCardFormViewControllerDidCancel {
- delegateMethod(self)
- os_log("Canceling form delegate notified", log: uiLogObject, type: .default)
- return true
- } else {
- os_log("Credit Card Form dismissing requested but there is not delegate to ask. Ignore the request",
- log: uiLogObject,
- type: .default)
- return false
- }
+ func performCancelingForm() -> Bool {
+ guard let viewModel = viewModel else { return false }
+ viewModel.viewDidTapClose()
+ return true
}
- private func makeViewContext() -> ViewContext {
+ func makeViewContext() -> ViewContext {
+ guard let viewModel = viewModel else { return ViewContext() }
+
var context = ViewContext()
let fields = viewModel.addressFields
for field in fields {
@@ -388,7 +360,7 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
}
context.countryCode = viewModel.countryListViewModel.selectedCountry?.code ?? ""
- context.pan = cardNumberTextField.pan
+ context.number = cardNumberTextField.text ?? ""
context.name = cardNameTextField.text ?? ""
context.expirationMonth = expiryDateTextField.selectedMonth ?? 0
context.expirationYear = expiryDateTextField.selectedYear ?? 0
@@ -399,40 +371,23 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
@IBAction private func requestToken() {
doneEditing(nil)
+ guard let viewModel = viewModel else { return }
UIAccessibility.post(notification: UIAccessibility.Notification.announcement, argument: "Submitting payment, please wait")
-
startActivityIndicator()
- viewModel.onSubmitButtonPressed(makeViewContext(), publicKey: publicKey) { [weak self] result in
- guard let strongSelf = self else { return }
-
- strongSelf.stopActivityIndicator()
- switch result {
- case let .success(token):
- os_log("Credit Card Form's Request succeed %{private}@, trying to notify the delegate",
- log: uiLogObject,
- type: .default,
- token.id)
- if let delegate = strongSelf.delegate {
- delegate.creditCardFormViewController(strongSelf, didSucceedWithToken: token)
- os_log("Credit Card Form Create Token succeed delegate notified", log: uiLogObject, type: .default)
- } else {
- os_log("There is no Credit Card Form's delegate to notify about the created token", log: uiLogObject, type: .default)
- }
- case let .failure(err):
- strongSelf.handleError(err)
- }
+ viewModel.onSubmitButtonPressed(makeViewContext()) {
+ self.stopActivityIndicator()
}
}
- @objc private func keyboardWillAppear(_ notification: Notification) {
+ func keyboardWillAppear(_ notification: Notification) {
if hasErrorMessage {
hasErrorMessage = false
dismissErrorMessage(animated: true, sender: self)
}
}
- @objc func keyboardWillChangeFrame(_ notification: NSNotification) {
+ func keyboardWillChangeFrame(_ notification: NSNotification) {
guard let frameEnd = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect,
let frameStart = notification.userInfo?[UIResponder.keyboardFrameBeginUserInfoKey] as? CGRect,
frameEnd != frameStart else {
@@ -456,37 +411,19 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
contentView.scrollIndicatorInsets.bottom = 0.0
}
- private func handleError(_ error: Error) {
- guard handleErrors else {
- os_log("Credit Card Form's Request failed %{private}@, automatically error handling turned off. Trying to notify the delegate",
- log: uiLogObject,
- type: .info,
- error.localizedDescription)
- if let delegate = self.delegate {
- delegate.creditCardFormViewController(self, didFailWithError: error)
- os_log("Error handling delegate notified", log: uiLogObject, type: .default)
- } else {
- os_log("There is no Credit Card Form's delegate to notify about the error", log: uiLogObject, type: .default)
- }
- return
- }
-
- os_log("Credit Card Form's Request failed %{private}@, automatically error handling turned on.",
- log: uiLogObject,
- type: .default,
- error.localizedDescription)
-
+ func handleError(_ error: Error) {
+// delegate?.creditCardFormViewController(self, didFailWithError: error)
displayError(error)
hasErrorMessage = true
}
- private func displayError(_ error: Error) {
+ func displayError(_ error: Error) {
let targetController = targetViewController(forAction: #selector(UIViewController.displayErrorWith(title:message:animated:sender:)),
sender: self)
if let targetController = targetController, targetController !== self {
if let error = error as? OmiseError {
- targetController.displayErrorWith(title: error.bannerErrorDescription,
- message: error.bannerErrorRecoverySuggestion,
+ targetController.displayErrorWith(title: error.localizedDescription,
+ message: error.localizedRecoverySuggestion,
animated: true,
sender: self)
} else if let error = error as? LocalizedError {
@@ -504,8 +441,8 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
let errorTitle: String
let errorMessage: String?
if let error = error as? OmiseError {
- errorTitle = error.bannerErrorDescription
- errorMessage = error.bannerErrorRecoverySuggestion
+ errorTitle = error.localizedDescription
+ errorMessage = error.localizedRecoverySuggestion
} else if let error = error as? LocalizedError {
errorTitle = error.localizedDescription
errorMessage = error.recoverySuggestion
@@ -525,7 +462,7 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
}
}
- private func setShowsErrorBanner(_ showsErrorBanner: Bool, animated: Bool = true) {
+ func setShowsErrorBanner(_ showsErrorBanner: Bool, animated: Bool = true) {
hidingErrorBannerConstraint.isActive = !showsErrorBanner
let animationBlock = {
@@ -547,7 +484,7 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
setShowsErrorBanner(false)
}
- private func updateSupplementaryUI() {
+ func updateSupplementaryUI() {
updateSubmitButtonState()
let cardBrandIconName: String?
@@ -565,32 +502,32 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
default:
cardBrandIconName = nil
}
- cardBrandIconImageView.image = cardBrandIconName.flatMap { UIImage(named: $0, in: .omiseSDK, compatibleWith: nil) }
+ cardBrandIconImageView.image = cardBrandIconName.flatMap { UIImage(omise: $0) }
cardNumberTextField.rightViewMode = cardBrandIconImageView.image != nil ? .always : .never
}
- private func startActivityIndicator() {
+ func startActivityIndicator() {
requestingIndicatorView.startAnimating()
submitButton.isEnabled = false
view.isUserInteractionEnabled = false
}
- private func stopActivityIndicator() {
+ func stopActivityIndicator() {
requestingIndicatorView.stopAnimating()
submitButton.isEnabled = true
view.isUserInteractionEnabled = true
}
- private func applyPrimaryColor() {
+ func applyPrimaryColor() {
guard isViewLoaded else {
return
}
formFields.forEach {
- $0.textColor = currentPrimaryColor
+ $0.textColor = UIColor.omisePrimary
}
formLabels.forEach {
- $0.textColor = currentPrimaryColor
+ $0.textColor = UIColor.omisePrimary
}
let textFields: [UIView] =
@@ -599,20 +536,20 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
textFields.forEach {
if let input = $0 as? TextFieldView {
- input.textColor = currentPrimaryColor
+ input.textColor = UIColor.omisePrimary
}
}
}
- private func applySecondaryColor() {
+ func applySecondaryColor() {
guard isViewLoaded else {
return
}
formFields.forEach {
- $0.borderColor = currentSecondaryColor
- $0.placeholderTextColor = currentSecondaryColor
+ $0.borderColor = UIColor.omiseSecondary
+ $0.placeholderTextColor = UIColor.omiseSecondary
}
let textFields: [UIView] =
@@ -621,14 +558,14 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
textFields.forEach {
if let input = $0 as? TextFieldView {
- input.titleColor = preferredPrimaryColor
- input.borderColor = currentSecondaryColor
- input.placeholderTextColor = currentSecondaryColor
+ input.titleColor = UIColor.omisePrimary
+ input.borderColor = UIColor.omiseSecondary
+ input.placeholderTextColor = UIColor.omiseSecondary
}
}
}
- fileprivate func associatedErrorLabelOf(_ textField: OmiseTextField) -> UILabel? {
+ func associatedErrorLabelOf(_ textField: OmiseTextField) -> UILabel? {
switch textField {
case cardNumberTextField:
return creditCardNumberErrorLabel
@@ -643,7 +580,7 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
}
}
- private func validateField(_ textField: OmiseTextField) {
+ func validateField(_ textField: OmiseTextField) {
guard let errorLabel = associatedErrorLabelOf(textField) else {
return
}
@@ -656,7 +593,7 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
}
}
- private func validationErrorText(for textField: UITextField, error: Error) -> String {
+ func validationErrorText(for textField: UITextField, error: Error) -> String {
switch (error, textField) {
case (OmiseTextFieldValidationError.emptyText, _):
return "-" // We need to set the error label some string in order to have it retains its height
@@ -706,7 +643,7 @@ public class CreditCardFormViewController: UIViewController, PaymentChooserUI, P
}
// MARK: - Fields Accessory methods
-extension CreditCardFormViewController {
+extension CreditCardPaymentController {
@IBAction private func validateTextFieldDataOf(_ sender: OmiseTextField) {
let duration = TimeInterval(UINavigationController.hideShowBarDuration)
@@ -715,7 +652,7 @@ extension CreditCardFormViewController {
options: [.curveEaseInOut, .allowUserInteraction, .beginFromCurrentState, .layoutSubviews]) {
self.validateField(sender)
}
- sender.borderColor = currentSecondaryColor
+ sender.borderColor = UIColor.omiseSecondary
}
@IBAction private func updateInputAccessoryViewFor(_ sender: OmiseTextField) {
@@ -746,14 +683,14 @@ extension CreditCardFormViewController {
}
// MARK: - Accessibility
-extension CreditCardFormViewController {
+extension CreditCardPaymentController {
- @IBAction private func updateAccessibilityValue(_ sender: OmiseTextField) {
+ @IBAction private func updateAccessibilityValue() {
updateSupplementaryUI()
}
// swiftlint:disable:next function_body_length
- private func configureAccessibility() {
+ func configureAccessibility() {
formLabels.forEach {
$0.adjustsFontForContentSizeCategory = true
}
@@ -761,14 +698,9 @@ extension CreditCardFormViewController {
$0.adjustsFontForContentSizeCategory = true
}
- submitButton.titleLabel?.adjustsFontForContentSizeCategory = true
+ let fields = formFields
- let fields = [
- cardNumberTextField,
- cardNameTextField,
- expiryDateTextField,
- secureCodeTextField
- ] as [OmiseTextField]
+ submitButton.titleLabel?.adjustsFontForContentSizeCategory = true
// swiftlint:disable:next function_body_length
func accessiblityElementAfter(
@@ -860,7 +792,7 @@ extension CreditCardFormViewController {
]
}
- public override func accessibilityPerformMagicTap() -> Bool {
+ override func accessibilityPerformMagicTap() -> Bool {
guard isInputDataValid else {
return false
}
@@ -869,19 +801,15 @@ extension CreditCardFormViewController {
return true
}
- public override func accessibilityPerformEscape() -> Bool {
+ override func accessibilityPerformEscape() -> Bool {
return performCancelingForm()
}
}
-extension CreditCardFormViewController: MoreInformationOnCVVViewControllerDelegate {
- func moreInformationOnCVVViewControllerDidAskToClose(_ controller: MoreInformationOnCVVViewController) {
- dismiss(animated: true, completion: nil)
- }
-}
-
-private extension CreditCardFormViewController {
+extension CreditCardPaymentController {
func updateSubmitButtonState() {
+ guard let viewModel = viewModel else { return }
+
let valid = isInputDataValid
submitButton?.isEnabled = valid && viewModel.isSubmitButtonEnabled(makeViewContext())
@@ -893,6 +821,7 @@ private extension CreditCardFormViewController {
}
func updateError(for field: Field) {
+ guard let viewModel = viewModel else { return }
guard let input = input(for: field) else { return }
input.error = viewModel.error(for: field, validate: input.text)
}
@@ -910,6 +839,7 @@ private extension CreditCardFormViewController {
func input(after input: TextFieldView) -> TextFieldView? {
guard
+ let viewModel = viewModel,
let inputField = Field(rawValue: input.identifier),
let index = viewModel.addressFields.firstIndex(of: inputField),
let nextField = viewModel.addressFields.at(index + 1),
@@ -925,6 +855,8 @@ private extension CreditCardFormViewController {
}
func hideErrorIfNil(field: Field) {
+ guard let viewModel = viewModel else { return }
+
if let input = input(for: field) {
let error = viewModel.error(for: field, validate: input.text)
if error == nil {
@@ -994,6 +926,7 @@ private extension CreditCardFormViewController {
}
func goToFirstInvalidField() {
+ guard let viewModel = viewModel else { return }
for field in viewModel.addressFields {
if let input = input(for: field), input.error != nil {
input.becomeFirstResponder()
@@ -1004,9 +937,44 @@ private extension CreditCardFormViewController {
}
func showAllErrors() {
+ guard let viewModel = viewModel else { return }
for field in viewModel.addressFields {
updateError(for: field)
}
}
}
+
+extension CreditCardPaymentController {
+ func updateInputAccessoryViewWithFirstResponder(_ firstResponder: OmiseTextField) {
+ guard formFields.contains(firstResponder) else { return }
+
+ currentEditingTextField = firstResponder
+ gotoPreviousFieldBarButtonItem.isEnabled = firstResponder !== formFields.first
+ gotoNextFieldBarButtonItem.isEnabled = firstResponder !== formFields.last
+ }
+
+ func gotoPreviousField() {
+ guard let currentTextField = currentEditingTextField, let index = formFields.firstIndex(of: currentTextField) else {
+ return
+ }
+
+ let prevIndex = index - 1
+ guard prevIndex >= 0 else { return }
+ formFields[prevIndex].becomeFirstResponder()
+ }
+
+ func gotoNextField() {
+ guard let currentTextField = currentEditingTextField, let index = formFields.firstIndex(of: currentTextField) else {
+ return
+ }
+
+ let nextIndex = index + 1
+ guard nextIndex < formFields.count else { return }
+ formFields[nextIndex].becomeFirstResponder()
+ }
+
+ func doneEditing() {
+ view.endEditing(true)
+ }
+}
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.xib b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.xib
new file mode 100644
index 00000000..769a5eb2
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentController.xib
@@ -0,0 +1,423 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentDelegate.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentDelegate.swift
new file mode 100644
index 00000000..f05ef430
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentDelegate.swift
@@ -0,0 +1,6 @@
+import Foundation
+
+protocol CreditCardPaymentDelegate: AnyObject {
+ func didSelectCardPayment(_ card: CreateTokenPayload.Card, completion: @escaping () -> Void)
+ func didCancelCardPayment()
+}
diff --git a/OmiseSDK/CreditCardFormViewContext.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewContext.swift
similarity index 91%
rename from OmiseSDK/CreditCardFormViewContext.swift
rename to OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewContext.swift
index 041d2e89..7bee634b 100644
--- a/OmiseSDK/CreditCardFormViewContext.swift
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewContext.swift
@@ -1,5 +1,5 @@
//
-// CreditCardFormViewContext.swift
+// CreditCardPaymentViewContext.swift
// OmiseSDK
//
// Created by Andrei Solovev on 19/6/23.
@@ -8,7 +8,7 @@
import UIKit
-struct CreditCardFormViewContext {
+struct CreditCardPaymentViewContext {
enum Field: String, CaseIterable {
case address
case city
@@ -16,7 +16,7 @@ struct CreditCardFormViewContext {
case postalCode
}
- var pan = PAN("")
+ var number: String = ""
var expirationMonth: Int = 0
var expirationYear: Int = 0
var name: String = ""
@@ -39,7 +39,7 @@ struct CreditCardFormViewContext {
}
}
-extension CreditCardFormViewContext.Field {
+extension CreditCardPaymentViewContext.Field {
var title: String {
"CreditCard.field.\(self.rawValue)".localized()
}
diff --git a/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModel.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModel.swift
new file mode 100644
index 00000000..e1034f2d
--- /dev/null
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModel.swift
@@ -0,0 +1,121 @@
+//
+// CreditCardPaymentViewModel.swift
+// OmiseSDK
+//
+// Created by Andrei Solovev on 19/6/23.
+// Copyright © 2023 Omise. All rights reserved.
+//
+
+import Foundation
+import os.log
+
+class CreditCardPaymentViewModel: CreditCardPaymentViewModelProtocol, CountryListViewModelProtocol {
+ var addressFields: [AddressField] = [.address, .city, .state, .postalCode]
+
+ var fieldForShippingAddressHeader: AddressField?
+
+ var isAddressFieldsVisible: Bool {
+ selectedCountry?.isAVS ?? false
+ }
+
+ func title(for field: AddressField) -> String? {
+ field.title
+ }
+
+ var countryListViewModel: CountryListViewModelProtocol { return self }
+
+ private weak var delegate: CreditCardPaymentDelegate?
+
+ init(currentCountry: Country?, delegate: CreditCardPaymentDelegate?) {
+ self.delegate = delegate
+ self.selectedCountry = currentCountry
+ }
+
+ // MARK: CountryListViewModelProtocol
+ lazy var countries: [Country] = Country.sortedAll
+
+ var selectedCountry: Country? {
+ didSet {
+ if let selectedCountry = selectedCountry {
+ onSelectCountry(selectedCountry)
+ }
+ }
+ }
+ var onSelectCountry: (Country) -> Void = { _ in }
+
+ func error(for field: AddressField, validate text: String?) -> String? {
+ guard isAddressFieldsVisible else { return nil }
+ let result = (text?.isEmpty ?? true) ? field.error : nil
+ return result
+ }
+
+ func viewDidTapClose() {
+ delegate?.didCancelCardPayment()
+ }
+
+ func onSubmitButtonPressed(_ viewContext: ViewContext, completion: @escaping () -> Void) {
+
+ let card = CreateTokenPayload.Card(
+ name: viewContext.name,
+ number: viewContext.number,
+ expirationMonth: viewContext.expirationMonth,
+ expirationYear: viewContext.expirationYear,
+ securityCode: viewContext.securityCode,
+ phoneNumber: nil,
+ countryCode: viewContext.countryCode,
+ city: viewContext[.city],
+ state: viewContext[.state],
+ street1: viewContext[.address],
+ street2: nil,
+ postalCode: viewContext[.postalCode]
+ )
+
+ delegate?.didSelectCardPayment(card, completion: completion)
+
+ /*
+ viewModel.onSubmitButtonPressed(makeViewContext(), publicKey: publicKey) { [weak self] result in
+ guard let self = self else { return }
+ self.stopActivityIndicator()
+ switch result {
+ case .success(let token):
+ os_log("Credit Card Form's Request succeed %{private}@, trying to notify the delegate",
+ log: uiLogObject,
+ type: .default,
+ token.id)
+ self.delegate?.creditCardFormViewController(self, didSucceedWithToken: token)
+ case .failure(let error):
+ self.handleError(error)
+ }
+ }
+ */
+
+// guard let publicKey = publicKey else {
+// os_log("Missing or invalid public key information - %{private}@", log: uiLogObject, type: .error, publicKey ?? "")
+// assertionFailure("Missing public key information. Please set the public key before request token.")
+// return
+// }
+//
+// os_log("Requesting to create token", log: uiLogObject, type: .info)
+//
+// let payload = CreateTokenPayload.Card(
+// name: viewContext.name,
+// number: viewContext.number,
+// expirationMonth: viewContext.expirationMonth,
+// expirationYear: viewContext.expirationYear,
+// securityCode: viewContext.securityCode,
+// phoneNumber: nil,
+// countryCode: viewContext.countryCode,
+// city: viewContext[.city],
+// state: viewContext[.state],
+// street1: viewContext[.address],
+// street2: nil,
+// postalCode: viewContext[.postalCode]
+// )
+//
+// let client = OmiseSDK(publicKey: publicKey).client
+// client.createToken(payload: payload) { result in
+// onComplete(result)
+// }
+ }
+
+}
diff --git a/OmiseSDK/CreditCardFormViewModelProtocol.swift b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModelProtocol.swift
similarity index 84%
rename from OmiseSDK/CreditCardFormViewModelProtocol.swift
rename to OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModelProtocol.swift
index d20a9b5f..5cac4c6e 100644
--- a/OmiseSDK/CreditCardFormViewModelProtocol.swift
+++ b/OmiseSDK/Sources/Views/Screens/Credit Card Payment/CreditCardPaymentViewModelProtocol.swift
@@ -1,5 +1,5 @@
//
-// CreditCardFormViewModelProtocol.swift
+// CreditCardPaymentViewModelProtocol.swift
// OmiseSDK
//
// Created by Andrei Solovev on 19/6/23.
@@ -8,15 +8,15 @@
import UIKit
-protocol CreditCardFormViewModelProtocol {
- typealias ViewContext = CreditCardFormViewContext
+protocol CreditCardPaymentViewModelProtocol {
+ typealias ViewContext = CreditCardPaymentViewContext
typealias AddressField = ViewContext.Field
var addressFields: [AddressField] { get }
var fieldForShippingAddressHeader: AddressField? { get }
var countryListViewModel: CountryListViewModelProtocol { get }
var isAddressFieldsVisible: Bool { get }
- func onSubmitButtonPressed(_ viewContext: ViewContext, publicKey: String?, onComplete: @escaping (RequestResult) -> Void)
+ func onSubmitButtonPressed(_ viewContext: ViewContext, completion: @escaping () -> Void )
func error(for: AddressField, validate: String?) -> String?
func title(for: AddressField) -> String?
func placeholder(for: AddressField) -> String?
@@ -25,7 +25,7 @@ protocol CreditCardFormViewModelProtocol {
func contentType(for: AddressField) -> UITextContentType
}
-extension CreditCardFormViewModelProtocol {
+extension CreditCardPaymentViewModelProtocol {
func isSubmitButtonEnabled(_ viewContext: ViewContext) -> Bool {
addressFields.allSatisfy {
error(for: $0, validate: viewContext[$0]) == nil
diff --git a/OmiseSDK/PaymentCreatorController.swift b/OmiseSDK/Sources/Views/Screens/_ to refactor and delete/PaymentCreatorController.swift
similarity index 54%
rename from OmiseSDK/PaymentCreatorController.swift
rename to OmiseSDK/Sources/Views/Screens/_ to refactor and delete/PaymentCreatorController.swift
index 6dd340aa..c600818d 100644
--- a/OmiseSDK/PaymentCreatorController.swift
+++ b/OmiseSDK/Sources/Views/Screens/_ to refactor and delete/PaymentCreatorController.swift
@@ -1,32 +1,8 @@
-// swiftlint:disable file_length
-
import UIKit
import os
-public protocol PaymentCreatorControllerDelegate: NSObjectProtocol {
- func paymentCreatorController(_ paymentCreatorController: PaymentCreatorController, didCreatePayment payment: Payment)
- func paymentCreatorController(_ paymentCreatorController: PaymentCreatorController, didFailWithError error: Error)
- func paymentCreatorControllerDidCancel(_ paymentCreatorController: PaymentCreatorController)
-}
-
-public enum Payment {
- case token(Token)
- case source(Source)
-}
-
-public protocol PaymentChooserUI: AnyObject {
- var preferredPrimaryColor: UIColor? { get set }
- var preferredSecondaryColor: UIColor? { get set }
-}
-
/// Drop-in UI flow controller that let user choose the payment method with the given payment options
public class PaymentCreatorController: UINavigationController {
- // swiftlint:disable:previous type_body_length
-
- enum PreconditionFailures: String {
- case paymentChooserViewcontrollerAsRoot =
- "This Payment Creator doesn't allow the root view controller to be other class than the PaymentChooserViewcontroller"
- }
/// Omise public key for calling tokenization API.
public var publicKey: String? {
@@ -37,7 +13,7 @@ public class PaymentCreatorController: UINavigationController {
return
}
- self.client = Client(publicKey: publicKey)
+ self.client = OmiseSDK(publicKey: publicKey).client
}
}
@@ -55,17 +31,20 @@ public class PaymentCreatorController: UINavigationController {
}
/// Boolean indicates that the form should show the Credit Card payment option or not
- public var showsCreditCardPayment = true {
+ public var allowedCardPayment = true {
didSet {
- paymentChooserViewController.showsCreditCardPayment = showsCreditCardPayment
+// paymentChooserController.viewModel.allowedCardPayment = allowedCardPayment
}
}
+ private let paymentChooserController = UIViewController()
+// ChoosePaymentMethodController(nibName: nil, bundle: .omiseSDK)
+
/// Available Source payment options to let user to choose.
/// The default value is the default available payment method for merchant in Thailand
- public var allowedPaymentMethods: [SourceTypeValue] = PaymentCreatorController.thailandDefaultAvailableSourceMethods {
+ public var allowedPaymentMethods: [SourceType] = SourceType.availableByDefaultInThailand {
didSet {
- paymentChooserViewController.allowedPaymentMethods = allowedPaymentMethods
+// paymentChooserController.viewModel.allowedPaymentMethods = allowedPaymentMethods
}
}
@@ -76,9 +55,6 @@ public class PaymentCreatorController: UINavigationController {
/// Defaults to `true`.
public var handleErrors = true
- /// Delegate to receive CreditCardFormController result.
- public weak var paymentDelegate: PaymentCreatorControllerDelegate?
-
var client: Client? {
didSet {
paymentSourceCreatorFlowSession.client = client
@@ -87,10 +63,6 @@ public class PaymentCreatorController: UINavigationController {
private let paymentSourceCreatorFlowSession = PaymentCreatorFlowSession()
- private var paymentChooserViewController: PaymentChooserViewController {
- return viewControllers[0] as! PaymentChooserViewController // swiftlint:disable:this force_cast
- }
-
private var noticeViewHeightConstraint: NSLayoutConstraint!
private let displayingNoticeView: NoticeView = {
let noticeViewNib = UINib(nibName: "NoticeView", bundle: .omiseSDK)
@@ -113,98 +85,53 @@ public class PaymentCreatorController: UINavigationController {
}
}
- /// Factory method for creating CreditCardFormController with given public key.
- /// - parameter publicKey: Omise public key.
- public static func makePaymentCreatorControllerWith(
- publicKey: String,
- amount: Int64,
- currency: Currency,
- allowedPaymentMethods: [SourceTypeValue],
- paymentDelegate: PaymentCreatorControllerDelegate?
- ) -> PaymentCreatorController {
- let storyboard = UIStoryboard(name: "OmiseSDK", bundle: .omiseSDK)
- let paymentCreatorController = storyboard.instantiateViewController(
- withIdentifier: "PaymentCreatorController"
- ) as! PaymentCreatorController // swiftlint:disable:this force_cast
- paymentCreatorController.publicKey = publicKey
- paymentCreatorController.paymentAmount = amount
- paymentCreatorController.paymentCurrency = currency
- paymentCreatorController.allowedPaymentMethods = allowedPaymentMethods
- paymentCreatorController.paymentDelegate = paymentDelegate
-
- return paymentCreatorController
- }
+// /// Factory method for creating CreditCardPaymentController with given public key.
+// /// - parameter publicKey: Omise public key.
+// public static func makePaymentCreatorControllerWith(
+// publicKey: String,
+// amount: Int64,
+// currency: Currency,
+// allowedPaymentMethods: [SourceType],
+// paymentDelegate: PaymentCreatorControllerDelegate?
+// ) -> PaymentCreatorController {
+// let paymentCreatorController = PaymentCreatorController()
+// paymentCreatorController.publicKey = publicKey
+// paymentCreatorController.paymentAmount = amount
+// paymentCreatorController.paymentCurrency = currency
+// paymentCreatorController.allowedPaymentMethods = allowedPaymentMethods
+// paymentCreatorController.paymentDelegate = paymentDelegate
+// return paymentCreatorController
+// }
public init() {
- let storyboard = UIStoryboard(name: "OmiseSDK", bundle: .omiseSDK)
- let viewController = storyboard.instantiateViewController(withIdentifier: "PaymentChooserController")
-
- guard let paymentChooserViewController = viewController as? PaymentChooserViewController else {
- preconditionFailure(
- PreconditionFailures.paymentChooserViewcontrollerAsRoot.rawValue
- )
- }
-
- super.init(rootViewController: paymentChooserViewController)
-
- initializeWithPaymentChooserViewController(paymentChooserViewController)
+ super.init(rootViewController: paymentChooserController)
+ initializeWithPaymentChooserViewController(paymentChooserController)
}
public required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
-
- guard let rootViewController = topViewController as? PaymentChooserViewController else {
- preconditionFailure(
- PreconditionFailures.paymentChooserViewcontrollerAsRoot.rawValue
- )
- return nil
- }
- initializeWithPaymentChooserViewController(rootViewController)
+ viewControllers = [paymentChooserController]
+ initializeWithPaymentChooserViewController(paymentChooserController)
}
public override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
super.init(nibName: nibNameOrNil, bundle: nibBundleOrNil)
-
- guard let rootViewController = topViewController as? PaymentChooserViewController else {
- preconditionFailure(
- PreconditionFailures.paymentChooserViewcontrollerAsRoot.rawValue
- )
- }
- initializeWithPaymentChooserViewController(rootViewController)
+ initializeWithPaymentChooserViewController(paymentChooserController)
}
public override init(navigationBarClass: AnyClass?, toolbarClass: AnyClass?) {
super.init(navigationBarClass: navigationBarClass, toolbarClass: toolbarClass)
-
- guard let rootViewController = topViewController as? PaymentChooserViewController else {
- preconditionFailure(
- PreconditionFailures.paymentChooserViewcontrollerAsRoot.rawValue
- )
- }
- initializeWithPaymentChooserViewController(rootViewController)
+ initializeWithPaymentChooserViewController(paymentChooserController)
}
-
- public override var viewControllers: [UIViewController] {
- willSet {
- if !(viewControllers.first is PaymentChooserViewController) {
- preconditionFailure(
- PreconditionFailures.paymentChooserViewcontrollerAsRoot.rawValue
- )
- }
- }
- }
-
+
public func applyPaymentMethods(from capability: Capability) {
- paymentChooserViewController.applyPaymentMethods(from: capability)
+// paymentChooserController.viewModel.usePaymentMethodsFromCapability = true
}
- private func initializeWithPaymentChooserViewController(_ viewController: PaymentChooserViewController) {
- viewController.preferredPrimaryColor = preferredPrimaryColor
- viewController.preferredSecondaryColor = preferredSecondaryColor
-
- viewController.flowSession = paymentSourceCreatorFlowSession
- viewController.allowedPaymentMethods = allowedPaymentMethods
- viewController.showsCreditCardPayment = showsCreditCardPayment
+ private func initializeWithPaymentChooserViewController(_ viewController: UIViewController) {
+// viewController.viewModel.flowSession = paymentSourceCreatorFlowSession
+// viewController.viewModel.allowedPaymentMethods = allowedPaymentMethods
+// viewController.viewModel.allowedCardPayment = allowedCardPayment
paymentSourceCreatorFlowSession.delegate = self
@@ -300,13 +227,9 @@ public class PaymentCreatorController: UINavigationController {
public override func pushViewController(_ viewController: UIViewController, animated: Bool) {
dismissErrorMessage(animated: false, sender: self)
- if let viewController = viewController as? PaymentChooserUI {
- viewController.preferredPrimaryColor = preferredPrimaryColor
- viewController.preferredSecondaryColor = preferredSecondaryColor
- }
- if let viewController = viewController as? PaymentChooserViewController {
- viewController.flowSession = self.paymentSourceCreatorFlowSession
- }
+// if let viewController = viewController as? ChoosePaymentMethodControllerOld {
+// viewController.viewModel.flowSession = self.paymentSourceCreatorFlowSession
+// }
super.pushViewController(viewController, animated: animated)
}
@@ -315,17 +238,6 @@ public class PaymentCreatorController: UINavigationController {
return super.popViewController(animated: animated)
}
- public override func addChild(_ childController: UIViewController) {
- if let viewController = childController as? PaymentChooserUI {
- viewController.preferredPrimaryColor = preferredPrimaryColor
- viewController.preferredSecondaryColor = preferredSecondaryColor
- }
- if let viewController = childController as? PaymentChooserViewController {
- viewController.flowSession = self.paymentSourceCreatorFlowSession
- }
- super.addChild(childController)
- }
-
// need to refactor loadView, removing super results in crash
// swiftlint:disable:next prohibited_super_call
public override func loadView() {
@@ -365,9 +277,9 @@ extension PaymentCreatorController: PaymentCreatorFlowSessionDelegate {
type: .default,
token.id)
- if let paymentDelegate = self.paymentDelegate {
- paymentDelegate.paymentCreatorController(self, didCreatePayment: Payment.token(token))
- }
+// if let paymentDelegate = self.paymentDelegate {
+// paymentDelegate.paymentCreatorController(self, didCreatePayment: Payment.token(token))
+// }
}
func paymentCreatorFlowSession(_ paymentSourceCreatorFlowSession: PaymentCreatorFlowSession, didCreatedSource source: Source) {
@@ -376,12 +288,12 @@ extension PaymentCreatorController: PaymentCreatorFlowSessionDelegate {
type: .default,
source.id)
- if let paymentDelegate = self.paymentDelegate {
- paymentDelegate.paymentCreatorController(self, didCreatePayment: Payment.source(source))
- os_log("Payment Creator Created Source succeed delegate notified", log: uiLogObject, type: .default)
- } else {
- os_log("There is no Payment Creator delegate to notify about the created source", log: uiLogObject, type: .default)
- }
+// if let paymentDelegate = self.paymentDelegate {
+// paymentDelegate.paymentCreatorController(self, didCreatePayment: Payment.source(source))
+// os_log("Payment Creator Created Source succeed delegate notified", log: uiLogObject, type: .default)
+// } else {
+// os_log("There is no Payment Creator delegate to notify about the created source", log: uiLogObject, type: .default)
+// }
}
func paymentCreatorFlowSession(_ paymentSourceCreatorFlowSession: PaymentCreatorFlowSession, didFailWithError error: Error) {
@@ -390,15 +302,15 @@ extension PaymentCreatorController: PaymentCreatorFlowSessionDelegate {
log: uiLogObject,
type: .info,
error.localizedDescription)
- if let paymentDelegate = self.paymentDelegate {
- paymentDelegate.paymentCreatorController(self, didFailWithError: error)
- os_log("Payment Creator error handling delegate notified", log: uiLogObject, type: .default)
- } else {
- os_log("There is no Payment Creator delegate to notify about the error", log: uiLogObject, type: .default)
- }
+// if let paymentDelegate = self.paymentDelegate {
+// paymentDelegate.paymentCreatorController(self, didFailWithError: error)
+// os_log("Payment Creator error handling delegate notified", log: uiLogObject, type: .default)
+// } else {
+// os_log("There is no Payment Creator delegate to notify about the error", log: uiLogObject, type: .default)
+// }
} else if let error = error as? OmiseError {
- displayErrorWith(title: error.bannerErrorDescription,
- message: error.bannerErrorRecoverySuggestion,
+ displayErrorWith(title: error.localizedDescription,
+ message: error.localizedRecoverySuggestion,
animated: true,
sender: self)
} else if let error = error as? LocalizedError {
@@ -422,100 +334,17 @@ extension PaymentCreatorController: PaymentCreatorFlowSessionDelegate {
func paymentCreatorFlowSessionDidCancel(_ paymentSourceCreatorFlowSession: PaymentCreatorFlowSession) {
os_log("Payment Creator dismissal requested. Asking the delegate what should the controler do", log: uiLogObject, type: .default)
- if let paymentDelegate = self.paymentDelegate {
- paymentDelegate.paymentCreatorControllerDidCancel(self)
- } else {
- os_log("Payment Creator dismissal requested but there is no delegate to ask. Ignore the request",
- log: uiLogObject,
- type: .default)
- }
+// if let paymentDelegate = self.paymentDelegate {
+// paymentDelegate.paymentCreatorControllerDidCancel(self)
+// } else {
+// os_log("Payment Creator dismissal requested but there is no delegate to ask. Ignore the request",
+// log: uiLogObject,
+// type: .default)
+// }
}
}
-extension PaymentCreatorController {
- public static let thailandDefaultAvailableSourceMethods: [SourceTypeValue] = [
- .internetBankingBAY,
- .internetBankingBBL,
- .mobileBankingSCB,
- .mobileBankingKBank,
- .mobileBankingBAY,
- .mobileBankingBBL,
- .mobileBankingKTB,
- .alipay,
- .billPaymentTescoLotus,
- .installmentBAY,
- .installmentFirstChoice,
- .installmentBBL,
- .installmentKTC,
- .installmentKBank,
- .installmentSCB,
- .installmentTTB,
- .installmentUOB,
- .promptPay,
- .trueMoney,
- .pointsCiti,
- .shopeePayJumpApp
- ]
-
- public static let japanDefaultAvailableSourceMethods: [SourceTypeValue] = [
- .eContext,
- .payPay
- ]
-
- public static let singaporeDefaultAvailableSourceMethods: [SourceTypeValue] = [
- .payNow,
- .shopeePayJumpApp
- ]
-
- public static let malaysiaDefaultAvailableSourceMethods: [SourceTypeValue] = [
- .fpx,
- .installmentMBB,
- .touchNGo,
- .grabPay,
- .boost,
- .shopeePay,
- .shopeePayJumpApp,
- .maybankQRPay,
- .duitNowQR,
- .duitNowOBW
- ]
-
- public static let internetBankingAvailablePaymentMethods: [SourceTypeValue] = [
- .internetBankingBAY,
- .internetBankingBBL
- ]
-
- // swiftlint:disable:next identifier_name
- public static let installmentsBankingAvailablePaymentMethods: [SourceTypeValue] = [
- .installmentBAY,
- .installmentFirstChoice,
- .installmentBBL,
- .installmentMBB,
- .installmentKTC,
- .installmentKBank,
- .installmentSCB,
- .installmentTTB,
- .installmentUOB
- ]
-
- public static let billPaymentAvailablePaymentMethods: [SourceTypeValue] = [
- .billPaymentTescoLotus
- ]
-
- public static let barcodeAvailablePaymentMethods: [SourceTypeValue] = [
- .barcodeAlipay
- ]
-
- public static let mobileBankingAvailablePaymentMethods: [SourceTypeValue] = [
- .mobileBankingSCB,
- .mobileBankingKBank,
- .mobileBankingBAY,
- .mobileBankingKTB
- ]
-}
-
class NoticeView: UIView {
-
@IBOutlet var iconImageView: UIImageView!
@IBOutlet var titleLabel: UILabel!
@IBOutlet var detailLabel: UILabel!
diff --git a/OmiseSDK/PaymentUI.swift b/OmiseSDK/Sources/Views/Screens/_ to refactor and delete/PaymentUI.swift
similarity index 59%
rename from OmiseSDK/PaymentUI.swift
rename to OmiseSDK/Sources/Views/Screens/_ to refactor and delete/PaymentUI.swift
index 2cd6c9b3..9288bfec 100644
--- a/OmiseSDK/PaymentUI.swift
+++ b/OmiseSDK/Sources/Views/Screens/_ to refactor and delete/PaymentUI.swift
@@ -24,7 +24,7 @@ internal class PaymentCreatorFlowSession {
let waringMessageMessage: String
if self.client == nil {
- os_log("Missing or invalid public key information - %{private}@", log: uiLogObject, type: .error, self.client ?? "")
+// os_log("Missing or invalid public key information - %{private}@", log: uiLogObject, type: .error, self.client ?? "")
waringMessageTitle = "Missing public key information."
waringMessageMessage = "Please set the public key before request token or source."
} else if self.paymentAmount == nil || self.paymentCurrency == nil {
@@ -43,7 +43,7 @@ internal class PaymentCreatorFlowSession {
return false
}
- func requestCreateSource(_ paymentInformation: PaymentInformation, completionHandler: ((RequestResult) -> Void)?) {
+ func requestCreateSource(_ payload: Source.Payment, completionHandler: ((Result) -> Void)?) {
guard validateRequiredProperties(), let client = self.client,
let amount = paymentAmount, let currency = paymentCurrency else {
return
@@ -52,13 +52,14 @@ internal class PaymentCreatorFlowSession {
os_log("Request to create a new source", log: uiLogObject, type: .info)
delegate?.paymentCreatorFlowSessionWillCreateSource(self)
- client.send(Request(paymentInformation: paymentInformation, amount: amount, currency: currency)) { (result) in
- defer {
- DispatchQueue.main.async {
- completionHandler?(result)
- }
- }
+ let sourcePayment = CreateSourcePayload(
+ amount: amount,
+ currency: currency.code,
+ details: payload
+ )
+ client.createSource(payload: sourcePayment) { [weak self] result in
+ guard let self = self else { return }
switch result {
case .success(let source):
self.delegate?.paymentCreatorFlowSession(self, didCreatedSource: source)
@@ -73,34 +74,24 @@ internal class PaymentCreatorFlowSession {
}
}
-extension PaymentCreatorFlowSession: CreditCardFormViewControllerDelegate {
- func creditCardFormViewController(_ controller: CreditCardFormViewController, didSucceedWithToken token: Token) {
- delegate?.paymentCreatorFlowSession(self, didCreateToken: token)
- }
-
- func creditCardFormViewController(_ controller: CreditCardFormViewController, didFailWithError error: Error) {
- delegate?.paymentCreatorFlowSession(self, didFailWithError: error)
- }
-
- func creditCardFormViewControllerDidCancel(_ controller: CreditCardFormViewController) {
- // Intentionally empty (SonarCloud warning fix)
- }
-}
+// extension PaymentCreatorFlowSession: CreditCardPaymentControllerDelegate {
+// func creditCardFormViewController(_ controller: CreditCardPaymentController, didSucceedWithToken token: Token) {
+// delegate?.paymentCreatorFlowSession(self, didCreateToken: token)
+// }
+//
+// func creditCardFormViewController(_ controller: CreditCardPaymentController, didFailWithError error: Error) {
+// delegate?.paymentCreatorFlowSession(self, didFailWithError: error)
+// }
+//
+// func creditCardFormViewControllerDidCancel(_ controller: CreditCardPaymentController) {
+// // Intentionally empty (SonarCloud warning fix)
+// }
+// }
protocol PaymentSourceChooser: AnyObject {
var flowSession: PaymentCreatorFlowSession? { get set }
}
-extension PaymentChooserUI {
- var currentPrimaryColor: UIColor {
- return preferredPrimaryColor ?? defaultPaymentChooserUIPrimaryColor
- }
-
- var currentSecondaryColor: UIColor {
- return preferredSecondaryColor ?? defaultPaymentChooserUISecondaryColor
- }
-}
-
protocol PaymentFormUIController: AnyObject {
var formLabels: [UILabel]! { get }
var formFields: [OmiseTextField]! { get }
@@ -170,6 +161,7 @@ extension PaymentFormUIController where Self: UIViewController {
}
}
+protocol PaymentChooserUI {}
extension PaymentFormUIController where Self: UIViewController & PaymentChooserUI {
func applyPrimaryColor() {
guard isViewLoaded else {
@@ -177,106 +169,17 @@ extension PaymentFormUIController where Self: UIViewController & PaymentChooserU
}
formFields.forEach {
- $0.textColor = currentPrimaryColor
+ $0.textColor = UIColor.omisePrimary
}
formLabels.forEach {
- $0.textColor = currentPrimaryColor
+ $0.textColor = UIColor.omisePrimary
}
}
func applySecondaryColor() {
- guard isViewLoaded else {
- return
- }
-
formFields.forEach {
- $0.borderColor = currentSecondaryColor
- $0.placeholderTextColor = currentSecondaryColor
- }
- }
-}
-
-extension SourceTypeValue {
-
- var installmentBrand: PaymentInformation.Installment.Brand? {
- switch self {
- case .installmentBAY:
- return .bay
- case .installmentMBB:
- return .mbb
- case .installmentFirstChoice:
- return .firstChoice
- case .installmentBBL:
- return .bbl
- case .installmentKTC:
- return .ktc
- case .installmentKBank:
- return .kBank
- case .installmentSCB:
- return .scb
- case .installmentTTB:
- return .ttb
- case .installmentUOB:
- return .uob
- default:
- return nil
- }
- }
-
- var isInstallmentSource: Bool {
- switch self {
- case .installmentBAY, .installmentMBB, .installmentFirstChoice, .installmentBBL,
- .installmentKTC, .installmentKBank, .installmentSCB, .installmentTTB, .installmentUOB:
- return true
- default:
- return false
- }
-
- }
-
- var internetBankingSource: PaymentInformation.InternetBanking? {
- switch self {
- case .internetBankingBAY:
- return .bay
- case .internetBankingBBL:
- return .bbl
- default:
- return nil
- }
- }
-
- var isInternetBankingSource: Bool {
- switch self {
- case .internetBankingBAY, .internetBankingBBL:
- return true
- default:
- return false
- }
- }
-
- var mobileBankingSource: PaymentInformation.MobileBanking? {
- switch self {
- case .mobileBankingSCB:
- return .scb
- case .mobileBankingKBank:
- return .kbank
- case .mobileBankingBAY:
- return .bay
- case .mobileBankingBBL:
- return .bbl
- case .mobileBankingKTB:
- return .ktb
- default:
- return nil
- }
- }
-
- var isMobileBankingSource: Bool {
- switch self {
- case .mobileBankingSCB, .mobileBankingKBank, .mobileBankingBAY, .mobileBankingBBL, .mobileBankingKTB:
- return true
- default:
- return false
+ $0.borderColor = UIColor.omiseSecondary
+ $0.placeholderTextColor = UIColor.omiseSecondary
}
}
}
diff --git a/OmiseSDK/Token.swift b/OmiseSDK/Token.swift
deleted file mode 100644
index 3bb202c9..00000000
--- a/OmiseSDK/Token.swift
+++ /dev/null
@@ -1,308 +0,0 @@
-import Foundation
-
-/// Parameter for creating a new `Token`
-/// - seealso: Token
-public struct CreateTokenParameter: Encodable {
- /// Card holder's full name.
- public let name: String
- /// Card number.
- public let pan: PAN
-
- /// Masked PAN number
- public var number: String {
- return pan.number
- }
-
- /// Card expiration month (1-12)
- public let expirationMonth: Int
- /// Card expiration year (Gregorian)
- public let expirationYear: Int
- /// Security code (CVV, CVC, etc) printed on the back of the card.
- public let securityCode: String
-
- public let city: String?
- public let postalCode: String?
-
- public let countryCode: String?
- public let state: String?
- public let street1: String?
- public let street2: String?
- public let phoneNumber: String?
-
- private enum TokenCodingKeys: String, CodingKey {
- case card
-
- enum CardCodingKeys: String, CodingKey {
- case number
- case name
- case expirationMonth = "expiration_month"
- case expirationYear = "expiration_year"
- case securityCode = "security_code"
- case city
- case postalCode = "postal_code"
- case countryCode = "country"
- case state
- case street1
- case street2
- case phoneNumber = "phone_number"
- }
- }
-
- /// Initializes new token request.
- public init(
- name: String,
- pan: PAN,
- expirationMonth: Int,
- expirationYear: Int,
- securityCode: String,
- countryCode: String? = nil,
- city: String? = nil,
- state: String? = nil,
- street1: String? = nil,
- street2: String? = nil,
- postalCode: String? = nil,
- phoneNumber: String? = nil
- ) {
- self.name = name
- self.pan = pan
- self.expirationMonth = expirationMonth
- self.expirationYear = expirationYear
- self.securityCode = securityCode
- self.city = city
- self.postalCode = postalCode
- self.countryCode = countryCode
- self.state = state
- self.street1 = street1
- self.street2 = street2
- self.phoneNumber = phoneNumber
- }
-
- /// Initializes a new token request.
- public init(
- name: String,
- number: String,
- expirationMonth: Int,
- expirationYear: Int,
- securityCode: String,
- countryCode: String? = nil,
- city: String? = nil,
- state: String? = nil,
- street1: String? = nil,
- street2: String? = nil,
- postalCode: String? = nil,
- phoneNumber: String? = nil
- ) {
- self.init(
- name: name,
- pan: PAN(number),
- expirationMonth: expirationMonth,
- expirationYear: expirationYear,
- securityCode: securityCode,
- countryCode: countryCode,
- city: city,
- state: state,
- street1: street1,
- street2: street2,
- postalCode: postalCode,
- phoneNumber: phoneNumber
- )
- }
-
- public func encode(to encoder: Encoder) throws {
- var tokenContainer = encoder.container(keyedBy: TokenCodingKeys.self)
- var cardContainer = tokenContainer.nestedContainer(keyedBy: TokenCodingKeys.CardCodingKeys.self, forKey: .card)
-
- try cardContainer.encode(pan.pan, forKey: .number)
- try cardContainer.encodeIfPresent(name, forKey: .name)
- try cardContainer.encodeIfPresent(expirationMonth, forKey: .expirationMonth)
- try cardContainer.encodeIfPresent(expirationYear, forKey: .expirationYear)
- try cardContainer.encodeIfPresent(securityCode, forKey: .securityCode)
- try cardContainer.encodeIfPresent(city, forKey: .city)
- try cardContainer.encodeIfPresent(postalCode, forKey: .postalCode)
-
- try cardContainer.encodeIfPresent(countryCode, forKey: .countryCode)
- try cardContainer.encodeIfPresent(state, forKey: .state)
- try cardContainer.encodeIfPresent(street1, forKey: .street1)
- try cardContainer.encodeIfPresent(street2, forKey: .street2)
- try cardContainer.encodeIfPresent(phoneNumber, forKey: .phoneNumber)
- }
-}
-
-/// Represents an Charge status
-public enum ChargeStatus: String, Codable {
- case unknown
- case failed
- case expired
- case pending
- case reversed
- case successful
-}
-
-/// Represents an Omise Token object
-public struct Token: CreatableObject {
- public typealias CreateParameter = CreateTokenParameter
-
- public static let postURL: URL = Configuration.default.environment.tokenURL
-
- public let object: String
- /// Omise ID of the token
- public let id: String
-
- /// Boolean indicates that if this Token is in the live mode
- public let isLiveMode: Bool
-
- /// URL for fetching the Token data
- public let location: String
-
- /// Boolean indicates that if this token is already used for creating a charge already
- public var isUsed: Bool
-
- /// Card that is used for creating this Token
- public let card: Card?
-
- /// Date that this Token was created
- public let createdDate: Date
-
- /// Status of charge created using this token
- public let chargeStatus: ChargeStatus
-
- private enum CodingKeys: String, CodingKey {
- case object
- case location
- case id
- case createdDate = "created_at"
- case isLiveMode = "livemode"
- case isUsed = "used"
- case card
- case chargeStatus = "charge_status"
- }
-}
-
-public struct Card: Decodable {
- /// Card's ID.
- public let id: String
- /// Boolean flag indicating wether this card is a live card or a test card.
- public let isLiveMode: Bool
- /// Card's creation time.
- public let createdDate: Date
- /// ISO3166 Country code based on the card number.
- /// - note: This is informational only and may not always be 100% accurate.
- public let countryCode: String?
- /// Issuing city.
- /// - note: This is informational only and may not always be 100% accurate.
- public let city: String?
- /// Postal code.
- public let postalCode: String?
- /// Credit card financing type. (debit or credit)
- public let financing: String?
- /// Last 4 digits of the card number.
- public let lastDigits: String
- /// Card brand. (e.g. Visa, Mastercard, ...)
- public let brand: String?
- /// Card expiration month (1-12)
- public let expirationMonth: Int?
- /// Card expiration year (Gregrorian)
- public let expirationYear: Int?
- /// Unique card-based fingerprint. Allows detection of identical cards without
- /// exposing card numbers directly.
- public let fingerprint: String?
- /// Card holder's full name.
- public let name: String?
- /// Boolean indicates that whether that the card is passed the security code check
- public let securityCodeCheck: Bool
-
- public let bankName: String?
- public let object: String
-
- private enum CodingKeys: String, CodingKey {
- case object
- case id
- case isLiveMode = "livemode"
- case createdDate = "created_at"
- case lastDigits = "last_digits"
- case brand
- case name
- case bankName = "bank"
- case postalCode = "postal_code"
- case countryCode = "country"
- case city
- case financing
- case fingerprint
- case expirationMonth = "expiration_month"
- case expirationYear = "expiration_year"
- case securityCodeCheck = "security_code_check"
- }
-}
-
-extension Calendar {
- /// Calendar used in the Credit Card information which is Gregorian Calendar
- public static let creditCardInformationCalendar = Calendar(identifier: .gregorian)
- /// Range contains the valid range of the expiration month value
- public static let validExpirationMonthRange: Range = Calendar.creditCardInformationCalendar.maximumRange(of: .month)!
- // swiftlint:disable:previous force_unwrapping
-}
-
-extension Request where T == Token {
-
- /// Initializes a new Token Request with the given information
- public init(
- name: String,
- pan: PAN,
- expirationMonth: Int,
- expirationYear: Int,
- securityCode: String,
- countryCode: String? = nil,
- city: String? = nil,
- state: String? = nil,
- street1: String? = nil,
- street2: String? = nil,
- postalCode: String? = nil,
- phoneNumber: String? = nil
- ) {
- self.init(parameter: CreateTokenParameter(
- name: name,
- pan: pan,
- expirationMonth: expirationMonth,
- expirationYear: expirationYear,
- securityCode: securityCode,
- countryCode: countryCode,
- city: city,
- state: state,
- street1: street1,
- street2: street2,
- postalCode: postalCode,
- phoneNumber: phoneNumber
- ))
- }
-
- /// Initializes a new Token Request with the given information
- public init(
- name: String,
- number: String,
- expirationMonth: Int,
- expirationYear: Int,
- securityCode: String,
- countryCode: String? = nil,
- city: String? = nil,
- state: String? = nil,
- street1: String? = nil,
- street2: String? = nil,
- postalCode: String? = nil,
- phoneNumber: String? = nil
- ) {
- self.init(parameter: CreateTokenParameter(
- name: name,
- number: number,
- expirationMonth: expirationMonth,
- expirationYear: expirationYear,
- securityCode: securityCode,
- countryCode: countryCode,
- city: city,
- state: state,
- street1: street1,
- street2: street2,
- postalCode: postalCode,
- phoneNumber: phoneNumber
- ))
- }
-}
diff --git a/OmiseSDK/Views/AtomeInputView.swift b/OmiseSDK/Views/AtomeInputView.swift
deleted file mode 100644
index 4638409e..00000000
--- a/OmiseSDK/Views/AtomeInputView.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-//
-// AtomeInputView.swift
-// OmiseSDKUITests
-//
-// Created by Andrei Solovev on 21/5/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
-import UIKit
-
-typealias AtomeInputView = TextFieldView
diff --git a/OmiseSDKTests/Atome/AtomeFormViewModelTests.swift b/OmiseSDKTests/Atome/AtomeFormViewModelTests.swift
deleted file mode 100644
index 0b7809aa..00000000
--- a/OmiseSDKTests/Atome/AtomeFormViewModelTests.swift
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// AtomeFormViewModelTests.swift
-// OmiseSDKTests
-//
-// Created by Andrei Solovev on 23/5/23.
-// Copyright © 2023 Omise. All rights reserved.
-//
-
-import XCTest
-import OmiseUnitTestKit
-@testable import OmiseSDK
-
-class AtomeFormViewModelTests: XCTestCase {
- typealias ViewModel = AtomeFormViewModelMockup
-
- let validCases = TestCaseValueGenerator.validCases(AtomeFormViewContext.generateMockup)
- let invalidCases = TestCaseValueGenerator.invalidCases(AtomeFormViewContext.generateMockup)
- let mostInvalidCases = TestCaseValueGenerator.mostInvalidCases(AtomeFormViewContext.generateMockup)
-
-}
diff --git a/OmiseSDKTests/Atome/CountryLists/CountryListViewModelMockup.swift b/OmiseSDKTests/Atome/CountryLists/CountryListViewModelMockup.swift
deleted file mode 100644
index 823df907..00000000
--- a/OmiseSDKTests/Atome/CountryLists/CountryListViewModelMockup.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-import Foundation
-import OmiseUnitTestKit
-#if OMISE_SDK_UNIT_TESTING
-@testable import OmiseSDK
-#endif
-
-class CountryListViewModelMockup: CountryListViewModelProtocol {
- var countries: [CountryInfo] = [CountryInfo(name: "Thailand", code: "TH"), CountryInfo(name: "France", code: "FR")]
- lazy var selectedCountry: CountryInfo? = countries.first
- var onSelectCountry: (CountryInfo) -> Void = { _ in }
-}
diff --git a/OmiseSDKTests/CapabilityOperationFixtureTests.swift b/OmiseSDKTests/CapabilityOperationFixtureTests.swift
deleted file mode 100644
index 6206c60a..00000000
--- a/OmiseSDKTests/CapabilityOperationFixtureTests.swift
+++ /dev/null
@@ -1,91 +0,0 @@
-import XCTest
-@testable import OmiseSDK
-
-class CapabilityOperationFixtureTests: XCTestCase {
-
- func validateCapabilitySupportsCurrency(_ capability: Capability, sourceType: SourceTypeValue, currencies: Set) {
- if let backend = capability[sourceType] {
- XCTAssertEqual(backend.supportedCurrencies, currencies)
- } else {
- XCTFail("Capability doesn't have the \(sourceType) backend")
- }
- }
-
- func testCapabilityRetrieve() {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let capabilityData = try XCTestCase.fixturesData(forFilename: "capability")
- let capability = try decoder.decode(Capability.self, from: capabilityData)
-
- XCTAssertEqual(capability.supportedBackends.count, 33)
-
- if let creditCardBackend = capability.creditCardBackend {
- XCTAssertEqual(creditCardBackend.payment, .card([]))
- XCTAssertEqual(creditCardBackend.supportedCurrencies, [.thb, .jpy, .usd, .eur, .gbp, .sgd, .aud, .chf, .cny, .dkk, .hkd])
- } else {
- XCTFail("Capability doesn't have the Credit Card backend")
- }
-
- if let bayInstallmentBackend = capability[SourceTypeValue.installmentBAY] {
- XCTAssertEqual(
- bayInstallmentBackend.payment,
- .installment(.bay, availableNumberOfTerms: IndexSet([3, 4, 6, 9, 10]))
- )
- XCTAssertEqual(bayInstallmentBackend.supportedCurrencies, [.thb])
- } else {
- XCTFail("Capability doesn't have the BAY Installment backend")
- }
-
- if let fpxBackend = capability[SourceTypeValue.fpx] {
- XCTAssertEqual(fpxBackend.banks, [
- Capability.Backend.Bank(name: "UOB", code: "uob", isActive: true)
- ])
- } else {
- XCTFail("Capability doesn't have the FPX backend")
- }
-
- if let mobileBankingKBankBackend = capability[SourceTypeValue.mobileBankingKBank] {
- XCTAssertEqual(
- mobileBankingKBankBackend.payment, .mobileBanking(.kbank))
- XCTAssertEqual(mobileBankingKBankBackend.supportedCurrencies, [.thb])
- } else {
- XCTFail("Capability doesn't have the Mobile Banking KBank backend")
- }
-
- validateCapabilitySupportsCurrency(capability, sourceType: .trueMoney, currencies: [.thb])
- validateCapabilitySupportsCurrency(capability, sourceType: .trueMoneyJumpApp, currencies: [.thb])
- validateCapabilitySupportsCurrency(capability, sourceType: .pointsCiti, currencies: [.thb])
- validateCapabilitySupportsCurrency(capability, sourceType: .rabbitLinepay, currencies: [.thb])
- validateCapabilitySupportsCurrency(capability, sourceType: .grabPay, currencies: [.sgd, .myr])
- validateCapabilitySupportsCurrency(capability, sourceType: .payPay, currencies: [.jpy])
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testEncodeCapabilityRetrieve() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
- let capabilityData = try XCTestCase.fixturesData(forFilename: "capability")
- let capability = try decoder.decode(Capability.self, from: capabilityData)
-
- let encoder = JSONEncoder()
- encoder.dateEncodingStrategy = .iso8601
- let encodedData = try encoder.encode(capability)
-
- let decodedCapability = try decoder.decode(Capability.self, from: encodedData)
- XCTAssertEqual(capability.supportedBackends.count, decodedCapability.supportedBackends.count)
-
- XCTAssertEqual(capability.creditCardBackend?.payment, decodedCapability.creditCardBackend?.payment)
- XCTAssertEqual(capability.creditCardBackend?.supportedCurrencies,
- decodedCapability.creditCardBackend?.supportedCurrencies)
- XCTAssertEqual(
- capability[.installmentBAY]?.payment,
- decodedCapability[.installmentBAY]?.payment
- )
- XCTAssertEqual(capability[.installmentBAY]?.supportedCurrencies,
- decodedCapability[.installmentBAY]?.supportedCurrencies)
- XCTAssertEqual(capability[.installmentBAY]?.payment,
- decodedCapability[.installmentBAY]?.payment)
- }
-}
diff --git a/OmiseSDKTests/ClientTestCase.swift b/OmiseSDKTests/ClientTestCase.swift
deleted file mode 100644
index 81f90433..00000000
--- a/OmiseSDKTests/ClientTestCase.swift
+++ /dev/null
@@ -1,145 +0,0 @@
-import XCTest
-@testable import OmiseSDK
-@testable import OmiseUnitTestKit
-
-private let timeout: TimeInterval = 15.0
-
-class ClientTestCase: XCTestCase {
-
- static let requestTokenGenerator: OmiseUnitTestKit.TestCaseValueGenerator.GeneratorFunction> = { gen in
- Request(parameter: Token.CreateParameter(
- name: "JOHN DOE",
- number: "4242424242424242",
- expirationMonth: 11,
- expirationYear: gen.cases(.valid(2030), .invalid(2016, "Expired")),
- securityCode: "123"
- ))
- }
-
- var testClient: Client!
- override func setUp() {
- super.setUp()
- testClient = Client(publicKey: "pkey_test_58wfnlwoxz1tbkdd993")
- }
-
- override func tearDown() {
- testClient = nil
- super.tearDown()
- }
-
- func testValidTokenRequestWithCallback() {
- let expectation = self.expectation(description: "Tokenized Reqeust with a valid token data")
- let tokenRequest = ClientTestCase.makeValidTokenRequest()
- let task = testClient.send(tokenRequest) { (result) in
- defer { expectation.fulfill() }
- switch result {
- case .success(let token):
- XCTAssertEqual("4242", token.card?.lastDigits)
- XCTAssertEqual(11, token.card?.expirationMonth)
- XCTAssertEqual(2030, token.card?.expirationYear)
- case .failure(let error):
- XCTFail("Expected succeed request but it failed with \(error)")
- }
- }
-
- XCTAssertEqual(tokenRequest.parameter.number, task.request.parameter.number)
- XCTAssertEqual(tokenRequest.parameter.expirationMonth, task.request.parameter.expirationMonth)
- XCTAssertEqual(tokenRequest.parameter.expirationYear, task.request.parameter.expirationYear)
-
- XCTAssertEqual(Token.postURL, task.dataTask.currentRequest?.url)
- XCTAssertEqual("POST", task.dataTask.currentRequest?.httpMethod)
-
- waitForExpectations(timeout: timeout, handler: nil)
- }
-
- func testInvalidTokenRequestWithCallback() {
- let expectation = self.expectation(description: "Tokenized Reqeust with an invalid token data")
- let tokenRequest = ClientTestCase.makeInvalidTokenRequest()
- let task = testClient.send(tokenRequest) { (result) in
- defer { expectation.fulfill() }
- if case .success = result {
- XCTFail("Expected failed request")
- }
- }
-
- XCTAssertEqual(tokenRequest.parameter.number, task.request.parameter.number)
- XCTAssertEqual(tokenRequest.parameter.expirationMonth, task.request.parameter.expirationMonth)
- XCTAssertEqual(tokenRequest.parameter.expirationYear, task.request.parameter.expirationYear)
-
- XCTAssertEqual(Token.postURL, task.dataTask.currentRequest?.url)
- XCTAssertEqual("POST", task.dataTask.currentRequest?.httpMethod)
-
- waitForExpectations(timeout: timeout, handler: nil)
- }
-
- func testValidSourceRequestWithCallback() {
- let expectation = self.expectation(description: "Source Reqeust with a valid token data")
- let task = testClient.send(ClientTestCase.makeValidSourceRequest()) { (result) in
- defer { expectation.fulfill() }
- switch result {
- case .success(let source):
- XCTAssertEqual(100_00, source.amount)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(Flow.redirect, source.flow)
- XCTAssertEqual(PaymentInformation.internetBanking(.bay), source.paymentInformation)
- case .failure(let error):
- XCTFail("Expected succeed request but it failed with \(error)")
- }
- }
-
- XCTAssertEqual(100_00, task.request.parameter.amount)
- XCTAssertEqual(Currency.thb, task.request.parameter.currency)
- XCTAssertEqual(PaymentInformation.internetBanking(.bay), task.request.parameter.paymentInformation)
-
- XCTAssertEqual(Source.postURL, task.dataTask.currentRequest?.url)
- XCTAssertEqual("POST", task.dataTask.currentRequest?.httpMethod)
-
- waitForExpectations(timeout: timeout, handler: nil)
- }
-
- func testInvalidSourceRequestWithCallback() {
- let expectation = self.expectation(description: "Source Reqeust with an invalid source data")
- let task = testClient.send(ClientTestCase.makeInvalidSourceRequest()) { (result) in
- defer { expectation.fulfill() }
- if case .success = result {
- XCTFail("Expected failed request")
- }
- }
-
- XCTAssertEqual(100_00, task.request.parameter.amount)
- XCTAssertEqual(Currency.custom(code: "UNSUPPORTED_CURRENCY", factor: 100), task.request.parameter.currency)
- XCTAssertEqual(
- PaymentInformation.other(type: "UNSUPPORTED SOURCE", parameters: [ "client_id": "client_12345", "client_balance": 12345.67]),
- task.request.parameter.paymentInformation
- )
-
- XCTAssertEqual(Source.postURL, task.dataTask.currentRequest?.url)
- XCTAssertEqual("POST", task.dataTask.currentRequest?.httpMethod)
-
- waitForExpectations(timeout: timeout, handler: nil)
- }
-}
-
-extension ClientTestCase {
-
- // MARK: Request factory methods
- static func makeValidTokenRequest() -> Request {
- // swiftlint:disable:next force_unwrapping
- TestCaseValueGenerator.validCases(self.requestTokenGenerator).first!
- }
- static func makeInvalidTokenRequest() -> Request {
- // swiftlint:disable:next force_unwrapping
- TestCaseValueGenerator.invalidCases(self.requestTokenGenerator).first!
- }
-
- static func makeValidSourceRequest() -> Request {
- return Request(paymentInformation: PaymentInformation.internetBanking(.bay), amount: 100_00, currency: .thb)
- }
- static func makeInvalidSourceRequest() -> Request {
- return Request(
- paymentInformation: .other(type: "UNSUPPORTED SOURCE", parameters: [ "client_id": "client_12345", "client_balance": 12345.67]),
- amount: 100_00,
- currency: Currency.custom(code: "UNSUPPORTED_CURRENCY", factor: 100)
- )
- }
-}
diff --git a/OmiseSDKTests/ClientTests.swift b/OmiseSDKTests/ClientTests.swift
new file mode 100644
index 00000000..a43e2c43
--- /dev/null
+++ b/OmiseSDKTests/ClientTests.swift
@@ -0,0 +1,149 @@
+import Foundation
+import XCTest
+@testable import OmiseSDK
+
+struct NetworkMockup: NetworkServiceProtocol {
+ var sendClosure: (URLRequest) -> Void = { _ in }
+
+ func send(
+ urlRequest: URLRequest,
+ dateFormatter: DateFormatter?,
+ completion: @escaping RequestResultClosure
+ ) {
+ self.sendClosure(urlRequest)
+ }
+}
+
+class ClientTests: XCTestCase {
+ let publicKey = "pkey_test_58wfnlwoxz1tbkdd993"
+ let publicKeyBase64 = "cGtleV90ZXN0XzU4d2ZubHdveHoxdGJrZGQ5OTM="
+ let requestTimeout: TimeInterval = 15.0
+
+ var testClient: Client!
+
+ override func setUp() {
+ super.setUp()
+ // swiftlint:disable force_unwrapping
+ testClient = Client(
+ publicKey: publicKey,
+ version: "1.0.0",
+ apiURL: URL(string: "https://api.staging-omise.co")!,
+ vaultURL: URL(string: "https://vault.staging-omise.co")!
+ )
+ // swiftlint:enable force_unwrapping
+ }
+
+ override func tearDown() {
+ testClient = nil
+ super.tearDown()
+ }
+ let tokenPayload = CreateTokenPayload.Card(
+ name: "JOHN DOE",
+ number: "4242424242424242",
+ expirationMonth: 11,
+ expirationYear: 2022,
+ securityCode: "123"
+ )
+ /// Testing createToken API Request.
+ /// Testing if `Client` generates URLRequest with correct HTTP body to perform API request
+ func testCreateTokenURLRequest() throws {
+ let expectation = self.expectation(description: "Create Token Mockup Callback")
+ let cardPayload = CreateTokenPayload(card: try sampleFromJSONBy(.card))
+
+ let networkMockup = NetworkMockup { [cardPayload] urlRequest in
+ defer { expectation.fulfill() }
+
+ func validateURLRequest() {
+ if let data = urlRequest.httpBody, let jsonString = String(data: data, encoding: .utf8) {
+ do {
+ let decodedCardPayload: CreateTokenPayload = try parse(jsonString: jsonString)
+ XCTAssertEqual(cardPayload, decodedCardPayload)
+ } catch {
+ XCTFail("Unable to decode payload from encoded JSON string")
+ }
+
+ } else {
+ XCTFail("Unable to decode payload from encoded JSON string")
+ }
+ }
+
+ validateURLRequest()
+ }
+
+ let client = Client(publicKey: publicKey, version: "1.0.0", network: networkMockup)
+ client.createToken(payload: cardPayload) { _ in
+ /// Testing URLRequst in through Network Mockup closure
+ /// Closure implementation is nor required
+ }
+ waitForExpectations(timeout: requestTimeout, handler: nil)
+ }
+
+ /// Testing createToken API Request.
+ /// Testing if `Client` generates URLRequest with correct HTTP body to perform API request
+ func testCreateSourceURLRequest() throws {
+ let expectation = self.expectation(description: "Create Source Mockup Callback")
+ let sourcePayload: CreateSourcePayload = try sampleFromJSONBy(.source(type: .atome))
+
+ let networkMockup = NetworkMockup { [sourcePayload] urlRequest in
+ defer { expectation.fulfill() }
+
+ func validateURLRequest() {
+ if let data = urlRequest.httpBody, let jsonString = String(data: data, encoding: .utf8) {
+ do {
+ let decodedCardPayload: CreateSourcePayload = try parse(jsonString: jsonString)
+ XCTAssertEqual(sourcePayload, decodedCardPayload)
+ } catch {
+ XCTFail("Unable to decode payload from encoded JSON string")
+ }
+
+ } else {
+ XCTFail("Unable to decode payload from encoded JSON string")
+ }
+ }
+
+ validateURLRequest()
+ }
+
+ let client = Client(publicKey: publicKey, version: "1.0.0", network: networkMockup)
+ client.createSource(payload: sourcePayload) { _ in
+ /// Testing URLRequst in through Network Mockup closure
+ /// Closure implementation is nor required
+ }
+ waitForExpectations(timeout: requestTimeout, handler: nil)
+ }
+
+ // - Mark testClient.userAgent as private
+ // - Move this test to testUrlRequest
+ func testUserAgent() {
+ let sdkVersion = "1.0.0"
+ let platform = "12.0.0"
+ let device = "iPhone"
+
+ let expectedResult = "OmiseIOS/\(sdkVersion) iOS/\(platform) Apple/\(device)"
+ let result = testClient.userAgent(sdkVersion: sdkVersion, platform: platform, device: device)
+ XCTAssertEqual(expectedResult, result)
+ }
+
+ // - Mark testClient.httpHeaders as private
+ // - Move this test to testUrlRequest
+ func testHTTPHeaders() {
+ let userAgent = "OmiseIOSSDK/3.0.0 iOS/12.0.0 Apple/iPhone"
+ let apiVersion = "2019-05-29"
+ let contentType = "application/json; charset=utf8"
+
+ let expectedResult = [
+ "Authorization": "Basic \(publicKeyBase64)",
+ "User-Agent": userAgent,
+ "Content-Type": contentType,
+ "Omise-Version": apiVersion
+ ]
+
+ let result = testClient.httpHeaders(
+ publicKey: publicKey,
+ userAgent: userAgent,
+ apiVersion: apiVersion,
+ contentType: contentType
+ )
+ XCTAssertEqual(expectedResult, result)
+ }
+}
diff --git a/OmiseSDKTests/Fixtures/objects/source_atome.json b/OmiseSDKTests/Fixtures/objects/source_atome.json
deleted file mode 100644
index f68548ca..00000000
--- a/OmiseSDKTests/Fixtures/objects/source_atome.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
- "object": "source",
- "id": "src_test_5jhmesi7s4at1qctloy",
- "livemode": false,
- "location": "/sources/src_test_5jhmesi7s4at1qctloy",
- "created_at": "2020-04-09T02:47:32Z",
- "type": "atome",
- "flow": "redirect",
- "amount": 100000,
- "currency": "THB",
- "phone_number": "+66800000101",
- "name": "name surname",
- "email": "test_user@opn.ooo",
- "shipping_street": "4 Sukhumvit 103 rd.",
- "shipping_city": "Bangkok",
- "shipping_country_code": "TH",
- "shipping_postal_code": "10260"
-}
diff --git a/OmiseSDKTests/Fixtures/objects/source_installments/citi.json b/OmiseSDKTests/Fixtures/objects/source_installments/citi.json
deleted file mode 100644
index fb5c6b2e..00000000
--- a/OmiseSDKTests/Fixtures/objects/source_installments/citi.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "object": "source",
- "id": "src_test_5obr9ossd5huc93kd71",
- "livemode": false,
- "location": "/sources/src_test_5obr9opqz5huc6tefw8",
- "created_at": "2019-05-22T06:22:18Z",
- "type": "installment_citi",
- "flow": "redirect",
- "amount": 500000,
- "currency": "THB",
- "installment_term": 6,
- "zero_interest_installments": false
-}
diff --git a/OmiseSDKTests/Fixtures/objects/source_internet_banking/ktb.json b/OmiseSDKTests/Fixtures/objects/source_internet_banking/ktb.json
deleted file mode 100644
index 3e22f352..00000000
--- a/OmiseSDKTests/Fixtures/objects/source_internet_banking/ktb.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "object": "source",
- "id": "src_test_5cs0swjx9zguxt0kd0z",
- "livemode": false,
- "location": "/sources/src_test_5cs0swjx9zguxt0kd0z",
- "type": "internet_banking_ktb",
- "flow": "redirect",
- "amount": 100000,
- "currency": "THB"
-}
diff --git a/OmiseSDKTests/Fixtures/objects/source_internet_banking/scb.json b/OmiseSDKTests/Fixtures/objects/source_internet_banking/scb.json
deleted file mode 100644
index b9339b0e..00000000
--- a/OmiseSDKTests/Fixtures/objects/source_internet_banking/scb.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "object": "source",
- "id": "src_test_5avnh1p1dt3hkh161ac",
- "livemode": false,
- "location": "/sources/src_test_5avnh1p1dt3hkh161ac",
- "type": "internet_banking_scb",
- "flow": "redirect",
- "amount": 1000000,
- "currency": "THB"
-}
diff --git a/OmiseSDKTests/Fixtures/vault.omise.co/tokens-post.json b/OmiseSDKTests/Fixtures/vault.omise.co/tokens-post.json
deleted file mode 100644
index 087b4372..00000000
--- a/OmiseSDKTests/Fixtures/vault.omise.co/tokens-post.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "object": "token",
- "id": "tokn_test_4yq8lbecl0q6dsjzxr5",
- "livemode": false,
- "location": "/tokens/tokn_test_4yq8lbecl0q6dsjzxr5",
- "created_at": "2019-07-26T05:45:20Z",
- "used": false,
- "card": {
- "object": "card",
- "id": "card_test_5gorbb93q6uva7coy1q",
- "livemode": false,
- "location": null,
- "created_at": "2019-07-26T05:45:20Z",
- "deleted": false,
- "street1": null,
- "street2": null,
- "city": "Bangkok",
- "state": null,
- "postal_code": "10240",
- "country": "gb",
- "phone_number": null,
- "financing": "credit",
- "bank": "STRIPE PAYMENTS UK LIMITED",
- "first_digits": null,
- "last_digits": "4242",
- "brand": "Visa",
- "expiration_month": 12,
- "expiration_year": 2020,
- "fingerprint": "lU7vaGrF+kmVxxre6YC7xlVyeLuwzMIlS+VxdVLqxlk=",
- "name": "John Doe",
- "security_code_check": true
- }
-}
diff --git a/OmiseSDKTests/Fixtures/vault.omise.co/tokens/tokn_test_4yq8lbecl0q6dsjzxr5-get.json b/OmiseSDKTests/Fixtures/vault.omise.co/tokens/tokn_test_4yq8lbecl0q6dsjzxr5-get.json
deleted file mode 100644
index 087b4372..00000000
--- a/OmiseSDKTests/Fixtures/vault.omise.co/tokens/tokn_test_4yq8lbecl0q6dsjzxr5-get.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "object": "token",
- "id": "tokn_test_4yq8lbecl0q6dsjzxr5",
- "livemode": false,
- "location": "/tokens/tokn_test_4yq8lbecl0q6dsjzxr5",
- "created_at": "2019-07-26T05:45:20Z",
- "used": false,
- "card": {
- "object": "card",
- "id": "card_test_5gorbb93q6uva7coy1q",
- "livemode": false,
- "location": null,
- "created_at": "2019-07-26T05:45:20Z",
- "deleted": false,
- "street1": null,
- "street2": null,
- "city": "Bangkok",
- "state": null,
- "postal_code": "10240",
- "country": "gb",
- "phone_number": null,
- "financing": "credit",
- "bank": "STRIPE PAYMENTS UK LIMITED",
- "first_digits": null,
- "last_digits": "4242",
- "brand": "Visa",
- "expiration_month": 12,
- "expiration_year": 2020,
- "fingerprint": "lU7vaGrF+kmVxxre6YC7xlVyeLuwzMIlS+VxdVLqxlk=",
- "name": "John Doe",
- "security_code_check": true
- }
-}
diff --git a/OmiseSDKTests/Helpers/SampleData.swift b/OmiseSDKTests/Helpers/SampleData.swift
new file mode 100644
index 00000000..403325a9
--- /dev/null
+++ b/OmiseSDKTests/Helpers/SampleData.swift
@@ -0,0 +1,78 @@
+import Foundation
+import XCTest
+import OmiseSDK
+
+class SampleData {
+ enum Entity {
+ case source(type: SourceType)
+ case card
+ case token
+ case capability
+
+ var path: String {
+ switch self {
+ case .source(let type):
+ return "sources/\(type.rawValue)"
+ case .card:
+ return "card"
+ case .token:
+ return "token"
+ case .capability:
+ return "capability"
+ }
+ }
+ }
+
+ func jsonData(for entity: Entity) throws -> Data {
+ let bundle = Bundle(for: Self.self)
+ let path = try XCTUnwrap(
+ bundle.url(forResource: "SampleData/\(entity.path)", withExtension: "json")
+ )
+ let data = try Data(contentsOf: path)
+ return data
+ }
+}
+
+private let sampleData = SampleData()
+private let jsonDecoder = JSONDecoder()
+
+/// Load JSON sample data from resources by given SourceType
+func sampleFromJSONBy(_ entity: SampleData.Entity) throws -> T {
+ do {
+ switch entity {
+ case .card:
+ print("aa")
+ default:
+ break
+ }
+ let data = try sampleData.jsonData(for: entity)
+ let obj = try jsonDecoder.decode(T.self, from: data)
+ return obj
+ } catch {
+ XCTFail("Cannot decode \(T.self): \(entity) \(error)")
+ throw error
+ }
+}
+
+struct StringToDataCastError: Error {}
+struct DataToStringCastError: Error {}
+
+func encodeToJson(_ object: T) throws -> String {
+ let encoder = JSONEncoder()
+ encoder.outputFormatting = [.sortedKeys]
+
+ let data = try encoder.encode(object)
+ guard let result = String(data: data, encoding: .utf8) else {
+ throw DataToStringCastError()
+ }
+
+ return result
+}
+/// Decode JSON string into Decodable
+func parse(jsonString: String) throws -> T {
+ guard let data = jsonString.data(using: .utf8) else {
+ throw StringToDataCastError()
+ }
+
+ return try jsonDecoder.decode(T.self, from: data)
+}
diff --git a/OmiseSDKTests/Helpers/String+JSON.swift b/OmiseSDKTests/Helpers/String+JSON.swift
new file mode 100644
index 00000000..58b63215
--- /dev/null
+++ b/OmiseSDKTests/Helpers/String+JSON.swift
@@ -0,0 +1,37 @@
+import Foundation
+
+extension String {
+
+ struct DataFromStringError: Error {}
+ struct StringFromDateError: Error {}
+
+ /// Decode JSON object from current string
+ /// - returns Generic Decodable object
+ /// - throws: An error if any value throws an error during decoding
+ ///
+ func fromJson(_ type: T.Type) throws -> T {
+ guard let data = data(using: .utf8) else {
+ throw DataFromStringError()
+
+ }
+
+ let decoder = JSONDecoder()
+ let object = try decoder.decode(T.self, from: data)
+ return object
+ }
+
+ /// JSON string by encoding Encodable object
+ /// - parameter codable Encodable object
+ init(_ encodable: T) throws {
+ let encoder = JSONEncoder()
+ encoder.outputFormatting = [.sortedKeys]
+
+ let data = try encoder.encode(encodable)
+ guard let string = String(data: data, encoding: .utf8) else {
+ throw StringFromDateError()
+ }
+
+ self = string
+ }
+
+}
diff --git a/OmiseSDKTests/ModelTestCase.swift b/OmiseSDKTests/ModelTestCase.swift
deleted file mode 100644
index b4ed912e..00000000
--- a/OmiseSDKTests/ModelTestCase.swift
+++ /dev/null
@@ -1,733 +0,0 @@
-// swiftlint:disable file_length
-import XCTest
-@testable import OmiseSDK
-
-// swiftlint:disable:next type_body_length
-class ModelTestCase: XCTestCase {
-
- func testDecodeToken() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
- let tokenData = try XCTestCase.fixturesData(forFilename: "token_object")
- let token = try decoder.decode(Token.self, from: tokenData)
-
- XCTAssertEqual("tokn_test_5086xl7c9k5rnx35qba", token.id)
- XCTAssertEqual("/tokens/tokn_test_5086xl7c9k5rnx35qba", token.location)
- XCTAssertFalse(token.isLiveMode)
- XCTAssertEqual(XCTestCase.dateFromJSONString("2019-07-26T05:45:20Z"), token.createdDate)
- XCTAssertFalse(token.isUsed)
- XCTAssertEqual("card_test_5086xl7amxfysl0ac5l", token.card?.id)
- XCTAssertEqual(ChargeStatus.unknown, token.chargeStatus)
- }
-
- func testDecodeTokenWithoutCard() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
- let tokenData = try XCTestCase.fixturesData(forFilename: "token_with_empty_card_object")
- let token = try decoder.decode(Token.self, from: tokenData)
-
- XCTAssertEqual("tokn_test_5086xl7c9k5rnx35qba", token.id)
- XCTAssertEqual("/tokens/tokn_test_5086xl7c9k5rnx35qba", token.location)
- XCTAssertFalse(token.isLiveMode)
- XCTAssertEqual(XCTestCase.dateFromJSONString("2019-07-26T05:45:20Z"), token.createdDate)
- XCTAssertFalse(token.isUsed)
- XCTAssertEqual(ChargeStatus.pending, token.chargeStatus)
- XCTAssertNil(token.card)
- }
-
- func testDecodeCard() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
- let cardData = try XCTestCase.fixturesData(forFilename: "card_object")
- let card = try decoder.decode(Card.self, from: cardData)
-
- XCTAssertEqual("card_test_5086xl7amxfysl0ac5l", card.id)
- XCTAssertEqual("4242", card.lastDigits)
- XCTAssertTrue(card.securityCodeCheck)
- XCTAssertEqual(12, card.expirationMonth)
- XCTAssertEqual(2020, card.expirationYear)
- XCTAssertEqual("John Doe", card.name)
- XCTAssertEqual("mKleiBfwp+PoJWB/ipngANuECUmRKjyxROwFW5IO7TM=", card.fingerprint)
- XCTAssertEqual(XCTestCase.dateFromJSONString("2019-07-26T05:45:20Z"), card.createdDate)
- XCTAssertEqual("gb", card.countryCode)
- }
-
- func testDecodeSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_alipay_object")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5avnfnqxzzj2yu7a34e", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(1000000, source.amount)
- XCTAssertEqual(PaymentInformation.alipay, source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testBillPaymentSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_bill_payment/tesco_lotus")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_59trf2nxk43b5nml8z0", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(1000000, source.amount)
- XCTAssertEqual(PaymentInformation.billPayment(.tescoLotus), source.paymentInformation)
- XCTAssertEqual(Flow.offline, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeBarcodeSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_barcode/alipay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- let expectedBarcode = PaymentInformation.Barcode.AlipayBarcode(barcode: "1234567890123456",
- storeID: "1",
- storeName: "Main Store",
- terminalID: nil)
-
- XCTAssertEqual("src_test_5cq1tilrnz7d62t8y87", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(.barcode(.alipay(expectedBarcode)), source.paymentInformation)
- XCTAssertEqual(Flow.offline, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- // swiftlint:disable:next function_body_length
- func testDecodeInstallmentsSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_installments/first_choice")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cq1ugk8m0un1yefb2u", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(.installment(.init(brand: .firstChoice, numberOfTerms: 6)), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_installments/bay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0t6x8n0z8rcfrsfi", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(.installment(.init(brand: .bay, numberOfTerms: 6)), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_installments/bbl")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0tdinbyypg6kn1fa", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(.installment(.init(brand: .bbl, numberOfTerms: 6)), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_installments/mbb")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5obr9opqz5huc6tefw8", source.id)
- XCTAssertEqual(Currency.myr, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(.installment(.init(brand: .mbb, numberOfTerms: 6)), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_installments/ktc")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0tk7m2e5ivctrq30", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(.installment(.init(brand: .ktc, numberOfTerms: 6)), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_installments/kbank")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0totfv87k1i6y45l", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(.installment(.init(brand: .kBank, numberOfTerms: 6)), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_installments/ttb")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5obr9opd7ej5c6tefw8", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(.installment(.init(brand: .ttb, numberOfTerms: 6)), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_installments/uob")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5oe7fj1qz5huc6tefw8", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(.installment(.init(brand: .uob, numberOfTerms: 6)), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeInternetBankingSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_internet_banking/bay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0sm8u8h8nqo5hwcs", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(1000_00, source.amount)
- XCTAssertEqual(PaymentInformation.internetBanking(.bay), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_internet_banking/bbl")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0sfy7phu06yhyz5c", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(1000_00, source.amount)
- XCTAssertEqual(PaymentInformation.internetBanking(.bbl), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- // swiftlint:disable:next function_body_length
- func testDecodeMobileBankingSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_mobile_banking/scb")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0sm8u8h8nqo5zasd", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(1000000, source.amount)
- XCTAssertEqual(PaymentInformation.mobileBanking(.scb), source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_mobile_banking/kbank")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0sm8u8h8nqo5zasd", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(1000000, source.amount)
- XCTAssertEqual(PaymentInformation.mobileBanking(.kbank), source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_mobile_banking/bay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0sm8u8h8nqo5zasd", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(1000000, source.amount)
- XCTAssertEqual(PaymentInformation.mobileBanking(.bay), source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_mobile_banking/bbl")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0sm8u8h8nqo5zasd", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(1000000, source.amount)
- XCTAssertEqual(PaymentInformation.mobileBanking(.bbl), source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_mobile_banking/ktb")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5cs0sm8u8h8nqo5zasd", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(1000000, source.amount)
- XCTAssertEqual(PaymentInformation.mobileBanking(.ktb), source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeAlipayCNSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_alipay_plus/alipay_cn")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5owftw9kjhjisssm0n2", source.id)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(PaymentInformation.alipayCN, source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeAlipayHKSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_alipay_plus/alipay_hk")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5oxesy9ovpgawobhf6n", source.id)
- XCTAssertEqual(Currency.hkd, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(PaymentInformation.alipayHK, source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
-// func testDecodeAtomeSource() throws {
-// let decoder = Client.makeJSONDecoder(for: Request?.none)
-//
-// do {
-// let sourceData = try XCTestCase.fixturesData(forFilename: "source_atome")
-// let source = try decoder.decode(Source.self, from: sourceData)
-//
-// XCTAssertEqual("src_test_5jhmesi7s4at1qctloy", source.id)
-// XCTAssertEqual(100000, source.amount)
-// XCTAssertEqual(Currency.thb, source.currency)
-// XCTAssertEqual(PaymentInformation.atome(.init(
-// phoneNumber: "+66800000101",
-// shippingStreet: "4 Sukhumvit 103 rd.",
-// shippingCity: "Bangkok",
-// shippingCountryCode: "TH",
-// shippingPostalCode: "10260",
-// name: "name surname",
-// email: "test_user@opn.ooo")), source.paymentInformation)
-// XCTAssertEqual(Flow.redirect, source.flow)
-// } catch {
-// XCTFail("Cannot decode the source \(error)")
-// }
-// }
-
- func testDecodeDANASource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_alipay_plus/dana")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5oxew5l8jxhss03ybfb", source.id)
- XCTAssertEqual(Currency.jpy, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(PaymentInformation.dana, source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeGCashSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_alipay_plus/gcash")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5oxesgzoekdn5nukcdf", source.id)
- XCTAssertEqual(Currency.usd, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(PaymentInformation.gcash, source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeKakaoPaySource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_alipay_plus/kakaopay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5oxetau2owhu0rbzg7y", source.id)
- XCTAssertEqual(Currency.usd, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(PaymentInformation.kakaoPay, source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeTouchNGoSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_alipay_plus/touch_n_go")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5oxet335rx3xzdyn06g", source.id)
- XCTAssertEqual(Currency.sgd, source.currency)
- XCTAssertEqual(5000_00, source.amount)
- XCTAssertEqual(PaymentInformation.touchNGo, source.paymentInformation)
- XCTAssertEqual(Flow.appRedirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodePromptPayQRSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_qr_payment/promptpay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5jb2cjjyjea25nps3ya", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(PaymentInformation.promptpay, source.paymentInformation)
- XCTAssertEqual(Flow.offline, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodePayNowQRSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_qr_payment/paynow")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5iso4taobco8j5jehx5", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.sgd, source.currency)
- XCTAssertEqual(PaymentInformation.paynow, source.paymentInformation)
- XCTAssertEqual(Flow.offline, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeTrueMoneySource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_truemoney_object")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5jhmesi7s4at1qctloy", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(PaymentInformation.truemoney(.init(phoneNumber: "0123456789")), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeRabbitLinePaySource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_rabbit_linepay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5owftw9kjhjisssm0n2", source.id)
- XCTAssertEqual(500000, source.amount)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(PaymentInformation.rabbitLinepay, source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeGrabPaySource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_grabpay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5pqcjr6tu4xvqut5nh5", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.sgd, source.currency)
- XCTAssertEqual(PaymentInformation.grabPay, source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodePointsSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_points/city_points")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5ji0d5y5w8xd9ll3loh", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.thb, source.currency)
- XCTAssertEqual(PaymentInformation.points(.citiPoints), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeFPXSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_fpx")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_test_5jhmesi7s4at1qctloz", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.myr, source.currency)
- XCTAssertEqual(PaymentInformation.fpx(.init(bank: "uob", email: "support@omise.co")), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeBoostSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_boost")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_5pqcjr6tu4xvqut5nh5", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.myr, source.currency)
- XCTAssertEqual(PaymentInformation.boost, source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeShopeePaySource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_shopeepay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_5pqcjr6tu4xvqut5nh5", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.myr, source.currency)
- XCTAssertEqual(PaymentInformation.shopeePay, source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeShopeePayJumpAppSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_shopeepay_jumpapp")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_5pqcjr6tu4xvqut5nh5", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.myr, source.currency)
- XCTAssertEqual(PaymentInformation.shopeePayJumpApp, source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeMaybankQRPaySource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_maybank_qr")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_5pqcjr6tu4xvqut5nh5", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.myr, source.currency)
- XCTAssertEqual(PaymentInformation.maybankQRPay, source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeDuitNowQRSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_duitnow_qr")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_5pqcjr6tu4xvqut5nh5", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.myr, source.currency)
- XCTAssertEqual(PaymentInformation.duitNowQR, source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testDecodeDuitNowOBWSource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_duitnow_obw")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_5pqcjr6tu4xvqut5nh5", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.myr, source.currency)
- XCTAssertEqual(PaymentInformation.duitNowOBW(.init(bank: "affin")), source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-
- func testEncodeTokenParams() throws {
- let encoder = Client.makeJSONEncoder()
- encoder.outputFormatting = [.sortedKeys, .prettyPrinted]
-
- do {
- let tokenParameter = Token.CreateParameter(name: "John Appleseed",
- number: "4242424242424242",
- expirationMonth: 6,
- expirationYear: 2018,
- securityCode: "123")
- let encodedJSONString = String(data: try encoder.encode(tokenParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "card" : {
- "expiration_month" : 6,
- "expiration_year" : 2018,
- "name" : "John Appleseed",
- "number" : "4242424242424242",
- "security_code" : "123"
- }
- }
- """, encodedJSONString)
- }
-
- do {
- let tokenParameter = Token.CreateParameter(name: "John Appleseed",
- number: "4242424242424242",
- expirationMonth: 6,
- expirationYear: 2018,
- securityCode: "123",
- city: "Bangkok",
- postalCode: "12345")
- let encodedJSONString = String(data: try encoder.encode(tokenParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "card" : {
- "city" : "Bangkok",
- "expiration_month" : 6,
- "expiration_year" : 2018,
- "name" : "John Appleseed",
- "number" : "4242424242424242",
- "postal_code" : "12345",
- "security_code" : "123"
- }
- }
- """, encodedJSONString)
- }
- }
-
- func testDecodePayPaySource() throws {
- let decoder = Client.makeJSONDecoder(for: Request?.none)
-
- do {
- let sourceData = try XCTestCase.fixturesData(forFilename: "source_paypay")
- let source = try decoder.decode(Source.self, from: sourceData)
-
- XCTAssertEqual("src_5pqcjr6tu4xvqut5nh5", source.id)
- XCTAssertEqual(100000, source.amount)
- XCTAssertEqual(Currency.jpy, source.currency)
- XCTAssertEqual(PaymentInformation.payPay, source.paymentInformation)
- XCTAssertEqual(Flow.redirect, source.flow)
- } catch {
- XCTFail("Cannot decode the source \(error)")
- }
- }
-}
diff --git a/OmiseSDKTests/Atome/AtomeFormViewControllerTests.swift b/OmiseSDKTests/Not Refactored Tests/Atome/AtomeFormViewControllerTests.swift
similarity index 72%
rename from OmiseSDKTests/Atome/AtomeFormViewControllerTests.swift
rename to OmiseSDKTests/Not Refactored Tests/Atome/AtomeFormViewControllerTests.swift
index c8a60b8c..05ad5ecc 100644
--- a/OmiseSDKTests/Atome/AtomeFormViewControllerTests.swift
+++ b/OmiseSDKTests/Not Refactored Tests/Atome/AtomeFormViewControllerTests.swift
@@ -1,5 +1,5 @@
//
-// AtomeFormViewControllerTests.swift
+// AtomePaymentInputsFormControllerTests.swift
// OmiseSDKTests
//
// Created by Andrei Solovev on 22/5/23.
@@ -10,17 +10,17 @@ import XCTest
import OmiseUnitTestKit
@testable import OmiseSDK
-class AtomeFormViewControllerTests: XCTestCase {
- typealias ViewModel = AtomeFormViewModelMockup
+class AtomePaymentInputsFormControllerTests: XCTestCase {
+ typealias ViewModel = AtomePaymentFormViewModelMockup
// func testBindInputs() {
// let viewModel = ViewModel()
-// for field in AtomeFormViewContext.Field.allCases {
+// for field in AtomePaymentFormViewContext.Field.allCases {
// viewModel.titles[field] = "title: " + field.rawValue
// viewModel.errors[field] = "error: " + field.rawValue
// }
//
-// let vc = AtomeFormViewController(viewModel: viewModel)
+// let vc = AtomePaymentInputsFormController(viewModel: viewModel)
// for field in ViewModel.Field.allCases {
// XCTAssertEqual(vc.input(for: field)?.title, "title: " + field.rawValue)
// XCTAssertEqual(vc.input(for: field)?.error, "")
diff --git a/OmiseSDKTests/Not Refactored Tests/Atome/AtomeFormViewModelTests.swift b/OmiseSDKTests/Not Refactored Tests/Atome/AtomeFormViewModelTests.swift
new file mode 100644
index 00000000..269c6ce4
--- /dev/null
+++ b/OmiseSDKTests/Not Refactored Tests/Atome/AtomeFormViewModelTests.swift
@@ -0,0 +1,20 @@
+//
+// AtomePaymentFormViewModelTests.swift
+// OmiseSDKTests
+//
+// Created by Andrei Solovev on 23/5/23.
+// Copyright © 2023 Omise. All rights reserved.
+//
+
+import XCTest
+import OmiseUnitTestKit
+@testable import OmiseSDK
+
+class AtomePaymentFormViewModelTests: XCTestCase {
+ typealias ViewModel = AtomePaymentFormViewModelMockup
+
+ let validCases = TestCaseValueGenerator.validCases(AtomePaymentFormViewContext.generateMockup)
+ let invalidCases = TestCaseValueGenerator.invalidCases(AtomePaymentFormViewContext.generateMockup)
+ let mostInvalidCases = TestCaseValueGenerator.mostInvalidCases(AtomePaymentFormViewContext.generateMockup)
+
+}
diff --git a/OmiseSDKTests/Not Refactored Tests/Atome/CountryLists/CountryListViewModelMockup.swift b/OmiseSDKTests/Not Refactored Tests/Atome/CountryLists/CountryListViewModelMockup.swift
new file mode 100644
index 00000000..df45a469
--- /dev/null
+++ b/OmiseSDKTests/Not Refactored Tests/Atome/CountryLists/CountryListViewModelMockup.swift
@@ -0,0 +1,11 @@
+import Foundation
+import OmiseUnitTestKit
+#if OMISE_SDK_UNIT_TESTING
+@testable import OmiseSDK
+#endif
+
+class CountryListViewModelMockup: CountryListViewModelProtocol {
+ var countries: [Country] = [Country(name: "Thailand", code: "TH"), Country(name: "France", code: "FR")]
+ lazy var selectedCountry: Country? = countries.first
+ var onSelectCountry: (Country) -> Void = { _ in }
+}
diff --git a/OmiseSDKTests/Atome/Mockups/AtomeFormViewContextMockup.swift b/OmiseSDKTests/Not Refactored Tests/Atome/Mockups/AtomeFormViewContextMockup.swift
similarity index 86%
rename from OmiseSDKTests/Atome/Mockups/AtomeFormViewContextMockup.swift
rename to OmiseSDKTests/Not Refactored Tests/Atome/Mockups/AtomeFormViewContextMockup.swift
index d39673d9..9a46c76a 100644
--- a/OmiseSDKTests/Atome/Mockups/AtomeFormViewContextMockup.swift
+++ b/OmiseSDKTests/Not Refactored Tests/Atome/Mockups/AtomeFormViewContextMockup.swift
@@ -1,5 +1,5 @@
//
-// AtomeFormViewContextMockup.swift
+// AtomePaymentFormViewContextMockup.swift
// OmiseSDKTests
//
// Created by Andrei Solovev on 23/5/23.
@@ -12,9 +12,9 @@ import OmiseUnitTestKit
@testable import OmiseSDK
#endif
-extension AtomeFormViewContext {
+extension AtomePaymentFormViewContext {
static func generateMockup(_ generator: OmiseUnitTestKit.TestCaseValueGenerator) -> Self {
- AtomeFormViewContext(fields: [
+ AtomePaymentFormViewContext(fields: [
.name: generator.cases(
.valid("Tester"),
.valid("", "Name is optional"),
diff --git a/OmiseSDKTests/Atome/Mockups/AtomeFormViewModelMockup.swift b/OmiseSDKTests/Not Refactored Tests/Atome/Mockups/AtomeFormViewModelMockup.swift
similarity index 91%
rename from OmiseSDKTests/Atome/Mockups/AtomeFormViewModelMockup.swift
rename to OmiseSDKTests/Not Refactored Tests/Atome/Mockups/AtomeFormViewModelMockup.swift
index e782c04f..07b31597 100644
--- a/OmiseSDKTests/Atome/Mockups/AtomeFormViewModelMockup.swift
+++ b/OmiseSDKTests/Not Refactored Tests/Atome/Mockups/AtomeFormViewModelMockup.swift
@@ -1,5 +1,5 @@
//
-// AtomeFormViewModelMockup.swift
+// AtomePaymentFormViewModelMockup.swift
// OmiseSDKTests
//
// Created by Andrei Solovev on 23/5/23.
@@ -11,7 +11,7 @@ import Foundation
@testable import OmiseSDK
#endif
-class AtomeFormViewModelMockup: AtomeFormViewModelProtocol {
+class AtomePaymentFormViewModelMockup: AtomePaymentFormViewModelProtocol {
var countryListViewModel: CountryListViewModelProtocol = CountryListViewModelMockup()
var submitButtonTitle: String = "Next"
@@ -51,7 +51,7 @@ class AtomeFormViewModelMockup: AtomeFormViewModelProtocol {
}
}
-extension AtomeFormViewModelMockup {
+extension AtomePaymentFormViewModelMockup {
@discardableResult
func applyMockupTitles() -> Self {
self.titles = Field.allCases.reduce(into: [Field: String]()) { list, field in
diff --git a/OmiseSDKTests/BadRequestAPIErrorParsingTestCase.swift b/OmiseSDKTests/Not Refactored Tests/BadRequestAPIErrorParsingTestCase.swift
similarity index 100%
rename from OmiseSDKTests/BadRequestAPIErrorParsingTestCase.swift
rename to OmiseSDKTests/Not Refactored Tests/BadRequestAPIErrorParsingTestCase.swift
diff --git a/OmiseSDKTests/InvalidCardAPIErrorParsingTestCase.swift b/OmiseSDKTests/Not Refactored Tests/InvalidCardAPIErrorParsingTestCase.swift
similarity index 100%
rename from OmiseSDKTests/InvalidCardAPIErrorParsingTestCase.swift
rename to OmiseSDKTests/Not Refactored Tests/InvalidCardAPIErrorParsingTestCase.swift
diff --git a/OmiseSDKTests/PANModelTestCase.swift b/OmiseSDKTests/Not Refactored Tests/PANModelTestCase.swift
similarity index 100%
rename from OmiseSDKTests/PANModelTestCase.swift
rename to OmiseSDKTests/Not Refactored Tests/PANModelTestCase.swift
diff --git a/OmiseSDKTests/Views/CardExpiryDatePickerTests.swift b/OmiseSDKTests/Not Refactored Tests/Views/CardExpiryDatePickerTests.swift
similarity index 98%
rename from OmiseSDKTests/Views/CardExpiryDatePickerTests.swift
rename to OmiseSDKTests/Not Refactored Tests/Views/CardExpiryDatePickerTests.swift
index fb597a2b..3d5b7445 100644
--- a/OmiseSDKTests/Views/CardExpiryDatePickerTests.swift
+++ b/OmiseSDKTests/Not Refactored Tests/Views/CardExpiryDatePickerTests.swift
@@ -1,5 +1,5 @@
import XCTest
-import OmiseSDK
+@testable import OmiseSDK
class CardExpiryDatePickerTests: XCTestCase {
diff --git a/OmiseSDKTests/OmiseSDKTests.swift b/OmiseSDKTests/OmiseSDKTests.swift
new file mode 100644
index 00000000..0e68d80d
--- /dev/null
+++ b/OmiseSDKTests/OmiseSDKTests.swift
@@ -0,0 +1,13 @@
+import Foundation
+import XCTest
+@testable import OmiseSDK
+
+class OmiseSDKTests: XCTestCase {
+ func testCountry() {
+ let expectedCountry = Country(name: "Thailand", code: "TH")
+ let capability = Capability(countryCode: "TH", paymentMethods: [], banks: Set())
+ OmiseSDK.shared.client.setLatestLoadedCapability(capability)
+
+ XCTAssertEqual(expectedCountry, OmiseSDK.shared.country)
+ }
+}
diff --git a/OmiseSDKTests/Views/PaymentChooserViewControllerTests.swift b/OmiseSDKTests/PaymentChooserViewControllerTests.swift
similarity index 68%
rename from OmiseSDKTests/Views/PaymentChooserViewControllerTests.swift
rename to OmiseSDKTests/PaymentChooserViewControllerTests.swift
index 82ab476b..6e98b518 100644
--- a/OmiseSDKTests/Views/PaymentChooserViewControllerTests.swift
+++ b/OmiseSDKTests/PaymentChooserViewControllerTests.swift
@@ -10,11 +10,11 @@ import XCTest
@testable import OmiseSDK
class PaymentChooserViewControllerTests: XCTestCase {
- let allSourceTypes: [SourceTypeValue] = [
+ let allSourceTypes: [SourceType] = [
.internetBankingBAY,
.internetBankingBBL,
.mobileBankingSCB,
- .mobileBankingOCBC,
+ .ocbcDigital,
.mobileBankingBAY,
.mobileBankingBBL,
.mobileBankingKTB,
@@ -40,7 +40,7 @@ class PaymentChooserViewControllerTests: XCTestCase {
.payNow,
.touchNGo,
.touchNGoAlipayPlus,
- .trueMoney,
+ .trueMoneyWallet,
.trueMoneyJumpApp,
.pointsCiti,
.fpx,
@@ -61,13 +61,13 @@ class PaymentChooserViewControllerTests: XCTestCase {
func testTrueMoveFiltering() {
let trueMoneyWalletOnly = allSourceTypes.filter { $0 != .trueMoneyJumpApp }
- let trueMoneyJumpAppOnly = allSourceTypes.filter { $0 != .trueMoney }
+ let trueMoneyJumpAppOnly = allSourceTypes.filter { $0 != .trueMoneyWallet }
let trueMoneyAndJumpApp = allSourceTypes
let noTrueMoneyAndJumpApp = allSourceTypes.filter {
- ($0 != .trueMoney) && ($0 != .trueMoneyJumpApp)
+ ($0 != .trueMoneyWallet) && ($0 != .trueMoneyJumpApp)
}
- let vc = PaymentChooserViewController()
+ let vc = ChoosePaymentMethodControllerOld()
vc.loadView()
vc.allowedPaymentMethods = trueMoneyWalletOnly
@@ -87,11 +87,39 @@ class PaymentChooserViewControllerTests: XCTestCase {
XCTAssertFalse(vc.showingValues.contains(.truemoney))
}
+ func testShopeePayFiltering() {
+ let shopeePayOnly = allSourceTypes.filter { $0 != .shopeePayJumpApp }
+ let shopeePayJumpAppOnly = allSourceTypes.filter { $0 != .shopeePay }
+ let shopeePayAndJumpApp = allSourceTypes
+ let noShopeePayandJumpApp = allSourceTypes.filter {
+ ($0 != .shopeePay) && ($0 != .shopeePayJumpApp)
+ }
+
+ let vc = ChoosePaymentMethodControllerOld()
+ vc.loadView()
+
+ vc.allowedPaymentMethods = shopeePayOnly
+ XCTAssertTrue(vc.showingValues.contains(.shopeePay))
+ XCTAssertFalse(vc.showingValues.contains(.shopeePayJumpApp))
+
+ vc.allowedPaymentMethods = shopeePayJumpAppOnly
+ XCTAssertTrue(vc.showingValues.contains(.shopeePayJumpApp))
+ XCTAssertFalse(vc.showingValues.contains(.shopeePay))
+
+ vc.allowedPaymentMethods = shopeePayAndJumpApp
+ XCTAssertTrue(vc.showingValues.contains(.shopeePayJumpApp))
+ XCTAssertFalse(vc.showingValues.contains(.shopeePay))
+
+ vc.allowedPaymentMethods = noShopeePayandJumpApp
+ XCTAssertFalse(vc.showingValues.contains(.shopeePayJumpApp))
+ XCTAssertFalse(vc.showingValues.contains(.shopeePay))
+ }
+
func testAlphabetSorting() {
- let vc = PaymentChooserViewController()
+ let vc = ChoosePaymentMethodControllerOld()
vc.loadView()
- let sorted: [PaymentChooserOption] = [
+ let sorted: [PaymentMethod] = [
.alipay,
.alipayCN,
.alipayHK,
@@ -129,11 +157,11 @@ class PaymentChooserViewControllerTests: XCTestCase {
.weChat
]
- XCTAssertEqual(PaymentChooserOption.alphabetical, sorted)
+ XCTAssertEqual(PaymentMethod.alphabetical, sorted)
}
func testFilteringAndSorting() {
- let filteredAndSorted: [PaymentChooserOption] = [
+ let filteredAndSorted: [PaymentMethod] = [
.creditCard,
.paynow,
.promptpay,
@@ -144,7 +172,6 @@ class PaymentChooserViewControllerTests: XCTestCase {
.installment,
.ocbcDigital,
.rabbitLinepay,
- .shopeePay,
.shopeePayJumpApp,
.alipayCN,
.alipayHK,
@@ -170,7 +197,7 @@ class PaymentChooserViewControllerTests: XCTestCase {
.weChat
]
- let vc = PaymentChooserViewController()
+ let vc = ChoosePaymentMethodControllerOld()
vc.loadView()
vc.allowedPaymentMethods = allSourceTypes
@@ -178,42 +205,42 @@ class PaymentChooserViewControllerTests: XCTestCase {
}
func testShowsCreditCardPayment() {
- let availableTypes: [SourceTypeValue] = [
+ let availableTypes: [SourceType] = [
.alipay,
.alipayCN,
.alipayHK,
.atome
]
- let vc = PaymentChooserViewController()
+ let vc = ChoosePaymentMethodControllerOld()
vc.loadView()
- vc.showsCreditCardPayment = false
+ vc.allowedCardPayment = false
vc.allowedPaymentMethods = availableTypes
XCTAssertEqual(vc.showingValues.count, availableTypes.count)
- vc.showsCreditCardPayment = true
+ vc.allowedCardPayment = true
XCTAssertEqual(vc.showingValues.count, availableTypes.count + 1)
}
func testAllowedPaymentMethods() {
- let set1: [SourceTypeValue] = [ .alipay, .alipayCN ]
- let result1: [PaymentChooserOption] = [.alipay, .alipayCN]
+ let set1: [SourceType] = [ .alipay, .alipayCN ]
+ let result1: [PaymentMethod] = [.alipay, .alipayCN]
- let set2: [SourceTypeValue] = [ .atome, .payPay, .weChat ]
- let result2: [PaymentChooserOption] = [ .atome, .payPay, .weChat ]
+ let set2: [SourceType] = [ .atome, .payPay, .weChat ]
+ let result2: [PaymentMethod] = [ .atome, .payPay, .weChat ]
- let vc = PaymentChooserViewController()
+ let vc = ChoosePaymentMethodControllerOld()
vc.loadView()
- vc.showsCreditCardPayment = false
+ vc.allowedCardPayment = false
vc.allowedPaymentMethods = set1
XCTAssertEqual(vc.showingValues, result1)
vc.allowedPaymentMethods = set2
XCTAssertEqual(vc.showingValues, result2)
- vc.showsCreditCardPayment = true
- XCTAssertEqual(vc.showingValues, [PaymentChooserOption.creditCard] + result2)
+ vc.allowedCardPayment = true
+ XCTAssertEqual(vc.showingValues, [PaymentMethod.creditCard] + result2)
}
}
diff --git a/OmiseSDKTests/PaymentInformationTestCase.swift b/OmiseSDKTests/PaymentInformationTestCase.swift
deleted file mode 100644
index 68952d7e..00000000
--- a/OmiseSDKTests/PaymentInformationTestCase.swift
+++ /dev/null
@@ -1,1090 +0,0 @@
-// swiftlint:disable file_length
-import XCTest
-@testable import OmiseSDK
-
-// swiftlint:disable function_body_length
-// swiftlint:disable:next type_body_length
-class PaymentInformationTestCase: XCTestCase {
-
- static func makeJSONEncoder() -> JSONEncoder {
- let encoder = Client.makeJSONEncoder()
- encoder.outputFormatting = [.sortedKeys, .prettyPrinted]
- return encoder
- }
-
- func testEncodeInstallmentsSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let installment = PaymentInformation.Installment(brand: .bay, numberOfTerms: 6)
- let sourceParameter = Source.CreateParameter(paymentInformation: .installment(installment),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "installment_term" : 6,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "installment_bay"
- }
- """, encodedJSONString)
- }
-
- do {
- let installment = PaymentInformation.Installment(brand: .firstChoice, numberOfTerms: 6)
- let sourceParameter = Source.CreateParameter(paymentInformation: .installment(installment),
- amount: 100_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 10000,
- "currency" : "THB",
- "email" : null,
- "installment_term" : 6,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "installment_first_choice"
- }
- """, encodedJSONString)
- }
-
- do {
- let installment = PaymentInformation.Installment(brand: .bbl, numberOfTerms: 6)
- let sourceParameter = Source.CreateParameter(paymentInformation: .installment(installment),
- amount: 1_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 100000,
- "currency" : "THB",
- "email" : null,
- "installment_term" : 6,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "installment_bbl"
- }
- """, encodedJSONString)
- }
-
- do {
- let installment = PaymentInformation.Installment(brand: .mbb, numberOfTerms: 6)
- let sourceParameter = Source.CreateParameter(paymentInformation: .installment(installment),
- amount: 5_000_00,
- currency: .myr)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 500000,
- "currency" : "MYR",
- "email" : null,
- "installment_term" : 6,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "installment_mbb"
- }
- """, encodedJSONString)
- }
-
- do {
- let installment = PaymentInformation.Installment(brand: .ktc, numberOfTerms: 6)
- let sourceParameter = Source.CreateParameter(paymentInformation: .installment(installment),
- amount: 10_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000,
- "currency" : "THB",
- "email" : null,
- "installment_term" : 6,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "installment_ktc"
- }
- """, encodedJSONString)
- }
-
- do {
- let installment = PaymentInformation.Installment(brand: .kBank, numberOfTerms: 6)
- let sourceParameter = Source.CreateParameter(paymentInformation: .installment(installment),
- amount: 10_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000,
- "currency" : "THB",
- "email" : null,
- "installment_term" : 6,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "installment_kbank"
- }
- """, encodedJSONString)
- }
-
- do {
- let installment = PaymentInformation.Installment(brand: .scb, numberOfTerms: 9)
- let sourceParameter = Source.CreateParameter(paymentInformation: .installment(installment),
- amount: 30_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 3000,
- "currency" : "THB",
- "email" : null,
- "installment_term" : 9,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "installment_scb"
- }
- """, encodedJSONString)
- }
-
- do {
- let installment = PaymentInformation.Installment(brand: .ttb, numberOfTerms: 6)
- let sourceParameter = Source.CreateParameter(paymentInformation: .installment(installment),
- amount: 30_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 3000,
- "currency" : "THB",
- "email" : null,
- "installment_term" : 6,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "installment_ttb"
- }
- """, encodedJSONString)
- }
-
- do {
- let installment = PaymentInformation.Installment(brand: .uob, numberOfTerms: 6)
- let sourceParameter = Source.CreateParameter(paymentInformation: .installment(installment),
- amount: 30_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 3000,
- "currency" : "THB",
- "email" : null,
- "installment_term" : 6,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "installment_uob"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeInternetBankingSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .internetBanking(.bay),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "internet_banking_bay"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .internetBanking(.bbl),
- amount: 10_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "internet_banking_bbl"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeMobileBankingSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .mobileBanking(.scb),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "mobile_banking_scb"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .mobileBanking(.kbank),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "mobile_banking_kbank"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .ocbcDigital,
- amount: 10_000_00,
- currency: .sgd)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "SGD",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "mobile_banking_ocbc"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .mobileBanking(.bay),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "mobile_banking_bay"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .mobileBanking(.bbl),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "mobile_banking_bbl"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .mobileBanking(.ktb),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "mobile_banking_ktb"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeBarcodeAlipaySourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- typealias AlipayBarcode = PaymentInformation.Barcode.AlipayBarcode
- let storeInformation = AlipayBarcode.StoreInformation(storeID: "store_id_1", storeName: "Store Name")
- let barcode = AlipayBarcode(barcode: "barcode",
- storeInformation: storeInformation,
- terminalID: "Terminal 1")
- let sourceParameter = Source.CreateParameter(paymentInformation: .barcode(.alipay(barcode)),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "barcode" : "barcode",
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "store_id" : "store_id_1",
- "store_name" : "Store Name",
- "terminal_id" : "Terminal 1",
- "type" : "barcode_alipay"
- }
- """, encodedJSONString)
- }
-
- do {
- let barcode = PaymentInformation.Barcode.AlipayBarcode(barcode: "barcode", terminalID: "Terminal 1")
- let sourceParameter = Source.CreateParameter(paymentInformation: .barcode(.alipay(barcode)),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "barcode" : "barcode",
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "terminal_id" : "Terminal 1",
- "type" : "barcode_alipay"
- }
- """, encodedJSONString)
- }
-
- do {
- let barcode = PaymentInformation.Barcode.AlipayBarcode(barcode: "barcode", terminalID: nil)
- let sourceParameter = Source.CreateParameter(paymentInformation: .barcode(.alipay(barcode)),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "barcode" : "barcode",
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "barcode_alipay"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeTrueMoneySourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let trueMoney = PaymentInformation.TrueMoney(phoneNumber: "0123456789")
- let sourceParameter = Source.CreateParameter(paymentInformation: .truemoney(trueMoney),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : "0123456789",
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "truemoney"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeTrueMoneyJumpAppSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .truemoneyJumpApp,
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "truemoney_jumpapp"
- }
- """, encodedJSONString)
- }
- }
- func testEncodePointsSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .points(.citiPoints),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "points_citi"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeFPXSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let fpx = PaymentInformation.FPX(bank: "uob", email: "support@omise.co")
- let sourceParameter = Source.CreateParameter(paymentInformation: .fpx(fpx),
- amount: 10_000_00,
- currency: .myr)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "bank" : "uob",
- "currency" : "MYR",
- "email" : "support@omise.co",
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "fpx"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeAlipayPlusSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .alipayCN,
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "alipay_cn"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .alipayHK,
- amount: 10_000_00,
- currency: .hkd)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "HKD",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "alipay_hk"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .dana,
- amount: 10_000_00,
- currency: .jpy)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "JPY",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "dana"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .gcash,
- amount: 10_000_00,
- currency: .usd)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "USD",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "gcash"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .kakaoPay,
- amount: 10_000_00,
- currency: .usd)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "USD",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "kakaopay"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .touchNGo,
- amount: 10_000_00,
- currency: .sgd)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "SGD",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "touch_n_go"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .rabbitLinepay,
- amount: 50_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 5000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "rabbit_linepay"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .grabPay,
- amount: 1_000_00,
- currency: .sgd)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 100000,
- "currency" : "SGD",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "grabpay"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeDuitNowOBWSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let duitNowOBW = PaymentInformation.DuitNowOBW(bank: "affin")
- let sourceParameter = Source.CreateParameter(paymentInformation: .duitNowOBW(duitNowOBW),
- amount: 10_000_00,
- currency: .myr)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "bank" : "affin",
- "currency" : "MYR",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "duitnow_obw"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeAtomeSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let shipping = PaymentInformation.Atome.ShippingAddress(
- country: "TH",
- city: "Bangkok",
- postalCode: "10200",
- state: "---",
- street1: "4 Sukhumvit 103 rd.",
- street2: "")
-
- let items = [
- PaymentInformation.Atome.Item(
- sku: "1",
- category: "1",
- name: "1",
- quantity: 1,
- amount: 1000000,
- itemUri: "1",
- imageUri: "!",
- brand: "1")
- ]
-
- let atome = PaymentInformation.Atome(phoneNumber: "+66800000101",
- shippingAddress: shipping,
- items: items)
-
- let sourceParameter = Source.CreateParameter(paymentInformation: .atome(atome),
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : [
- {
- "amount" : 1000000,
- "brand" : "1",
- "category" : "1",
- "image_uri" : "!",
- "item_uri" : "1",
- "name" : "1",
- "quantity" : 1,
- "sku" : "1"
- }
- ],
- "name" : null,
- "phone_number" : "+66800000101",
- "platform_type" : "IOS",
- "shipping" : {
- "city" : "Bangkok",
- "country" : "TH",
- "postal_code" : "10200",
- "state" : "---",
- "street1" : "4 Sukhumvit 103 rd.",
- "street2" : ""
- },
- "type" : "atome"
- }
- """
- .trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
- .replacingOccurrences(of: " ", with: ""),
- encodedJSONString?
- .trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
- .replacingOccurrences(of: " ", with: ""))
- }
- }
-
- func testEncodePayPaySourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .payPay,
- amount: 10_000_00,
- currency: .jpy)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "JPY",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "paypay"
- }
- """, encodedJSONString)
- }
- }
-
- func testOtherPaymentInformation() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .alipay,
- amount: 300_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 30000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "alipay"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .billPayment(.tescoLotus),
- amount: 123_45,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 12345,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "bill_payment_tesco_lotus"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .boost,
- amount: 123_45,
- currency: .myr)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 12345,
- "currency" : "MYR",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "boost"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .shopeePay,
- amount: 123_45,
- currency: .myr)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 12345,
- "currency" : "MYR",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "shopeepay"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .maybankQRPay,
- amount: 123_45,
- currency: .myr)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 12345,
- "currency" : "MYR",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "maybank_qr"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .duitNowQR,
- amount: 123_45,
- currency: .myr)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 12345,
- "currency" : "MYR",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "duitnow_qr"
- }
- """, encodedJSONString)
- }
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .shopeePayJumpApp,
- amount: 123_45,
- currency: .myr)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
-
- XCTAssertEqual(
- """
- {
- "amount" : 12345,
- "currency" : "MYR",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "shopeepay_jumpapp"
- }
- """, encodedJSONString)
- }
- }
-
- func testEncodeWeChatSourceParameter() throws {
- let encoder = PaymentInformationTestCase.makeJSONEncoder()
-
- do {
- let sourceParameter = Source.CreateParameter(paymentInformation: .weChat,
- amount: 10_000_00,
- currency: .thb)
- let encodedJSONString = String(data: try encoder.encode(sourceParameter), encoding: .utf8)
- XCTAssertEqual(
- """
- {
- "amount" : 1000000,
- "currency" : "THB",
- "email" : null,
- "items" : null,
- "name" : null,
- "phone_number" : null,
- "platform_type" : "IOS",
- "shipping" : null,
- "type" : "wechat_pay"
- }
- """, encodedJSONString)
- }
- }
-
-}
-// swiftlint:enable function_body_length
diff --git a/OmiseSDKTests/SDKTestCase.swift b/OmiseSDKTests/SDKTestCase.swift
deleted file mode 100644
index f29a137c..00000000
--- a/OmiseSDKTests/SDKTestCase.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-import XCTest
-
-extension XCTestCase {
- static func fixturesData(forFilename filename: String) throws -> Data {
- let bundle = Bundle(for: ClientTestCase.self)
- let path = try XCTUnwrap(bundle.url(forResource: "Fixtures/objects/\(filename)", withExtension: "json"))
- let data = try Data(contentsOf: path)
-
- return data
- }
-
- static let jsonDateFormatter: DateFormatter = {
- let formatter = DateFormatter()
- formatter.locale = Locale(identifier: "en_US_POSIX")
- formatter.timeZone = TimeZone(identifier: "UTC")
- formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss'Z'"
- return formatter
- }()
-
- static func dateFromJSONString(_ dateString: String) -> Date? {
- return jsonDateFormatter.date(from: dateString)
- }
-}
diff --git a/OmiseSDKTests/Fixtures/objects/capability.json b/OmiseSDKTests/SampleData/capability.json
similarity index 99%
rename from OmiseSDKTests/Fixtures/objects/capability.json
rename to OmiseSDKTests/SampleData/capability.json
index f027dcb5..47a34167 100644
--- a/OmiseSDKTests/Fixtures/objects/capability.json
+++ b/OmiseSDKTests/SampleData/capability.json
@@ -336,7 +336,8 @@
],
"card_brands": null,
"installment_terms": null,
- "banks": []
+ "banks": [],
+ "provider": "Alipay_plus"
},
{
"object": "payment_method",
diff --git a/OmiseSDKTests/Fixtures/objects/card_object.json b/OmiseSDKTests/SampleData/card.json
similarity index 75%
rename from OmiseSDKTests/Fixtures/objects/card_object.json
rename to OmiseSDKTests/SampleData/card.json
index 664fe559..63d932c7 100644
--- a/OmiseSDKTests/Fixtures/objects/card_object.json
+++ b/OmiseSDKTests/SampleData/card.json
@@ -5,13 +5,13 @@
"location": null,
"created_at": "2019-07-26T05:45:20Z",
"deleted": false,
- "street1": null,
- "street2": null,
+ "street1": "Sukhumvit",
+ "street2": "MBK",
"city": "Bangkok",
- "state": null,
+ "state": "Bangkok Metropolis",
"postal_code": "10240",
"country": "gb",
- "phone_number": null,
+ "phone_number": "0123456789",
"financing": "credit",
"bank": "STRIPE PAYMENTS UK LIMITED",
"first_digits": null,
@@ -19,7 +19,9 @@
"brand": "Visa",
"expiration_month": 12,
"expiration_year": 2020,
+ "number": "4242424242424242",
"fingerprint": "mKleiBfwp+PoJWB/ipngANuECUmRKjyxROwFW5IO7TM=",
"name": "John Doe",
+ "security_code": "123",
"security_code_check": true
}
diff --git a/OmiseSDKTests/Fixtures/objects/source_alipay_object.json b/OmiseSDKTests/SampleData/sources/alipay.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_alipay_object.json
rename to OmiseSDKTests/SampleData/sources/alipay.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_alipay_plus/alipay_cn.json b/OmiseSDKTests/SampleData/sources/alipay_cn.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_alipay_plus/alipay_cn.json
rename to OmiseSDKTests/SampleData/sources/alipay_cn.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_alipay_plus/alipay_hk.json b/OmiseSDKTests/SampleData/sources/alipay_hk.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_alipay_plus/alipay_hk.json
rename to OmiseSDKTests/SampleData/sources/alipay_hk.json
diff --git a/OmiseSDKTests/SampleData/sources/atome.json b/OmiseSDKTests/SampleData/sources/atome.json
new file mode 100644
index 00000000..0f304871
--- /dev/null
+++ b/OmiseSDKTests/SampleData/sources/atome.json
@@ -0,0 +1,70 @@
+{
+ "object":"source",
+ "id":"src_5yqiaqtbbog2pxjdg6b",
+ "livemode":true,
+ "location":"/sources/src_5yqiaqtbbog2pxjdg6b",
+ "amount":700000,
+ "barcode":null,
+ "bank":null,
+ "created_at":"2024-02-11T10:36:32Z",
+ "currency":"THB",
+ "email":"test@omise.co",
+ "flow":"redirect",
+ "installment_term":null,
+ "ip":"11.5.27.19",
+ "absorption_type":null,
+ "name":"Test Data",
+ "mobile_number":"+12312312312",
+ "phone_number":"+12312312312",
+ "platform_type":"IOS",
+ "scannable_code":null,
+ "billing":{
+ "city":"Bangkok",
+ "country":"TH",
+ "postal_code":"10100",
+ "state":"Bangkok",
+ "street1":"Sukhumvit",
+ },
+ "shipping":{
+ "city":"Bangkok",
+ "country":"TH",
+ "postal_code":"10330",
+ "state":"Krung Thep Maha Nakhon",
+ "street1":"444 Phaya Thai Rd",
+ "street2":"Khwaeng Wang Mai, Pathum Wan"
+ },
+ "items":[
+ {
+ "sku":"3427842",
+ "name":"Prada shoes",
+ "brand":"Gucci",
+ "category":"Shoes",
+ "amount":500000,
+ "quantity":1,
+ "item_uri":"omise.co/product/shoes",
+ "image_uri":"omise.co/product/shoes/image"
+ },
+ {
+ "sku":"3427843",
+ "name":"Skate Shoes",
+ "brand":"DC",
+ "category":"Shoes",
+ "amount":200000,
+ "quantity":2,
+ "item_uri": null,
+ "image_uri": null
+ }
+ ],
+ "references":null,
+ "provider_references":null,
+ "store_id":null,
+ "store_name":null,
+ "terminal_id":null,
+ "type":"atome",
+ "zero_interest_installments":null,
+ "charge_status":"unknown",
+ "receipt_amount":null,
+ "discounts":[
+
+ ]
+}
diff --git a/OmiseSDKTests/Fixtures/objects/source_barcode/alipay.json b/OmiseSDKTests/SampleData/sources/barcode_alipay.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_barcode/alipay.json
rename to OmiseSDKTests/SampleData/sources/barcode_alipay.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_bill_payment/tesco_lotus.json b/OmiseSDKTests/SampleData/sources/bill_payment_tesco_lotus.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_bill_payment/tesco_lotus.json
rename to OmiseSDKTests/SampleData/sources/bill_payment_tesco_lotus.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_boost.json b/OmiseSDKTests/SampleData/sources/boost.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_boost.json
rename to OmiseSDKTests/SampleData/sources/boost.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_alipay_plus/dana.json b/OmiseSDKTests/SampleData/sources/dana.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_alipay_plus/dana.json
rename to OmiseSDKTests/SampleData/sources/dana.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_duitnow_obw.json b/OmiseSDKTests/SampleData/sources/duitnow_obw.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_duitnow_obw.json
rename to OmiseSDKTests/SampleData/sources/duitnow_obw.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_duitnow_qr.json b/OmiseSDKTests/SampleData/sources/duitnow_qr.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_duitnow_qr.json
rename to OmiseSDKTests/SampleData/sources/duitnow_qr.json
diff --git a/OmiseSDKTests/SampleData/sources/econtext.json b/OmiseSDKTests/SampleData/sources/econtext.json
new file mode 100644
index 00000000..348a9653
--- /dev/null
+++ b/OmiseSDKTests/SampleData/sources/econtext.json
@@ -0,0 +1,34 @@
+{
+ "object": "source",
+ "id": "src_test_5xsjw8qafayihquj3k9",
+ "livemode": false,
+ "location": "/sources/src_test_5xsjw8qafayihquj3k9",
+ "amount": 300,
+ "barcode": null,
+ "bank": null,
+ "created_at": "2023-11-16T15:04:47Z",
+ "currency": "JPY",
+ "email": "test@opn.com",
+ "flow": "offline",
+ "installment_term": null,
+ "ip": null,
+ "absorption_type": null,
+ "name": "ヤマダタロウ",
+ "mobile_number": "01234567891",
+ "phone_number": "01234567891",
+ "platform_type": null,
+ "scannable_code": null,
+ "billing": null,
+ "shipping": null,
+ "items": [],
+ "references": null,
+ "provider_references": null,
+ "store_id": null,
+ "store_name": null,
+ "terminal_id": null,
+ "type": "econtext",
+ "zero_interest_installments": null,
+ "charge_status": "unknown",
+ "receipt_amount": null,
+ "discounts": []
+}
diff --git a/OmiseSDKTests/Fixtures/objects/source_fpx.json b/OmiseSDKTests/SampleData/sources/fpx.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_fpx.json
rename to OmiseSDKTests/SampleData/sources/fpx.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_alipay_plus/gcash.json b/OmiseSDKTests/SampleData/sources/gcash.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_alipay_plus/gcash.json
rename to OmiseSDKTests/SampleData/sources/gcash.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_grabpay.json b/OmiseSDKTests/SampleData/sources/grabpay.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_grabpay.json
rename to OmiseSDKTests/SampleData/sources/grabpay.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_installments/bay.json b/OmiseSDKTests/SampleData/sources/installment_bay.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_installments/bay.json
rename to OmiseSDKTests/SampleData/sources/installment_bay.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_installments/bbl.json b/OmiseSDKTests/SampleData/sources/installment_bbl.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_installments/bbl.json
rename to OmiseSDKTests/SampleData/sources/installment_bbl.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_installments/first_choice.json b/OmiseSDKTests/SampleData/sources/installment_first_choice.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_installments/first_choice.json
rename to OmiseSDKTests/SampleData/sources/installment_first_choice.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_installments/kbank.json b/OmiseSDKTests/SampleData/sources/installment_kbank.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_installments/kbank.json
rename to OmiseSDKTests/SampleData/sources/installment_kbank.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_installments/ktc.json b/OmiseSDKTests/SampleData/sources/installment_ktc.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_installments/ktc.json
rename to OmiseSDKTests/SampleData/sources/installment_ktc.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_installments/mbb.json b/OmiseSDKTests/SampleData/sources/installment_mbb.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_installments/mbb.json
rename to OmiseSDKTests/SampleData/sources/installment_mbb.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_installments/ttb.json b/OmiseSDKTests/SampleData/sources/installment_ttb.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_installments/ttb.json
rename to OmiseSDKTests/SampleData/sources/installment_ttb.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_installments/uob.json b/OmiseSDKTests/SampleData/sources/installment_uob.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_installments/uob.json
rename to OmiseSDKTests/SampleData/sources/installment_uob.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_internet_banking/bay.json b/OmiseSDKTests/SampleData/sources/internet_banking_bay.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_internet_banking/bay.json
rename to OmiseSDKTests/SampleData/sources/internet_banking_bay.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_internet_banking/bbl.json b/OmiseSDKTests/SampleData/sources/internet_banking_bbl.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_internet_banking/bbl.json
rename to OmiseSDKTests/SampleData/sources/internet_banking_bbl.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_alipay_plus/kakaopay.json b/OmiseSDKTests/SampleData/sources/kakaopay.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_alipay_plus/kakaopay.json
rename to OmiseSDKTests/SampleData/sources/kakaopay.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_maybank_qr.json b/OmiseSDKTests/SampleData/sources/maybank_qr.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_maybank_qr.json
rename to OmiseSDKTests/SampleData/sources/maybank_qr.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_mobile_banking/bay.json b/OmiseSDKTests/SampleData/sources/mobile_banking_bay.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_mobile_banking/bay.json
rename to OmiseSDKTests/SampleData/sources/mobile_banking_bay.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_mobile_banking/bbl.json b/OmiseSDKTests/SampleData/sources/mobile_banking_bbl.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_mobile_banking/bbl.json
rename to OmiseSDKTests/SampleData/sources/mobile_banking_bbl.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_mobile_banking/kbank.json b/OmiseSDKTests/SampleData/sources/mobile_banking_kbank.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_mobile_banking/kbank.json
rename to OmiseSDKTests/SampleData/sources/mobile_banking_kbank.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_mobile_banking/ktb.json b/OmiseSDKTests/SampleData/sources/mobile_banking_ktb.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_mobile_banking/ktb.json
rename to OmiseSDKTests/SampleData/sources/mobile_banking_ktb.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_mobile_banking/scb.json b/OmiseSDKTests/SampleData/sources/mobile_banking_scb.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_mobile_banking/scb.json
rename to OmiseSDKTests/SampleData/sources/mobile_banking_scb.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_qr_payment/paynow.json b/OmiseSDKTests/SampleData/sources/paynow.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_qr_payment/paynow.json
rename to OmiseSDKTests/SampleData/sources/paynow.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_paypay.json b/OmiseSDKTests/SampleData/sources/paypay.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_paypay.json
rename to OmiseSDKTests/SampleData/sources/paypay.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_points/city_points.json b/OmiseSDKTests/SampleData/sources/points_citi.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_points/city_points.json
rename to OmiseSDKTests/SampleData/sources/points_citi.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_qr_payment/promptpay.json b/OmiseSDKTests/SampleData/sources/promptpay.json
similarity index 91%
rename from OmiseSDKTests/Fixtures/objects/source_qr_payment/promptpay.json
rename to OmiseSDKTests/SampleData/sources/promptpay.json
index cadf30ad..d070e088 100644
--- a/OmiseSDKTests/Fixtures/objects/source_qr_payment/promptpay.json
+++ b/OmiseSDKTests/SampleData/sources/promptpay.json
@@ -5,7 +5,7 @@
"location": "/sources/src_test_5jb2cjjyjea25nps3ya",
"amount": 100000,
"created_at": "2020-03-23T08:26:05Z",
+ "type": "promptpay",
"currency": "THB",
"flow": "offline",
- "type": "promptpay"
}
diff --git a/OmiseSDKTests/Fixtures/objects/source_rabbit_linepay.json b/OmiseSDKTests/SampleData/sources/rabbit_linepay.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_rabbit_linepay.json
rename to OmiseSDKTests/SampleData/sources/rabbit_linepay.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_shopeepay.json b/OmiseSDKTests/SampleData/sources/shopeepay.json
similarity index 90%
rename from OmiseSDKTests/Fixtures/objects/source_shopeepay.json
rename to OmiseSDKTests/SampleData/sources/shopeepay.json
index 8943aa2f..d0aca7e9 100644
--- a/OmiseSDKTests/Fixtures/objects/source_shopeepay.json
+++ b/OmiseSDKTests/SampleData/sources/shopeepay.json
@@ -5,6 +5,6 @@
"location": "/sources/src_5pqcjr6tu4xvqut5nh5",
"type": "shopeepay",
"flow": "redirect",
- "amount": 100000,
+ "amount": 110000,
"currency": "MYR"
}
diff --git a/OmiseSDKTests/Fixtures/objects/source_shopeepay_jumpapp.json b/OmiseSDKTests/SampleData/sources/shopeepay_jumpapp.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_shopeepay_jumpapp.json
rename to OmiseSDKTests/SampleData/sources/shopeepay_jumpapp.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_alipay_plus/touch_n_go.json b/OmiseSDKTests/SampleData/sources/touch_n_go.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_alipay_plus/touch_n_go.json
rename to OmiseSDKTests/SampleData/sources/touch_n_go.json
diff --git a/OmiseSDKTests/Fixtures/objects/source_truemoney_object.json b/OmiseSDKTests/SampleData/sources/truemoney.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/source_truemoney_object.json
rename to OmiseSDKTests/SampleData/sources/truemoney.json
diff --git a/OmiseSDKTests/SampleData/sources/truemoney_jumpapp.json b/OmiseSDKTests/SampleData/sources/truemoney_jumpapp.json
new file mode 100644
index 00000000..71186206
--- /dev/null
+++ b/OmiseSDKTests/SampleData/sources/truemoney_jumpapp.json
@@ -0,0 +1,37 @@
+{
+ "object":"source",
+ "id":"src_5yqlbf5w206mcfybj8v",
+ "livemode":true,
+ "location":"/sources/src_5yqlbf5w206mcfybj8v",
+ "amount":500000,
+ "barcode":null,
+ "bank":null,
+ "created_at":"2024-02-11T15:45:15Z",
+ "currency":"THB",
+ "email":null,
+ "flow":"app_redirect",
+ "installment_term":null,
+ "absorption_type":null,
+ "name":null,
+ "mobile_number":null,
+ "phone_number":null,
+ "platform_type":"IOS",
+ "scannable_code":null,
+ "billing":null,
+ "shipping":null,
+ "items":[
+
+ ],
+ "references":null,
+ "provider_references":null,
+ "store_id":null,
+ "store_name":null,
+ "terminal_id":null,
+ "type":"truemoney_jumpapp",
+ "zero_interest_installments":null,
+ "charge_status":"unknown",
+ "receipt_amount":null,
+ "discounts":[
+
+ ]
+}
diff --git a/OmiseSDKTests/Fixtures/objects/token_object.json b/OmiseSDKTests/SampleData/token.json
similarity index 100%
rename from OmiseSDKTests/Fixtures/objects/token_object.json
rename to OmiseSDKTests/SampleData/token.json
diff --git a/OmiseSDKTests/Source and Token JSON Codable Tests/CapabilityTests.swift b/OmiseSDKTests/Source and Token JSON Codable Tests/CapabilityTests.swift
new file mode 100644
index 00000000..c659af8b
--- /dev/null
+++ b/OmiseSDKTests/Source and Token JSON Codable Tests/CapabilityTests.swift
@@ -0,0 +1,41 @@
+import Foundation
+import XCTest
+@testable import OmiseSDK
+
+class CapabilityTests: XCTestCase {
+ func testJSONEncodingDecoding() throws {
+ let payments: [Capability.PaymentMethod] = [
+ Capability.PaymentMethod(
+ name: "card",
+ currencies: ["THB", "JPY", "USD", "EUR", "GBP", "SGD", "AUD", "CHF", "CNY", "DKK", "HKD"],
+ cardBrands: ["JCB", "Visa", "MasterCard", "UnionPay"],
+ installmentTerms: nil,
+ banks: nil,
+ provider: nil
+ ),
+ Capability.PaymentMethod(
+ name: "installment_bay",
+ currencies: ["THB"],
+ cardBrands: nil,
+ installmentTerms: [3, 4, 6, 9, 10],
+ banks: nil,
+ provider: nil
+ )
+ ]
+
+ // swiftlint:disable:next line_length
+ let banks = ["test", "bbl", "kbank", "rbs", "ktb", "jpm", "mufg", "tmb", "scb", "smbc", "sc", "cimb", "uob", "bay", "mega", "boa", "cacib", "gsb", "hsbc", "db", "ghb", "baac", "mb", "bnp", "tbank", "ibank", "tisco", "kk", "icbc", "tcrb", "lhb"]
+
+ let capability = Capability(
+ countryCode: "TH",
+ paymentMethods: payments,
+ banks: Set(banks)
+ )
+
+ let sample: Capability = try sampleFromJSONBy(.capability)
+ XCTAssertEqual(sample.banks, capability.banks)
+ XCTAssertEqual(sample.countryCode, capability.countryCode)
+ XCTAssertEqual(sample.paymentMethods[0], payments[0])
+ XCTAssertEqual(sample.paymentMethods[1], payments[1])
+ }
+}
diff --git a/OmiseSDKTests/Source and Token JSON Codable Tests/CreateSourcePayloadTests.swift b/OmiseSDKTests/Source and Token JSON Codable Tests/CreateSourcePayloadTests.swift
new file mode 100644
index 00000000..d2678ee4
--- /dev/null
+++ b/OmiseSDKTests/Source and Token JSON Codable Tests/CreateSourcePayloadTests.swift
@@ -0,0 +1,15 @@
+import Foundation
+import XCTest
+@testable import OmiseSDK
+
+class CreateSourcePayloadTests: XCTestCase {
+ func testJSONEncoding() throws {
+ let sourcePayload = CreateSourcePayload(amount: 1, currency: "THB", details: .sourceType(.alipay))
+
+ let jsonString = try encodeToJson(sourcePayload)
+ let decoded: CreateSourcePayload = try parse(jsonString: jsonString)
+ XCTAssertEqual(sourcePayload, decoded)
+ let expectedJsonString = "{\"amount\":1,\"currency\":\"THB\",\"platform_type\":\"IOS\",\"type\":\"alipay\"}"
+ XCTAssertEqual(jsonString, expectedJsonString)
+ }
+}
diff --git a/OmiseSDKTests/Source and Token JSON Codable Tests/CreateTokenPayloadTests.swift b/OmiseSDKTests/Source and Token JSON Codable Tests/CreateTokenPayloadTests.swift
new file mode 100644
index 00000000..c3f96ad7
--- /dev/null
+++ b/OmiseSDKTests/Source and Token JSON Codable Tests/CreateTokenPayloadTests.swift
@@ -0,0 +1,29 @@
+import Foundation
+import XCTest
+@testable import OmiseSDK
+
+class CreateTokenPayloadTests: XCTestCase {
+ func testJSONEncodingDecoding() throws {
+ let sourcePayload = CreateTokenPayload.Card(
+ name: "John Doe",
+ number: "4242424242424242",
+ expirationMonth: 12,
+ expirationYear: 2020,
+ securityCode: "123",
+ phoneNumber: "0123456789",
+ countryCode: "gb",
+ city: "Bangkok",
+ state: "Bangkok Metropolis",
+ street1: "Sukhumvit",
+ street2: "MBK",
+ postalCode: "10240"
+ )
+
+ let samplePayload: CreateTokenPayload.Card = try sampleFromJSONBy(.card)
+ XCTAssertEqual(samplePayload, sourcePayload)
+ let jsonString = try encodeToJson(samplePayload)
+
+ let decoded: CreateTokenPayload.Card = try parse(jsonString: jsonString)
+ XCTAssertEqual(samplePayload, decoded)
+ }
+}
diff --git a/OmiseSDKTests/Source and Token JSON Codable Tests/SourceFlowTests.swift b/OmiseSDKTests/Source and Token JSON Codable Tests/SourceFlowTests.swift
new file mode 100644
index 00000000..585bbb1b
--- /dev/null
+++ b/OmiseSDKTests/Source and Token JSON Codable Tests/SourceFlowTests.swift
@@ -0,0 +1,18 @@
+import Foundation
+import XCTest
+@testable import OmiseSDK
+
+class SourceFlowTests: XCTestCase {
+ func testDefaultValue() throws {
+ let testCases: [String: Source.Flow] = [
+ "\"redirect\"": .redirect,
+ "\"offline\"": .offline,
+ "\"app_redirect\"": .appRedirect,
+ "\"unknown\"": .unknown,
+ "\"Not supported flow\"": .unknown
+ ]
+ for (json, expectedResult) in testCases {
+ XCTAssertEqual(expectedResult, try json.fromJson(Source.Flow.self))
+ }
+ }
+}
diff --git a/OmiseSDKTests/Source and Token JSON Codable Tests/SourceTests.swift b/OmiseSDKTests/Source and Token JSON Codable Tests/SourceTests.swift
new file mode 100644
index 00000000..d62c5a35
--- /dev/null
+++ b/OmiseSDKTests/Source and Token JSON Codable Tests/SourceTests.swift
@@ -0,0 +1,565 @@
+import Foundation
+import XCTest
+@testable import OmiseSDK
+
+// swiftlint:disable file_length
+// swiftlint:disable:next type_body_length
+class SourceTests: XCTestCase {
+
+ typealias Payment = Source.Payment
+
+ /// Test Source.Payload's Codable protocol
+ func validatePayloadCodable(_ payload: Payment) throws {
+ let encodedPayload = try JSONEncoder().encode(payload)
+ let encodedPayloadJson = String(data: encodedPayload, encoding: .utf8) ?? ""
+ if payload.sourceType == .duitNowOBW {
+ print(encodedPayloadJson)
+ print("")
+ }
+
+ let decodedPayload: Payment = try parse(jsonString: encodedPayloadJson)
+ XCTAssertEqual(payload, decodedPayload)
+ }
+
+ func testAlipayCN() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .alipayCN))
+ XCTAssertEqual(source.id, "src_test_5owftw9kjhjisssm0n2")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.alipayCN))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.currency, "THB")
+ XCTAssertEqual(source.amount, 500000)
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeAlipayHK() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .alipayHK))
+ XCTAssertEqual(source.id, "src_test_5oxesy9ovpgawobhf6n")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.alipayHK))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.currency, "HKD")
+ XCTAssertEqual(source.amount, 500000)
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeAlipay() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .alipay))
+ XCTAssertEqual(source.id, "src_test_5avnfnqxzzj2yu7a34e")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.alipay))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.currency, "THB")
+ XCTAssertEqual(source.amount, 1000000)
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeBoost() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .boost))
+ XCTAssertEqual(source.id, "src_5pqcjr6tu4xvqut5nh5")
+ XCTAssertTrue(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.boost))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.currency, "MYR")
+ XCTAssertEqual(source.amount, 100000)
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeDana() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .dana))
+ XCTAssertEqual(source.id, "src_test_5oxew5l8jxhss03ybfb")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.dana))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.currency, "JPY")
+ XCTAssertEqual(source.amount, 500000)
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeDuitNowQR() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .duitNowQR))
+ XCTAssertEqual(source.id, "src_5pqcjr6tu4xvqut5nh5")
+ XCTAssertTrue(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.duitNowQR))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.currency, "MYR")
+ XCTAssertEqual(source.amount, 100000)
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeGcash() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .gcash))
+ XCTAssertEqual(source.id, "src_test_5oxesgzoekdn5nukcdf")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.gcash))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "USD")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeGrabPay() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .grabPay))
+ XCTAssertEqual(source.id, "src_test_5pqcjr6tu4xvqut5nh5")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.grabPay))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "SGD")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeKakaoPay() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .kakaoPay))
+ XCTAssertEqual(source.id, "src_test_5oxetau2owhu0rbzg7y")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.kakaoPay))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "USD")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeMaybankQRPay() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .maybankQRPay))
+ XCTAssertEqual(source.id, "src_5pqcjr6tu4xvqut5nh5")
+ XCTAssertTrue(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.maybankQRPay))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "MYR")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodePayNow() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .payNow))
+ XCTAssertEqual(source.id, "src_test_5iso4taobco8j5jehx5")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.payNow))
+ XCTAssertEqual(source.flow, .offline)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "SGD")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodePayPay() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .payPay))
+ XCTAssertEqual(source.id, "src_5pqcjr6tu4xvqut5nh5")
+ XCTAssertTrue(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.payPay))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "JPY")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodePromptPay() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .promptPay))
+ XCTAssertEqual(source.id, "src_test_5jb2cjjyjea25nps3ya")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.promptPay))
+ XCTAssertEqual(source.flow, .offline)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeRabbitLinepay() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .rabbitLinepay))
+ XCTAssertEqual(source.id, "src_test_5owftw9kjhjisssm0n2")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.rabbitLinepay))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeShopeePayJumpApp() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .shopeePayJumpApp))
+ XCTAssertEqual(source.id, "src_5pqcjr6tu4xvqut5nh5")
+ XCTAssertTrue(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.shopeePayJumpApp))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "MYR")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeShopeePay() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .shopeePay))
+ XCTAssertEqual(source.id, "src_5pqcjr6tu4xvqut5nh5")
+ XCTAssertTrue(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.shopeePay))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 110000)
+ XCTAssertEqual(source.currency, "MYR")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeTouchNGo() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .touchNGo))
+ XCTAssertEqual(source.id, "src_test_5oxet335rx3xzdyn06g")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.touchNGo))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "SGD")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeTrueMoneyJumpApp() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .trueMoneyJumpApp))
+ XCTAssertEqual(source.id, "src_5yqlbf5w206mcfybj8v")
+ XCTAssertTrue(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.trueMoneyJumpApp))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeBarcodeAlipay() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .barcodeAlipay))
+ let paymentInformation = Payment.BarcodeAlipay(
+ barcode: "1234567890123456",
+ storeID: "1",
+ storeName: "Main Store",
+ terminalID: nil
+ )
+ XCTAssertEqual(source.id, "src_test_5cq1tilrnz7d62t8y87")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .barcodeAlipay(paymentInformation))
+ XCTAssertEqual(source.flow, .offline)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeBillPaymentTescoLotus() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .billPaymentTescoLotus))
+ XCTAssertEqual(source.id, "src_test_59trf2nxk43b5nml8z0")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(.billPaymentTescoLotus))
+ XCTAssertEqual(source.flow, .offline)
+ XCTAssertEqual(source.amount, 1000000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ // swiftlint:disable:next function_body_length
+ func testDecodeAtome() throws {
+ let paymentInformation = Payment.Atome(
+ phoneNumber: "+12312312312",
+ name: "Test Data",
+ email: "test@omise.co",
+ shipping: Source.Payment.Address(
+ countryCode: "TH",
+ city: "Bangkok",
+ state: "Krung Thep Maha Nakhon",
+ street1: "444 Phaya Thai Rd",
+ street2: "Khwaeng Wang Mai, Pathum Wan",
+ postalCode: "10330"
+ ),
+ billing: Source.Payment.Address(
+ countryCode: "TH",
+ city: "Bangkok",
+ state: "Bangkok",
+ street1: "Sukhumvit",
+ street2: nil,
+ postalCode: "10100"
+ ),
+ items: [
+ Source.Payment.Item(
+ sku: "3427842",
+ category: "Shoes",
+ name: "Prada shoes",
+ quantity: 1,
+ amount: 500000,
+ itemUri: "omise.co/product/shoes",
+ imageUri: "omise.co/product/shoes/image",
+ brand: "Gucci"
+ ),
+ Source.Payment.Item(
+ sku: "3427843",
+ category: "Shoes",
+ name: "Skate Shoes",
+ quantity: 2,
+ amount: 200000,
+ itemUri: nil,
+ imageUri: nil,
+ brand: "DC"
+ )
+ ]
+ )
+
+ let source: Source = try sampleFromJSONBy(.source(type: .atome))
+ XCTAssertEqual(source.id, "src_5yqiaqtbbog2pxjdg6b")
+ XCTAssertTrue(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .atome(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 700000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeDuitNowOBW() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .duitNowOBW))
+ let paymentInformation = Payment.DuitNowOBW(bank: .affin)
+ XCTAssertEqual(source.id, "src_5pqcjr6tu4xvqut5nh5")
+ XCTAssertTrue(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .duitNowOBW(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "MYR")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInstallmentBay() throws {
+ let sourceType: SourceType = .installmentBAY
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.Installment(
+ installmentTerm: 6,
+ zeroInterestInstallments: false,
+ sourceType: sourceType
+ )
+ XCTAssertEqual(source.id, "src_test_5cs0t6x8n0z8rcfrsfi")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .installment(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInstallmentBBL() throws {
+ let sourceType: SourceType = .installmentBBL
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.Installment(
+ installmentTerm: 6,
+ zeroInterestInstallments: false,
+ sourceType: sourceType
+ )
+ XCTAssertEqual(source.id, "src_test_5cs0tdinbyypg6kn1fa")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .installment(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInstallmentFirstChoice() throws {
+ let sourceType: SourceType = .installmentFirstChoice
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.Installment(
+ installmentTerm: 6,
+ zeroInterestInstallments: false,
+ sourceType: sourceType
+ )
+
+ XCTAssertEqual(source.id, "src_test_5cq1ugk8m0un1yefb2u")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .installment(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInstallmentKBank() throws {
+ let sourceType: SourceType = .installmentKBank
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.Installment(
+ installmentTerm: 6,
+ zeroInterestInstallments: false,
+ sourceType: sourceType
+ )
+ XCTAssertEqual(source.id, "src_test_5cs0totfv87k1i6y45l")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .installment(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInstallmentKTC() throws {
+ let sourceType: SourceType = .installmentKTC
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.Installment(
+ installmentTerm: 6,
+ zeroInterestInstallments: false,
+ sourceType: sourceType
+ )
+ XCTAssertEqual(source.id, "src_test_5cs0tk7m2e5ivctrq30")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .installment(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInstallmentMBB() throws {
+ let sourceType: SourceType = .installmentMBB
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.Installment(
+ installmentTerm: 6,
+ zeroInterestInstallments: false,
+ sourceType: sourceType
+ )
+ XCTAssertEqual(source.id, "src_test_5obr9opqz5huc6tefw8")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .installment(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "MYR")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInstallmentTTB() throws {
+ let sourceType: SourceType = .installmentTTB
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.Installment(
+ installmentTerm: 6,
+ zeroInterestInstallments: false,
+ sourceType: sourceType
+ )
+ XCTAssertEqual(source.id, "src_test_5obr9opd7ej5c6tefw8")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .installment(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInstallmentUOB() throws {
+ let sourceType: SourceType = .installmentUOB
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.Installment(
+ installmentTerm: 6,
+ zeroInterestInstallments: false,
+ sourceType: sourceType
+ )
+ XCTAssertEqual(source.id, "src_test_5oe7fj1qz5huc6tefw8")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .installment(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 500000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeTrueMoneyWallet() throws {
+ let source: Source = try sampleFromJSONBy(.source(type: .trueMoneyWallet))
+ let paymentInformation = Payment.TrueMoneyWallet(phoneNumber: "0123456789")
+ XCTAssertEqual(source.id, "src_test_5jhmesi7s4at1qctloy")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .trueMoneyWallet(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInternetBankingBay() throws {
+ let sourceType: SourceType = .internetBankingBAY
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ XCTAssertEqual(source.id, "src_test_5cs0sm8u8h8nqo5hwcs")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(sourceType))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeInternetBankingBBL() throws {
+ let sourceType: SourceType = .internetBankingBBL
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ XCTAssertEqual(source.id, "src_test_5cs0sfy7phu06yhyz5c")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(sourceType))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeMobileBankingBAY() throws {
+ let sourceType: SourceType = .mobileBankingBAY
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ XCTAssertEqual(source.id, "src_test_5cs0sm8u8h8nqo5zasd")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(sourceType))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.amount, 1000000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeMobileBankingBBL() throws {
+ let sourceType: SourceType = .mobileBankingBBL
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ XCTAssertEqual(source.id, "src_test_5cs0sm8u8h8nqo5zasd")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(sourceType))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.amount, 1000000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeMobileBankingKBank() throws {
+ let sourceType: SourceType = .mobileBankingKBank
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ XCTAssertEqual(source.id, "src_test_5cs0sm8u8h8nqo5zasd")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(sourceType))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.amount, 1000000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+ func testDecodeMobileBankingTKB() throws {
+ let sourceType: SourceType = .mobileBankingKTB
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ XCTAssertEqual(source.id, "src_test_5cs0sm8u8h8nqo5zasd")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(sourceType))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.amount, 1000000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeMobileBankingSCB() throws {
+ let sourceType: SourceType = .mobileBankingSCB
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ XCTAssertEqual(source.id, "src_test_5cs0sm8u8h8nqo5zasd")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .sourceType(sourceType))
+ XCTAssertEqual(source.flow, .appRedirect)
+ XCTAssertEqual(source.amount, 1000000)
+ XCTAssertEqual(source.currency, "THB")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeEContext() throws {
+ let sourceType: SourceType = .eContext
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.EContext(
+ name: "ヤマダタロウ",
+ email: "test@opn.com",
+ phoneNumber: "01234567891"
+ )
+ XCTAssertEqual(source.id, "src_test_5xsjw8qafayihquj3k9")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .eContext(paymentInformation))
+ XCTAssertEqual(source.flow, .offline)
+ XCTAssertEqual(source.amount, 300)
+ XCTAssertEqual(source.currency, "JPY")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+
+ func testDecodeFPX() throws {
+ let sourceType: SourceType = .fpx
+ let source: Source = try sampleFromJSONBy(.source(type: sourceType))
+ let paymentInformation = Payment.FPX(
+ bank: "uob",
+ email: "support@omise.co"
+ )
+ XCTAssertEqual(source.id, "src_test_5jhmesi7s4at1qctloz")
+ XCTAssertFalse(source.isLiveMode)
+ XCTAssertEqual(source.paymentInformation, .fpx(paymentInformation))
+ XCTAssertEqual(source.flow, .redirect)
+ XCTAssertEqual(source.amount, 100000)
+ XCTAssertEqual(source.currency, "MYR")
+ try validatePayloadCodable(source.paymentInformation)
+ }
+}
diff --git a/QuickStart.playground/Pages/Credit Card Form.xcplaygroundpage/Contents.swift b/QuickStart.playground/Pages/Credit Card Form.xcplaygroundpage/Contents.swift
index d0e04f45..7d575f55 100644
--- a/QuickStart.playground/Pages/Credit Card Form.xcplaygroundpage/Contents.swift
+++ b/QuickStart.playground/Pages/Credit Card Form.xcplaygroundpage/Contents.swift
@@ -24,11 +24,11 @@ PlaygroundPage.current.needsIndefiniteExecution = true
/*: implement-delegate
- The form will automatically tokenizes credit card data for you as the user click on the submit button. To receive the resulting token data, implement the `CreditCardFormDelegate` methods on your view controller.
+ The form will automatically tokenizes credit card data for you as the user click on the submit button. To receive the resulting token data, implement the `CreditCardPaymentDelegate` methods on your view controller.
*/
-extension CheckoutViewController: CreditCardFormViewControllerDelegate {
- public func creditCardFormViewController(_ controller: CreditCardFormViewController, didSucceedWithToken token: Token) {
+extension CheckoutViewController: CreditCardPaymentControllerDelegate {
+ public func creditCardFormViewController(_ controller: CreditCardPaymentController, didSucceedWithToken token: Token) {
dismiss(animated: true, completion: nil)
print("token created: \(token.id )")
@@ -37,7 +37,7 @@ extension CheckoutViewController: CreditCardFormViewControllerDelegate {
}
- public func creditCardFormViewController(_ controller: CreditCardFormViewController, didFailWithError error: Error) {
+ public func creditCardFormViewController(_ controller: CreditCardPaymentController, didFailWithError error: Error) {
dismiss(animated: true, completion: nil)
print("error: \(error)")
@@ -46,14 +46,14 @@ extension CheckoutViewController: CreditCardFormViewControllerDelegate {
}
- public func creditCardFormViewControllerDidCancel(_ controller: CreditCardFormViewController) {
+ public func creditCardFormViewControllerDidCancel(_ controller: CreditCardPaymentController) {
dismiss(animated: true, completion: nil)
}
}
extension CheckoutViewController: CheckoutViewControllerDelegate {
public func checkoutViewControllerDidTapCheckout(_ checkoutViewController: CheckoutViewController) {
- let creditCardForm = CreditCardFormViewController.makeCreditCardFormViewController(withPublicKey: publicKey)
+ let creditCardForm = CreditCardPaymentController.makeCreditCardPaymentController(withPublicKey: publicKey)
creditCardForm.delegate = self
let navigationController = UINavigationController(rootViewController: creditCardForm)
diff --git a/QuickStart.playground/Pages/Source API Call.xcplaygroundpage/Contents.swift b/QuickStart.playground/Pages/Source API Call.xcplaygroundpage/Contents.swift
index 91a35124..382188c8 100644
--- a/QuickStart.playground/Pages/Source API Call.xcplaygroundpage/Contents.swift
+++ b/QuickStart.playground/Pages/Source API Call.xcplaygroundpage/Contents.swift
@@ -17,17 +17,15 @@ let client = Client(publicKey: publicKey)
/*: create-a-request
You also need a `Request` object which will have the credit card information that you want to tokenize.
*/
-let request = Request(parameter: CreateSourceParameter(
- paymentInformation: PaymentInformation.internetBanking(.bbl),
- amount: 50_000_00,
- currency: .thb
- )
+let createSourcePayload = CreateSourcePayload(
+ amount: amount,
+ currency: currency,
+ details: .sourceType(.internetBankingBBL) // Bangkok Bank Internet Banking payment method
)
-
/*: request
After you create a client and request, you can create a `RequestTask` with those and call resume method to make an API call with a completion handler block
*/
-let task = client.requestTask(with: request) { (result) in
+client.createSource(payload: createSourcePayload) { (result) in
defer {
PlaygroundPage.current.finishExecution()
}
@@ -40,6 +38,4 @@ let task = client.requestTask(with: request) { (result) in
}
}
-task.resume()
-
PlaygroundPage.current.needsIndefiniteExecution = true
diff --git a/QuickStart.playground/Pages/Tokenization API Call.xcplaygroundpage/Contents.swift b/QuickStart.playground/Pages/Tokenization API Call.xcplaygroundpage/Contents.swift
index 9a8cb143..8f9d195d 100644
--- a/QuickStart.playground/Pages/Tokenization API Call.xcplaygroundpage/Contents.swift
+++ b/QuickStart.playground/Pages/Tokenization API Call.xcplaygroundpage/Contents.swift
@@ -17,18 +17,17 @@ let client = Client(publicKey: publicKey)
/*: create-a-request
You also need a `Request` object which will have the credit card information that you want to tokenize.
*/
-let request = Request(parameter: CreateTokenParameter(
- name: "Customer Name",
- number: "4242424242424242",
- expirationMonth: 12,
- expirationYear: 2022,
- securityCode: "123")
+let createTokenPayload = CreateTokenPayload.Card(
+ name: "JOHN DOE",
+ number: "4242424242424242",
+ expirationMonth: 11,
+ expirationYear: 2022,
+ securityCode: "123"
)
-
/*: request
After you create a client and request, you can create a `RequestTask` with those and call resume method to make an API call with a completion handler block
*/
-let task = client.requestTask(with: request) { (result) in
+client.createToken(payload: createTokenPayload) { (result) in
defer {
PlaygroundPage.current.finishExecution()
}
@@ -41,6 +40,4 @@ let task = client.requestTask(with: request) { (result) in
}
}
-task.resume()
-
PlaygroundPage.current.needsIndefiniteExecution = true
diff --git a/QuickStart.playground/contents.xcplayground b/QuickStart.playground/contents.xcplayground
index ceec2ab5..403cd6b9 100644
--- a/QuickStart.playground/contents.xcplayground
+++ b/QuickStart.playground/contents.xcplayground
@@ -1,5 +1,5 @@
-
+
diff --git a/README.md b/README.md
index debf9398..2a53d4c0 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ To integrate the Opn Payments SDK into your Xcode project using the [Swift Packa
1. In Xcode, select `File` > `Swift Packages` > `Add Package Dependency...`
2. Enter the URL for this repository `https://github.com/omise/omise-ios.git`
-3. Choose a minimum semantic version of `v4.22.0`
+3. Choose a minimum semantic version of `v5.0.0`
4. Select your target, go to `Frameworks, Libraries, and Embedded Content` and set OmiseSDK to `Embed & Sign`
## Usage
@@ -58,14 +58,14 @@ details, read on:
### Opn Payments API
The Opn Payments iOS SDK provides an easy-to-use library for calling the
-Opn Payments API. The main class for the Opn Payments iOS SDK is `Client` through
+Opn Payments API. The main classes for the Opn Payments iOS SDK is `OmiseSDK` and `Client` through
which all requests to the Opn Payments API will be sent. Creating a new
-`Client` object requires an Opn Payments public key.
+`OmiseSDK` object requires an Opn Payments public key.
``` swift
import OmiseSDK
-let client = OmiseSDK.Client.init(publicKey: "omise_public_key")
+let omiseSDK = OmiseSDK(publicKey: "omise_public_key")
```
@@ -80,61 +80,46 @@ servers. To collect a card payment from a
customer, merchants will need to first *tokenize* the card data using the
Opn Payments API and then use the generated token in place of the card
data. You can tokenize card data by creating and initializing
-a `Request` as follows:
+a `CreateTokenPayload.Card` as follows:
```swift
-let tokenParameters = Token.CreateParameter(
+let createTokenPayload = CreateTokenPayload.Card(
name: "JOHN DOE",
number: "4242424242424242",
expirationMonth: 11,
expirationYear: 2022,
securityCode: "123"
)
-
-let request = Request(parameter: tokenParameters)
```
#### Creating a payment source
-Opn Payments now supports many payment methods other than cards. You
+Opn Payments now supports many payment methods other than cards. You
may request a payment with one of those supported payment methods from
-a customer by calling the `CreateSourceParameter` API. You need to specify
+a customer by calling the `CreateSource` API. You need to specify
the parameters (e.g. payment amount and currency) of the source you
-want to create by creating and initializing a `Request` with
+want to create by creating and initializing a `CreateSourcePayload` with
the `Payment Information` object:
```swift
-let paymentInformation = PaymentInformation.internetBanking(.bbl) // Bangkok Bank Internet Banking payment method
-let sourceParameter = CreateSourceParameter(
- paymentInformation: paymentInformation,
+let createSourcePayload = CreateSourcePayload(
amount: amount,
- currency: currency
+ currency: currency,
+ details: .sourceType(.internetBankingBBL) // Bangkok Bank Internet Banking payment method
)
-
-let request = Request(parameter: sourceParameter)
```
#### Sending the request
Whether you are charging a source or a card, sending the
-request is the same. Create a new `requestTask` on a `Client` object
-with the completion handler block and call `resume` on the
-requestTask:
-
-```swift
-let requestTask = client.requestTask(with: request, completionHandler: completionHandler)
-requestTask.resume()
-```
-
-You may also send a request by calling the
-`send(_:completionHandler:)` method on the `Client`.
-
+request is the same. Use `Client` object to perform one off API calls
+with the completion handler block
```swift
-client.send(request) { [weak self] (result) in
- guard let s = self else { return }
-
- // switch result { }
-}
+client.createToken(payload: createTokenPayload, completionHandler)
+client.createSource(payload: createSourcePayload, completionHandler)
+client.capability(completionHandler)
+client.token(tokenID: "tokenID", completionHandler)
+client.observeChargeStatus(completionHandler)
```
#### Creating the completion handler
@@ -144,9 +129,9 @@ A simple completion handler for a token looks as follows.
``` swift
func completionHandler(tokenResult: Result) -> Void {
switch tokenResult {
- case .success(let value):
+ case .success(let token):
// do something with Token id
- print(value.id)
+ print(token.id)
case .failure(let error):
print(error)
}
@@ -160,7 +145,7 @@ you can easily integrate into your application.
#### Card form
-The `CreditCardFormViewController` provides a pre-made card form and will automatically
+The `CreditCardPaymentController` provides a pre-made card form and will automatically
[tokenize card information](https://docs.opn.ooo/security-best-practices) for you.
You only need to implement two delegate methods and a way to display the form.
@@ -174,8 +159,8 @@ import OmiseSDK // at the top of the file
class ViewController: UIViewController {
private let publicKey = "pkey_test_123"
- @IBAction func displayCreditCardForm() {
- let creditCardView = CreditCardFormViewController.makeCreditCardFormViewController(withPublicKey: publicKey)
+ @IBAction func displayCreditCardPayment() {
+ let creditCardView = CreditCardPaymentController.makeCreditCardPaymentController(withPublicKey: publicKey)
creditCardView.delegate = self
creditCardView.handleErrors = true
@@ -187,15 +172,15 @@ class ViewController: UIViewController {
Then implement the delegate to receive the `Token` object after user has entered the card data:
```swift
-extension ViewController: CreditCardFormViewControllerDelegate {
- func creditCardFormViewController(_ controller: CreditCardFormViewController, didSucceedWithToken token: Token) {
- dismissCreditCardForm()
+extension ViewController: CreditCardPaymentControllerDelegate {
+ func creditCardFormViewController(_ controller: CreditCardPaymentController, didSucceedWithToken token: Token) {
+ dismissCreditCardPayment()
// Sends `Token` to your server to create a charge, or a customer object.
}
- func creditCardFormViewController(_ controller: CreditCardFormViewController, didFailWithError error: Error) {
- dismissCreditCardForm()
+ func creditCardFormViewController(_ controller: CreditCardPaymentController, didFailWithError error: Error) {
+ dismissCreditCardPayment()
// Only important if we set `handleErrors = false`.
// You can send errors to a logging service, or display them to the user here.
@@ -207,8 +192,8 @@ Alternatively, you can also push the view controller onto a `UINavigationControl
as follows:
```swift
-@IBAction func displayCreditCardForm() {
- let creditCardView = CreditCardFormViewController.makeCreditCardFormViewController(publicKey)
+@IBAction func displayCreditCardPayment() {
+ let creditCardView = CreditCardPaymentController.makeCreditCardPaymentController(publicKey)
creditCardView.delegate = self
creditCardView.handleErrors = true
@@ -217,23 +202,6 @@ as follows:
}
```
-##### Use card form in storyboard
-
-`CreditCardFormViewController` comes with built-in storyboard support. You can use `CreditCardFormViewController` in your storybard by using `Storyboard Reference`. Drag the `Storyboard Reference` object onto your canvas and set its bundle identifier to `co.omise.OmiseSDK` and Storyboard to `OmiseSDK`. You can either leave `Referenced ID` empty or use `CreditCardFormController` as a `Referenced ID`
-You can setup `CreditCardFormViewController` in `UIViewController.prepare(for:sender:)` method
-
-```swift
-override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
- if segue.identifier == "PresentCreditFormWithModal",
- let creditCardFormNavigationController = segue.destination as? UINavigationController,
- let creditCardFormViewController = creditCardFormNavigationController.topViewController as? CreditCardFormViewController {
- creditCardFormViewController.publicKey = publicKey
- creditCardFormViewController.handleErrors = true
- creditCardFormViewController.delegate = self
- }
-}
-```
-
##### Custom card form
You can create your own card form if you want but please keep in mind that you must not send the card information to your server.
@@ -299,25 +267,6 @@ extension ProductDetailViewController: PaymentCreatorControllerDelegate {
}
}
```
-##### Use payment creator controller in storyboard
-`PaymentCreatorController` comes with built-in storyboard support.
-You can use `PaymentCreatorController` in your storybard by using `Storyboard Reference`.
-Drag `Storyboard Reference` object onto your canvas and set its bundle identifier to `co.omise.OmiseSDK` and Storyboard to `OmiseSDK`
-and `PaymentCreatorController` as a `Referenced ID`
-You can setup `PaymentCreatorController` in `UIViewController.prepare(for:sender:)` method
-
-```swift
-override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
- if segue.identifier == "PresentCreditFormWithModal",
- let paymentCreatorController = segue.destination as? UINavigationController {
- paymentCreatorController.publicKey = self.publicKey
- paymentCreatorController.paymentAmount = paymentAmount
- paymentCreatorController.paymentCurrency = paymentCurrency
- paymentCreatorController.allowedPaymentMethods = allowedPaymentMethods
- paymentCreatorController.paymentDelegate = self
- }
-}
-```
### Authorizing payment
@@ -337,21 +286,6 @@ let handlerController = OmiseAuthorizingPaymentViewController.makeAuthorizingPay
self.present(handlerController, animated: true, completion: nil)
```
-##### Use `OmiseAuthorizingPaymentViewController` in storyboard
-
-`OmiseAuthorizingPaymentViewController` also comes with built-in storyboard support such as `CreditCardFormViewController`. You can use `OmiseAuthorizingPaymentViewController` in your storyboard by using `Storyboard Reference`. Drag `Storyboard Reference` object onto your canvas, set its bundle identifier to `co.omise.OmiseSDK` and storyboard to `OmiseSDK`, then use `DefaultAuthorizingPaymentViewController` as a `Referenced ID`.
-You can setup `OmiseAuthorizingPaymentViewController` in `UIViewController.prepare(for:sender:)` method
-```swift
-override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
- if segue.identifier == "AuthorizingPaymentViewController",
- let omiseAuthorizingPaymentController = segue.destination as? OmiseAuthorizingPaymentViewController {
- omiseAuthorizingPaymentController.delegate = self
- omiseAuthorizingPaymentController.authorizedURL = authorizedURL
- omiseAuthorizingPaymentController.expectedReturnURLPatterns = [ URLComponents(string: "http://www.example.com/orders")! ]
- }
-}
-```
-
##### Receive `Authorizing Payment` events via the delegate
`OmiseAuthorizingPaymentViewController` sends `Authorizing Payment` events to its `delegate` when an event occurs.
@@ -370,9 +304,7 @@ extension ViewController: OmiseAuthorizingPaymentViewControllerDelegate {
## Objective-C compatibility
-Opn Payments iOS SDK comes with full Objective-C support. The SDK is designed with the Swift language as a first-class citizen, and not only adopts Swift-only features in the SDK, but also provides an Objective-C counterpart for those features.
-If you found an API that is not available in Objective-C, please don't hestitate [to open an issue](https://github.com/omise/omise-ios/issues/new).
-
+This version of Opn Payments iOS SDK does not support Objective-C. Latest [version](https://github.com/omise/omise-ios/tree/support/v4.x.x) with full Objective-C support.
## Contributing
diff --git a/dev.xcodeproj/project.pbxproj b/dev.xcodeproj/project.pbxproj
index 40329b87..0ee78249 100644
--- a/dev.xcodeproj/project.pbxproj
+++ b/dev.xcodeproj/project.pbxproj
@@ -7,27 +7,35 @@
objects = {
/* Begin PBXBuildFile section */
- 1121F44028523BED0003EE4F /* DuitNowOBWBankChooserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1121F43F28523BED0003EE4F /* DuitNowOBWBankChooserViewController.swift */; };
14ACEF831D02D641001C5319 /* CardExpiryDatePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14ACEF821D02D641001C5319 /* CardExpiryDatePicker.swift */; };
- 2220F1AA1D0FEE85008CD89F /* OmiseError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2220F1A41D0FEE85008CD89F /* OmiseError.swift */; };
2225B3541D0FDD63003EB396 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2225B3531D0FDD63003EB396 /* Assets.xcassets */; };
22445FFC1CF41DD300801D0F /* Globals.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22445FFB1CF41DD300801D0F /* Globals.swift */; };
- 224460041CF43A1200801D0F /* SDKTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 225931561CE4745200841B86 /* SDKTestCase.swift */; settings = {COMPILER_FLAGS = "-Wnodeprecated-declarations"; }; };
- 2259314E1CE46E5700841B86 /* CardBrand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2259314D1CE46E5700841B86 /* CardBrand.swift */; };
229E14581D0EBAB5000511DE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 229E14541D0EBAB5000511DE /* AppDelegate.swift */; };
229E145A1D0EBAB5000511DE /* ProductDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 229E14561D0EBAB5000511DE /* ProductDetailViewController.swift */; };
22E0DBD71D0EBE2E00472C74 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 22E0DBD61D0EBE2E00472C74 /* Assets.xcassets */; };
- 731A75D325E3604A002353C0 /* FPXBankChooserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 731A75D225E3604A002353C0 /* FPXBankChooserViewController.swift */; };
- 73F9BA4725E50F4700F55CA8 /* AdaptableDynamicTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F9BA4625E50F4700F55CA8 /* AdaptableDynamicTableViewController.swift */; };
- 73F9BA4B25E6053700F55CA8 /* FPXFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F9BA4A25E6053700F55CA8 /* FPXFormViewController.swift */; };
+ 73F9BA4B25E6053700F55CA8 /* FPXPaymentFormController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73F9BA4A25E6053700F55CA8 /* FPXPaymentFormController.swift */; };
+ 7501265D2B87CB6500ED5E14 /* PaymentInputsFormController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7501265C2B87CB6500ED5E14 /* PaymentInputsFormController.swift */; };
+ 7501265F2B8893C900ED5E14 /* PaymentFormController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7501265E2B8893C900ED5E14 /* PaymentFormController.swift */; };
+ 750126612B8902A500ED5E14 /* PaymentFormStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750126602B8902A500ED5E14 /* PaymentFormStyle.swift */; };
+ 750126632B89200B00ED5E14 /* PaymentInputProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750126622B89200B00ED5E14 /* PaymentInputProtocol.swift */; };
+ 7501266A2B89F25000ED5E14 /* EContextPaymentFormController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 750126692B89F25000ED5E14 /* EContextPaymentFormController.xib */; };
+ 7501266C2B8A40E000ED5E14 /* TrueMoneyPaymentFormController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7501266B2B8A40E000ED5E14 /* TrueMoneyPaymentFormController.xib */; };
+ 7501266E2B8A411C00ED5E14 /* FPXPaymentFormController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7501266D2B8A411C00ED5E14 /* FPXPaymentFormController.xib */; };
+ 750126702B8A490000ED5E14 /* SelectFPXBankViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7501266F2B8A490000ED5E14 /* SelectFPXBankViewModel.swift */; };
+ 750126722B8A49BC00ED5E14 /* FPX.Bank+ViewPresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750126712B8A49BC00ED5E14 /* FPX.Bank+ViewPresentable.swift */; };
+ 750126742B8A580500ED5E14 /* SelectDuitNowOBWBankViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750126732B8A580500ED5E14 /* SelectDuitNowOBWBankViewModel.swift */; };
+ 750126772B95971A00ED5E14 /* ChoosePaymentCoordinator+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750126762B95971A00ED5E14 /* ChoosePaymentCoordinator+Helpers.swift */; };
+ 750126792B95A34000ED5E14 /* AuthorizingPaymentViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 750126782B95A34000ED5E14 /* AuthorizingPaymentViewController.xib */; };
7502CA532A3011A900766E7D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7502CA562A3011A900766E7D /* LaunchScreen.storyboard */; };
7502CA5F2A31A7D600766E7D /* CountryListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7502CA5E2A31A7D600766E7D /* CountryListViewController.swift */; };
7502CA602A31A7D600766E7D /* CountryListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7502CA5E2A31A7D600766E7D /* CountryListViewController.swift */; };
7502CA622A31A7E100766E7D /* CountryListViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7502CA612A31A7E100766E7D /* CountryListViewModelProtocol.swift */; };
7502CA632A31A7E100766E7D /* CountryListViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7502CA612A31A7E100766E7D /* CountryListViewModelProtocol.swift */; };
- 7502CA642A31AA6F00766E7D /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD391B0230C05BC00383286 /* Colors.swift */; };
- 7502CA662A31AEA200766E7D /* CountryInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7502CA652A31AEA200766E7D /* CountryInfo.swift */; };
- 7502CA672A31AEA200766E7D /* CountryInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7502CA652A31AEA200766E7D /* CountryInfo.swift */; };
+ 750708E02B7909BB00A48DD0 /* SourceTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750708DF2B7909BB00A48DD0 /* SourceTests.swift */; };
+ 750708E32B790B8300A48DD0 /* String+JSON.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750708E22B790B8300A48DD0 /* String+JSON.swift */; };
+ 750708E52B790BD600A48DD0 /* SampleData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750708E42B790BD600A48DD0 /* SampleData.swift */; };
+ 750708E72B790CF200A48DD0 /* SampleData in Resources */ = {isa = PBXBuildFile; fileRef = 750708E62B790CF200A48DD0 /* SampleData */; };
+ 750708F42B7A765500A48DD0 /* OmiseSDKTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 750708F32B7A765500A48DD0 /* OmiseSDKTests.swift */; };
7509D4DD2A1A9FD70050AB38 /* MainActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A275CBB21241E4500C5716F /* MainActionButton.swift */; };
7509D4E02A1AA1450050AB38 /* AtomeFormViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7509D4DF2A1AA1450050AB38 /* AtomeFormViewControllerTests.swift */; };
7509D4E22A1C876B0050AB38 /* AtomeFormViewContextMockup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7509D4E12A1C876B0050AB38 /* AtomeFormViewContextMockup.swift */; };
@@ -38,7 +46,14 @@
7509D4F42A1D2C3E0050AB38 /* AtomeFormViewModelMockup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7509D4E32A1C89F10050AB38 /* AtomeFormViewModelMockup.swift */; };
7509D4F52A1D2F550050AB38 /* AtomeFormViewContextMockup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7509D4E12A1C876B0050AB38 /* AtomeFormViewContextMockup.swift */; };
75131F862AC2BD9D008BCB17 /* UIViewController+NavigationBarStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75131F852AC2BD9D008BCB17 /* UIViewController+NavigationBarStyle.swift */; };
- 752E40C42ACD420C00B62A49 /* SourceTypeValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752E40C32ACD420C00B62A49 /* SourceTypeValue.swift */; };
+ 751E7BD52B7E2F2A0031B4A2 /* SourceType+ViewPresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 751E7BD42B7E2F2A0031B4A2 /* SourceType+ViewPresentable.swift */; };
+ 751E7BD92B7E5D130031B4A2 /* PaymentMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 751E7BD82B7E5D130031B4A2 /* PaymentMethod.swift */; };
+ 751E7BE32B7F4DD00031B4A2 /* MainActionButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A275CBB21241E4500C5716F /* MainActionButton.swift */; };
+ 751E7BEA2B7F77120031B4A2 /* Localized+Omise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 751E7BE92B7F77120031B4A2 /* Localized+Omise.swift */; };
+ 751E7BEC2B7F7CE50031B4A2 /* ViewPresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 751E7BEB2B7F7CE50031B4A2 /* ViewPresentable.swift */; };
+ 751E7BEE2B7F7DD20031B4A2 /* PaymentMethod+ViewPresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 751E7BED2B7F7DD20031B4A2 /* PaymentMethod+ViewPresentable.swift */; };
+ 751E7BF02B7FBA760031B4A2 /* UIColor+Omise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 751E7BEF2B7FBA760031B4A2 /* UIColor+Omise.swift */; };
+ 751E7BF22B7FC90C0031B4A2 /* SourceType+Collections.swift in Sources */ = {isa = PBXBuildFile; fileRef = 751E7BF12B7FC90C0031B4A2 /* SourceType+Collections.swift */; };
752E40C72ACD429B00B62A49 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 752E40C52ACD426E00B62A49 /* BaseViewController.swift */; };
753279382A31B40F008048AD /* CountryListViewModelMockup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 753279372A31B40F008048AD /* CountryListViewModelMockup.swift */; };
75348D4E29C3FCC70008C8A3 /* Bundle+OmiseSDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75348D4D29C3FCC70008C8A3 /* Bundle+OmiseSDK.swift */; };
@@ -59,72 +74,115 @@
75405A942A26340E008C21F6 /* UIButton+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75405A8A2A26340E008C21F6 /* UIButton+Helpers.swift */; };
75405A952A26343F008C21F6 /* SpacerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75405A802A2633B6008C21F6 /* SpacerView.swift */; };
75405A992A2634D9008C21F6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 75405A972A2634D9008C21F6 /* Assets.xcassets */; };
- 75405A9C2A266F50008C21F6 /* AtomeFormViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75405A9B2A266F50008C21F6 /* AtomeFormViewModel.swift */; };
- 75405AA42A27F5D3008C21F6 /* AtomeFormViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B52A1A5F020038FA54 /* AtomeFormViewContext.swift */; };
- 75405AA52A27F5D3008C21F6 /* AtomeFormViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B32A1A5EAD0038FA54 /* AtomeFormViewModelProtocol.swift */; };
+ 75405A9C2A266F50008C21F6 /* AtomePaymentFormViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75405A9B2A266F50008C21F6 /* AtomePaymentFormViewModel.swift */; };
+ 75405AA42A27F5D3008C21F6 /* AtomePaymentFormViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B52A1A5F020038FA54 /* AtomePaymentFormViewContext.swift */; };
+ 75405AA52A27F5D3008C21F6 /* AtomePaymentFormViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B32A1A5EAD0038FA54 /* AtomePaymentFormViewModelProtocol.swift */; };
75405AA82A27F97E008C21F6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 75405AA62A27F97E008C21F6 /* Localizable.strings */; };
- 75405AAB2A27F9B4008C21F6 /* Bundle+OmiseSDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75348D4D29C3FCC70008C8A3 /* Bundle+OmiseSDK.swift */; };
- 756C8F1E2A40693B00D53059 /* CreditCardFormViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756C8F1D2A40693B00D53059 /* CreditCardFormViewModelProtocol.swift */; };
- 756C8F202A40694000D53059 /* CreditCardFormViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756C8F1F2A40694000D53059 /* CreditCardFormViewModel.swift */; };
- 756C8F222A40694F00D53059 /* CreditCardFormViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756C8F212A40694F00D53059 /* CreditCardFormViewContext.swift */; };
+ 754B78182B8741CD00973B71 /* TapGestureHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 754B78172B8741CD00973B71 /* TapGestureHandler.swift */; };
+ 756C8F1E2A40693B00D53059 /* CreditCardPaymentViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756C8F1D2A40693B00D53059 /* CreditCardPaymentViewModelProtocol.swift */; };
+ 756C8F202A40694000D53059 /* CreditCardPaymentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756C8F1F2A40694000D53059 /* CreditCardPaymentViewModel.swift */; };
+ 756C8F222A40694F00D53059 /* CreditCardPaymentViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756C8F212A40694F00D53059 /* CreditCardPaymentViewContext.swift */; };
756C8F262A40698600D53059 /* TextFieldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 756C8F252A40698600D53059 /* TextFieldView.swift */; };
757B0A742AD71E3100DEAE8F /* OmiseUnitTestKit in Frameworks */ = {isa = PBXBuildFile; productRef = 757B0A732AD71E3100DEAE8F /* OmiseUnitTestKit */; };
757B0A752AD71E3100DEAE8F /* OmiseUnitTestKit in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 757B0A732AD71E3100DEAE8F /* OmiseUnitTestKit */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
- 758244092ACE988700781B3B /* PaymentInformationTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A429E7A2109A3AE007C230F /* PaymentInformationTestCase.swift */; };
759856242A286C880087B605 /* UIScrollView+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759856232A286C880087B605 /* UIScrollView+Helpers.swift */; };
- 75B43B572A0277A3004352C7 /* PaymentInformation.Atome.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B43B562A0277A3004352C7 /* PaymentInformation.Atome.swift */; };
+ 759C7EC02B7DC7F50029D555 /* SourceType+MobileBanking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759C7EBF2B7DC7F50029D555 /* SourceType+MobileBanking.swift */; };
+ 759C7EC22B7DC80A0029D555 /* SourceType+InternetBanking.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759C7EC12B7DC80A0029D555 /* SourceType+InternetBanking.swift */; };
+ 759C7EC42B7DC8270029D555 /* SourceType+Installments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 759C7EC32B7DC8270029D555 /* SourceType+Installments.swift */; };
+ 75B420502B7611710036134D /* Capability.PaymentMethod.Bank.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B4204F2B7611710036134D /* Capability.PaymentMethod.Bank.swift */; };
+ 75B4205E2B7674D70036134D /* Calendar+CreditCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B4205D2B7674D70036134D /* Calendar+CreditCard.swift */; };
+ 75B420612B776D8A0036134D /* APIProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B420602B776D8A0036134D /* APIProtocol.swift */; };
+ 75B420662B77741E0036134D /* CreateTokenPayload.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B420652B77741E0036134D /* CreateTokenPayload.swift */; };
+ 75B420822B77FAA50036134D /* CreateSourcePayload.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B420812B77FAA50036134D /* CreateSourcePayload.swift */; };
+ 75B420942B78DE350036134D /* Capability.PaymentMethod.Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B420932B78DE350036134D /* Capability.PaymentMethod.Provider.swift */; };
+ 75CFC4CE2B73AF0E00422A8F /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75CFC4CD2B73AF0E00422A8F /* Client.swift */; };
+ 75CFC4D22B73AFD500422A8F /* OmiseSDK.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75CFC4D12B73AFD500422A8F /* OmiseSDK.swift */; };
+ 75CFC4D42B73B21100422A8F /* ClientTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75CFC4D32B73B21100422A8F /* ClientTests.swift */; };
+ 75CFC4DB2B73F5AF00422A8F /* NetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75CFC4DA2B73F5AF00422A8F /* NetworkService.swift */; };
+ 75CFC4DD2B73F75C00422A8F /* OmiseAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75CFC4DC2B73F75C00422A8F /* OmiseAPI.swift */; };
+ 75CFC4EE2B7537BC00422A8F /* Client+URLRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75CFC4ED2B7537BC00422A8F /* Client+URLRequest.swift */; };
+ 75CFC4F12B753B0F00422A8F /* Capability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75CFC4F02B753B0F00422A8F /* Capability.swift */; };
+ 75CFC4F32B753BCD00422A8F /* Capability.PaymentMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75CFC4F22B753BCD00422A8F /* Capability.PaymentMethod.swift */; };
+ 75D13D5E2B8069650073A831 /* UIImage+Omise.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D5D2B8069650073A831 /* UIImage+Omise.swift */; };
+ 75D13D602B807AC90073A831 /* ChoosePaymentCoordinator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D5F2B807AC90073A831 /* ChoosePaymentCoordinator.swift */; };
+ 75D13D6C2B8335850073A831 /* ViewContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D6B2B8335850073A831 /* ViewContainer.swift */; };
+ 75D13D732B833A810073A831 /* TableCellContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D722B833A810073A831 /* TableCellContext.swift */; };
+ 75D13D772B833C200073A831 /* UITableViewCell+ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D762B833C200073A831 /* UITableViewCell+ActivityIndicator.swift */; };
+ 75D13D792B833F160073A831 /* ViewAttachable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D782B833F160073A831 /* ViewAttachable.swift */; };
+ 75D13D8A2B8382760073A831 /* ClosureBarButtonItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D892B8382760073A831 /* ClosureBarButtonItem.swift */; };
+ 75D13D8C2B8385820073A831 /* UIBarButtonItem+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D8B2B8385820073A831 /* UIBarButtonItem+Helpers.swift */; };
+ 75D13DA52B83B58B0073A831 /* Source.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D982B83B58B0073A831 /* Source.swift */; };
+ 75D13DA62B83B58B0073A831 /* Source.Payment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D992B83B58B0073A831 /* Source.Payment.swift */; };
+ 75D13DA72B83B58B0073A831 /* Source.Payment.BarcodeAlipay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D9A2B83B58B0073A831 /* Source.Payment.BarcodeAlipay.swift */; };
+ 75D13DA82B83B58B0073A831 /* Source.Payment.DuitNowOBW.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D9B2B83B58B0073A831 /* Source.Payment.DuitNowOBW.swift */; };
+ 75D13DA92B83B58B0073A831 /* Source.Payment.Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D9C2B83B58B0073A831 /* Source.Payment.Item.swift */; };
+ 75D13DAA2B83B58B0073A831 /* Source.Payment.Installment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D9D2B83B58B0073A831 /* Source.Payment.Installment.swift */; };
+ 75D13DAB2B83B58B0073A831 /* Source.Payment.FPX.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D9E2B83B58B0073A831 /* Source.Payment.FPX.swift */; };
+ 75D13DAC2B83B58B0073A831 /* Source.Payment.EContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13D9F2B83B58B0073A831 /* Source.Payment.EContext.swift */; };
+ 75D13DAD2B83B58B0073A831 /* Source.Payment.TrueMoney.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DA02B83B58B0073A831 /* Source.Payment.TrueMoney.swift */; };
+ 75D13DAE2B83B58B0073A831 /* Source.Payment.DuitNowOBW.Bank.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DA12B83B58B0073A831 /* Source.Payment.DuitNowOBW.Bank.swift */; };
+ 75D13DAF2B83B58B0073A831 /* Source.Payment.Atome.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DA22B83B58B0073A831 /* Source.Payment.Atome.swift */; };
+ 75D13DB02B83B58B0073A831 /* Source.Payment.Address.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DA32B83B58B0073A831 /* Source.Payment.Address.swift */; };
+ 75D13DB12B83B58B0073A831 /* Source.Payment.FPX.Bank.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DA42B83B58B0073A831 /* Source.Payment.FPX.Bank.swift */; };
+ 75D13DB42B83B71D0073A831 /* DuitNowOBW.Bank+ViewPresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DB32B83B71D0073A831 /* DuitNowOBW.Bank+ViewPresentable.swift */; };
+ 75D13DBB2B83FB470073A831 /* SelectPaymentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DBA2B83FB470073A831 /* SelectPaymentController.swift */; };
+ 75D13DC12B8400610073A831 /* SelectPaymentMethodViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DC02B8400610073A831 /* SelectPaymentMethodViewModel.swift */; };
+ 75D13DC92B8529790073A831 /* SelectSourceTypePaymentViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DC82B8529790073A831 /* SelectSourceTypePaymentViewModel.swift */; };
+ 75D13DCB2B8531D20073A831 /* Assets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DCA2B8531D20073A831 /* Assets.swift */; };
+ 75D13DCD2B8536B10073A831 /* SelectInstallmentTermsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DCC2B8536B10073A831 /* SelectInstallmentTermsViewModel.swift */; };
+ 75D13DD42B8652230073A831 /* SourceType+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DD32B8652230073A831 /* SourceType+Helpers.swift */; };
+ 75D13DD62B8653360073A831 /* UIControl.State+Hashable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DD52B8653360073A831 /* UIControl.State+Hashable.swift */; };
+ 75D13DD82B86539C0073A831 /* Optional+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DD72B86539C0073A831 /* Optional+Helpers.swift */; };
+ 75D13DDD2B8658660073A831 /* SelectPaymentPresentableProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DDC2B8658660073A831 /* SelectPaymentPresentableProtocol.swift */; };
+ 75D13DE22B8666C40073A831 /* SelectPaymentMethodDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DE12B8666C40073A831 /* SelectPaymentMethodDelegate.swift */; };
+ 75D13DE42B8666CC0073A831 /* SelectSourceTypeDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DE32B8666CC0073A831 /* SelectSourceTypeDelegate.swift */; };
+ 75D13DE62B8666DB0073A831 /* SelectSourcePaymentDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13DE52B8666DB0073A831 /* SelectSourcePaymentDelegate.swift */; };
+ 75D13DFC2B866DFE0073A831 /* PaymentCreatorController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A30FB7C214929C900DC09DC /* PaymentCreatorController.swift */; };
+ 75D13E022B866E040073A831 /* PaymentUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A76791E214663560085DE3C /* PaymentUI.swift */; };
+ 75D13E0F2B8678530073A831 /* OmiseSwiftUIKit in Frameworks */ = {isa = PBXBuildFile; productRef = 75D13E0E2B8678530073A831 /* OmiseSwiftUIKit */; };
+ 75D13E102B8678530073A831 /* OmiseSwiftUIKit in Embed Frameworks */ = {isa = PBXBuildFile; productRef = 75D13E0E2B8678530073A831 /* OmiseSwiftUIKit */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
+ 75D13E1B2B86FD2D0073A831 /* CCVInfoController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 75D13E192B86FD2D0073A831 /* CCVInfoController.xib */; };
+ 75D13E1D2B86FF8C0073A831 /* CreditCardPaymentDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13E1C2B86FF8C0073A831 /* CreditCardPaymentDelegate.swift */; };
+ 75D13E202B8703F80073A831 /* CreditCardPaymentController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75D13E1E2B8703F70073A831 /* CreditCardPaymentController.swift */; };
+ 75D13E212B8703F80073A831 /* CreditCardPaymentController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 75D13E1F2B8703F80073A831 /* CreditCardPaymentController.xib */; };
75DAD8902A0BB8D80098AF96 /* LocalConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75DAD88F2A0BB8D80098AF96 /* LocalConfig.swift */; };
+ 75E0EB712B7A904100E3198A /* SourceFlowTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB702B7A904100E3198A /* SourceFlowTests.swift */; };
+ 75E0EB722B7A962600E3198A /* CreateSourcePayloadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75B4208D2B78C2120036134D /* CreateSourcePayloadTests.swift */; };
+ 75E0EB7C2B7B410600E3198A /* Client+NetworkService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB7B2B7B410600E3198A /* Client+NetworkService.swift */; };
+ 75E0EB7E2B7B5EE400E3198A /* CreateTokenPayloadTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB7D2B7B5EE400E3198A /* CreateTokenPayloadTests.swift */; };
+ 75E0EB832B7B79E700E3198A /* CapabilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB822B7B79E700E3198A /* CapabilityTests.swift */; };
+ 75E0EB9A2B7BD00F00E3198A /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB952B7BD00F00E3198A /* Currency.swift */; };
+ 75E0EB9B2B7BD00F00E3198A /* PAN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB962B7BD00F00E3198A /* PAN.swift */; };
+ 75E0EB9C2B7BD00F00E3198A /* Country.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB972B7BD00F00E3198A /* Country.swift */; };
+ 75E0EB9D2B7BD00F00E3198A /* CardBrand.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB982B7BD00F00E3198A /* CardBrand.swift */; };
+ 75E0EB9E2B7BD00F00E3198A /* OmiseError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB992B7BD00F00E3198A /* OmiseError.swift */; };
+ 75E0EBA22B7BD02200E3198A /* Token.Card.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EB9F2B7BD02200E3198A /* Token.Card.swift */; };
+ 75E0EBA32B7BD02200E3198A /* Token.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EBA02B7BD02200E3198A /* Token.swift */; };
+ 75E0EBA42B7BD02200E3198A /* Token.ChargeStatus.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EBA12B7BD02200E3198A /* Token.ChargeStatus.swift */; };
+ 75E0EBBB2B7BD02F00E3198A /* SourceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EBAF2B7BD02F00E3198A /* SourceType.swift */; };
+ 75E0EBC22B7D1F9E00E3198A /* OmiseError+LocalizedDescription.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75E0EBC12B7D1F9E00E3198A /* OmiseError+LocalizedDescription.swift */; };
75F2A0182A0BD0D40038FA54 /* Config.local.plist in Resources */ = {isa = PBXBuildFile; fileRef = 75DAD8922A0BC9540098AF96 /* Config.local.plist */; };
75F2A09A2A13B0B10038FA54 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 75F2A0992A13B0B10038FA54 /* Preview Assets.xcassets */; };
75F2A0A62A13B70F0038FA54 /* OmiseTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9864062F1CFEA7E4004BCF51 /* OmiseTextField.swift */; };
75F2A0B02A1A5BF30038FA54 /* ProxyProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0AF2A1A5BF30038FA54 /* ProxyProperty.swift */; };
- 75F2A0B22A1A5E780038FA54 /* AtomeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B12A1A5E780038FA54 /* AtomeInputView.swift */; };
- 75F2A0B72A1A60630038FA54 /* AtomeFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0A42A13B1470038FA54 /* AtomeFormViewController.swift */; };
+ 75F2A0B72A1A60630038FA54 /* AtomePaymentFormController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0A42A13B1470038FA54 /* AtomePaymentFormController.swift */; };
75F2A0B82A1A60630038FA54 /* ProxyProperty.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0AF2A1A5BF30038FA54 /* ProxyProperty.swift */; };
- 75F2A0B92A1A60630038FA54 /* AtomeFormViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B32A1A5EAD0038FA54 /* AtomeFormViewModelProtocol.swift */; };
- 75F2A0BA2A1A60630038FA54 /* AtomeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B12A1A5E780038FA54 /* AtomeInputView.swift */; };
- 75F2A0BB2A1A60630038FA54 /* AtomeFormViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B52A1A5F020038FA54 /* AtomeFormViewContext.swift */; };
+ 75F2A0B92A1A60630038FA54 /* AtomePaymentFormViewModelProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B32A1A5EAD0038FA54 /* AtomePaymentFormViewModelProtocol.swift */; };
+ 75F2A0BB2A1A60630038FA54 /* AtomePaymentFormViewContext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0B52A1A5F020038FA54 /* AtomePaymentFormViewContext.swift */; };
75F2A0C12A1A84900038FA54 /* UIColor+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0C02A1A84900038FA54 /* UIColor+Helpers.swift */; };
75F2A0C22A1A87AE0038FA54 /* UIColor+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F2A0C02A1A84900038FA54 /* UIColor+Helpers.swift */; };
- 75F8C0B72B1F78E300AE78D9 /* PaymentChooserViewControllerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 75F8C0B62B1F78E300AE78D9 /* PaymentChooserViewControllerTests.swift */; };
- 8A01E48D21059EFF00D73FE6 /* PaymentInformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A01E48C21059EFF00D73FE6 /* PaymentInformation.swift */; };
- 8A0A67E72137EE49006356B7 /* AdaptableStaticTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A0A67E62137EE49006356B7 /* AdaptableStaticTableViewController.swift */; };
- 8A0A67E821383614006356B7 /* PaymentChooserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AE23AAD20F8CA8800BC9D8F /* PaymentChooserViewController.swift */; };
- 8A14C209220ACB2B003F5B20 /* Capability.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A14C208220ACB2B003F5B20 /* Capability.swift */; };
- 8A14C20B220AE241003F5B20 /* CapabilityOperationFixtureTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A14C20A220AE241003F5B20 /* CapabilityOperationFixtureTests.swift */; };
8A188BB01D951E3C00FFF467 /* AuthorizingPaymentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A188BAF1D951E3C00FFF467 /* AuthorizingPaymentViewController.swift */; };
- 8A2BE95520A9A39E000CEB60 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A2BE95420A9A39E000CEB60 /* Request.swift */; };
8A2C451920ECC7A60033E2EB /* OmiseSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 225931181CE3210700841B86 /* OmiseSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
- 8A30FB7D214929C900DC09DC /* PaymentCreatorController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A30FB7C214929C900DC09DC /* PaymentCreatorController.swift */; };
- 8A37E43620B584D300E2DA18 /* ModelTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A37E43520B584D300E2DA18 /* ModelTestCase.swift */; };
- 8A3C10562159F7FC00BEFD8A /* InvalidCardAPIErrorParsingTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A3C10552159F7FC00BEFD8A /* InvalidCardAPIErrorParsingTestCase.swift */; };
- 8A3C10582159FCE900BEFD8A /* BadRequestAPIErrorParsingTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A3C10572159FCE900BEFD8A /* BadRequestAPIErrorParsingTestCase.swift */; };
8A40DA29216B441E00749F45 /* PaymentSettingTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A7A9EBC2166160300F12D86 /* PaymentSettingTableViewController.swift */; };
8A40DA2B216B53E900749F45 /* Tools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A40DA2A216B53E900749F45 /* Tools.swift */; };
- 8A43454720DBAE76005C5C94 /* PANModelTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A43454620DBAE76005C5C94 /* PANModelTestCase.swift */; };
- 8A47173A20AAB0F40022733A /* Token.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A47173920AAB0F40022733A /* Token.swift */; };
- 8A47173D20AAB11B0022733A /* Source.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A47173C20AAB11B0022733A /* Source.swift */; };
- 8A4F7CB920A9C0FD001C441A /* Object.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A4F7CB820A9C0FD001C441A /* Object.swift */; };
- 8A5D59811D5317DD005D3346 /* OmiseSDK.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8A5D59831D5317DD005D3346 /* OmiseSDK.storyboard */; };
- 8A60619A20B2A8D400CF90D5 /* PAN.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A60619920B2A8D400CF90D5 /* PAN.swift */; };
- 8A72CD5E2162358400F14F76 /* PaymentOptionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A72CD5D2162358400F14F76 /* PaymentOptionTableViewCell.swift */; };
8A7567652178956800C684C9 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8A7567642178956800C684C9 /* Main.storyboard */; };
- 8A76791F214663560085DE3C /* PaymentUI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A76791E214663560085DE3C /* PaymentUI.swift */; };
8A776647214A5FC60029D166 /* NoticeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 8A776646214A5FC60029D166 /* NoticeView.xib */; };
- 8AC1D3A32139224D0051F966 /* InternetBankingSourceChooserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC1D3A22139224D0051F966 /* InternetBankingSourceChooserViewController.swift */; };
- 8AC1D3A5213922570051F966 /* InstallmentBankingSourceChooserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC1D3A4213922570051F966 /* InstallmentBankingSourceChooserViewController.swift */; };
- 8AC1D3A7213941C80051F966 /* InstallmentsNumberOfTermsChooserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AC1D3A6213941C80051F966 /* InstallmentsNumberOfTermsChooserViewController.swift */; };
- 8AD0609320B55B3A0074894E /* RequestTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD0609220B55B3A0074894E /* RequestTask.swift */; };
- 8AD0609620B55E610074894E /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD0609520B55E610074894E /* Client.swift */; };
8AD391B1230C05BC00383286 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AD391B0230C05BC00383286 /* Colors.swift */; };
- 8ADAA9A520B6C0AF00DD7CCF /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8ADAA9A420B6C0AF00DD7CCF /* Currency.swift */; };
- 8AEF7804224CABF800787470 /* EContextInformationInputViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A25E929213CF6F300D48252 /* EContextInformationInputViewController.swift */; };
+ 8AEF7804224CABF800787470 /* EContextPaymentFormController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A25E929213CF6F300D48252 /* EContextPaymentFormController.swift */; };
8AF5517A213D4C0100D61C98 /* Localizable.stringsdict in Resources */ = {isa = PBXBuildFile; fileRef = 8AF5517C213D4C0100D61C98 /* Localizable.stringsdict */; };
8AF56E62226878070097CFEE /* CustomCreditCardFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AF56E61226878070097CFEE /* CustomCreditCardFormViewController.swift */; };
- 8AF9857121479F38007E18ED /* MoreInformationOnCVVViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A3150AD2146B6C300A4F429 /* MoreInformationOnCVVViewController.swift */; };
- 8AF9857221479F72007E18ED /* CreditCardFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A1D4C651D51B72200C7837C /* CreditCardFormViewController.swift */; };
+ 8AF9857121479F38007E18ED /* CCVInfoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A3150AD2146B6C300A4F429 /* CCVInfoController.swift */; };
8AF985732147CC3D007E18ED /* Error.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8AF985752147CC3D007E18ED /* Error.strings */; };
- 8AFE10BB20B69B39008E741D /* ClientTestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8AFE10BA20B69B39008E741D /* ClientTestCase.swift */; };
986406301CFEA7E4004BCF51 /* CardCVVTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9864062A1CFEA7E4004BCF51 /* CardCVVTextField.swift */; };
986406311CFEA7E4004BCF51 /* CardExpiryDateTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9864062B1CFEA7E4004BCF51 /* CardExpiryDateTextField.swift */; };
986406321CFEA7E4004BCF51 /* CardNumberTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9864062C1CFEA7E4004BCF51 /* CardNumberTextField.swift */; };
@@ -133,9 +191,8 @@
987A02CE1CE35D5E0035417A /* OmiseSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 225931181CE3210700841B86 /* OmiseSDK.framework */; };
987A03AD1CE5CD450035417A /* Fixtures in Resources */ = {isa = PBXBuildFile; fileRef = 987A03AC1CE5CD450035417A /* Fixtures */; };
98FF99BB2577789800476487 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 98FF99BA2577789800476487 /* Configuration.swift */; };
- F3497368254C067000D05C7B /* MobileBankingSourceChooserViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3497367254C066F00D05C7B /* MobileBankingSourceChooserViewController.swift */; };
F615CBF8261565D600E1A2D9 /* CardExpiryDatePickerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F615CBF7261565D600E1A2D9 /* CardExpiryDatePickerTests.swift */; };
- F6614CD6243DB8E7005B656E /* TrueMoneyFormViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6614CD5243DB8E7005B656E /* TrueMoneyFormViewController.swift */; };
+ F6614CD6243DB8E7005B656E /* TrueMoneyPaymentFormController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6614CD5243DB8E7005B656E /* TrueMoneyPaymentFormController.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -167,6 +224,16 @@
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
+ 75D13E142B8679790073A831 /* Embed Frameworks */ = {
+ isa = PBXCopyFilesBuildPhase;
+ buildActionMask = 2147483647;
+ dstPath = "";
+ dstSubfolderSpec = 10;
+ files = (
+ );
+ name = "Embed Frameworks";
+ runOnlyForDeploymentPostprocessing = 0;
+ };
75DAD88D2A0BA5130098AF96 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
@@ -185,6 +252,7 @@
dstSubfolderSpec = 10;
files = (
8A2C451920ECC7A60033E2EB /* OmiseSDK.framework in Embed Frameworks */,
+ 75D13E102B8678530073A831 /* OmiseSwiftUIKit in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
@@ -192,37 +260,53 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
- 1121F43F28523BED0003EE4F /* DuitNowOBWBankChooserViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DuitNowOBWBankChooserViewController.swift; sourceTree = ""; };
14ACEF821D02D641001C5319 /* CardExpiryDatePicker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardExpiryDatePicker.swift; sourceTree = ""; };
- 2220F1A41D0FEE85008CD89F /* OmiseError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OmiseError.swift; sourceTree = ""; };
2225B3531D0FDD63003EB396 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; };
22445FFB1CF41DD300801D0F /* Globals.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Globals.swift; sourceTree = ""; };
225931181CE3210700841B86 /* OmiseSDK.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = OmiseSDK.framework; sourceTree = BUILT_PRODUCTS_DIR; };
2259311D1CE3210700841B86 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
- 2259314D1CE46E5700841B86 /* CardBrand.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CardBrand.swift; sourceTree = ""; };
- 225931561CE4745200841B86 /* SDKTestCase.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SDKTestCase.swift; sourceTree = ""; };
226E16101D2268B400219652 /* QuickStart.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = QuickStart.playground; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
229E14541D0EBAB5000511DE /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; };
229E14561D0EBAB5000511DE /* ProductDetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ProductDetailViewController.swift; sourceTree = ""; };
22D4809D1D0EB29C00544CE1 /* ExampleApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ExampleApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
22D480AB1D0EB29C00544CE1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; };
22E0DBD61D0EBE2E00472C74 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; };
- 731A75D225E3604A002353C0 /* FPXBankChooserViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FPXBankChooserViewController.swift; sourceTree = ""; };
- 73F9BA4625E50F4700F55CA8 /* AdaptableDynamicTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdaptableDynamicTableViewController.swift; sourceTree = ""; };
- 73F9BA4A25E6053700F55CA8 /* FPXFormViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FPXFormViewController.swift; sourceTree = ""; };
+ 73F9BA4A25E6053700F55CA8 /* FPXPaymentFormController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FPXPaymentFormController.swift; sourceTree = ""; };
+ 7501265C2B87CB6500ED5E14 /* PaymentInputsFormController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentInputsFormController.swift; sourceTree = ""; };
+ 7501265E2B8893C900ED5E14 /* PaymentFormController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentFormController.swift; sourceTree = ""; };
+ 750126602B8902A500ED5E14 /* PaymentFormStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentFormStyle.swift; sourceTree = ""; };
+ 750126622B89200B00ED5E14 /* PaymentInputProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentInputProtocol.swift; sourceTree = ""; };
+ 750126692B89F25000ED5E14 /* EContextPaymentFormController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = EContextPaymentFormController.xib; sourceTree = ""; };
+ 7501266B2B8A40E000ED5E14 /* TrueMoneyPaymentFormController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TrueMoneyPaymentFormController.xib; sourceTree = ""; };
+ 7501266D2B8A411C00ED5E14 /* FPXPaymentFormController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FPXPaymentFormController.xib; sourceTree = ""; };
+ 7501266F2B8A490000ED5E14 /* SelectFPXBankViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectFPXBankViewModel.swift; sourceTree = ""; };
+ 750126712B8A49BC00ED5E14 /* FPX.Bank+ViewPresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "FPX.Bank+ViewPresentable.swift"; sourceTree = ""; };
+ 750126732B8A580500ED5E14 /* SelectDuitNowOBWBankViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectDuitNowOBWBankViewModel.swift; sourceTree = ""; };
+ 750126762B95971A00ED5E14 /* ChoosePaymentCoordinator+Helpers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ChoosePaymentCoordinator+Helpers.swift"; sourceTree = ""; };
+ 750126782B95A34000ED5E14 /* AuthorizingPaymentViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AuthorizingPaymentViewController.xib; sourceTree = ""; };
7502CA552A3011A900766E7D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; };
7502CA582A3011B000766E7D /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/LaunchScreen.strings; sourceTree = ""; };
7502CA5A2A3011B100766E7D /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/LaunchScreen.strings; sourceTree = ""; };
7502CA5C2A3011B200766E7D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/LaunchScreen.strings; sourceTree = ""; };
7502CA5E2A31A7D600766E7D /* CountryListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryListViewController.swift; sourceTree = ""; };
7502CA612A31A7E100766E7D /* CountryListViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryListViewModelProtocol.swift; sourceTree = ""; };
- 7502CA652A31AEA200766E7D /* CountryInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryInfo.swift; sourceTree = ""; };
+ 750708DF2B7909BB00A48DD0 /* SourceTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceTests.swift; sourceTree = ""; };
+ 750708E22B790B8300A48DD0 /* String+JSON.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+JSON.swift"; sourceTree = ""; };
+ 750708E42B790BD600A48DD0 /* SampleData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleData.swift; sourceTree = ""; };
+ 750708E62B790CF200A48DD0 /* SampleData */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SampleData; sourceTree = ""; };
+ 750708F32B7A765500A48DD0 /* OmiseSDKTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OmiseSDKTests.swift; sourceTree = ""; };
7509D4DF2A1AA1450050AB38 /* AtomeFormViewControllerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomeFormViewControllerTests.swift; sourceTree = ""; };
7509D4E12A1C876B0050AB38 /* AtomeFormViewContextMockup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomeFormViewContextMockup.swift; sourceTree = ""; };
7509D4E32A1C89F10050AB38 /* AtomeFormViewModelMockup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomeFormViewModelMockup.swift; sourceTree = ""; };
7509D4E62A1C8E3D0050AB38 /* AtomeFormViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomeFormViewModelTests.swift; sourceTree = ""; };
75131F852AC2BD9D008BCB17 /* UIViewController+NavigationBarStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+NavigationBarStyle.swift"; sourceTree = ""; };
- 752E40C32ACD420C00B62A49 /* SourceTypeValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceTypeValue.swift; sourceTree = ""; };
+ 751E7BD42B7E2F2A0031B4A2 /* SourceType+ViewPresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceType+ViewPresentable.swift"; sourceTree = ""; };
+ 751E7BD82B7E5D130031B4A2 /* PaymentMethod.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethod.swift; sourceTree = ""; };
+ 751E7BE92B7F77120031B4A2 /* Localized+Omise.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Localized+Omise.swift"; sourceTree = ""; };
+ 751E7BEB2B7F7CE50031B4A2 /* ViewPresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewPresentable.swift; sourceTree = ""; };
+ 751E7BED2B7F7DD20031B4A2 /* PaymentMethod+ViewPresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "PaymentMethod+ViewPresentable.swift"; sourceTree = ""; };
+ 751E7BEF2B7FBA760031B4A2 /* UIColor+Omise.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Omise.swift"; sourceTree = ""; };
+ 751E7BF12B7FC90C0031B4A2 /* SourceType+Collections.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceType+Collections.swift"; sourceTree = ""; };
752E40C52ACD426E00B62A49 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = ""; };
753279372A31B40F008048AD /* CountryListViewModelMockup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryListViewModelMockup.swift; sourceTree = ""; };
75348D4D29C3FCC70008C8A3 /* Bundle+OmiseSDK.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Bundle+OmiseSDK.swift"; sourceTree = ""; };
@@ -235,76 +319,121 @@
75405A892A26340E008C21F6 /* UILabel+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UILabel+Helpers.swift"; sourceTree = ""; };
75405A8A2A26340E008C21F6 /* UIButton+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIButton+Helpers.swift"; sourceTree = ""; };
75405A972A2634D9008C21F6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; };
- 75405A9B2A266F50008C21F6 /* AtomeFormViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomeFormViewModel.swift; sourceTree = ""; };
+ 75405A9B2A266F50008C21F6 /* AtomePaymentFormViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AtomePaymentFormViewModel.swift; sourceTree = ""; };
75405AA72A27F97E008C21F6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; };
75405AA92A27F985008C21F6 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = ""; };
75405AAA2A27F988008C21F6 /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/Localizable.strings; sourceTree = ""; };
- 756C8F1D2A40693B00D53059 /* CreditCardFormViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditCardFormViewModelProtocol.swift; sourceTree = ""; };
- 756C8F1F2A40694000D53059 /* CreditCardFormViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditCardFormViewModel.swift; sourceTree = ""; };
- 756C8F212A40694F00D53059 /* CreditCardFormViewContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditCardFormViewContext.swift; sourceTree = ""; };
+ 754B78172B8741CD00973B71 /* TapGestureHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TapGestureHandler.swift; sourceTree = ""; };
+ 756C8F1D2A40693B00D53059 /* CreditCardPaymentViewModelProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditCardPaymentViewModelProtocol.swift; sourceTree = ""; };
+ 756C8F1F2A40694000D53059 /* CreditCardPaymentViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditCardPaymentViewModel.swift; sourceTree = ""; };
+ 756C8F212A40694F00D53059 /* CreditCardPaymentViewContext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreditCardPaymentViewContext.swift; sourceTree = ""; };
756C8F252A40698600D53059 /* TextFieldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextFieldView.swift; sourceTree = ""; };
757B0A712AD71D7B00DEAE8F /* OmiseSwiftUIKit */ = {isa = PBXFileReference; lastKnownFileType = text; name = OmiseSwiftUIKit; path = Helpers/OmiseSwiftUIKit; sourceTree = SOURCE_ROOT; };
757B0A722AD71DCD00DEAE8F /* OmiseUnitTestKit */ = {isa = PBXFileReference; lastKnownFileType = text; name = OmiseUnitTestKit; path = Helpers/OmiseUnitTestKit; sourceTree = SOURCE_ROOT; };
759856232A286C880087B605 /* UIScrollView+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIScrollView+Helpers.swift"; sourceTree = ""; };
- 75B43B562A0277A3004352C7 /* PaymentInformation.Atome.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentInformation.Atome.swift; sourceTree = ""; };
+ 759C7EBF2B7DC7F50029D555 /* SourceType+MobileBanking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceType+MobileBanking.swift"; sourceTree = ""; };
+ 759C7EC12B7DC80A0029D555 /* SourceType+InternetBanking.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceType+InternetBanking.swift"; sourceTree = ""; };
+ 759C7EC32B7DC8270029D555 /* SourceType+Installments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "SourceType+Installments.swift"; sourceTree = ""; };
+ 75B4204F2B7611710036134D /* Capability.PaymentMethod.Bank.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Capability.PaymentMethod.Bank.swift; sourceTree = ""; };
+ 75B4205D2B7674D70036134D /* Calendar+CreditCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Calendar+CreditCard.swift"; sourceTree = ""; };
+ 75B420602B776D8A0036134D /* APIProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIProtocol.swift; sourceTree = ""; };
+ 75B420652B77741E0036134D /* CreateTokenPayload.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateTokenPayload.swift; sourceTree = "