@jimrising/easymerchantsdk-react-native 1.3.9 → 1.4.2

package/ios/Pods/ViewControllers/CountryListVC.swift

@@ -25,7 +25,6 @@ class CountryListVC: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        
         // Remove top and bottom lines (background/shadow)
         if let searchBar = self.searchBarCountry {
             searchBar.backgroundImage = UIImage() // Removes background line
@@ -56,6 +55,26 @@ class CountryListVC: UIViewController {
             searchBarCountry.searchTextField.font = UIFont.systemFont(ofSize: fontSize)
         }
         
+        if let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
+           let uiColor = UIColor(hex: secondaryFontColor) {
+            // Set placeholder text color
+            let placeholderAttributes: [NSAttributedString.Key: Any] = [
+                .foregroundColor: uiColor
+            ]
+            searchBarCountry.searchTextField.attributedPlaceholder = NSAttributedString(
+                string: searchBarCountry.searchTextField.placeholder ?? "Search here",
+                attributes: placeholderAttributes
+            )
+            // Set search icon color
+            searchBarCountry.searchTextField.leftView?.tintColor = uiColor
+        }
+        
+        if let searchBar = self.searchBarCountry {
+            searchBar.backgroundImage = UIImage() // Removes background line
+            searchBar.layer.borderWidth = 0
+            searchBar.layer.borderColor = UIColor.clear.cgColor
+        }
+        
         tblViewCountry.delegate = self
         tblViewCountry.dataSource = self
         

package/ios/Pods/ViewControllers/CustomOverlay.swift

@@ -0,0 +1,199 @@
+////
+////  CustomOverlay.swift
+////  EasyPay
+////
+////  Created by Mony's Mac on 21/03/25.
+////
+//
+////import BlinkCard
+//
+//protocol CustomOverlayDelegate: AnyObject {
+//    func didFinishScanningCard(cardNumber: String, expiryDate: String, cvv: String, nameOnCard: String)
+//}
+//
+//class CustomOverlay: MBCCustomOverlayViewController, MBCScanningRecognizerRunnerViewControllerDelegate,
+//                     MBCFirstSideFinishedRecognizerRunnerViewControllerDelegate {
+//    
+//    @IBOutlet weak var tooltipLabel: UILabel!
+//    @IBOutlet weak var centerView: UIView!
+//    @IBOutlet weak var lblScanCardCount: UILabel!
+//    @IBOutlet weak var btnRotate: UIButton!
+//    @IBOutlet weak var imgProcessing: UIImageView!
+//    
+//    var currentScanStep = 1 // Start with 1 for the first scan step
+//    
+//    var blinkCardEditScreen: MBCBlinkCardEditViewController?
+//    var blinkcardNavigationViewController: MBCBlinkCardEditNavigationController?
+//    var blinkCardRecognizerResult: MBCBlinkCardRecognizerResult?
+//    
+//    static func initFromStoryboard() -> CustomOverlay {
+//        let viewController = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "CustomOverlay")
+//        
+//        guard let customOverlay = viewController as? CustomOverlay else {
+//            fatalError("CustomOverlay should always be an instance of \(CustomOverlay.self) here because we instantiate it from the Storyboard")
+//        }
+//        
+//        return customOverlay
+//    }
+//    
+//    weak var delegate: CustomOverlayDelegate?
+//    
+//    override func viewDidLoad() {
+//        super.viewDidLoad()
+//        
+//        super.scanningRecognizerRunnerViewControllerDelegate = self
+//        super.metadataDelegates.firstSideFinishedRecognizerRunnerViewControllerDelegate = self
+//        
+//        lblScanCardCount.text = "Scan Card (1/2)"
+//        
+//        centerView.layer.borderColor = UIColor.white.cgColor
+//        centerView.layer.borderWidth = 2.0
+//        centerView.layer.cornerRadius = 8.0
+//        
+//        imgProcessing.image = UIImage(systemName: "exclamationmark.circle")
+//        tooltipLabel.text = "Place the front side of your card inside the frame"
+//    }
+//    
+//    func updateScanProgress() {
+//        if currentScanStep < 2 {
+//            currentScanStep += 1
+//            lblScanCardCount.text = "Scan Card (\(currentScanStep)/2)"
+//        }
+//    }
+//    
+//    func showBorderColorForOneSeconds() {
+//        centerView.layer.borderColor = UIColor.green.cgColor
+//        centerView.layer.borderWidth = 2.0
+//        centerView.layer.cornerRadius = 8.0
+//        
+//        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+//            self.centerView.layer.borderColor = UIColor.white.cgColor
+//            self.centerView.layer.borderWidth = 2.0
+//        }
+//    }
+//    
+//    func recognizerRunnerViewControllerDidFinishScanning(_ recognizerRunnerViewController: UIViewController & MBCRecognizerRunnerViewController, state: MBCRecognizerResultState) {
+//        if state == .valid {
+//            recognizerRunnerViewController.pauseScanning()
+//            
+//            DispatchQueue.main.async {
+//                self.showBorderColorForOneSeconds()
+//                
+//                // Show loader while processing final results
+//                self.imgProcessing.image = UIImage(named: "loaderImage")
+//                self.tooltipLabel.text = "Keep it in frame while we’re processing..."
+//                self.startRotationAnimation(on: self.imgProcessing)
+//                
+//                for recognizer in self.recognizerCollection.recognizerList where recognizer.baseResult?.resultState == .valid {
+//                    if recognizer is MBCBlinkCardRecognizer {
+//                        let blinkCardRecognizer = recognizer as? MBCBlinkCardRecognizer
+//                        self.blinkCardRecognizerResult = blinkCardRecognizer?.result
+//                    }
+//                }
+//                
+//                self.imgProcessing.image = UIImage(named: "check")
+//                self.tooltipLabel.text = "Done"
+//                self.stopRotationAnimation(on: self.imgProcessing)
+//                
+//                guard let blinkCardResult = self.blinkCardRecognizerResult else { return }
+//                
+//                // Extract card details
+//                let cardNumber = blinkCardResult.cardNumber
+//                let expiryDate = "\(blinkCardResult.expiryDate.month)/\(blinkCardResult.expiryDate.year)"
+//                let cvv = blinkCardResult.cvv
+//                let nameOnCard = blinkCardResult.owner
+//                
+//                // Pass data to delegate
+//                self.delegate?.didFinishScanningCard(cardNumber: cardNumber, expiryDate: expiryDate, cvv: cvv, nameOnCard: nameOnCard)
+//                
+//                // Dismiss the scanner
+//                recognizerRunnerViewController.dismiss(animated: true, completion: nil)
+//            }
+//        }
+//    }
+//    
+//    func recognizerRunnerViewControllerDidFinishRecognition(ofFirstSide recognizerRunnerViewController: UIViewController & MBCRecognizerRunnerViewController) {
+//        DispatchQueue.main.async {
+//            // Show loader image during scanning
+//            self.imgProcessing.image = UIImage(named: "loaderImage", in: .easyPayBundle, with: nil)
+//            self.tooltipLabel.text = "Keep it in frame while we’re processing..."
+//            self.startRotationAnimation(on: self.imgProcessing)
+//            
+//            self.updateScanProgress()
+//            self.showBorderColorForOneSeconds()
+//            
+//            // Update tooltip and show check image after completing the first side
+//            DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+//                self.imgProcessing.image = UIImage(named: "check", in: .easyPayBundle, with: nil)
+//                self.tooltipLabel.text = "Done"
+//                self.stopRotationAnimation(on: self.imgProcessing)
+//                
+//                DispatchQueue.main.asyncAfter(deadline: .now() + 1.0) {
+//                    self.imgProcessing.image = UIImage(systemName: "exclamationmark.circle")
+//                    self.tooltipLabel.text = "Place the back side of your card inside the frame"
+//                    self.stopRotationAnimation(on: self.imgProcessing)
+//                }
+//            }
+//        }
+//    }
+//    
+//    func startRotationAnimation(on imageView: UIImageView) {
+//        let rotationAnimation = CABasicAnimation(keyPath: "transform.rotation")
+//        rotationAnimation.fromValue = 0
+//        rotationAnimation.toValue = CGFloat.pi * 2
+//        rotationAnimation.duration = 1.0 // Duration of one full rotation
+//        rotationAnimation.repeatCount = Float.infinity // Repeat indefinitely
+//        imageView.layer.add(rotationAnimation, forKey: "rotationAnimation")
+//    }
+//    
+//    func stopRotationAnimation(on imageView: UIImageView) {
+//        imageView.layer.removeAnimation(forKey: "rotationAnimation")
+//    }
+//    
+//    @IBAction func didTapClose(_ sender: Any) {
+//        self.recognizerRunnerViewController?.overlayViewControllerWillCloseCamera(self)
+//        self.dismiss(animated: true, completion: nil)
+//    }
+//    
+//    func showEditScreen(blinkCardRecognizerResult: MBCBlinkCardRecognizerResult) {
+//        blinkCardEditScreen = MBCBlinkCardEditViewController(blinkCardRecognizerResult: blinkCardRecognizerResult, fieldConfiguration: MBCBlinkCardEditFieldConfiguration(), delegate: self)
+//        blinkcardNavigationViewController = MBCBlinkCardEditNavigationController(rootViewController: blinkCardEditScreen!)
+//        self.present(blinkcardNavigationViewController!, animated: true, completion: nil)
+//    }
+//    
+//    @IBAction func actionBtnRotate(_ sender: UIButton) {
+//        UIView.animate(withDuration: 0.5, animations: {
+//            // Rotate the centerView by 180 degrees
+//            self.centerView.transform = self.centerView.transform.rotated(by: .pi/2)
+//        })
+//    }
+//    
+//}
+//
+//extension CustomOverlay: MBCBlinkCardEditViewControllerDelegate {
+//    func blinkCardEditViewControllerDidFinishEditing(_ blinkCardEditViewController: MBCBlinkCardEditViewController, editResult: MBCBlinkCardEditResult) {
+//        self.recognizerRunnerViewController?.pauseScanning()
+//        
+//        DispatchQueue.main.async {
+//            let alertController: UIAlertController = UIAlertController.init(title: "BlinkCard Edit Results", message: editResult.description, preferredStyle: .alert)
+//            
+//            let okAction: UIAlertAction = UIAlertAction.init(title: "OK", style: .default, handler: { (action) -> Void in
+//                self.blinkCardEditScreen?.dismiss(animated: true, completion: nil)
+//                self.dismiss(animated: true, completion: nil)
+//            })
+//            alertController.addAction(okAction)
+//            blinkCardEditViewController.present(alertController, animated: true, completion: nil)
+//        }
+//    }
+//    
+//    func blinkCardEditViewControllerDidTapClose(_ blinkCardEditViewController: MBCBlinkCardEditViewController) {
+//        DispatchQueue.main.async {
+//            blinkCardEditViewController.dismiss(animated: true, completion: nil)
+//        }
+//    }
+//}
+//
+//
+//
+//
+//

package/ios/Pods/ViewControllers/EmailVerificationVC.swift

@@ -18,7 +18,10 @@ class EmailVerificationVC: BaseVC {
     var expiryDate: String?
     var cvv: String?
     var nameOnCard: String?
-    var billingInfoData: [String: Any]?
+    var userEmail: String?
+    var billingInfoData: Data?
+    
+    var amount: Int?
     
     var chosenPlan: String?
     var startDate: String?
@@ -42,6 +45,14 @@ class EmailVerificationVC: BaseVC {
     
     var request: Request!
     
+    var fieldSection: FieldSection?
+    var additionalInfo: [FieldItem]?
+    var billingInfo: [FieldItem]?
+    var visibility: FieldsVisibility?
+    
+    var isSavedNewAccount: Bool?
+    var isFrom = String()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -51,9 +62,31 @@ class EmailVerificationVC: BaseVC {
         let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard))
         view.addGestureRecognizer(tapGesture)
         
-        print(grailPayAccountID ?? "")
-        print(selectedGrailPayAccountType ?? "")
-        print(selectedGrailPayAccountName ?? "")
+        if let email = userEmail {
+            txtFieldEmail.text = email
+        }
+        
+        decodeBillingInfo()
+    }
+    
+    // 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)")
+        }
     }
     
     func uiFinishingTouch() {
@@ -180,6 +213,7 @@ class EmailVerificationVC: BaseVC {
                                         vc.cvv = self.cvv
                                         vc.nameOnCard = self.nameOnCard
                                         vc.billingInfoData = self.billingInfoData
+                                        vc.billingInfo = self.billingInfo
                                         vc.selectedPaymentMethod = self.selectedPaymentMethod
                                         vc.easyPayDelegate = self.easyPayDelegate
                                         vc.email = self.txtFieldEmail.text
@@ -187,6 +221,10 @@ class EmailVerificationVC: BaseVC {
                                         vc.request = self.request
                                         vc.chosenPlan = self.chosenPlan
                                         vc.startDate = self.startDate
+                                        vc.userEmail = self.userEmail
+                                        vc.billingInfo = self.billingInfo
+                                        vc.additionalInfo = self.additionalInfo
+                                        vc.visibility = self.visibility
                                         self.navigationController?.pushViewController(vc, animated: true)
                                     }
                                 }
@@ -197,18 +235,23 @@ class EmailVerificationVC: BaseVC {
                                         vc.accountType = self.accountType
                                         vc.accountNumber = self.accountNumber
                                         vc.billingInfoData = self.billingInfoData
+                                        vc.billingInfo = self.billingInfo
                                         vc.selectedPaymentMethod = self.selectedPaymentMethod
                                         vc.easyPayDelegate = self.easyPayDelegate
                                         vc.email = self.txtFieldEmail.text
                                         vc.chosenPlan = self.chosenPlan
                                         vc.startDate = self.startDate
                                         vc.request = self.request
+                                        vc.userEmail = self.userEmail
+                                        vc.billingInfo = self.fieldSection?.billing
+                                        vc.additionalInfo = self.fieldSection?.additional
+                                        vc.visibility = self.fieldSection?.visibility
                                         self.navigationController?.pushViewController(vc, animated: true)
                                     }
                                 }
                                 else if self.selectedPaymentMethod == "GrailPay" {
                                     if let vc = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
-                                        vc.selectedPaymentMethod = "GrailPay"
+                                        vc.selectedPaymentMethod = self.selectedPaymentMethod
                                         vc.easyPayDelegate = self.easyPayDelegate
                                         vc.grailPayAccountID = self.grailPayAccountID
                                         vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
@@ -217,6 +260,32 @@ class EmailVerificationVC: BaseVC {
                                         vc.chosenPlan = self.chosenPlan
                                         vc.startDate = self.startDate
                                         vc.request = self.request
+                                        vc.billingInfoData = self.billingInfoData
+                                        vc.billingInfo = self.billingInfo
+                                        vc.userEmail = self.userEmail
+                                        vc.billingInfo = self.fieldSection?.billing
+                                        vc.additionalInfo = self.fieldSection?.additional
+                                        vc.visibility = self.fieldSection?.visibility
+                                        self.navigationController?.pushViewController(vc, animated: true)
+                                    }
+                                }
+                                else if self.selectedPaymentMethod == "NewGrailPayAccount" {
+                                    if let vc = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+                                        vc.selectedPaymentMethod = self.selectedPaymentMethod
+                                        vc.easyPayDelegate = self.easyPayDelegate
+                                        vc.grailPayAccountID = self.grailPayAccountID
+                                        vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+                                        vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+                                        vc.email = self.txtFieldEmail.text
+                                        vc.chosenPlan = self.chosenPlan
+                                        vc.startDate = self.startDate
+                                        vc.request = self.request
+                                        vc.billingInfoData = self.billingInfoData
+                                        vc.billingInfo = self.billingInfo
+                                        vc.userEmail = self.userEmail
+                                        vc.billingInfo = self.fieldSection?.billing
+                                        vc.additionalInfo = self.fieldSection?.additional
+                                        vc.visibility = self.fieldSection?.visibility
                                         self.navigationController?.pushViewController(vc, animated: true)
                                     }
                                 }