Merge pull request #37 from dojo-engineering/develop

Release v1.4.2

Author: deniss-kaibagarovs

Sources/dojo-ios-sdk/Classes/ApplePay/ApplePayHandler.swift

@@ -49,7 +49,7 @@ class ApplePayHandler: NSObject, ApplePayHandlerProtocol {
 
         // Create our payment request
         let paymentRequest = PKPaymentRequest()
-        paymentRequest.paymentSummaryItems = [getApplePayAmount(paymentIntent.totalAmount.value)]
+        paymentRequest.paymentSummaryItems = [getApplePayAmount(paymentIntent.totalAmount.value, merchantName: payload.merchantName)]
         paymentRequest.merchantIdentifier = payload.applePayConfig.merchantIdentifier
         paymentRequest.supportedNetworks = getSupportedApplePayNetworks(payload.applePayConfig.supportedCards)
         paymentRequest.merchantCapabilities = getMerchantCapability()
@@ -196,8 +196,8 @@ extension ApplePayHandler {
         return schemas
     }
 
-    func getApplePayAmount(_ amount: UInt64) -> PKPaymentSummaryItem {
-        PKPaymentSummaryItem(label: "Amount", amount: NSDecimalNumber(mantissa: amount, exponent: -2, isNegative: false), type: .final)
+    func getApplePayAmount(_ amount: UInt64, merchantName: String?) -> PKPaymentSummaryItem {
+        PKPaymentSummaryItem(label: merchantName ?? "Amount", amount: NSDecimalNumber(mantissa: amount, exponent: -2, isNegative: false), type: .final)
     }
 
     func convertPaymentMethodType(_ type: PKPaymentMethodType) -> String {

Sources/dojo-ios-sdk/Classes/DojoSDK.swift

@@ -45,7 +45,7 @@ protocol DojoSDKProtocol {
 @objc public class DojoSDK: NSObject, DojoSDKProtocol {
 
     public static override func version() -> Int {
-        141
+        142
     }
 
     /// Execute card payment

Sources/dojo-ios-sdk/Classes/Entities/DojoApplePayPayload.swift

@@ -15,10 +15,12 @@ import Foundation
     ///   - metaData: A set of key-value pairs that you can use for storing additional information.
     @objc public init(applePayConfig: DojoApplePayConfig,
                       userEmailAddress: String? = nil,
-                      metaData: [String : String]? = nil) {
+                      metaData: [String : String]? = nil,
+                      merchantName: String? = nil) {
         self.applePayConfig = applePayConfig
         self.userEmailAddress = userEmailAddress
         self.metaData = metaData
+        self.merchantName = merchantName
     }
 
     /// ApplePay related settings.
@@ -27,5 +29,7 @@ import Foundation
     public let userEmailAddress: String?
     /// A set of key-value pairs that you can use for storing additional information.
     public let metaData: [String: String]?
+    
+    public var merchantName: String?
 }
 

dojo-ios-sdk.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'dojo-ios-sdk'
-  s.version          = '1.4.1'
+  s.version          = '1.4.2'
   s.summary          = 'Dojo Payment SDK'
 
 # This description is used to generate tags and improve search results.