@jimrising/easymerchantsdk-react-native 1.3.4 → 1.3.6

package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift

@@ -35,6 +35,15 @@ class BillingInfoVC: BaseVC {
     @IBOutlet weak var lblEasyMerchant: UILabel!
     @IBOutlet weak var btnNext: UIButton!
     
+    @IBOutlet weak var lblStarAddressField: UILabel!
+    @IBOutlet weak var lblStarCountryField: UILabel!
+    @IBOutlet weak var lblStarStateField: UILabel!
+    @IBOutlet weak var lblStarCityField: UILabel!
+    @IBOutlet weak var lblStarPostalCodeField: UILabel!
+    
+    @IBOutlet weak var btnSelectState: UIButton!
+    @IBOutlet weak var btnSelectCity: UIButton!
+    
     // Variable to store the auth token
     var authToken: String?
     
@@ -62,7 +71,7 @@ class BillingInfoVC: BaseVC {
     var isSavedForFuture: Bool = false
     var isSavedNewCard: Bool = false
     
-    private var request: Request!
+    var request: Request!
     var selectedCard: CardModel?
     var amount: Int?
     var cvvText: String?
@@ -77,11 +86,16 @@ class BillingInfoVC: BaseVC {
     
     weak var delegate: BillingInfoVCDelegate?
     
+    var chosenPlan: String?
+    var startDate: String?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        btnSelectState.isHidden = true
+        btnSelectCity.isHidden = true
         
         uiFinishingTouchElements()
-        
+        configureFieldVisibility()
         setupShadowForListViews()
         
         tblViewCountryList.delegate = self
@@ -134,6 +148,7 @@ class BillingInfoVC: BaseVC {
             }
         }
         
+        print(selectedCard ?? "")
     }
     
     override func viewWillAppear(_ animated: Bool) {
@@ -147,6 +162,8 @@ class BillingInfoVC: BaseVC {
             self.view.setNeedsLayout()
             self.view.layoutIfNeeded()
         })
+        
+        configureFieldVisibility()
     }
     
     override func viewWillDisappear(_ animated: Bool) {
@@ -217,7 +234,23 @@ class BillingInfoVC: BaseVC {
             btnNext.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
             btnPrevious.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
         }
-        
+    }
+    
+    private func configureFieldVisibility() {
+        let address = billingInfoData?["address"] as? String
+        let country = billingInfoData?["country"] as? String
+        let state = billingInfoData?["state"] as? String
+        let city = billingInfoData?["city"] as? String
+        let postalCode = billingInfoData?["postal_code"] as? String
+        
+        DispatchQueue.main.async {
+            self.lblStarAddressField.isHidden = (address ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+            self.lblStarCountryField.isHidden = (country ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+            self.lblStarStateField.isHidden = (state ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+            self.lblStarCityField.isHidden = (city ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+            self.lblStarPostalCodeField.isHidden = (postalCode ?? "").trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
+            self.view.layoutIfNeeded()
+        }
     }
     
     @objc func didTapOutside() {
@@ -501,20 +534,30 @@ class BillingInfoVC: BaseVC {
     }
     
     @IBAction func actionBtnNext(_ sender: UIButton) {
-        if self.txtFieldAddress.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            self.showAlert(title: "Missing Information", message: "Please enter your address.")
+        if !lblStarAddressField.isHidden &&
+            txtFieldAddress.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            showAlert(title: "Missing Information", message: "Please enter your address.")
+            return
         }
-        else if self.txtFieldCountry.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            self.showAlert(title: "Missing Information", message: "Please select your country.")
+        else if !lblStarCountryField.isHidden &&
+                    txtFieldCountry.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            showAlert(title: "Missing Information", message: "Please select your country.")
+            return
         }
-        else if self.txtFieldState.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            self.showAlert(title: "Missing Information", message: "Please select your state.")
+        else if !lblStarStateField.isHidden &&
+                    txtFieldState.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            showAlert(title: "Missing Information", message: "Please select your state.")
+            return
         }
-        else if self.txtFieldCity.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            self.showAlert(title: "Missing Information", message: "Please select your city.")
+        else if !lblStarCityField.isHidden &&
+                    txtFieldCity.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            showAlert(title: "Missing Information", message: "Please select your city.")
+            return
         }
-        else if self.txtFieldPostalCode.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-            self.showAlert(title: "Missing Information", message: "Please enter your postal code.")
+        else if !lblStarPostalCodeField.isHidden &&
+                    txtFieldPostalCode.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+            showAlert(title: "Missing Information", message: "Please enter your postal code.")
+            return
         }
         else {
             let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
@@ -540,19 +583,32 @@ class BillingInfoVC: BaseVC {
             vc.isFrom = isFrom
             
             vc.isSavedNewAccount = isSavedNewAccount
-            vc.amount = amount
+            vc.amount = Int(request.amount)
+            
+            vc.request = self.request
+            
+            vc.chosenPlan = chosenPlan
+            vc.startDate = startDate
             
             if isFrom == "SavedCards" {
                 vc.isFrom = "SavedCards"
                 vc.selectedCard = selectedCard // Passing the selected card data
                 vc.cvvText = cvvText // Passing the CVV text
-                vc.amount = amount
+                vc.amount = Int(request.amount)
+                
+                vc.request = self.request
+                vc.chosenPlan = chosenPlan
+                vc.startDate = startDate
             }
             
             if isFrom == "AddNewCard" {
                 vc.isFrom = "AddNewCard"
-                vc.amount = amount
+                vc.amount = Int(request.amount)
                 vc.isSavedNewCard = isSavedNewCard
+                
+                vc.request = self.request
+                vc.chosenPlan = chosenPlan
+                vc.startDate = startDate
             }
             
             self.navigationController?.pushViewController(vc, animated: true)
@@ -665,12 +721,3 @@ extension BillingInfoVC: UITextFieldDelegate {
     }
 }
 
-
-
-
-
-
-
-
-
-

package/ios/Pods/ViewControllers/EmailVerificationVC.swift

@@ -20,6 +20,9 @@ class EmailVerificationVC: BaseVC {
     var nameOnCard: String?
     var billingInfoData: [String: Any]?
     
+    var chosenPlan: String?
+    var startDate: String?
+    
     var selectedPaymentMethod: String?
     
     //Banking Params
@@ -37,6 +40,8 @@ class EmailVerificationVC: BaseVC {
     var selectedGrailPayAccountType: String?
     var selectedGrailPayAccountName: String?
     
+    var request: Request!
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
@@ -179,6 +184,9 @@ class EmailVerificationVC: BaseVC {
                                         vc.easyPayDelegate = self.easyPayDelegate
                                         vc.email = self.txtFieldEmail.text
                                         vc.isSavedForFuture = self.isSavedForFuture
+                                        vc.request = self.request
+                                        vc.chosenPlan = self.chosenPlan
+                                        vc.startDate = self.startDate
                                         self.navigationController?.pushViewController(vc, animated: true)
                                     }
                                 }
@@ -192,6 +200,9 @@ class EmailVerificationVC: BaseVC {
                                         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
                                         self.navigationController?.pushViewController(vc, animated: true)
                                     }
                                 }
@@ -203,6 +214,9 @@ class EmailVerificationVC: BaseVC {
                                         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
                                         self.navigationController?.pushViewController(vc, animated: true)
                                     }
                                 }