@jimrising/easymerchantsdk-react-native 2.0.7 → 2.0.9

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -100,7 +100,7 @@ class OTPVerificationVC: BaseVC {
         print(visibility ?? "")
         
         // Decode request.billingInfoData
-        if let billingData = request?.billingInfoData {
+        if let billingData = request?.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingData)
                 self.visibility = fieldSection.visibility
@@ -578,7 +578,7 @@ class OTPVerificationVC: BaseVC {
             params["create_customer"] = "1"
         }
 
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -663,17 +663,10 @@ class OTPVerificationVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-                
-                // ✅ Flatten metadata into requestBody
-                if let metadata = request?.metadata, !metadata.isEmpty {
-                    for (key, value) in metadata {
-                        params[key] = value
-                    }
-                }
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
         
         print(params)
         
@@ -725,7 +718,7 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.request = self.request
                                         
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             // Filter billing info: only include non-empty values
@@ -846,17 +839,10 @@ class OTPVerificationVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
-        //        // ✅ Include metadata only if it has at least 1 key-value pair
-        //        if let metadata = request?.metadata, !metadata.isEmpty {
-        //            requestBody["metadata"] = metadata
-        //        }
-                
-                // ✅ Flatten metadata into requestBody
-                if let metadata = request?.metadata, !metadata.isEmpty {
-                    for (key, value) in metadata {
-                        params[key] = value
-                    }
-                }
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
         
         print(params)
         
@@ -996,7 +982,7 @@ class OTPVerificationVC: BaseVC {
             params["create_customer"] = "1"
         }
         
-        if let billingInfoData = request.billingInfoData {
+        if let billingInfoData = request.fields {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
@@ -1081,6 +1067,11 @@ class OTPVerificationVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -1131,7 +1122,7 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.bankPaymentParams = params
                                         paymentDoneVC.request = self.request
                                         // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.billingInfoData,
+                                        if let billingInfoData = self.request.fields,
                                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
                                             // Filter billing info: only include non-empty values
@@ -1252,6 +1243,11 @@ class OTPVerificationVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {
@@ -1459,6 +1455,11 @@ class OTPVerificationVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         print(params)
         
         do {

package/ios/Pods/ViewControllers/PaymentErrorVC.swift

@@ -1,9 +1,8 @@
-//
-//  PaymentErrorVC.swift
-//  EasyPay
-//
-//  Created by Mony's Mac on 20/08/24.
-//
+////
+////  PaymentErrorVC.swift
+////  EasyPay
+////
+////  Created by Mony's Mac on 20/08/24.
 
 import UIKit
 
@@ -13,21 +12,21 @@ class PaymentErrorVC: UIViewController {
     @IBOutlet weak var lblError: UILabel!
     
     var errorMessage: String?
+    var errorStatus: Bool? // <-- NEW
     var easyPayDelegate: EasyPayViewControllerDelegate?
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        
         uiFinishingTouchElements()
         lblError.text = errorMessage
     }
     
     override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         uiFinishingTouchElements()
     }
     
     func uiFinishingTouchElements() {
-        // Set background color for the main view
         if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
            let uiColor = UIColor(hex: containerBGcolor) {
             self.view.backgroundColor = uiColor
@@ -44,12 +43,12 @@ class PaymentErrorVC: UIViewController {
         }
         
         if let borderRadiusString = UserStoreSingleton.shared.border_radious,
-           let borderRadius = Double(borderRadiusString) { // Convert String to Double
-            btnDone.layer.cornerRadius = CGFloat(borderRadius) // Set corner radius
+           let borderRadius = Double(borderRadiusString) {
+            btnDone.layer.cornerRadius = CGFloat(borderRadius)
         } else {
-            btnDone.layer.cornerRadius = 8 // Default value
+            btnDone.layer.cornerRadius = 8
         }
-        btnDone.layer.masksToBounds = true // Ensure the corners are clipped properly
+        btnDone.layer.masksToBounds = true
         
         if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
            let uiColor = UIColor(hex: primaryFontColor) {
@@ -57,32 +56,30 @@ class PaymentErrorVC: UIViewController {
         }
         
         if let fontSizeString = UserStoreSingleton.shared.fontSize,
-           let fontSizeDouble = Double(fontSizeString) { // Convert String to Double
-            let fontSize = CGFloat(fontSizeDouble) // Convert Double to CGFloat
+           let fontSizeDouble = Double(fontSizeString) {
+            let fontSize = CGFloat(fontSizeDouble)
             lblError.font = UIFont.systemFont(ofSize: fontSize)
             btnDone.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
         }
-        
     }
     
     @IBAction func actionBtnDone(_ sender: UIButton) {
-        let result = SDKResult(type: .error, chargeData: nil)
-        // Pass the error message back using the delegate
+        let errorData: [String: Any] = [
+            "status": errorStatus ?? false,
+            "message": errorMessage ?? "Unknown error"
+        ]
+        
+        let result = SDKResult(type: .error, chargeData: errorData)
         easyPayDelegate?.easyPayController(self.navigationController as! EasyPayViewController, didFinishWith: result)
         
         if let easyPayVC = self.navigationController as? EasyPayViewController {
-            easyPayVC.dismiss(animated: true, completion: {
-                // Ensure the error message is sent back to the starting screen
+            easyPayVC.dismiss(animated: true) {
                 if let delegate = easyPayVC.easyPayDelegate {
                     UserStoreSingleton.shared.isLoggedIn = false
-                    let errorResult = SDKResult(type: .error, chargeData: ["errorMessage": self.errorMessage ?? "Unknown error"])
+                    let errorResult = SDKResult(type: .error, chargeData: errorData)
                     delegate.easyPayController(easyPayVC, didFinishWith: errorResult)
                 }
-            })
+            }
         }
     }
-
 }
-
-
-