Browse Source

Merge branch 'send-money-module' into addMain

pull/1/head
gme_2 6 years ago
parent
commit
5295b51c07
  1. 1
      GMERemittance/Model/SendMoneyAccountValidationRequestModel.swift
  2. 2
      GMERemittance/Model/SendMoneyPaymentModeModel.swift
  3. 1
      GMERemittance/Module/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift
  4. 7
      GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift

1
GMERemittance/Model/SendMoneyAccountValidationRequestModel.swift

@ -25,6 +25,7 @@ import Foundation
class SendMoneyAccountValidationRequestModel { class SendMoneyAccountValidationRequestModel {
var idType: String? var idType: String?
var idNumber: String? var idNumber: String?
var amount: String?
var customerFirstName: String? var customerFirstName: String?
var customerLastName: String? var customerLastName: String?
var reciverFirstName: String? var reciverFirstName: String?

2
GMERemittance/Model/SendMoneyPaymentModeModel.swift

@ -78,6 +78,7 @@ class SendMoneyBank: Mappable {
var accountRequired: String? var accountRequired: String?
var accountValidationRequired: String? var accountValidationRequired: String?
var payCurrency: [String]? var payCurrency: [String]?
var code: String?
required init?(map: Map) { required init?(map: Map) {
@ -91,6 +92,7 @@ class SendMoneyBank: Mappable {
accountValidationRequired <- map["IsAccountValidation"] accountValidationRequired <- map["IsAccountValidation"]
payCurrency <- map["PayCurrency"] payCurrency <- map["PayCurrency"]
branches <- map["BranchList"] branches <- map["BranchList"]
code <- map["Code"]
} }
} }

1
GMERemittance/Module/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift

@ -43,6 +43,7 @@ extension SendMoneyPaymentModePresenter: SendMoneyPaymentModeModuleInterface {
"IssuerCode": model.issuerCode ?? "", "IssuerCode": model.issuerCode ?? "",
"AccountNo": model.accountNo ?? "", "AccountNo": model.accountNo ?? "",
"BankCode": model.bankCode ?? "", "BankCode": model.bankCode ?? "",
"Amount": model.amount ?? "",
"PayoutPartner": model.payoutPartner ?? "", "PayoutPartner": model.payoutPartner ?? "",
"ProcessId": model.processId ?? "" "ProcessId": model.processId ?? ""
] ]

7
GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift

@ -172,11 +172,12 @@ class SendMoneyPaymentModeViewController: UIViewController {
validationRequest.reciverFirstName = self.recipient?.firstName validationRequest.reciverFirstName = self.recipient?.firstName
validationRequest.reciverLastName = self.recipient?.lastName validationRequest.reciverLastName = self.recipient?.lastName
validationRequest.country = self.recipient?.countryId validationRequest.country = self.recipient?.countryId
validationRequest.accountType = "i" // saving account, current account type ko
validationRequest.issuerCode = self.selectedBank?.id
validationRequest.accountType = "1" // saving account, current account type ko
validationRequest.issuerCode = self.selectedBank?.code
validationRequest.accountNo = self.accountTextField.text! validationRequest.accountNo = self.accountTextField.text!
validationRequest.bankCode = self.selectedBank?.id
validationRequest.bankCode = self.selectedBank?.code
validationRequest.payoutPartner = self.selectedPayoutMode?.payoutPartner validationRequest.payoutPartner = self.selectedPayoutMode?.payoutPartner
validationRequest.amount = "0.0"
validationRequest.processId = "" validationRequest.processId = ""
callingApi = true callingApi = true
self.presenter?.validate(model: validationRequest) self.presenter?.validate(model: validationRequest)

Loading…
Cancel
Save