1. changed account validation parameter

2. changed address filter option as only use alphabet
3. added Ukraine cs information

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": "",

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)
   }
 }
 

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)
   }
 }

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)
   }
 }
 

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
   }
 }

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 {

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)

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/"
             }
         ]
     }