@jimrising/easymerchantsdk-react-native 1.4.5 → 1.4.6

package/README.md

@@ -7,7 +7,7 @@ To add the path of sdk in your project. Open your `package.json` file and inside
 
 ```json
 "dependencies": {
-  "@jimrising/easymerchantsdk-react-native": "^1.4.5"
+  "@jimrising/easymerchantsdk-react-native": "^1.4.6"
 },
 ```
 
@@ -137,8 +137,8 @@ const App = () => {
           await EasyMerchantSdk.setViewController();
           await EasyMerchantSdk.configureEnvironment(
             'staging',
-            'mobilesdk1980IUuCzwWl',
-            'mobilesdk1980LVHnN0Oh'
+            'c4dd6319f905ee4d17f202e3d',
+            '615e339659f2657ae01452561'
           );
         }
       } catch (err) {
@@ -167,11 +167,11 @@ const App = () => {
     const billingInfo = {
       visibility: { billing: false, additional: false },
       billing: {
-        address: 'Mohali, Punjab',
-        country: 'India',
-        state: 'Punjab',
-        city: 'Anandpur Sahib',
-        postal_code: '140118',
+        address: 'San Fran, Punjab',
+        country: 'USA',
+        state: 'California',
+        city: 'Paris',
+        postal_code: '234234',
       },
       billingRequired: {
         address: true,
@@ -183,7 +183,7 @@ const App = () => {
       additional: {
         name: 'Test User',
         email_address: 'test@gmail.com',
-        phone_number: '9465351125',
+        phone_number: '21408713290',
         description: 'Test',
       },
       additionalRequired: {
@@ -212,8 +212,8 @@ const App = () => {
     };
 
 const authConfig = {
-      accessToken: '251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF',
-      vendorId: '251',
+//      accessToken: '251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF',
+//      vendorId: '251',
       role: 'business',
       timeout: 10,
       isSandbox: true,
@@ -246,7 +246,9 @@ const authConfig = {
           true, // secureAuthentication
           true, // showReceipt
           true, // showTotal
-          true // showSubmitButton
+          true,// showSubmitButton
+          "davindersingh@gmail.com",
+          "Davinder Singh"
         );
 
         console.log('Billing success (full response):', JSON.stringify(result, null, 2));
@@ -355,7 +357,6 @@ const styles = StyleSheet.create({
   },
 });
 
-
 ```
 
 You can send `null` if billing info not available.

package/ios/Classes/EasyMerchantSdk.m

@@ -48,6 +48,8 @@ RCT_EXPORT_METHOD(
     showReceipt:(BOOL)showReceipt
     showTotal:(BOOL)showTotal
     showSubmitButton:(BOOL)showSubmitButton
+    email:(NSString *)email
+    name:(NSString *)name
     resolver:(RCTPromiseResolveBlock)resolve
     rejecter:(RCTPromiseRejectBlock)reject
 )
@@ -76,6 +78,8 @@ RCT_EXPORT_METHOD(
                             showReceipt:showReceipt
                              showTotal:showTotal
                        showSubmitButton:showSubmitButton
+                                  email:email
+                                   name:name
                               enable3DS:secureAuthentication
                                resolver:^(id result) {
                                    resolve(result);

package/ios/Classes/EasyMerchantSdk.swift

@@ -77,6 +77,8 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         showReceipt: Bool,
         showTotal: Bool,
         showSubmitButton: Bool,
+        email: String?,
+        name: String?,
         enable3DS: Bool,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock
@@ -152,8 +154,8 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         var grailParams: GrailPayRequest? = nil
         if authenticatedACH, let params = grailPayParams {
             grailParams = GrailPayRequest(
-                accessToken: params["accessToken"] as? String ?? "251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF",
-                vendorId: params["vendorId"] as? String ?? "251",
+//                accessToken: params["accessToken"] as? String ?? "251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF",
+//                vendorId: params["vendorId"] as? String ?? "251",
                 role: params["role"] as? String ?? "business",
                 timeout: params["timeout"] as? Int ?? 10,
                 isSandbox: params["isSandbox"] as? Bool ?? true,
@@ -224,8 +226,11 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             showReceipt: showReceipt,
             showTotal: showTotal,
             showSubmitButton: showSubmitButton,
+        
             referenceID: enable3DS,
-            referenceToken: nil
+            referenceToken: nil,
+            email:email,
+            name: name
         )
 
         // Store resolvers

package/ios/Models/Request.swift

@@ -57,8 +57,8 @@ public struct ThemeConfiguration: Codable {
 }
 
 public struct GrailPayRequest: Codable {
-    public let accessToken: String
-    public let vendorId: String
+    // public let accessToken: String
+    // public let vendorId: String
     public let role: String
     public let timeout: Int
     public let isSandbox: Bool
@@ -67,8 +67,8 @@ public struct GrailPayRequest: Codable {
     public let searchPlaceholder: String
     
     public init(
-        accessToken: String,
-        vendorId: String,
+        // accessToken: String,
+        // vendorId: String,
         role: String,
         timeout: Int,
         isSandbox: Bool,
@@ -76,8 +76,8 @@ public struct GrailPayRequest: Codable {
         finderSubtitle: String,
         searchPlaceholder: String
     ) {
-        self.accessToken = accessToken
-        self.vendorId = vendorId
+        // self.accessToken = accessToken
+        // self.vendorId = vendorId
         self.role = role
         self.timeout = timeout
         self.isSandbox = isSandbox
@@ -168,6 +168,8 @@ public final class Request: NSObject {
     public let showSubmitButton: Bool?
     public let referenceID: Bool?
     public let referenceToken: String?
+    public let email: String?
+    public let name: String?
     
     public init(
         amount: Double? = nil,
@@ -191,7 +193,9 @@ public final class Request: NSObject {
         showTotal: Bool = false,
         showSubmitButton: Bool = false,
         referenceID: Bool = false,
-        referenceToken: String? = nil
+        referenceToken: String? = nil,
+        email: String? = nil,
+        name: String? = nil
     ) {
         // Validate if amount is provided, must be ≥ 0.50
         if let amt = amount, amt < 0.50 {
@@ -234,6 +238,8 @@ public final class Request: NSObject {
         self.showSubmitButton = showSubmitButton
         self.referenceID = referenceID
         self.referenceToken = referenceToken
+        self.email = email
+        self.name = name
         
         // Conditionally assign recurring fields only if is_recurring == true
         if is_recurring {
@@ -334,7 +340,7 @@ public final class Request: NSObject {
         
         let params: [String: Any] = [
             "amount": amount ?? 0,
-//            "allowed_cycles": String(recurringIntervals?.count ?? 0),
+            //            "allowed_cycles": String(recurringIntervals?.count ?? 0),
             "allowed_cycles": numOfCycle ?? 0,
             "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
             "is_recurring": self.is_recurring ?? false,
@@ -468,6 +474,23 @@ public final class Request: NSObject {
                                 print("Saved merchantName: \(merchantName)")
                             }
                             
+                            if let companyName = dataObject["company_name"] as? String {
+                                UserStoreSingleton.shared.companyName = companyName
+                                print("Saved company name: \(companyName)")
+                            }
+                            
+                            if let bankWidgetKey = dataObject["bank_widget_key"] as? String {
+                                UserStoreSingleton.shared.bankWidgetKey = bankWidgetKey
+                                print("Saved bank_widget_key: \(bankWidgetKey)")
+                                
+                                // Extract vendor ID from bankWidgetKey
+                                let components = bankWidgetKey.components(separatedBy: "|")
+                                if let vendorID = components.first {
+                                    UserStoreSingleton.shared.vendorID = vendorID
+                                    print("Extracted and saved vendor_id: \(vendorID)")
+                                }
+                            }
+                            
                             // Save payment methods (crypto payment account)
                             if let paymentMethods = dataObject["payment_methods"] as? [String: Any],
                                let cryptoSection = paymentMethods["crypto"] as? [String: Any],

package/ios/Pods/UserDefaults/UserStoreSingleton.swift

@@ -110,6 +110,33 @@ class UserStoreSingleton: NSObject {
         }
     }
     
+    var companyName: String? {
+        get {
+            return UserDefaults.standard.string(forKey: "companyName")
+        }
+        set {
+            UserDefaults.standard.set(newValue, forKey: "companyName")
+        }
+    }
+    
+    var bankWidgetKey: String? {
+        get {
+            return UserDefaults.standard.string(forKey: "bank_widget_key")
+        }
+        set {
+            UserDefaults.standard.set(newValue, forKey: "bank_widget_key")
+        }
+    }
+    
+    var vendorID: String? {
+        get {
+            return UserDefaults.standard.string(forKey: "vendor_id")
+        }
+        set {
+            UserDefaults.standard.set(newValue, forKey: "vendor_id")
+        }
+    }
+    
     //apperance_settings
     var body_bg_col : String? {
         get {
@@ -212,22 +239,21 @@ class UserStoreSingleton: NSObject {
 //            UserDefaults.standard.set(value, forKey: key)
 //        }
 //    }
-
-
+    
     func updateThemeConfiguration(with themeConfiguration: ThemeConfiguration) {
-            self.body_bg_col = themeConfiguration.bodyBackgroundColor
-            self.container_bg_col = themeConfiguration.containerBackgroundColor
-            self.primary_font_col = themeConfiguration.primaryFontColor
-            self.secondary_font_col = themeConfiguration.secondaryFontColor
-            self.primary_btn_bg_col = themeConfiguration.primaryButtonBackgroundColor
-            self.primary_btn_hover_col = themeConfiguration.primaryButtonHoverColor
-            self.primary_btn_font_col = themeConfiguration.primaryButtonFontColor
-            self.secondary_btn_bg_col = themeConfiguration.secondaryButtonBackgroundColor
-            self.secondary_btn_hover_col = themeConfiguration.secondaryButtonHoverColor
-            self.secondary_btn_font_col = themeConfiguration.secondaryFontColor
-            self.border_radious = themeConfiguration.borderRadius
-            self.fontSize = themeConfiguration.fontSize
-        }
+        self.body_bg_col = themeConfiguration.bodyBackgroundColor
+        self.container_bg_col = themeConfiguration.containerBackgroundColor
+        self.primary_font_col = themeConfiguration.primaryFontColor
+        self.secondary_font_col = themeConfiguration.secondaryFontColor
+        self.primary_btn_bg_col = themeConfiguration.primaryButtonBackgroundColor
+        self.primary_btn_hover_col = themeConfiguration.primaryButtonHoverColor
+        self.primary_btn_font_col = themeConfiguration.primaryButtonFontColor
+        self.secondary_btn_bg_col = themeConfiguration.secondaryButtonBackgroundColor
+        self.secondary_btn_hover_col = themeConfiguration.secondaryButtonHoverColor
+        self.secondary_btn_font_col = themeConfiguration.secondaryFontColor
+        self.border_radious = themeConfiguration.borderRadius
+        self.fontSize = themeConfiguration.fontSize
+    }
 
     // Method to clear user data from UserDefaults
     func clearUserData() {

package/ios/Pods/ViewControllers/GrailPayVC.swift

@@ -90,8 +90,8 @@ public class GrailPayVC: UIViewController {
                     }
         
                     window.grailpay.init({
-                        token: '\(request.accessToken)',
-                        vendorId: '\(request.vendorId)',
+                        token: '\(UserStoreSingleton.shared.bankWidgetKey ?? "")',
+                        vendorId: '\(UserStoreSingleton.shared.vendorID ?? "")',
                         role: '\(request.role)',
                         timeout: \(request.timeout),
                         theme: {

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -570,36 +570,67 @@ class OTPVerificationVC: BaseVC {
         //            params["email"] = userEmail ?? ""
         //        }
         
-        // Billing Info
-        if let visibility = visibility, visibility.billing == true,
-           let billing = billingInfo, !billing.isEmpty {
-            var billingDict: [String: Any] = [:]
-            billing.forEach { billingDict[$0.name] = $0.value }
-            
-            params["address"] = billingDict["address"] as? String ?? ""
-            params["country"] = billingDict["country"] as? String ?? ""
-            params["state"] = billingDict["state"] as? String ?? ""
-            params["city"] = billingDict["city"] as? String ?? ""
-            params["zip"] = billingDict["postal_code"] as? String ?? ""
-        }
-        
-        // Additional Info or default description
-        var descriptionValue: String = "Hosted payment checkout" // default
-        if let visibility = visibility, visibility.additional == true,
-           let additional = additionalInfo, !additional.isEmpty {
-            
-            var additionalDict: [String: Any] = [:]
-            additional.forEach { additionalDict[$0.name] = $0.value }
-            
-            if let desc = additionalDict["description"] as? String, !desc.isEmpty {
-                descriptionValue = desc
-            }
-            
-            if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
-                params["phone_number"] = phone
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+                    
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+                
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+                    
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+                    
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+                
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
             }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
         }
-        params["description"] = descriptionValue
         
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
@@ -671,21 +702,22 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-                                        // Pass billing and additional info
-                                        // Conditionally pass raw FieldItem array
-                                        paymentDoneVC.visibility = self.visibility
-                                        
-                                        if self.visibility?.billing == true {
-                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+                                            
+                                            // Filter billing info: only include non-empty values
+                                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.billingInfoData = filteredBilling
                                             var billingDict: [String: Any] = [:]
-                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
                                             paymentDoneVC.billingInfo = billingDict
-                                        }
-                                        
-                                        if self.visibility?.additional == true {
-                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            
+                                            // Filter additional info: only include non-empty values
+                                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.additionalInfoData = filteredAdditional
                                             var additionalDict: [String: Any] = [:]
-                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
                                             paymentDoneVC.additionalInfo = additionalDict
                                         }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
@@ -920,36 +952,67 @@ class OTPVerificationVC: BaseVC {
             params["username"] = emailPrefix
         }
         
-        // Billing Info
-        if let visibility = visibility, visibility.billing == true,
-           let billing = billingInfo, !billing.isEmpty {
-            var billingDict: [String: Any] = [:]
-            billing.forEach { billingDict[$0.name] = $0.value }
-            
-            params["address"] = billingDict["address"] as? String ?? ""
-            params["country"] = billingDict["country"] as? String ?? ""
-            params["state"] = billingDict["state"] as? String ?? ""
-            params["city"] = billingDict["city"] as? String ?? ""
-            params["zip"] = billingDict["postal_code"] as? String ?? ""
-        }
-        
-        // Additional Info or default description
-        var descriptionValue: String = "Hosted payment checkout" // default
-        if let visibility = visibility, visibility.additional == true,
-           let additional = additionalInfo, !additional.isEmpty {
-            
-            var additionalDict: [String: Any] = [:]
-            additional.forEach { additionalDict[$0.name] = $0.value }
-            
-            if let desc = additionalDict["description"] as? String, !desc.isEmpty {
-                descriptionValue = desc
-            }
-            
-            if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
-                params["phone_number"] = phone
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+                    
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+                
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+                    
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+                    
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+                
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
             }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
         }
-        params["description"] = descriptionValue
         
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
@@ -1021,21 +1084,22 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-                                        // Pass billing and additional info
-                                        // Conditionally pass raw FieldItem array
-                                        paymentDoneVC.visibility = self.visibility
-                                        
-                                        if self.visibility?.billing == true {
-                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+                                            
+                                            // Filter billing info: only include non-empty values
+                                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.billingInfoData = filteredBilling
                                             var billingDict: [String: Any] = [:]
-                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
                                             paymentDoneVC.billingInfo = billingDict
-                                        }
-                                        
-                                        if self.visibility?.additional == true {
-                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            
+                                            // Filter additional info: only include non-empty values
+                                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                                            paymentDoneVC.additionalInfoData = filteredAdditional
                                             var additionalDict: [String: Any] = [:]
-                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
                                             paymentDoneVC.additionalInfo = additionalDict
                                         }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
@@ -1613,37 +1677,6 @@ class OTPVerificationVC: BaseVC {
             "customer_id": customerId ?? ""
         ]
         
-//        // Billing Info
-//        if let visibility = visibility, visibility.billing == true,
-//           let billing = billingInfo, !billing.isEmpty {
-//            var billingDict: [String: Any] = [:]
-//            billing.forEach { billingDict[$0.name] = $0.value }
-//            
-//            params["address"] = billingDict["address"] as? String ?? ""
-//            params["country"] = billingDict["country"] as? String ?? ""
-//            params["state"] = billingDict["state"] as? String ?? ""
-//            params["city"] = billingDict["city"] as? String ?? ""
-//            params["zip"] = billingDict["postal_code"] as? String ?? ""
-//        }
-//        
-//        // Additional Info or default description
-//        var descriptionValue: String = "Hosted payment checkout" // default
-//        if let visibility = visibility, visibility.additional == true,
-//           let additional = additionalInfo, !additional.isEmpty {
-//            
-//            var additionalDict: [String: Any] = [:]
-//            additional.forEach { additionalDict[$0.name] = $0.value }
-//            
-//            if let desc = additionalDict["description"] as? String, !desc.isEmpty {
-//                descriptionValue = desc
-//            }
-//            
-//            if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
-//                params["phone_number"] = phone
-//            }
-//        }
-//        params["description"] = descriptionValue
-        
         // Always include Billing Info if available
         if let billing = billingInfo, !billing.isEmpty {
             var billingDict: [String: Any] = [:]