Merge pull request #6 from MadBrains/apple_parameters

[2.0.2] Add more Apple Parameters

Author: Antol

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.2
+
+* Change proto structure
+* [iOS] Add more Apple Parameters
+
 ## 2.0.1
 
 * [Android] Fix Dependency conflict with firebase

README.md

@@ -17,7 +17,7 @@ Easy integration with Google Pay and Apple Pay for your flutter app.
 Add this to your package's pubspec.yaml file:
 ```yaml
 dependencies:
-  mad_pay: 2.0.1
+  mad_pay: 2.0.2
 ```
 
 For Android: set `minSdkVersion` to 21

android/src/main/kotlin/ru/madbrains/mad_pay/PaymentHelpers.kt

@@ -1,7 +1,7 @@
 package ru.madbrains.mad_pay
 
+import google.Google.CardAuthMethods
 import ru.madbrains.mad_pay.MadPay.PaymentNetwork
-import ru.madbrains.mad_pay.MadPay.CardAuthMethods
 
 class PaymentHelpers {
     companion object {

android/src/main/kotlin/ru/madbrains/mad_pay/RawMethods.kt

@@ -71,7 +71,7 @@ class RawMethods {
         }
 
         fun getPaymentMethod(totalPrice: Double, allowedPaymentNetworks: List<MadPay.PaymentNetwork>,
-                             google: MadPay.GoogleParameters,
+                             google: google.Google.GoogleParameters,
                              emailRequired: Boolean, currencyCode: String, countryCode: String): JSONObject {
 
             val paymentNetworks = PaymentHelpers.getPaymentNetwork(allowedPaymentNetworks)

example/lib/main.dart

@@ -75,6 +75,12 @@ class _MyAppState extends State<MyApp> {
                       ),
                       apple: AppleParameters(
                         merchantIdentifier: 'example_id',
+                        billingContact: Contact(
+                          emailAddres: 'test@test.com',
+                        ),
+                        shippingContact: Contact(
+                          emailAddres: 'test@test.com',
+                        ),
                       ),
                       currencyCode: 'USD',
                       countryCode: 'US',

example/pubspec.lock

@@ -73,7 +73,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.1"
+    version: "2.0.2"
   matcher:
     dependency: transitive
     description:

ios/Classes/PaymentHelpers.swift

@@ -97,33 +97,111 @@ class PaymentNetworkHelper {
         paymentNetwork.compactMap({ decodePaymentNetwork($0) })
     }
 
-    static func getMerchantCapabilities(_ merchantCapabilities: MerchantCapabilities) -> PKMerchantCapability {
+    static func getMerchantCapabilities(_ merchantCapabilities: Apple_MerchantCapabilities) -> PKMerchantCapability {
         switch (merchantCapabilities) {
-        case MerchantCapabilities.threeds:
+        case Apple_MerchantCapabilities.threeds:
             return PKMerchantCapability.capability3DS
-        case MerchantCapabilities.credit:
+        case Apple_MerchantCapabilities.credit:
             return PKMerchantCapability.capabilityCredit
-        case MerchantCapabilities.debit:
+        case Apple_MerchantCapabilities.debit:
             return PKMerchantCapability.capabilityDebit
-        case MerchantCapabilities.emv:
+        case Apple_MerchantCapabilities.emv:
             return PKMerchantCapability.capabilityEMV
         default:
             return PKMerchantCapability.capability3DS
         }
     }
 
-    static func getShippingType(_ shippingType: ShippingType) -> PKShippingType {
+    static func getShippingType(_ shippingType: Apple_ShippingType) -> PKShippingType {
         switch (shippingType) {
-        case ShippingType.shipping:
+        case Apple_ShippingType.shipping:
             return PKShippingType.shipping
-        case ShippingType.delivery:
+        case Apple_ShippingType.delivery:
             return PKShippingType.delivery
-        case ShippingType.servicePickup:
+        case Apple_ShippingType.servicePickup:
             return PKShippingType.servicePickup
-        case ShippingType.storePickup:
+        case Apple_ShippingType.storePickup:
             return PKShippingType.storePickup
         default:
             return PKShippingType.shipping
         }
     }
+
+    static func getPaymentSummaryItem(_ paymentItems: Array<PaymentItem>) -> Array<PKPaymentSummaryItem> {
+        var paymentSummaryItem = [PKPaymentSummaryItem]()
+        paymentItems.forEach { item in
+            let itemTitle = item.name
+            let itemPrice = item.price
+            let payment = PKPaymentSummaryItem(label: itemTitle, amount: NSDecimalNumber(floatLiteral: itemPrice))
+            paymentSummaryItem.append(payment)
+        }
+        return paymentSummaryItem
+    }
+
+    static func getShippingMethods(_ methods: Array<Apple_ShippingMethod>) -> Array<PKShippingMethod>? {
+        var shippingMethods = [PKShippingMethod]()
+        methods.forEach { item in
+            let itemTitle = item.name
+            let itemPrice = item.price
+            let shippingMethod = PKShippingMethod(label: itemTitle, amount: NSDecimalNumber(floatLiteral: itemPrice))
+            shippingMethod.identifier = item.identifier
+            shippingMethod.detail = item.detail
+            shippingMethods.append(shippingMethod)
+        }
+        return shippingMethods
+    }
+
+    static func getContactFields(_ contacts: Array<String>) -> Set<PKContactField> {
+        var items = Set<PKContactField>()
+        contacts.forEach { item in
+            items.insert(PKContactField(rawValue: item))
+        }
+        return items
+    }
+
+    static func getContact(_ appleContact: Apple_Contact) -> PKContact? {
+        let contact = PKContact()
+
+        contact.emailAddress = appleContact.emailAddres
+        if appleContact.hasName {
+            contact.name = getPersonNameComponents(appleContact.name)
+        }
+        if appleContact.hasPostalAddress {
+            contact.postalAddress = getPostalAddress(appleContact.postalAddress)
+        }
+        if !appleContact.phoneNumber.isEmpty {
+            contact.phoneNumber = CNPhoneNumber(stringValue: appleContact.phoneNumber)
+        }
+        return contact
+    }
+
+    private static func getPersonNameComponents(_ personName: Apple_PersonNameComponents) -> PersonNameComponents {
+        var name = PersonNameComponents()
+        name.namePrefix = personName.namePrefix
+        name.familyName = personName.familyName
+        name.givenName = personName.givenName
+        name.middleName = personName.middleName
+        name.nameSuffix = personName.nameSuffix
+        name.nickname = personName.nickname
+        if personName.hasPhoneticRepresentation {
+            name.phoneticRepresentation = getPersonNameComponents(personName.phoneticRepresentation)
+        }
+        return name
+    }
+
+    private static func getPostalAddress(_ postalAddress: Apple_PostalAddress) -> CNPostalAddress {
+        let address = CNMutablePostalAddress()
+        address.city = postalAddress.city
+        address.country = postalAddress.country
+        address.isoCountryCode = postalAddress.isoCountryCode
+        address.postalCode = postalAddress.postalCode
+        address.state = postalAddress.state
+        address.street = postalAddress.street
+        if #available(iOS 10.3, *) {
+            address.subAdministrativeArea = postalAddress.subAdministrativeArea
+            address.subLocality = postalAddress.subLocality
+        }
+
+        return address
+    }
 }

ios/Classes/SwiftMadPayPlugin.swift

@@ -80,33 +80,37 @@ public class SwiftMadPayPlugin: NSObject, FlutterPlugin {
 
         if (arguments.apple.merchantIdentifier.isEmpty || arguments.currencyCode.isEmpty || arguments.countryCode.isEmpty) {
             invokeErrorResult(errorCode: Constants.invalidParametersCode, message: """
-                                                                       Invalid Payment parameters. 
-                                                                       merchantIdentifier: \(arguments.apple.merchantIdentifier) 
-                                                                       currencyCode: \(arguments.currencyCode) 
-                                                                       countryCode: \(arguments.countryCode)
-                                                                       """)
+                                                                                   Invalid Payment parameters. 
+                                                                                   merchantIdentifier: \(arguments.apple.merchantIdentifier) 
+                                                                                   currencyCode: \(arguments.currencyCode) 
+                                                                                   countryCode: \(arguments.countryCode)
+                                                                                   """)
             return
         }
 
         var paymentNetworks = PaymentNetworkHelper.getPaymentNetworks(arguments.allowedPaymentNetworks)
         paymentNetworks = paymentNetworks.isEmpty ? PKPaymentRequest.availableNetworks() : paymentNetworks
 
-        var paymentItems = [PKPaymentSummaryItem]()
-        arguments.paymentItems.forEach { item in
-            let itemTitle = item.name
-            let itemPrice = item.price
-            let item = PKPaymentSummaryItem(label: itemTitle, amount: NSDecimalNumber(floatLiteral: itemPrice))
-            paymentItems.append(item)
-        }
-
         let paymentRequest = PKPaymentRequest()
-        paymentRequest.paymentSummaryItems = paymentItems
+        paymentRequest.paymentSummaryItems = PaymentNetworkHelper.getPaymentSummaryItem(arguments.paymentItems)
         paymentRequest.supportedNetworks = paymentNetworks
         paymentRequest.merchantIdentifier = arguments.apple.merchantIdentifier
         paymentRequest.countryCode = arguments.countryCode
         paymentRequest.currencyCode = arguments.currencyCode
         paymentRequest.merchantCapabilities = PaymentNetworkHelper.getMerchantCapabilities(arguments.apple.merchantCapabilities)
+        paymentRequest.billingContact = PaymentNetworkHelper.getContact(arguments.apple.billingContact)
+        paymentRequest.shippingContact = PaymentNetworkHelper.getContact(arguments.apple.shippingContact)
+        paymentRequest.shippingMethods = PaymentNetworkHelper.getShippingMethods(arguments.apple.shippingMethods)
         paymentRequest.shippingType = PaymentNetworkHelper.getShippingType(arguments.apple.shippingType)
+        paymentRequest.applicationData = arguments.apple.applicationData
+        if #available(iOS 11.0, *) {
+            if !arguments.apple.requiredBillingContactFields.isEmpty {
+                paymentRequest.requiredBillingContactFields = PaymentNetworkHelper.getContactFields(arguments.apple.requiredBillingContactFields)
+            }
+            if !arguments.apple.requiredShippingContactFields.isEmpty {
+                paymentRequest.requiredShippingContactFields = PaymentNetworkHelper.getContactFields(arguments.apple.requiredShippingContactFields)
+            }
+        }
 
         let paymentController = PKPaymentAuthorizationController(paymentRequest: paymentRequest)
         paymentController.delegate = self