From cea4d0e32401f792b9b1deed0becaa3057f25de9 Mon Sep 17 00:00:00 2001 From: james Date: Wed, 29 May 2019 13:45:12 +0900 Subject: [PATCH] add deliveryMethodId field at SendMoneyAccountValidationRequestModel --- GMERemittance/AppDelegate.swift | 2 +- .../Model/SendMoneyAccountValidationRequestModel.swift | 1 + .../Presenter/SendMoneyPaymentModePresenter.swift | 4 +++- .../View/SendMoneyPaymentModeViewController.swift | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/GMERemittance/AppDelegate.swift b/GMERemittance/AppDelegate.swift index d2dd46d0..e3800e6f 100644 --- a/GMERemittance/AppDelegate.swift +++ b/GMERemittance/AppDelegate.swift @@ -20,7 +20,7 @@ import IQKeyboardManagerSwift import LGSideMenuController import Localize_Swift -let server: Server = .uat +let server: Server = .uat2 var overlayView: UIView? @UIApplicationMain diff --git a/GMERemittance/Model/SendMoneyAccountValidationRequestModel.swift b/GMERemittance/Model/SendMoneyAccountValidationRequestModel.swift index 782c9ddd..64fc6ac6 100644 --- a/GMERemittance/Model/SendMoneyAccountValidationRequestModel.swift +++ b/GMERemittance/Model/SendMoneyAccountValidationRequestModel.swift @@ -39,4 +39,5 @@ class SendMoneyAccountValidationRequestModel { var processId: String? var BankId: String? var ReceiverCountryId: String? + var deliveryMethodId: String? } diff --git a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift index 2dc6c2ff..27e9c244 100644 --- a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift +++ b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift @@ -47,7 +47,8 @@ extension SendMoneyPaymentModePresenter: SendMoneyPaymentModeModuleInterface { "PayoutPartner": model.payoutPartner ?? "", "ProcessId": model.processId ?? "", "BankId": model.BankId ?? "", - "ReceiverCountryId": model.ReceiverCountryId ?? "" + "ReceiverCountryId": model.ReceiverCountryId ?? "", + "deliveryMethodId": model.deliveryMethodId ?? "" ] self.interactor?.validateAccountNumber(params: params) @@ -69,6 +70,7 @@ extension SendMoneyPaymentModePresenter: SendMoneyPaymentModeInteractorOutput { } func success() { + self.view?.hideLoading() self.view?.success() } } diff --git a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift index 695f7403..18083734 100644 --- a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift +++ b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift @@ -221,6 +221,8 @@ class SendMoneyPaymentModeViewController: UIViewController { validationRequest.processId = "" validationRequest.BankId = self.selectedBank?.id validationRequest.ReceiverCountryId = self.recipient?.countryId + validationRequest.deliveryMethodId = self.selectedPayoutMode?.id + //TODO callingApi = true self.presenter?.validate(model: validationRequest)