@jimrising/easymerchantsdk-react-native 1.3.8 → 1.3.9

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -369,7 +369,7 @@ class OTPVerificationVC: BaseVC {
     //MARK: - Send OTP Email Verification Api
     func emailVerificationApi() {
         showLoadingIndicator()
-       
+        
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -452,7 +452,7 @@ class OTPVerificationVC: BaseVC {
     //MARK: - Card Charge Api
     func paymentIntentApi(customerId: String?) {
         showLoadingIndicator()
-       
+        
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -594,6 +594,9 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -780,7 +783,7 @@ class OTPVerificationVC: BaseVC {
     //MARK: - Account Charge Api
     func accountChargeApi(customerId: String?) {
         showLoadingIndicator()
-       
+        
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -921,6 +924,9 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -950,7 +956,7 @@ class OTPVerificationVC: BaseVC {
     //MARK: - Account Charge Api if billing info is nil and saved account
     func accountChargeWithSavedAccountApi(customerId: String?) {
         showLoadingIndicator()
-       
+        
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -1096,7 +1102,7 @@ class OTPVerificationVC: BaseVC {
     //MARK: - GrailPay Account Charge Api if user saved account
     func grailPayAccountChargeApi(customerId: String?) {
         showLoadingIndicator()
-       
+        
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -1271,7 +1277,7 @@ class OTPVerificationVC: BaseVC {
             
             params["interval"] = chosenPlan?.lowercased()
         }
-                
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             uRLRequest.httpBody = jsonData
@@ -1394,7 +1400,7 @@ class OTPVerificationVC: BaseVC {
             "city": billingInfoData["city"] as? String ?? "",
             "postal_code": billingInfoData["postal_code"] as? String ?? ""
         ]
-                
+        
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
             "email": email ?? "",
@@ -1484,7 +1490,9 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.redirectURL = urlString
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-                                        
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -1510,7 +1518,7 @@ class OTPVerificationVC: BaseVC {
         }
         task.resume()
     }
-
+    
     @IBAction func actionBtnCancel(_ sender: UIButton) {
         stopTimer()
         for viewController in self.navigationController?.viewControllers ?? [] {

package/ios/Pods/ViewControllers/PaymentDoneVC.swift

@@ -9,6 +9,7 @@ import UIKit
 
 class PaymentDoneVC: UIViewController {
     
+    @IBOutlet weak var viewMain: UIView!
     @IBOutlet weak var lblDate: UILabel!
     @IBOutlet weak var lblTransactionId: UILabel!
     @IBOutlet weak var lblPaymentSource: UILabel!
@@ -23,6 +24,7 @@ class PaymentDoneVC: UIViewController {
     @IBOutlet weak var viewSubscriptionId: UIStackView!
     @IBOutlet weak var lblHeadingSubscriptionId: UILabel!
     @IBOutlet weak var lblSubscriptionId: UILabel!
+    @IBOutlet weak var lblBillingInfo: UILabel!
     
     var chargeData: [String: Any]?
     var selectedPaymentMethod: String?
@@ -34,6 +36,10 @@ class PaymentDoneVC: UIViewController {
     var transactionId: String?
     var isFrom = String()
     
+    // Add these two properties:
+    var billingInfo: [String: Any]?
+    var additionalInfo: [String: Any]?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -77,6 +83,7 @@ class PaymentDoneVC: UIViewController {
             showDateAndTime()
         }
         
+        showBillingInfo()
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -88,6 +95,7 @@ class PaymentDoneVC: UIViewController {
         if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
            let uiColor = UIColor(hex: containerBGcolor) {
             self.view.backgroundColor = uiColor
+            self.viewMain.backgroundColor = uiColor
         }
         
         if let primaryBtnBackGroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
@@ -120,26 +128,53 @@ class PaymentDoneVC: UIViewController {
             lblTotal.textColor = uiColor
             lblHeadingSubscriptionId.textColor = uiColor
             lblSubscriptionId.textColor = uiColor
+            lblBillingInfo.textColor = uiColor
         }
         
         if let fontSizeString = UserStoreSingleton.shared.fontSize,
            let fontSizeDouble = Double(fontSizeString) { // Convert String to Double
             let fontSize = CGFloat(fontSizeDouble) // Convert Double to CGFloat
-            lblDate.font = UIFont.systemFont(ofSize: fontSize)
-            lblTransactionId.font = UIFont.systemFont(ofSize: fontSize)
-            lblPaymentSource.font = UIFont.systemFont(ofSize: fontSize)
-            lblTotal.font = UIFont.systemFont(ofSize: fontSize)
-            lblHeadingDate.font = UIFont.systemFont(ofSize: fontSize)
-            lblHeadingTransactionID.font = UIFont.systemFont(ofSize: fontSize)
-            lbHeadingPaymentMethod.font = UIFont.systemFont(ofSize: fontSize)
-            lblHeadingTotal.font = UIFont.systemFont(ofSize: fontSize)
-            btnDone.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
-            lblHeadingSubscriptionId.font = UIFont.systemFont(ofSize: fontSize)
-            lblSubscriptionId.font = UIFont.systemFont(ofSize: fontSize)
+            lblDate.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblTransactionId.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblPaymentSource.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblTotal.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblHeadingDate.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblHeadingTransactionID.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lbHeadingPaymentMethod.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblHeadingTotal.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            btnDone.titleLabel?.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblHeadingSubscriptionId.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblSubscriptionId.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblBillingInfo.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
         }
         
     }
     
+    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
+        }
+    }
+    
     // Helper method to check if the date string is valid
     func isValidDate(_ dateString: String) -> Bool {
         let dateFormatter = DateFormatter()
@@ -159,12 +194,15 @@ class PaymentDoneVC: UIViewController {
     }
     
     @IBAction func actionBtnDone(_ sender: UIButton) {
-        let result = Result(type: .success, chargeData: chargeData)
+        let result = Result(type: .success,
+                            chargeData: chargeData,
+                            billingInfo: billingInfo,
+                            additionalInfo: additionalInfo)
+        
         easyPayDelegate?.easyPayController(self.navigationController as! EasyPayViewController, didFinishWith: result)
         
         if let easyPayVC = self.navigationController as? EasyPayViewController {
             easyPayVC.dismiss(animated: true, completion: {
-                // Ensure the chargeData is sent back to the starting screen
                 if let delegate = easyPayVC.easyPayDelegate {
                     UserStoreSingleton.shared.isLoggedIn = false
                     delegate.easyPayController(easyPayVC, didFinishWith: result)

package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift

@@ -541,7 +541,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.txtFieldSelectDateGrailPayBankView.isHidden = false
                 self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
                 
-                self.heightViewBankFields.constant = 696
+                self.heightViewBankFields.constant = 710
+                
                 self.heightViewNewCardFields.constant = 624
                 self.heightViewNewAccountFields.constant = 808
                 self.heightSubViewNewAccountFields.constant = 738
@@ -3272,7 +3273,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.showAlert(title: "Missing Information", message: "Card Expiry Date is required.")
                     return
                 }
-                
                 else if !expiryDate.matches(expiryDateRegex) {
                     self.showAlert(title: "Invalid Expiry Date", message: "Expiry Date must be in format MM/yyyy (e.g., 02/2026).")
                     return
@@ -3547,6 +3547,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         btnPayNowSingleAccountView.isHidden = !isSelectForPayBank
         
         if isSelectForPayBank {
+            selectedBankIndex = 0
             // Show or hide recurring plan fields based on request.enableRecurring
             if request?.is_recurring == true {
                 txtFieldSelectPlanSingleSavedBankView.isHidden = false
@@ -3560,6 +3561,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 txtFieldSelectDateSingleSavedBankView.isHidden = true
             }
         } else {
+            selectedBankIndex = nil
             // Hide all related fields if not selected
             btnNext.isHidden = true
             btnNextHeight.constant = 0
@@ -6529,6 +6531,20 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
             }
         }
         
+        //        // Update border color based on selection
+        //        if selectedIndex == indexPath {
+        //            if let primaryBackGroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
+        //               let uiColor = UIColor(hex: primaryBackGroundColor) {
+        //                cell.vwMain.layer.borderColor = uiColor.cgColor // Convert UIColor to CGColor
+        //                cell.imgVwPayments.tintColor = uiColor
+        //                cell.lblPayment.textColor = uiColor
+        //            }
+        //        } else {
+        //            cell.vwMain.layer.borderColor = UIColor.gray.cgColor
+        //            cell.imgVwPayments.tintColor = .systemGray
+        //            cell.lblPayment.textColor = .systemGray
+        //        }
+        
         return cell
     }
     

package/ios/Pods/ViewControllers/ThreeDSecurePaymentDoneVC.swift

@@ -9,19 +9,27 @@ import UIKit
 
 class ThreeDSecurePaymentDoneVC: UIViewController {
     
+    @IBOutlet weak var viewMain: UIView!
     @IBOutlet weak var lblCompleteAuthentication: UILabel!
     @IBOutlet weak var btnDone: UIButton!
     @IBOutlet weak var lblPaymentLink: UILabel!
+    @IBOutlet weak var lblBillingInfoData: UILabel!
     
     var easyPayDelegate: EasyPayViewControllerDelegate?
     var redirectURL: String?
     var chargeData: [String: Any] = [:]
     
+    // Add these two properties:
+    var billingInfo: [String: Any]?
+    var additionalInfo: [String: Any]?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         uiFinishingTouchElements()
         
         setupTapOnLabel()
+        
+        showBillingInfo()
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -48,13 +56,41 @@ class ThreeDSecurePaymentDoneVC: UIViewController {
         UIApplication.shared.open(url, options: [:], completionHandler: nil)
     }
     
+    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
+            lblBillingInfoData.text = displayText.trimmingCharacters(in: .whitespacesAndNewlines)
+            lblBillingInfoData.isHidden = false
+        } else {
+            // Hide label if billing info is not available
+            lblBillingInfoData.isHidden = true
+        }
+    }
+    
     @IBAction func actionBtnDone(_ sender: UIButton) {
-        let result = Result(type: .success, chargeData: chargeData)
+        let result = Result(type: .success,
+                            chargeData: chargeData,
+                            billingInfo: billingInfo,
+                            additionalInfo: additionalInfo)
+        
         easyPayDelegate?.easyPayController(self.navigationController as! EasyPayViewController, didFinishWith: result)
         
         if let easyPayVC = self.navigationController as? EasyPayViewController {
             easyPayVC.dismiss(animated: true, completion: {
-                // Ensure the chargeData is sent back to the starting screen
                 if let delegate = easyPayVC.easyPayDelegate {
                     UserStoreSingleton.shared.isLoggedIn = false
                     delegate.easyPayController(easyPayVC, didFinishWith: result)
@@ -68,6 +104,7 @@ class ThreeDSecurePaymentDoneVC: UIViewController {
         if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
            let uiColor = UIColor(hex: containerBGcolor) {
             self.view.backgroundColor = uiColor
+            self.viewMain.backgroundColor = uiColor
         }
         
         if let primaryBtnBackGroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
@@ -91,6 +128,7 @@ class ThreeDSecurePaymentDoneVC: UIViewController {
         if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
            let uiColor = UIColor(hex: primaryFontColor) {
             lblCompleteAuthentication.textColor = uiColor
+            lblBillingInfoData.textColor = uiColor
         }
         
         if let fontSizeString = UserStoreSingleton.shared.fontSize,
@@ -98,6 +136,7 @@ class ThreeDSecurePaymentDoneVC: UIViewController {
             let fontSize = CGFloat(fontSizeDouble) // Convert Double to CGFloat
             lblCompleteAuthentication.font = UIFont.systemFont(ofSize: fontSize, weight: .semibold)
             lblPaymentLink.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            lblBillingInfoData.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
         }
         
     }

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '1.3.8'
+  s.version          = '1.3.9'
   s.summary          = 'A React Native SDK for Easy Merchant.'
   s.description      = <<-DESC
     A React Native SDK to enable Easy Merchant functionality in mobile applications.