From 52279cf745fa4adf20ed692d0db26d22bd16d768 Mon Sep 17 00:00:00 2001 From: gme_2 Date: Mon, 3 Sep 2018 19:21:31 +0900 Subject: [PATCH] vefirication submitted --- GMERemittance/Login/LoginViewModel.swift | 1 + .../Model/SendMoneyExchangeRate.swift | 5 +++ GMERemittance/Model/User.swift | 4 +- .../SendMoneyExchangeRateViewController.swift | 20 ++++------ .../SendMoneyPaymentModeViewController.swift | 19 ++++++---- .../SendMoneyVerificationInteractor.swift | 37 +++++++++++-------- .../RecipientListViewController.swift | 2 +- 7 files changed, 51 insertions(+), 37 deletions(-) diff --git a/GMERemittance/Login/LoginViewModel.swift b/GMERemittance/Login/LoginViewModel.swift index c4b242d7..dc93bb28 100644 --- a/GMERemittance/Login/LoginViewModel.swift +++ b/GMERemittance/Login/LoginViewModel.swift @@ -143,6 +143,7 @@ extension LoginViewModel { self.save(value: user?.idNumber ?? "", forKey: UserKeys.idNumber) self.save(value: user?.country ?? "" , forKey: UserKeys.country) self.save(value: user?.countryCode, forKey: UserKeys.countryCode) + self.save(value: user?.senderId, forKey: UserKeys.senderId) self.loggedin.value = true diff --git a/GMERemittance/Model/SendMoneyExchangeRate.swift b/GMERemittance/Model/SendMoneyExchangeRate.swift index 018250cc..a4849a0b 100644 --- a/GMERemittance/Model/SendMoneyExchangeRate.swift +++ b/GMERemittance/Model/SendMoneyExchangeRate.swift @@ -13,10 +13,13 @@ class SendMoneyExchangeRateModel: Mappable { var id: String? var transferFee: String? var exchangeRate: String? + var apiExchangeRate: String? var recipientAmount: String? var senderAmount: String? var senderCurrency: String? + var reciepientCurrency: String? var calcBy: String? + var forexId:String? init() {} @@ -32,6 +35,8 @@ class SendMoneyExchangeRateModel: Mappable { senderAmount <- map["collAmt"] senderCurrency <- map["collCurr"] calcBy <- map["calcBy"] + forexId <- map["EXRATEID"] + apiExchangeRate <- map["exRate"] } } diff --git a/GMERemittance/Model/User.swift b/GMERemittance/Model/User.swift index ece22c93..327e346e 100644 --- a/GMERemittance/Model/User.swift +++ b/GMERemittance/Model/User.swift @@ -28,7 +28,7 @@ extension Login { struct UserKeys { static let userId = "com.gmeremit.username" - + static let senderId = "senderId" static let fullName = "com.gmeremit.fullName" static let firstName = "firstName" static let middleName = "middleName" @@ -103,6 +103,7 @@ class User: Mappable { var sourceId: String? var idType: String? var idNumber: String? + var senderId: String? var countryCode: String? var ErrorCode: String? var Msg: String? @@ -139,6 +140,7 @@ class User: Mappable { idType <- map["idType"] idNumber <- map["idNumber"] countryCode <- map["countryCode"] + senderId <- map["senderId"] ErrorCode <- map["ErrorCode"] Msg <- map["Msg"] Id <- map["Id"] diff --git a/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift b/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift index 00eaad8d..d56b9b70 100644 --- a/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift +++ b/GMERemittance/Module/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift @@ -70,7 +70,8 @@ class SendMoneyExchangeRateViewController: UIViewController { didSet { self.reciepientTextField.text = self.exchangeRateModel?.recipientAmount self.senderTextField.text = self.exchangeRateModel?.senderAmount - self.transferFeeInfoLabel.text = self.exchangeRateModel?.transferFee + let transferFee = self.exchangeRateModel?.transferFee ?? "" + self.transferFeeInfoLabel.text = transferFee + " (Transfer fee included)" self.transferFeeInfoLabel.isHidden = false self.action = ._continue } @@ -125,6 +126,7 @@ class SendMoneyExchangeRateViewController: UIViewController { let reciepientAmount = self.reciepientTextField.text! self.calculateExchangeRate(senderAmount: senderAmount, reciepientAmount: reciepientAmount, calcBy: self.calcBy) case ._continue: + // todo self.goToVerification() } } @@ -132,13 +134,15 @@ class SendMoneyExchangeRateViewController: UIViewController { private func goToVerification() { + self.exchangeRateModel?.calcBy = self.calcBy + self.exchangeRateModel?.reciepientCurrency = self.selectedCurrencyViewModel?.currency ?? "" self.actionDelegate?.calculated(model: self.exchangeRateModel) self.actionDelegate?.continueToVerificationAction() } func calculateExchangeRate(senderAmount: String, reciepientAmount: String, calcBy: String) { - let senderAmount = "15000" - let reciepientAmount = "15000" + let senderAmount = senderAmount + let reciepientAmount = reciepientAmount let recipientCurrency = self.selectedCurrencyViewModel?.currency let reciepientCountryId = self.reciepient?.countryId let paymentMethod = "WALLET" @@ -250,15 +254,7 @@ extension SendMoneyExchangeRateViewController: SendMoneyExchangeRateViewInterfac } func show(error: String) { - let ex = SendMoneyExchangeRateModel() - ex.id = "1" - ex.recipientAmount = "15000" - ex.exchangeRate = "34" - ex.senderAmount = "1000" - ex.senderCurrency = "NNN" - ex.transferFee = "500 (Transfer fee included)" - self.exchangeRateModel = ex -// self.alert(message: error) + self.alert(message: error) } func showLoading() { diff --git a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift index e7ace711..b0ab4557 100644 --- a/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift +++ b/GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift @@ -53,14 +53,17 @@ class SendMoneyPaymentModeViewController: UIViewController { } var selectedPayoutMode: SendMoneyPayoutMode? { didSet { + self.accountTextField.text = "" + self.bankTextField.text = "" + self.branchTextField.text = "" + self.bankStackView.isHidden = true + self.branchStackView.isHidden = true + self.accountNumberStackView.isHidden = true if (self.selectedPayoutMode?.bankRequired ?? "false").lowercased() == "true" { - self.bankStackView.isHidden = false }else { - self.bankStackView.isHidden = true - self.branchStackView.isHidden = true - self.accountNumberStackView.isHidden = true - self.accountTextField.text = "" - self.bankTextField.text = "" - self.branchTextField.text = "" + self.bankStackView.isHidden = false + + }else { + } collectionView.reloadData() } @@ -185,7 +188,7 @@ class SendMoneyPaymentModeViewController: UIViewController { } private func shouldValidateAccount() -> Bool { - return true +// return true return (self.selectedBank?.accountValidationRequired ?? "false").lowercased() == "true" } diff --git a/GMERemittance/Module/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift b/GMERemittance/Module/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift index 69013721..06fea4b6 100644 --- a/GMERemittance/Module/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift +++ b/GMERemittance/Module/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift @@ -28,8 +28,7 @@ class SendMoneyVerificationInteractor { extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput { func submit(model: SendMoneyRequestModel, reciepient: Recipient) { - guard let username = UserDefaults.standard.value(forKey: UserKeys.userId) as? String else {return} - let params = self.getParams(model: model, reciepient: reciepient, userName: username) + let params = self.getParams(model: model, reciepient: reciepient) self.service.submit(params: params, success: { (response) in self.output?.show(model: response) }) { (error) in @@ -37,43 +36,51 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput } } - func getParams(model: SendMoneyRequestModel, reciepient: Recipient, userName: String) -> [String: String] { + func getParams(model: SendMoneyRequestModel, reciepient: Recipient) -> [String: String] { + let _default = UserDefaults.standard + + guard let username = _default.value(forKey: UserKeys.userId) as? String else {return [:]} + let senderId = _default.value(forKey: UserKeys.senderId) as? String + let recieverId = reciepient.recipientId + + + let params: [String: String] = [ - "user": userName, - "senderId": "353434", - "receiverId": "43434", - "deliveryMethodId": model.paymemtMode?.mode ?? "", - "pBranch": model.branch?.name ?? "", + "user": username, + "senderId": senderId ?? "", + "receiverId": recieverId ?? "", + "deliveryMethodId": model.paymemtMode?.id ?? "", + "pBranch": model.branch?.id ?? "", "pAgent": model.bank?.id ?? "", "payOutPartner": model.paymemtMode?.payoutPartner ?? "", "paymentType": "wallet", - "pCurr": model.exchangeRateDetail?.senderCurrency ?? "", + "pCurr": model.exchangeRateDetail?.reciepientCurrency ?? "", "collCurr": "KRW", "collAmt": model.exchangeRateDetail?.senderAmount ?? "", "payoutAmt": model.exchangeRateDetail?.recipientAmount ?? "", "transferAmt": model.exchangeRateDetail?.transferFee ?? "", "serviceCharge": model.exchangeRateDetail?.transferFee ?? "", "discount": "", - "exRate": model.exchangeRateDetail?.exchangeRate ?? "", + "exRate": model.exchangeRateDetail?.apiExchangeRate ?? "", "calBy": model.exchangeRateDetail?.calcBy ?? "", - "tpExRate": model.exchangeRateDetail?.exchangeRate ?? "", + "tpExRate": model.exchangeRateDetail?.apiExchangeRate ?? "", "tpPCurr": model.exchangeRateDetail?.recipientAmount ?? "", - "foreX_SESSION_ID": "", + "foreX_SESSION_ID": model.exchangeRateDetail?.forexId ?? "", "purposeOfRemittance": reciepient.reasonId ?? "", - "sourceOfFund": "", + "sourceOfFund": "123", "relWithSender": reciepient.relationId ?? "", "occupation": "", "ipAddress": "", "rState": "", "rLocation": "", - "isAgreed": "", - "txnPassword": "", + "isAgreed": "TRUE", + "txnPassword": model.transactionPassword ?? "", ] diff --git a/GMERemittance/Recipient/RecipientListViewController.swift b/GMERemittance/Recipient/RecipientListViewController.swift index 3aa84eea..e73a1c7e 100644 --- a/GMERemittance/Recipient/RecipientListViewController.swift +++ b/GMERemittance/Recipient/RecipientListViewController.swift @@ -28,7 +28,7 @@ class RecipientListViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) setupNavigation() - self.title = "Send Money" +// self.title = "Send Money" self.navigationItem.title = "Send Money" fetchReceipients() }