diff --git a/GME Remit/APIs/Router/APIRouter.swift b/GME Remit/APIs/Router/APIRouter.swift index 170db862..56fe6923 100644 --- a/GME Remit/APIs/Router/APIRouter.swift +++ b/GME Remit/APIs/Router/APIRouter.swift @@ -740,7 +740,7 @@ extension APIRouter { "AccountType": validateModel.accountType, "IssuerCode": validateModel.bank?.code ?? "", "AccountNo": validateModel.accountNumber, - "BankCode": validateModel.bank?.code ?? "", + "BankCode": validateModel.branch?.code ?? validateModel.bank?.code ?? "", "Amount": validateModel.amount, "PayoutPartner": validateModel.payoutPartner, "ProcessId": "", diff --git a/GME Remit/Models/Response/SendMoneyPaymentModeModel.swift b/GME Remit/Models/Response/SendMoneyPaymentModeModel.swift index 41eaefbc..c5c9fe9a 100644 --- a/GME Remit/Models/Response/SendMoneyPaymentModeModel.swift +++ b/GME Remit/Models/Response/SendMoneyPaymentModeModel.swift @@ -134,6 +134,7 @@ extension SendMoneyBank: TablePresenterProtocol { class SendMoneyBankBranch: Mappable { var id: String? var name: String? + var code: String? var localizedName: String? required init?(map: Map) { @@ -145,20 +146,23 @@ class SendMoneyBankBranch: Mappable { init( id: String?, name: String?, + code: String?, localizedName: String?) { self.id = id self.name = name + self.code = code self.localizedName = localizedName } func mapping(map: Map) { id <- map["Id"] name <- map["Name"] + code <- map["BranchCode"] localizedName <- map["localizedName"] } func toBranchModel() -> BranchModel { - return BranchModel(id: id, name: name, localizedName: localizedName) + return BranchModel(id: id, name: name, code: code ,localizedName: localizedName) } } diff --git a/GME Remit/Modules/ManageAgreement/Application Logic/Service/ManageAgreementService.swift b/GME Remit/Modules/ManageAgreement/Application Logic/Service/ManageAgreementService.swift index 42127992..fb0cd0f6 100644 --- a/GME Remit/Modules/ManageAgreement/Application Logic/Service/ManageAgreementService.swift +++ b/GME Remit/Modules/ManageAgreement/Application Logic/Service/ManageAgreementService.swift @@ -21,9 +21,6 @@ class ManageAgreementService: ManageAgreementServiceType { success: @escaping () -> Void, failure: @escaping (Error) -> Void ) { -// APIRouter.customerInfoAgree(flag).json(success: success, failure: failure) - // FIXME: - - success() + APIRouter.customerInfoAgree(flag).json(success: success, failure: failure) } } diff --git a/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/BranchModel.swift b/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/BranchModel.swift index 22394d19..be8d7c11 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/BranchModel.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/BranchModel.swift @@ -11,11 +11,13 @@ import ObjectMapper struct BranchModel: Mappable, RecipientCommonType { var id: String? var name: String? + var code: String? var localizedName: String? - init(id : String?, name: String?, localizedName: String?) { + init(id : String?, name: String?, code: String?, localizedName: String?) { self.id = id self.name = name + self.code = code self.localizedName = localizedName } @@ -24,11 +26,12 @@ struct BranchModel: Mappable, RecipientCommonType { mutating func mapping(map: Map) { id <- map["id"] name <- map["name"] + code <- map["BranchCode"] localizedName <- map["localizedName"] } func toSendMoneyBankBranch() -> SendMoneyBankBranch { - return SendMoneyBankBranch(id: id, name: name, localizedName: localizedName) + return SendMoneyBankBranch(id: id, name: name, code: code, localizedName: localizedName) } } diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/Application Logic/Model/Request/ValidateAccountRequest.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/Application Logic/Model/Request/ValidateAccountRequest.swift index 5999652c..d5802686 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/Application Logic/Model/Request/ValidateAccountRequest.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/Application Logic/Model/Request/ValidateAccountRequest.swift @@ -17,6 +17,7 @@ struct ValidateAccountRequest { var country: CountryAndServiceModel? var paymentMethod: PaymentServiceType? var bank: SendMoneyBank? + var branch: BranchModel? // let idType: ReceiverIdType init( @@ -29,7 +30,8 @@ struct ValidateAccountRequest { payoutPartner: String, country: CountryAndServiceModel?, paymentMethod: PaymentServiceType?, - bank: SendMoneyBank? + bank: SendMoneyBank?, + branch: BranchModel? // idType: ReceiverIdType ) { self.firstName = firstName @@ -43,5 +45,6 @@ struct ValidateAccountRequest { self.amount = amount self.processID = processID self.payoutPartner = payoutPartner + self.branch = branch } } diff --git a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift index c549197b..6b9ff4c7 100644 --- a/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift +++ b/GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift @@ -250,7 +250,8 @@ class SetupRecipientViewModel: ViewModelType { payoutPartner: self.payoutPartner ?? "", country: selectedCountry, paymentMethod: selectedPaymentMode, - bank: selectedBank + bank: selectedBank, + branch: recipient.agent?.branch ) self.presenter?.validateAccount(with: validateModel, recipient: recipient) } else { diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/User Interface/View/NewRegisterStep1ViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/User Interface/View/NewRegisterStep1ViewController.swift index 23723e34..4589e80f 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/User Interface/View/NewRegisterStep1ViewController.swift +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/NewRegisterStep1/User Interface/View/NewRegisterStep1ViewController.swift @@ -403,7 +403,7 @@ extension NewRegisterStep1ViewController { userNameTextField.rx.filterBy(.uppercaseAlphabet).disposed(by: disposeBag) emailTextField.rx.filterBy(.alphabetNumbericSpecial).disposed(by: disposeBag) - addressTextField.rx.filterBy(.alphabetNumberic).disposed(by: disposeBag) + addressTextField.rx.filterBy(.alphabet).disposed(by: disposeBag) bankAccountTextField.rx.filterBy(.numberic).disposed(by: disposeBag) passportNumberTextField.rx.filterBy(.alphabetNumberic).disposed(by: disposeBag) idNumberTextField.rx.filterBy("[0-9-]").disposed(by: disposeBag) diff --git a/GME Remit/Utilities/HotLine/Application Logic/Service/HotLineService.swift b/GME Remit/Utilities/HotLine/Application Logic/Service/HotLineService.swift index 70a18016..5df549dd 100644 --- a/GME Remit/Utilities/HotLine/Application Logic/Service/HotLineService.swift +++ b/GME Remit/Utilities/HotLine/Application Logic/Service/HotLineService.swift @@ -153,6 +153,14 @@ class HotLineService: HotLineServiceType { "remitFacebookURL": "https://www.facebook.com/gmerussia/", "loanPhoneNumber": "010-2968-6864", "loanFacebookURL": "https://www.facebook.com/GME-Loan-Uzbekistan-307204249997604/" + }, + { + "countryName": "Ukraine", + "countryCode": "ua", + "remitPhoneNumber": "010-2960-6864", + "remitFacebookURL": "https://www.facebook.com/gmerussia/", + "loanPhoneNumber": "010-2960-6864", + "loanFacebookURL": "https://www.facebook.com/GME-Loan-Uzbekistan-307204249997604/" } ] } @@ -303,6 +311,14 @@ class HotLineService: HotLineServiceType { "remitFacebookURL": "https://www.facebook.com/gmerussia/", "loanPhoneNumber": "010-2968-6864", "loanFacebookURL": "https://www.facebook.com/GME-Loan-Uzbekistan-307204249997604/" + }, + { + "countryName": "Ukraine", + "countryCode": "ua", + "remitPhoneNumber": "010-2960-6864", + "remitFacebookURL": "https://www.facebook.com/gmerussia/", + "loanPhoneNumber": "010-2960-6864", + "loanFacebookURL": "https://www.facebook.com/GME-Loan-Uzbekistan-307204249997604/" } ] }