From 2ac714029893e33648efd3a5c2d070ced87c763e Mon Sep 17 00:00:00 2001 From: puranpanthi Date: Sun, 28 Apr 2024 21:10:36 +0545 Subject: [PATCH] promotional code implemented and other fixes --- .../Extensions/UIViewController+Ext.swift | 2 +- .../View/NewUserRegister.storyboard | 4 +- .../View/NewUserRegisterViewController.swift | 81 ++++++++++--------- .../View/KYCVerifyStep1.storyboard | 4 +- .../SendMoneyExchangeRateViewController.swift | 7 +- 5 files changed, 54 insertions(+), 44 deletions(-) diff --git a/GME Remit/Extensions/UIViewController+Ext.swift b/GME Remit/Extensions/UIViewController+Ext.swift index d9c18f30..d0a4531e 100644 --- a/GME Remit/Extensions/UIViewController+Ext.swift +++ b/GME Remit/Extensions/UIViewController+Ext.swift @@ -252,7 +252,7 @@ extension UIViewController { // Create a message label let messageLabel = UILabel() messageLabel.text = message - messageLabel.font = UIFont.systemFont(ofSize: 15) + messageLabel.font = UIFont.systemFont(ofSize: 13) messageLabel.textAlignment = .center messageLabel.numberOfLines = 0 stackView.addArrangedSubview(messageLabel) diff --git a/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegister.storyboard b/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegister.storyboard index f87b408c..c7df07c9 100644 --- a/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegister.storyboard +++ b/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegister.storyboard @@ -533,13 +533,13 @@ - + - + diff --git a/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift b/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift index 5ac561d4..baf2215e 100644 --- a/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift +++ b/GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift @@ -186,46 +186,51 @@ class NewUserRegisterViewController: UIViewController { } @IBAction func registerBttnClicked(_ sender: UIButton) { - if isForUpdate == true{ - let model = UserUpdateModel() - let userId = GMEDB.shared.user.string(.senderId) ?? "" - model.userName = self.idTextField.text - model.userId = userId - model.dob = self.dobTextField.text - model.fullName = self.fullNameTextField.text - model.mobileNumber = self.mobileNoTextField.text - model.gender = self.getIdByValue(array: self.gender ?? [], targetValue: self.genderTextField.text ?? "") - model.postalCode = self.postalCodeTextField.text - model.address1 = self.address1TextField.text - model.address2 = self.address2TextField.text - model.city = self.cityTextField.text - model.nationality = self.getCountryCodeByValue(array: self.nativeCountry ?? [], targetValue: self.nationalityTextField.text ?? "") - - self.updateModel = model - self.presenter?.updateUser(model: model) - + if self.mobileNoTextField.text?.count ?? 0 < 13 { + self.showImageAlert(title: "Information Missing", message: "Mobile No. should be of atleast 10 digits!") }else{ - let model = NewUserRegisterModel() - model.userId = self.idTextField.text - model.dob = self.dobTextField.text - model.fullName = self.fullNameTextField.text - model.password = self.passwordTextField.text - model.confirmPassword = self.confirmPasswordTxtField.text - model.mobileNumber = self.mobileNoTextField.text - // model.gender = self.genderTextField.text - model.gender = self.getIdByValue(array: self.gender ?? [], targetValue: self.genderTextField.text ?? "") - model.email = self.idTextField.text - model.postalCode = self.postalCodeTextField.text - model.address1 = self.address1TextField.text - model.address2 = self.address2TextField.text - model.city = self.cityTextField.text - // model.nationality = self.nationalityTextField.text - model.nationality = self.getCountryCodeByValue(array: self.nativeCountry ?? [], targetValue: self.nationalityTextField.text ?? "") - - model.referralCode = isValidReferCode ? self.referralCode.text : "" - self.registerModel = model - self.presenter?.registerUser(model: model) + if isForUpdate == true{ + let model = UserUpdateModel() + let userId = GMEDB.shared.user.string(.senderId) ?? "" + model.userName = self.idTextField.text + model.userId = userId + model.dob = self.dobTextField.text + model.fullName = self.fullNameTextField.text + model.mobileNumber = self.mobileNoTextField.text + model.gender = self.getIdByValue(array: self.gender ?? [], targetValue: self.genderTextField.text ?? "") + model.postalCode = self.postalCodeTextField.text + model.address1 = self.address1TextField.text + model.address2 = self.address2TextField.text + model.city = self.cityTextField.text + model.nationality = self.getCountryCodeByValue(array: self.nativeCountry ?? [], targetValue: self.nationalityTextField.text ?? "") + + self.updateModel = model + self.presenter?.updateUser(model: model) + + }else{ + let model = NewUserRegisterModel() + model.userId = self.idTextField.text + model.dob = self.dobTextField.text + model.fullName = self.fullNameTextField.text + model.password = self.passwordTextField.text + model.confirmPassword = self.confirmPasswordTxtField.text + + model.mobileNumber = self.mobileNoTextField.text + // model.gender = self.genderTextField.text + model.gender = self.getIdByValue(array: self.gender ?? [], targetValue: self.genderTextField.text ?? "") + model.email = self.idTextField.text + model.postalCode = self.postalCodeTextField.text + model.address1 = self.address1TextField.text + model.address2 = self.address2TextField.text + model.city = self.cityTextField.text + // model.nationality = self.nationalityTextField.text + model.nationality = self.getCountryCodeByValue(array: self.nativeCountry ?? [], targetValue: self.nationalityTextField.text ?? "") + + model.referralCode = isValidReferCode ? self.referralCode.text : "" + self.registerModel = model + self.presenter?.registerUser(model: model) + } } } diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard index ddb7c283..e0340f5b 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard @@ -1,9 +1,9 @@ - + - + diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift index 5c90d36a..0bb0abc7 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift @@ -310,7 +310,12 @@ class SendMoneyExchangeRateViewController: UIViewController { cardView.layer.cornerRadius = 10 // self.showProgressHud() // print(self.reciepient?.paymentMethods[0]?.receiverId) - presenter?.getRewardPoint(receiverID: self.reciepient?.paymentMethods?[0].receiverId ?? "", isAccountValidationRequired: self.reciepient?.isAccountValidationRequired ?? "", payoutPartner: self.reciepient?.payoutPartner ?? "") + if self.reciepient?.paymentMethods?[0].receiverId == nil{ + presenter?.getRewardPoint(receiverID: self.reciepient?.receiverID ?? "", isAccountValidationRequired: self.reciepient?.isAccountValidationRequired ?? "", payoutPartner: self.reciepient?.payoutPartner ?? "") + }else{ + presenter?.getRewardPoint(receiverID: self.reciepient?.paymentMethods?[0].receiverId ?? "", isAccountValidationRequired: self.reciepient?.isAccountValidationRequired ?? "", payoutPartner: self.reciepient?.payoutPartner ?? "") + } + } override func viewWillAppear(_ animated: Bool) {