Skip to content

Commit 4cafba5

Browse files
authored
Merge pull request #3 from Tap-Payments/FT_update_merchant_id_tap_apple_pay_request
chore: Bump version to 1.0.30 and update merchant ID in TapApplePay
2 parents 21d2a5b + dfb9ab2 commit 4cafba5

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

TapApplePayKit-iOS.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
1616
#
1717

1818
spec.name = "TapApplePayKit-iOS"
19-
spec.version = "1.0.29"
19+
spec.version = "1.0.30"
2020
spec.summary = "Provide an interface and an easy wrapper for Apple Pay functionalities."
2121

2222
# This description is used to generate tags and improve search results.

TapApplePayKit-iOS/Core/private/Network/TapCreateTokenWithApplePayRequest.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ internal struct TapApplePayTokenModel: Encodable,Decodable {
6161
internal var transactionIdentifier: String? = ""
6262
/// The payment method
6363
internal var paymentMethod: PaymentMethod? = nil
64+
/// Merchant ID.
65+
internal var merchant: Merchant?
66+
6467
// MARK: Methods
6568

6669
/// Initializes the model with decoded apple pay token
@@ -89,6 +92,7 @@ internal struct TapApplePayTokenModel: Encodable,Decodable {
8992
case header = "header"
9093
case transactionIdentifier = "transactionIdentifier"
9194
case paymentMethod = "paymentMethod"
95+
case merchant = "merchant"
9296
}
9397
}
9498

TapApplePayKit-iOS/Core/public/Controllers/TapApplePay.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ import TapNetworkKit_iOS
162162
do {
163163
var appleTokenModel = try TapApplePayTokenModel.init(dictionary: applePayToken.jsonAppleToken)
164164
appleTokenModel.transactionIdentifier = applePayToken.rawAppleToken?.transactionIdentifier
165+
appleTokenModel.merchant = Merchant.init(identifier: TapApplePay.merchantID)
165166
appleTokenModel.paymentMethod = PaymentMethod.init(displayName: applePayToken.rawAppleToken?.paymentMethod.displayName, network: applePayToken.rawAppleToken?.paymentMethod.network?.rawValue, type: applePayToken.rawAppleToken?.paymentMethod.type.toString())
166167
return TapCreateTokenWithApplePayRequest.init(appleToken: appleTokenModel)
167168

0 commit comments

Comments
 (0)