@jimrising/easymerchantsdk-react-native 1.3.9 → 1.4.2

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -34,7 +34,7 @@ class OTPVerificationVC: BaseVC {
     var expiryDate: String?
     var cvv: String?
     var nameOnCard: String?
-    var billingInfoData: [String: Any]?
+    var billingInfoData: Data?
     
     var email: String?
     
@@ -65,6 +65,13 @@ class OTPVerificationVC: BaseVC {
     var chosenPlan: String?
     var startDate: String?
     
+    var userEmail: String?
+    
+    var fieldSection: FieldSection?
+    var additionalInfo: [FieldItem]?
+    var billingInfo: [FieldItem]?
+    var visibility: FieldsVisibility?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -77,6 +84,25 @@ class OTPVerificationVC: BaseVC {
         setupTextFields()
         
         btnResendOTP.isHidden = true
+        
+        print(fieldSection ?? "")
+        print(additionalInfo ?? "")
+        print(billingInfo ?? "")
+        print(visibility ?? "")
+        
+        // Decode request.billingInfoData
+        if let billingData = request?.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingData)
+                self.visibility = fieldSection.visibility
+                self.billingInfo = fieldSection.billing
+                self.additionalInfo = fieldSection.additional
+            } catch {
+                print("Failed to decode billing info: \(error)")
+            }
+        }
+        
+        decodeBillingInfo()
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -84,6 +110,26 @@ class OTPVerificationVC: BaseVC {
         uiFinishingTouchElements()
     }
     
+    // MARK: - Decode billingInfoData
+    private func decodeBillingInfo() {
+        guard let data = billingInfoData else {
+            print("No billingInfoData found")
+            return
+        }
+        
+        do {
+            let decodedSection = try JSONDecoder().decode(FieldSection.self, from: data)
+            self.fieldSection = decodedSection
+            self.billingInfo = decodedSection.billing
+            self.additionalInfo = decodedSection.additional
+            self.visibility = decodedSection.visibility
+            
+            print("Decoded billingInfo: \(billingInfo ?? [])")
+        } catch {
+            print("Failed to decode billing info data: \(error)")
+        }
+    }
+    
     //MARK: - Ui Colors Setup.
     func uiFinishingTouchElements() {
         if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
@@ -294,7 +340,7 @@ class OTPVerificationVC: BaseVC {
                                    let customerId = innerData["customer_id"] as? String {
                                     print("Extracted customer_id: \(customerId)")
                                     if self.billingInfoData == nil {
-                                        if self.request.enable3DS == true {
+                                        if self.request.secureAuthentication == true {
                                             self.threeDSecurePaymentApi(customerId: customerId)
                                         }
                                         else {
@@ -304,7 +350,7 @@ class OTPVerificationVC: BaseVC {
                                     else {
                                         // self.paymentIntentApi(customerId: customerId)
                                         if let request = self.request {
-                                            if request.enable3DS == true {
+                                            if request.secureAuthentication == true {
                                                 self.threeDSecurePaymentSavedCardApi(customerId: customerId)
                                             } else {
                                                 self.paymentIntentApi(customerId: customerId)
@@ -337,7 +383,6 @@ class OTPVerificationVC: BaseVC {
                                         self.accountChargeApi(customerId: nil)
                                     }
                                 }
-                                
                             }
                             else if self.selectedPaymentMethod == "GrailPay" {
                                 if let dataSection = responseObject["data"] as? [String: Any],
@@ -350,6 +395,17 @@ class OTPVerificationVC: BaseVC {
                                     self.grailPayAccountChargeApi(customerId: nil)
                                 }
                             }
+                            else if self.selectedPaymentMethod == "NewGrailPayAccount" {
+                                if let dataSection = responseObject["data"] as? [String: Any],
+                                   let innerData = dataSection["data"] as? [String: Any],
+                                   let customerId = innerData["customer_id"] as? String {
+                                    print("Extracted customer_id: \(customerId)")
+                                    self.grailPayAccountChargeApi(customerId: customerId)
+                                } else {
+                                    print("customer_id not found. Sending empty customerId.")
+                                    self.grailPayAccountChargeApi(customerId: nil)
+                                }
+                            }
                         } else {
                             print("Invalid JSON format")
                         }
@@ -476,54 +532,63 @@ class OTPVerificationVC: BaseVC {
             uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            return
-        }
-        
-        let additionalInfoFromBilling = billingInfoData["additional_info"] as? [String: Any] ?? [:]
-        
-        let additionalInfo: [String: Any] = [
-            "name": additionalInfoFromBilling["name"] as? String ?? "",
-            "email": additionalInfoFromBilling["email"] as? String ?? "",
-            "phone_number": additionalInfoFromBilling["phone_number"] as? String ?? "",
-            "description": additionalInfoFromBilling["description"] as? String ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
-        
-        let emailPrefix = email?.components(separatedBy: "@").first ?? ""
+        //  let emailPrefix = email?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
-            "name": additionalInfoFromBilling["name"] as? String ?? "",
+            "name": nameOnCard ?? "",
             "card_number": cardNumber?.replacingOccurrences(of: " ", with: "") ?? "",
             "cardholder_name": nameOnCard ?? "",
             "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
             "exp_year": expiryDate?.components(separatedBy: "/").last ?? "",
             "cvc": cvv ?? "",
-            "description": additionalInfoFromBilling["description"] as? String ?? "",
             "currency": "usd",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo,
-            "payment_method": selectedPaymentMethod ?? "",
+            // "payment_method": selectedPaymentMethod ?? "",
             "save_card": 1,
-            "is_default": "1"
+            "is_default": "1",
+            // "create_customer": "1"
+            // "email": userEmail ?? ""
         ]
         
         if let customerId = customerId {
-            params["customer"] = customerId
+            // params["customer"] = customerId
             params["customer_id"] = customerId
-        } else {
-            params["username"] = emailPrefix
-            params["email"] = email ?? ""
+        }
+        //        else {
+        //            params["username"] = emailPrefix
+        //            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
+            }
+        }
+        params["description"] = descriptionValue
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -595,8 +660,22 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -807,37 +886,12 @@ class OTPVerificationVC: BaseVC {
             uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            return
-        }
-        
-        let additionalInfoFromBilling = billingInfoData["additional_info"] as? [String: Any] ?? [:]
-        
-        let additionalInfo: [String: Any] = [
-            "name": additionalInfoFromBilling["name"] as? String ?? "",
-            "email": additionalInfoFromBilling["email"] as? String ?? "",
-            "phone_number": additionalInfoFromBilling["phone_number"] as? String ?? "",
-            "description": additionalInfoFromBilling["description"] as? String ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
-        
         let emailPrefix = email?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
-            "name": additionalInfoFromBilling["name"] as? String ?? "",
+            "name": accountName ?? "",
             "email": email ?? "",
-            "description": additionalInfoFromBilling["description"] as? String ?? "",
             "currency": "usd",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo,
             "account_type": accountType?.lowercased() ?? "",
             "routing_number": routingNumber ?? "",
             "account_number": accountNumber ?? "",
@@ -854,6 +908,37 @@ 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
+            }
+        }
+        params["description"] = descriptionValue
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -925,8 +1010,22 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -1111,36 +1210,91 @@ class OTPVerificationVC: BaseVC {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         if let apiKey = EnvironmentConfig.apiKey {
-            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
         }
         if let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
         }
         
-        let params: [String: Any] = [
+        var params: [String: Any] = [
             "account_id": self.grailPayAccountID ?? "",
             "account_type": self.selectedGrailPayAccountType ?? "",
             "name": self.selectedGrailPayAccountName ?? "",
-            "description": "payment checkout",
+            // "description": "payment checkout",
             "save_account": 1,
             "is_default": 1,
-            "customer_id": customerId ?? ""
+            "customer_id": customerId ?? "",
+            "email": UserStoreSingleton.shared.merchantEmail ?? ""
         ]
         
+        // 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
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = startDate, !startDateText.isEmpty {
+                    let inputFormatter = DateFormatter()
+                    inputFormatter.dateFormat = "dd/MM/yyyy"
+                    
+                    let outputFormatter = DateFormatter()
+                    outputFormatter.dateFormat = "MM/dd/yyyy"
+                    
+                    if let date = inputFormatter.date(from: startDateText) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = chosenPlan?.lowercased()
+        }
+        
         print(params)
         
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            uRLRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -1151,7 +1305,7 @@ class OTPVerificationVC: BaseVC {
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: uRLRequest) { (serviceData, serviceResponse, error) in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
@@ -1183,6 +1337,23 @@ 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
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -1379,28 +1550,6 @@ class OTPVerificationVC: BaseVC {
             uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        guard let billingInfoData = billingInfoData else {
-            print("Billing info data is nil")
-            return
-        }
-        
-        let additionalInfoFromBilling = billingInfoData["additional_info"] as? [String: Any] ?? [:]
-        
-        let additionalInfo: [String: Any] = [
-            "name": additionalInfoFromBilling["name"] as? String ?? "",
-            "email": additionalInfoFromBilling["email"] as? String ?? "",
-            "phone_number": additionalInfoFromBilling["phone_number"] as? String ?? "",
-            "description": additionalInfoFromBilling["description"] as? String ?? ""
-        ]
-        
-        let billingInfo: [String: Any] = [
-            "address": billingInfoData["address"] as? String ?? "",
-            "country": billingInfoData["country"] as? String ?? "",
-            "state": billingInfoData["state"] as? String ?? "",
-            "city": billingInfoData["city"] as? String ?? "",
-            "postal_code": billingInfoData["postal_code"] as? String ?? ""
-        ]
-        
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
             "email": email ?? "",
@@ -1409,17 +1558,44 @@ class OTPVerificationVC: BaseVC {
             "exp_month": expiryDate?.components(separatedBy: "/").first ?? "",
             "exp_year": expiryDate?.components(separatedBy: "/").last ?? "",
             "cvc": cvv ?? "",
-            "description": "Test",
             "currency": "usd",
             "tokenize": request.tokenOnly ?? false,
-            "address": billingInfoData["address"] as? String ?? "",
-            "billing_info": billingInfo,
-            "additional_info": additionalInfo,
             "save_card": "1",
             "is_default": "1",
             "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
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -1491,8 +1667,22 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                                         // Pass billing and additional info
-                                        paymentDoneVC.billingInfo = billingInfo
-                                        paymentDoneVC.additionalInfo = additionalInfo
+                                        // Conditionally pass raw FieldItem array
+                                        paymentDoneVC.visibility = self.visibility
+                                        
+                                        if self.visibility?.billing == true {
+                                            paymentDoneVC.billingInfoData = self.billingInfo
+                                            var billingDict: [String: Any] = [:]
+                                            self.billingInfo?.forEach { billingDict[$0.name] = $0.value }
+                                            paymentDoneVC.billingInfo = billingDict
+                                        }
+                                        
+                                        if self.visibility?.additional == true {
+                                            paymentDoneVC.additionalInfoData = self.additionalInfo
+                                            var additionalDict: [String: Any] = [:]
+                                            self.additionalInfo?.forEach { additionalDict[$0.name] = $0.value }
+                                            paymentDoneVC.additionalInfo = additionalDict
+                                        }
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }

package/ios/Pods/ViewControllers/PaymentDoneVC.swift

@@ -19,7 +19,7 @@ class PaymentDoneVC: UIViewController {
     @IBOutlet weak var lblHeadingDate: UILabel!
     @IBOutlet weak var lblHeadingTransactionID: UILabel!
     @IBOutlet weak var lbHeadingPaymentMethod: UILabel!
-    @IBOutlet weak var lblHeadingTotal: UILabel!    
+    @IBOutlet weak var lblHeadingTotal: UILabel!
     
     @IBOutlet weak var viewSubscriptionId: UIStackView!
     @IBOutlet weak var lblHeadingSubscriptionId: UILabel!
@@ -40,6 +40,10 @@ class PaymentDoneVC: UIViewController {
     var billingInfo: [String: Any]?
     var additionalInfo: [String: Any]?
     
+    var additionalInfoData: [FieldItem]?
+    var billingInfoData: [FieldItem]?
+    var visibility: FieldsVisibility?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -83,7 +87,7 @@ class PaymentDoneVC: UIViewController {
             showDateAndTime()
         }
         
-        showBillingInfo()
+      //  showBillingInfo()
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -150,30 +154,35 @@ class PaymentDoneVC: UIViewController {
         
     }
     
-    func showBillingInfo() {
-        var displayText = ""
-        
-        if let billing = billingInfo {
-            displayText += "Billing Info:\n"
-            for (key, value) in billing {
-                displayText += "\(key.capitalized): \(value)\n"
-            }
-            
-            if let additional = additionalInfo {
-                displayText += "\nAdditional Info:\n"
-                for (key, value) in additional {
-                    displayText += "\(key.capitalized): \(value)\n"
-                }
-            }
-            
-            // Set text and make label visible
-            lblBillingInfo.text = displayText.trimmingCharacters(in: .whitespacesAndNewlines)
-            lblBillingInfo.isHidden = false
-        } else {
-            // Hide label if billing info is not available
-            lblBillingInfo.isHidden = true
-        }
-    }
+//    func showBillingInfo() {
+//        var displayText = ""
+//        
+//        if let visibility = visibility {
+//            if visibility.billing, let billing = billingInfo {
+//                displayText += "Billing Info:-\n"
+//                for (key, value) in billing {
+//                    displayText += "\(key.capitalized): \(value)\n"
+//                }
+//            }
+//            
+//            if visibility.additional, let additional = additionalInfo {
+//                if !displayText.isEmpty {
+//                    displayText += "\n"
+//                }
+//                displayText += "Additional Info:-\n"
+//                for (key, value) in additional {
+//                    displayText += "\(key.capitalized): \(value)\n"
+//                }
+//            }
+//        }
+//        
+//        if displayText.isEmpty {
+//            lblBillingInfo.isHidden = true
+//        } else {
+//            lblBillingInfo.text = displayText.trimmingCharacters(in: .whitespacesAndNewlines)
+//            lblBillingInfo.isHidden = false
+//        }
+//    }
     
     // Helper method to check if the date string is valid
     func isValidDate(_ dateString: String) -> Bool {