Merge pull request #17 from MadBrains/minor_edits

[2.1.3] Checking applicationData for empty. Optional merchantId.

Author: mit-73

CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.1.3
+
+* [iOS] checking `applicationData` for empty
+* [Android] optional `merchantId`
+
 ## 2.1.2
 
 * [Android] add `merchantId`

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.1.2
+  mad_pay: 2.1.3
 ```
 
 <details><summary><b>For Android</b></summary>

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

@@ -121,7 +121,7 @@ class RawMethods {
                              currencyCode: String, countryCode: String, emailRequired: Boolean): JSONObject {
             val merchantInfo = when {
                 google.merchantName.isNotEmpty() -> JSONObject()
-                        .put("merchantId", google.merchantId)
+                        .putOpt("merchantId", google.merchantId)
                         .putOpt("merchantName", google.merchantName)
                 else -> null
             }

example/pubspec.lock

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

ios/Classes/SwiftMadPayPlugin.swift

@@ -101,7 +101,11 @@ public class SwiftMadPayPlugin: NSObject, FlutterPlugin {
         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 !arguments.apple.applicationData.isEmpty {
+            paymentRequest.applicationData = arguments.apple.applicationData
+        }
+        
         if #available(iOS 11.0, *) {
             if !arguments.apple.requiredBillingContactFields.isEmpty {
                 paymentRequest.requiredBillingContactFields = PaymentNetworkHelper.getContactFields(arguments.apple.requiredBillingContactFields)

lib/src/models/google_parameters.dart

@@ -8,7 +8,7 @@ class GoogleParameters {
   GoogleParameters({
     required this.gatewayName,
     required this.gatewayMerchantId,
-    required this.merchantId,
+    this.merchantId,
     this.merchantName,
     this.cardParameters,
     this.transactionInfo,
@@ -31,7 +31,7 @@ class GoogleParameters {
   /// Required when PaymentsClient is initialized with an environment property of `PRODUCTION`.
   /// 
   /// In environment `TEST`, use the value `TEST`.
-  final String merchantId;
+  final String? merchantId;
 
   /// Merchant name is rendered in the payment sheet.
   /// In TEST environment, or if a merchant isn't recognized,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: mad_pay
 description: Mad Pay will help you make payments through Apple Pay and Google Pay
-version: 2.1.2
+version: 2.1.3
 repository: https://github.com/MadBrains/Mad-Pay-Flutter
 issue_tracker: https://github.com/MadBrains/Mad-Pay-Flutter/issues
 homepage: https://madbrains.ru/