Browse Source

apply recipient list ui

pull/1/head
InKwon James Kim 5 years ago
parent
commit
b063b1160f
  1. 28
      GME Remit.xcodeproj/project.pbxproj
  2. 3
      GME Remit/Models/Request/SendMoneyAccountValidationRequestModel.swift
  3. 3
      GME Remit/Models/Response/AccountEx.swift
  4. 7
      GME Remit/Models/Response/ReciepientEx.swift
  5. 29
      GME Remit/Models/Response/ResponseContainerWithArray.swift
  6. 2
      GME Remit/Modules/AutoDebitModules/AutoDebit/Application Logic/Service/AutoDebitService.swift
  7. 15
      GME Remit/Modules/RecipientModules/AddReciepient/User Interface/Presenter/AddReciepientPresenter.swift
  8. 5
      GME Remit/Modules/RecipientModules/AddReciepient/User Interface/View/AddReciepientViewController.swift
  9. 42
      GME Remit/Modules/RecipientModules/EditReciepient/User Interface/Presenter/EditReciepientPresenter.swift
  10. 3
      GME Remit/Modules/RecipientModules/EditReciepient/User Interface/Presenter/EditRecipientRecipientViewModel.swift
  11. 8
      GME Remit/Modules/RecipientModules/EditReciepient/User Interface/View/EditReciepientViewController.swift
  12. 28
      GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractor.swift
  13. 2
      GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Account/AccountModel.swift
  14. 8
      GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/FetchRecipientsModel.swift
  15. 132
      GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/Recipient.swift
  16. 27
      GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/RecipientModel.swift
  17. 2
      GME Remit/Modules/RecipientModules/Recipients/Application Logic/Service/RecipientsService.swift
  18. 21
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/RecipientCell.swift
  19. 106
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
  20. 8
      GME Remit/Modules/SendMoneyModules/ResendExchange/User Interface/View/ResendExchangeViewController.swift
  21. 2
      GME Remit/Modules/SendMoneyModules/SendMoneyCode/Application Logic/Interactor/SendMoneyCodeInteractor.swift
  22. 2
      GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
  23. 2
      GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/Application Logic/Interactor/SendMoneyPaymentModeInteractor.swift
  24. 5
      GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift
  25. 5
      GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift
  26. 8
      GME Remit/Modules/SendMoneyModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift
  27. 4
      GME Remit/Modules/SendMoneyModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift

28
GME Remit.xcodeproj/project.pbxproj

@ -25,7 +25,7 @@
04546C4120329A36007EFE15 /* AboutGMEViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04546C4020329A36007EFE15 /* AboutGMEViewController.swift */; };
045976B221A3D8F30001E92A /* AutoRefundsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045976B121A3D8F30001E92A /* AutoRefundsViewController.swift */; };
045976B421A3D90A0001E92A /* autoRefund.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 045976B321A3D90A0001E92A /* autoRefund.storyboard */; };
0470301221CA4BD000B6C9C3 /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0470301121CA4BD000B6C9C3 /* Account.swift */; };
0470301221CA4BD000B6C9C3 /* AccountEx.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0470301121CA4BD000B6C9C3 /* AccountEx.swift */; };
0496B8481FE7DFA20044810E /* RestApiManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0496B8451FE7DFA10044810E /* RestApiManager.swift */; };
0496B84E1FE7DFCD0044810E /* UIViewController+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0496B84C1FE7DFCC0044810E /* UIViewController+Ext.swift */; };
0496B84F1FE7DFCD0044810E /* String+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0496B84D1FE7DFCD0044810E /* String+Ext.swift */; };
@ -308,9 +308,8 @@
73B4C8C522A5F2440078D495 /* CouponCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B4C8B922A5F2430078D495 /* CouponCell.swift */; };
73B4C8C622A5F2440078D495 /* SelectCouponViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B4C8BA22A5F2430078D495 /* SelectCouponViewController.swift */; };
73B4C8C722A5F2440078D495 /* SelectCouponViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B4C8BB22A5F2430078D495 /* SelectCouponViewInterface.swift */; };
73B6D6822306361400A0CB6E /* ResponseContainerWithArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D6812306361400A0CB6E /* ResponseContainerWithArray.swift */; };
73B6D68423063DFD00A0CB6E /* ResponseContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D68323063DFD00A0CB6E /* ResponseContainer.swift */; };
73B6D68623063F7D00A0CB6E /* RecipientModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D68523063F7D00A0CB6E /* RecipientModel.swift */; };
73B6D68623063F7D00A0CB6E /* Recipient.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D68523063F7D00A0CB6E /* Recipient.swift */; };
73B6D6882306402200A0CB6E /* PaymentMethodModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D6872306402200A0CB6E /* PaymentMethodModel.swift */; };
73B6D68A2306406D00A0CB6E /* AgentModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D6892306406D00A0CB6E /* AgentModel.swift */; };
73B6D68C230640D400A0CB6E /* BranchModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73B6D68B230640D400A0CB6E /* BranchModel.swift */; };
@ -410,7 +409,7 @@
D90A9D65213696E400A96E45 /* BankPickerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90A9D62213696E400A96E45 /* BankPickerCell.swift */; };
D90A9D66213696E400A96E45 /* BankPickerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90A9D63213696E400A96E45 /* BankPickerViewController.swift */; };
D90A9D67213696E400A96E45 /* BankPicker.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D90A9D64213696E400A96E45 /* BankPicker.storyboard */; };
D90D55B121326DA800EEEE04 /* Reciepient.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90D55B021326DA800EEEE04 /* Reciepient.swift */; };
D90D55B121326DA800EEEE04 /* ReciepientEx.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90D55B021326DA800EEEE04 /* ReciepientEx.swift */; };
D90D55CB21327CD600EEEE04 /* AddReciepientModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90D55B821327CD600EEEE04 /* AddReciepientModuleInterface.swift */; };
D90D55CC21327CD600EEEE04 /* AddReciepientServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90D55BB21327CD600EEEE04 /* AddReciepientServiceType.swift */; };
D90D55CD21327CD600EEEE04 /* AddReciepientService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D90D55BC21327CD600EEEE04 /* AddReciepientService.swift */; };
@ -2260,7 +2259,7 @@
04546C4020329A36007EFE15 /* AboutGMEViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutGMEViewController.swift; sourceTree = "<group>"; };
045976B121A3D8F30001E92A /* AutoRefundsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AutoRefundsViewController.swift; sourceTree = "<group>"; };
045976B321A3D90A0001E92A /* autoRefund.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = autoRefund.storyboard; sourceTree = "<group>"; };
0470301121CA4BD000B6C9C3 /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = "<group>"; };
0470301121CA4BD000B6C9C3 /* AccountEx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountEx.swift; sourceTree = "<group>"; };
0496B8451FE7DFA10044810E /* RestApiManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RestApiManager.swift; sourceTree = "<group>"; };
0496B84C1FE7DFCC0044810E /* UIViewController+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIViewController+Ext.swift"; sourceTree = "<group>"; };
0496B84D1FE7DFCD0044810E /* String+Ext.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "String+Ext.swift"; sourceTree = "<group>"; };
@ -2548,9 +2547,8 @@
73B4C8B922A5F2430078D495 /* CouponCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CouponCell.swift; sourceTree = "<group>"; };
73B4C8BA22A5F2430078D495 /* SelectCouponViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectCouponViewController.swift; sourceTree = "<group>"; };
73B4C8BB22A5F2430078D495 /* SelectCouponViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SelectCouponViewInterface.swift; sourceTree = "<group>"; };
73B6D6812306361400A0CB6E /* ResponseContainerWithArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseContainerWithArray.swift; sourceTree = "<group>"; };
73B6D68323063DFD00A0CB6E /* ResponseContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResponseContainer.swift; sourceTree = "<group>"; };
73B6D68523063F7D00A0CB6E /* RecipientModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RecipientModel.swift; sourceTree = "<group>"; };
73B6D68523063F7D00A0CB6E /* Recipient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Recipient.swift; sourceTree = "<group>"; };
73B6D6872306402200A0CB6E /* PaymentMethodModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentMethodModel.swift; sourceTree = "<group>"; };
73B6D6892306406D00A0CB6E /* AgentModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AgentModel.swift; sourceTree = "<group>"; };
73B6D68B230640D400A0CB6E /* BranchModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BranchModel.swift; sourceTree = "<group>"; };
@ -2661,7 +2659,7 @@
D90A9D62213696E400A96E45 /* BankPickerCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BankPickerCell.swift; sourceTree = "<group>"; };
D90A9D63213696E400A96E45 /* BankPickerViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BankPickerViewController.swift; sourceTree = "<group>"; };
D90A9D64213696E400A96E45 /* BankPicker.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = BankPicker.storyboard; sourceTree = "<group>"; };
D90D55B021326DA800EEEE04 /* Reciepient.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Reciepient.swift; sourceTree = "<group>"; };
D90D55B021326DA800EEEE04 /* ReciepientEx.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReciepientEx.swift; sourceTree = "<group>"; };
D90D55B821327CD600EEEE04 /* AddReciepientModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddReciepientModuleInterface.swift; sourceTree = "<group>"; };
D90D55BB21327CD600EEEE04 /* AddReciepientServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddReciepientServiceType.swift; sourceTree = "<group>"; };
D90D55BC21327CD600EEEE04 /* AddReciepientService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddReciepientService.swift; sourceTree = "<group>"; };
@ -6326,7 +6324,7 @@
isa = PBXGroup;
children = (
73B6D68323063DFD00A0CB6E /* ResponseContainer.swift */,
0470301121CA4BD000B6C9C3 /* Account.swift */,
0470301121CA4BD000B6C9C3 /* AccountEx.swift */,
04DC27EB21A51E29003714F5 /* AutoRefund.swift */,
D962231D212C126500B7A115 /* ExchangeModel.swift */,
D9E57944212E938D00D47AC0 /* ExchangeRateDetailModel.swift */,
@ -6334,7 +6332,7 @@
D94173B2214B40ED00D04BE5 /* KycModel.swift */,
D9535CCB2150C14700EDFCD2 /* KYCResponseModel.swift */,
73168A1E22F3CC4B00878038 /* NativeCountry.swift */,
D90D55B021326DA800EEEE04 /* Reciepient.swift */,
D90D55B021326DA800EEEE04 /* ReciepientEx.swift */,
D97D58D62240D34900EFB27E /* ResendDetail.swift */,
D9D2242A22407EBA00C7313D /* ResendListModel.swift */,
D92C24A621477EA600F6876F /* ResponseMessage.swift */,
@ -6347,7 +6345,6 @@
D97785AB215DD23400754079 /* TransactionModel.swift */,
D9768C87213BAE92009E01BC /* User.swift */,
D96BD1202164828D00DFE7D8 /* WalletStatement.swift */,
73B6D6812306361400A0CB6E /* ResponseContainerWithArray.swift */,
);
path = Response;
sourceTree = "<group>";
@ -6554,7 +6551,7 @@
73B6D68F230642CA00A0CB6E /* Recipient */ = {
isa = PBXGroup;
children = (
73B6D68523063F7D00A0CB6E /* RecipientModel.swift */,
73B6D68523063F7D00A0CB6E /* Recipient.swift */,
73B6D6872306402200A0CB6E /* PaymentMethodModel.swift */,
73B6D6892306406D00A0CB6E /* AgentModel.swift */,
73B6D68B230640D400A0CB6E /* BranchModel.swift */,
@ -14281,9 +14278,8 @@
D9DC108121639078008F3C51 /* MessageComposeViewInterface.swift in Sources */,
73168A1F22F3CC4C00878038 /* NativeCountry.swift in Sources */,
73B4C8BE22A5F2440078D495 /* SelectCouponService.swift in Sources */,
73B6D6822306361400A0CB6E /* ResponseContainerWithArray.swift in Sources */,
739A7781228BB2B40018A1A9 /* DetailOrderModuleInterface.swift in Sources */,
73B6D68623063F7D00A0CB6E /* RecipientModel.swift in Sources */,
73B6D68623063F7D00A0CB6E /* Recipient.swift in Sources */,
FF6E7D9621BF951D00A003B9 /* AppUpdateViewInterface.swift in Sources */,
73210DB522FC01C200715D6C /* RecipientCell.swift in Sources */,
7301978C22535135001954AB /* KycService.swift in Sources */,
@ -14622,7 +14618,7 @@
D945F11F213E1D5100A24824 /* SendMoneyReceiptServiceType.swift in Sources */,
D96BD117216479E200DFE7D8 /* WalletStatementService.swift in Sources */,
D922D9262134DCF000D43053 /* EditReciepientViewInterface.swift in Sources */,
D90D55B121326DA800EEEE04 /* Reciepient.swift in Sources */,
D90D55B121326DA800EEEE04 /* ReciepientEx.swift in Sources */,
D9790625223F58420025BD5B /* ResendViewController.swift in Sources */,
73FE883A228A4A8C00A5EB56 /* OrderHistoryInteractorIO.swift in Sources */,
D950BED821549242008367A1 /* HomeWireframe.swift in Sources */,
@ -14673,7 +14669,7 @@
73FE883E228A4A8C00A5EB56 /* OrderHistoryWireframeInput.swift in Sources */,
D950BED521549242008367A1 /* HomeInteractor.swift in Sources */,
D96BD11F216479E200DFE7D8 /* WalletStatementViewController.swift in Sources */,
0470301221CA4BD000B6C9C3 /* Account.swift in Sources */,
0470301221CA4BD000B6C9C3 /* AccountEx.swift in Sources */,
D94173B3214B40ED00D04BE5 /* KycModel.swift in Sources */,
73BCCDD3228993040057B161 /* RewardGroupInteractorIO.swift in Sources */,
D95B7047213FB5F10053CC3D /* WebLinksViewController.swift in Sources */,

3
GME Remit/Models/Request/SendMoneyAccountValidationRequestModel.swift

@ -15,7 +15,8 @@ class SendMoneyAccountValidationRequestModel {
var customerFirstName: String?
var customerLastName: String?
var reciverFirstName: String?
var reciverLastName: String?
var reciverLastName1: String?
var reciverLastName2: String?
var country: String?
var accountType: String?
var issuerCode: String?

3
GME Remit/Models/Response/Account.swift → GME Remit/Models/Response/AccountEx.swift

@ -27,8 +27,7 @@ class KftcAccountContainer: Mappable {
}
}
class Account: Mappable {
class AccountEx: Mappable {
var errorCode: String?
var accessToken: String?
var tokenType: String?

7
GME Remit/Models/Response/Reciepient.swift → GME Remit/Models/Response/ReciepientEx.swift

@ -36,7 +36,8 @@ class ReceipientViewModel {
var id: String?
var firstName: String?
var middleName: String?
var lastName: String?
var lastName1: String?
var lastName2: String?
var countryId: String?
var stateId: String?
var districtId: String?
@ -51,7 +52,7 @@ class ReceipientViewModel {
var idType: String?
}
struct Recipient: Codable, Mappable {
struct RecipientEx: Codable, Mappable {
var firstName: String?
var middleName: String?
var lastName: String?
@ -116,7 +117,7 @@ struct Recipient: Codable, Mappable {
init() {}
}
extension Recipient: Serializer {
extension RecipientEx: Serializer {
func serialize() -> [String : String] {
var dict: [String: String] = [:]
dict[RecipientModelFields.firstName] = self.firstName ?? ""

29
GME Remit/Models/Response/ResponseContainerWithArray.swift

@ -1,29 +0,0 @@
//
// ResponseContainer.swift
// GME Remit
//
// Created by InKwon James Kim on 16/08/2019.
// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
import ObjectMapper
struct ResponseContainerWithArray: Mappable {
var errorCode: String?
var message: String?
var id: String?
var extra: String?
var extra2: String?
var data: [Mappable]?
init?(map: Map) {}
mutating func mapping(map: Map) {
errorCode <- map["ErrorCode"]
message <- map["Msg"]
id <- map["Id"]
extra <- map["Extra"]
extra2 <- map["Extra2"]
data <- map["Data"]
}
}

2
GME Remit/Modules/AutoDebitModules/AutoDebit/Application Logic/Service/AutoDebitService.swift

@ -48,7 +48,7 @@ class AutoDebitService: AutoDebitServiceType {
success: @escaping () -> Void,
failure: @escaping (Error) -> Void
) {
APIRouter.deleteAutoDebitAccount(username: username, kftcLogID: account.kftcLogId ?? "")
APIRouter.deleteAutoDebitAccount(username: username, kftcLogID: account.kftcAccountId ?? "")
.request(
success: { (response: KftcAccountContainer) in
if (response.errorCode ?? "") == "1" {

15
GME Remit/Modules/RecipientModules/AddReciepient/User Interface/Presenter/AddReciepientPresenter.swift

@ -80,15 +80,16 @@ class AddReciepientPresenter {
var reciepient = Recipient()
reciepient.firstName = model.firstName
reciepient.middleName = model.middleName
reciepient.lastName = model.lastName
reciepient.countryId = model.countryId
reciepient.stateId = model.stateId
reciepient.districtId = model.districtId
reciepient.lastName1 = model.lastName1
reciepient.lastName2 = model.lastName2
reciepient.countryID = model.countryId
reciepient.stateID = model.stateId
reciepient.districtID = model.districtId
reciepient.city = model.city
reciepient.address = model.address
reciepient.relationId = model.relationId
reciepient.reasonId = model.reasonId
reciepient.mobileNumber = model.mobileNumber
reciepient.relationshipID = model.relationId
reciepient.purposeOfRemitID = model.reasonId
reciepient.mobile = model.mobileNumber
reciepient.email = model.email
reciepient.idType = model.idType
reciepient.idNumber = model.idNumber

5
GME Remit/Modules/RecipientModules/AddReciepient/User Interface/View/AddReciepientViewController.swift

@ -277,8 +277,9 @@ class AddReciepientViewController: UIViewController {
self.reciepient?.firstName = firstNameTextField.text
case middleNameTextField:
self.reciepient?.middleName = middleNameTextField.text
case lastNameTextField:
self.reciepient?.lastName = lastNameTextField.text
case lastNameTextField: ()
//FIXME
// self.reciepient?.lastName1 = lastNameTextField.text
case cityTextField:
self.reciepient?.city = cityTextField.text
case addressTextField:

42
GME Remit/Modules/RecipientModules/EditReciepient/User Interface/Presenter/EditReciepientPresenter.swift

@ -79,23 +79,24 @@ class EditReciepientPresenter {
func convert(model: EditRecipientRecipientViewModel) {
var reciepient = Recipient()
reciepient.recipientId = model.id
reciepient.id = model.id
reciepient.firstName = model.firstName
reciepient.middleName = model.middleName
reciepient.lastName = model.lastName
reciepient.countryId = model.countryId
reciepient.lastName1 = model.lastName1
reciepient.lastName2 = model.lastName2
reciepient.countryID = model.countryId
reciepient.country = model.country
reciepient.stateId = model.stateId
reciepient.stateID = model.stateId
reciepient.state = model.state
reciepient.district = model.district
reciepient.districtId = model.districtId
reciepient.districtID = model.districtId
reciepient.city = model.city
reciepient.address = model.address
reciepient.relation = model.relation
reciepient.relationId = model.relationId
reciepient.reason = model.reason
reciepient.reasonId = model.reasonId
reciepient.mobileNumber = model.mobileNumber
reciepient.relationship = model.relation
reciepient.relationshipID = model.relationId
reciepient.purposeOfRemit = model.reason
reciepient.purposeOfRemitID = model.reasonId
reciepient.mobile = model.mobileNumber
reciepient.email = model.email
reciepient.idType = model.idType
reciepient.idNumber = model.idNumber
@ -104,24 +105,25 @@ class EditReciepientPresenter {
func convert(model: Recipient) {
let reciepient = EditRecipientRecipientViewModel()
reciepient.id = model.recipientId
reciepient.id = model.id
reciepient.firstName = model.firstName
reciepient.middleName = model.middleName
reciepient.lastName = model.lastName
reciepient.lastName1 = model.lastName1
reciepient.lastName2 = model.lastName2
reciepient.country = model.country
reciepient.countryId = model.countryId
reciepient.countryId = model.countryID
reciepient.state = model.state
reciepient.stateId = model.stateId
reciepient.stateId = model.stateID
reciepient.city = model.city
reciepient.address = model.address
reciepient.relation = model.relation
reciepient.relationId = model.relationId
reciepient.reason = model.reason
reciepient.reasonId = model.reasonId
reciepient.mobileNumber = model.mobileNumber
reciepient.relation = model.relationship
reciepient.relationId = model.relationshipID
reciepient.reason = model.purposeOfRemit
reciepient.reasonId = model.purposeOfRemitID
reciepient.mobileNumber = model.mobile
reciepient.email = model.email
reciepient.district = model.district
reciepient.districtId = model.districtId
reciepient.districtId = model.districtID
reciepient.idType = model.idType
reciepient.idNumber = model.idNumber

3
GME Remit/Modules/RecipientModules/EditReciepient/User Interface/Presenter/EditRecipientRecipientViewModel.swift

@ -12,7 +12,8 @@ class EditRecipientRecipientViewModel {
var id: String?
var firstName: String?
var middleName: String?
var lastName: String?
var lastName1: String?
var lastName2: String?
var country: String?
var state: String?
var stateId: String?

8
GME Remit/Modules/RecipientModules/EditReciepient/User Interface/View/EditReciepientViewController.swift

@ -265,8 +265,9 @@ class EditReciepientViewController: UIViewController {
self.reciepient?.firstName = firstNameTextField.text!
case middleNameTextField:
self.reciepient?.middleName = middleNameTextField.text!
case lastNameTextField:
self.reciepient?.lastName = lastNameTextField.text!
case lastNameTextField: ()
//FIXME
// self.reciepient?.lastName = lastNameTextField.text!
case cityTextField:
self.reciepient?.city = cityTextField.text!
case addressTextField:
@ -285,7 +286,8 @@ class EditReciepientViewController: UIViewController {
private func populateInformations() {
self.firstNameTextField.text = self.reciepient?.firstName
self.middleNameTextField.text = self.reciepient?.middleName
self.lastNameTextField.text = self.reciepient?.lastName
//FIXME
// self.lastNameTextField.text = self.reciepient?.lastName
let relation = self.relations?.filter({
$0.title == self.reciepient?.relation

28
GME Remit/Modules/RecipientModules/Recipients/Application Logic/Interactor/RecipientsInteractor.swift

@ -27,18 +27,26 @@ class RecipientsInteractor {
extension RecipientsInteractor: RecipientsInteractorInput {
func fetchRecipients() {
let myUsername = GMEDB.shared.user.string(.userId) ?? ""
service.fetchReciepientList(
username: myUsername,
success: { (recipients) in
self.output?.setRecipients(using: recipients?.reciepients ?? [])
self.output?.setAccounts(using: recipients?.accounts ?? [])
service.fetchRecipients(
success: {
self.output?.setRecipients(using: $0.recipients ?? [])
self.output?.setAccounts(using: $0.accounts ?? [])
},
failure: {
self.output?.setError(with: $0)
}
failure: { self.output?.setError(with:$0) }
)
// let myUsername = GMEDB.shared.user.string(.userId) ?? ""
// service.fetchReciepientList(
// username: myUsername,
// success: { (recipients) in
// self.output?.setRecipients(using: recipients?.reciepients ?? [])
// self.output?.setAccounts(using: recipients?.accounts ?? [])
// },
// failure: {
// self.output?.setError(with: $0)
// }
// )
}
func deleteRecipient(who recipient: Recipient) {

2
GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Account/AccountModel.swift

@ -8,7 +8,7 @@
import ObjectMapper
struct AccountModel: Mappable {
struct Account: Mappable {
var kftcAccountId: String?
var accessToken: String?
var tokenType: String?

8
GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/FetchRecipientsModel.swift

@ -9,12 +9,10 @@
import ObjectMapper
struct FetchRecipientsModel: Mappable {
var recipients: [RecipientModel]?
var accounts: [AccountModel]?
var recipients: [Recipient]?
var accounts: [Account]?
init?(map: Map) {
print("data set")
}
init?(map: Map) {}
mutating func mapping(map: Map) {
recipients <- map["Receivers"]

132
GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/Recipient.swift

@ -0,0 +1,132 @@
//
// RecipientModel.swift
// GME Remit
//
// Created by InKwon James Kim on 16/08/2019.
// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
import ObjectMapper
struct Recipient: Mappable {
var firstName: String?
var middleName: String?
var lastName1: String?
var lastName2: String?
var localFirstName: String?
var localMiddleName: String?
var localLastName1: String?
var localLastName2: String?
var id: String?
var name: String?
var localizedName: String?
var paymentMethod: PaymentMethodModel?
var agent: AgentModel?
var receiverID: String?
var membershipID: String?
var country: String?
var countryCode: String?
var countryID: String?
var address: String?
var state: String?
var stateID: String?
var zipCode: String?
var city: String?
var email: String?
var homePhone: String?
var workPhone: String?
var mobile: String?
var relationship: String?
var relationshipID: String?
var district: String?
var districtID: String?
var purposeOfRemit: String?
var purposeOfRemitID: String?
var fullName: String?
var idType: String?
var idNumber: String?
init?(map: Map) {}
init() {}
mutating func mapping(map: Map) {
firstName <- map["firstName"]
middleName <- map["middleName"]
lastName1 <- map["lastName1"]
lastName2 <- map["lastName2"]
localFirstName <- map["localFirstName"]
localMiddleName <- map["localMiddleName"]
localLastName1 <- map["localLastName1"]
localLastName2 <- map["localLastName2"]
id <- map["id"]
name <- map["name"]
localizedName <- map["localizedName"]
paymentMethod <- map["paymentMethod"]
agent <- map["agent"]
receiverID <- map["receiverId"]
membershipID <- map["membershipId"]
country <- map["country"]
address <- map["address"]
state <- map["state"]
zipCode <- map["zipCode"]
city <- map["city"]
email <- map["email"]
homePhone <- map["homePhone"]
workPhone <- map["workPhone"]
mobile <- map["mobile"]
relationship <- map["relationship"]
district <- map["district"]
purposeOfRemit <- map["purposeOfRemit"]
fullName <- map["fullName"]
idType <- map["idType"]
idNumber <- map["idNumber"]
stateID <- map["stateId"]
countryCode <- map["countryCode"]
countryID <- map["countryId"]
relationshipID <- map["relationshipId"]
districtID <- map["districtId"]
purposeOfRemitID <- map["purposeOfRemitId"]
}
func serialize() -> [String : String] {
return [
"firstName": firstName ?? "",
"middleName": middleName ?? "",
"lastName1": lastName1 ?? "",
"lastName2": lastName2 ?? "",
"localFirstName": localFirstName ?? "",
"localMiddleName": localMiddleName ?? "",
"localLastName1": localLastName1 ?? "",
"localLastName2": localLastName2 ?? "",
"id": id ?? "",
"name": name ?? "",
"localizedName": localizedName ?? "",
// "paymentMethod": paymentMethod ?? "",
// "agent": agent ?? "",
"receiverId": receiverID ?? "",
"membershipId": membershipID ?? "",
"country": country ?? "",
"address": address ?? "",
"state": state ?? "",
"zipCode": zipCode ?? "",
"city": city ?? "",
"email": email ?? "",
"homePhone": homePhone ?? "",
"workPhone": workPhone ?? "",
"mobile": mobile ?? "",
"relationship": relationship ?? "",
"district": district ?? "",
"purposeOfRemit": purposeOfRemit ?? "",
"fullName": fullName ?? "",
"idType": idType ?? "",
"idNumber": idNumber ?? "",
"stateId": stateID ?? "",
"countryCode": countryCode ?? "",
"countryId": countryID ?? "",
"relationshipId": relationshipID ?? "",
"districtId": districtID ?? "",
"purposeOfRemitId": purposeOfRemitID ?? "",
]
}
}

27
GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/RecipientModel.swift

@ -1,27 +0,0 @@
//
// RecipientModel.swift
// GME Remit
//
// Created by InKwon James Kim on 16/08/2019.
// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved.
//
import ObjectMapper
struct RecipientModel: Mappable {
var id: String?
var name: String?
var localizedName: String?
var paymentMethod: PaymentMethodModel?
var agent: AgentModel?
init?(map: Map) {}
mutating func mapping(map: Map) {
id <- map["id"]
name <- map["name"]
localizedName <- map["localizedName"]
paymentMethod <- map["paymentMethod"]
agent <- map["agent"]
}
}

2
GME Remit/Modules/RecipientModules/Recipients/Application Logic/Service/RecipientsService.swift

@ -51,7 +51,7 @@ class RecipientsService: RecipientsServiceType {
success: @escaping () -> Void,
failure: @escaping (Error) -> Void
) {
let url = baseUrl + "/mobile/receiver/remove/" + username + "/?receiverId=\(reciepient.recipientId ?? "")"
let url = baseUrl + "/mobile/receiver/remove/" + username + "/?receiverId=\(reciepient.id ?? "")"
auth.request(
method: .post,

21
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/RecipientCell.swift

@ -10,15 +10,22 @@ import UIKit
class RecipientCell: UITableViewCell {
@IBOutlet weak var labelInitial: UILabel!
@IBOutlet weak var labelRecipientName: UILabel!
@IBOutlet private weak var countryFlagImageView: UIImageView!
@IBOutlet private weak var labelRecipientName: UILabel!
@IBOutlet private weak var paymentMethodNameLabel: UILabel!
@IBOutlet private weak var agentNameLabel: UILabel!
@IBOutlet private weak var branchNameLabel: UILabel!
@IBOutlet private weak var agentAccountLabel: UILabel!
func setModel(with model: Recipient?) {
let name = model?.getFullName()
labelRecipientName.text = name
labelInitial.text = name?.prefix(1).uppercased()
labelInitial.layer.cornerRadius = labelInitial.frame.size.width/2
labelInitial.backgroundColor = UIColor.init(hex: "#DE333C")
let country = CountryEnum(rawValue: model?.countryCode?.lowercased() ?? "")
countryFlagImageView.image = country?.flag
labelRecipientName.text = model?.localizedName
paymentMethodNameLabel.text = model?.paymentMethod?.localizedName
agentNameLabel.text = model?.agent?.localizedName
branchNameLabel.text = model?.agent?.branch?.localizedName
agentAccountLabel.text = model?.agent?.accountNumber
layer.borderColor = UIColor(red:0.91, green:0.93, blue:0.95, alpha:1.0).cgColor
layer.borderWidth = 1

106
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard

@ -10,6 +10,9 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="SanFranciscoDisplay-Medium.otf">
<string>SanFranciscoDisplay-Medium</string>
</array>
<array key="SanFranciscoDisplay-Regular.otf">
<string>SanFranciscoDisplay-Regular</string>
</array>
@ -34,7 +37,7 @@
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Recipient" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wj9-qf-u2U">
<rect key="frame" x="77" y="30" width="261" height="20.5"/>
<rect key="frame" x="77" y="30" width="261" height="20"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -57,48 +60,80 @@
</connections>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="vEB-d2-zNF">
<rect key="frame" x="10" y="143.5" width="355" height="474.5"/>
<rect key="frame" x="10" y="143" width="355" height="475"/>
<color key="backgroundColor" red="0.90588235289999997" green="0.92941176469999998" blue="0.94901960780000005" alpha="1" colorSpace="calibratedRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="RecipientCell" rowHeight="80" id="hGj-Pf-Qj3" customClass="RecipientCell" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="355" height="80"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="RecipientCell" rowHeight="120" id="hGj-Pf-Qj3" customClass="RecipientCell" customModule="GME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="28" width="355" height="120"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="hGj-Pf-Qj3" id="sz3-Ck-jnS">
<rect key="frame" x="0.0" y="0.0" width="355" height="80"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="120"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FsO-FW-udC">
<rect key="frame" x="0.0" y="0.0" width="355" height="80"/>
<rect key="frame" x="0.0" y="0.0" width="355" height="120"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="D" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rIZ-YY-RnK">
<rect key="frame" x="20" y="20" width="40" height="40"/>
<color key="backgroundColor" red="0.87058823529999996" green="0.20000000000000001" blue="0.23529411759999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillProportionally" translatesAutoresizingMaskIntoConstraints="NO" id="Bj6-79-KCV">
<rect key="frame" x="110" y="10" width="225" height="95"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="James Kim" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="15" translatesAutoresizingMaskIntoConstraints="NO" id="xrV-Uw-p0g">
<rect key="frame" x="0.0" y="0.0" width="225" height="22"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20.5" id="byb-sc-gnt"/>
</constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="17"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="JRd-10-b03">
<rect key="frame" x="0.0" y="22" width="225" height="73"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="BankDeposit" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="fp5-32-al9">
<rect key="frame" x="0.0" y="0.0" width="225" height="18.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ShinhanBank" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="llO-GY-kgJ">
<rect key="frame" x="0.0" y="18.5" width="225" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Seoul" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="e6I-QA-szH">
<rect key="frame" x="0.0" y="36.5" width="225" height="18.5"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="110224458044" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="VyT-Xs-vLr">
<rect key="frame" x="0.0" y="55" width="225" height="18"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
</subviews>
</stackView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="flag_south_korea" translatesAutoresizingMaskIntoConstraints="NO" id="W49-dR-oEY">
<rect key="frame" x="20" y="25" width="70" height="70"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="kFp-N5-uN5"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="50" id="TVV-si-CbV"/>
<constraint firstAttribute="width" constant="70" id="fSM-56-REM"/>
<constraint firstAttribute="width" secondItem="W49-dR-oEY" secondAttribute="height" multiplier="1:1" id="mvv-Mc-MIb"/>
</constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="New Recipient" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xrV-Uw-p0g">
<rect key="frame" x="80" y="20" width="255" height="40"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="17"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="xrV-Uw-p0g" secondAttribute="trailing" constant="20" id="Esj-xd-xnA"/>
<constraint firstItem="xrV-Uw-p0g" firstAttribute="top" secondItem="FsO-FW-udC" secondAttribute="top" constant="20" id="HBv-XH-a5O"/>
<constraint firstAttribute="bottom" secondItem="rIZ-YY-RnK" secondAttribute="bottom" constant="20" id="JrR-RQ-gei"/>
<constraint firstItem="rIZ-YY-RnK" firstAttribute="leading" secondItem="FsO-FW-udC" secondAttribute="leading" constant="20" id="NOK-Rd-bQT"/>
<constraint firstItem="xrV-Uw-p0g" firstAttribute="leading" secondItem="rIZ-YY-RnK" secondAttribute="trailing" constant="20" id="Tkd-Jd-sl6"/>
<constraint firstItem="xrV-Uw-p0g" firstAttribute="centerY" secondItem="FsO-FW-udC" secondAttribute="centerY" id="Wgd-db-QQL"/>
<constraint firstItem="rIZ-YY-RnK" firstAttribute="top" secondItem="FsO-FW-udC" secondAttribute="top" constant="20" id="Yvt-GM-iBV"/>
<constraint firstItem="rIZ-YY-RnK" firstAttribute="centerY" secondItem="FsO-FW-udC" secondAttribute="centerY" id="frz-it-Faq"/>
<constraint firstAttribute="bottom" secondItem="xrV-Uw-p0g" secondAttribute="bottom" constant="20" id="lsr-pf-FaV"/>
<constraint firstAttribute="height" constant="80" id="shM-dD-W05"/>
<constraint firstItem="Bj6-79-KCV" firstAttribute="leading" secondItem="W49-dR-oEY" secondAttribute="trailing" constant="20" id="2xF-Wb-PFV"/>
<constraint firstItem="W49-dR-oEY" firstAttribute="centerY" secondItem="FsO-FW-udC" secondAttribute="centerY" id="OEw-Yr-k71"/>
<constraint firstItem="Bj6-79-KCV" firstAttribute="top" secondItem="FsO-FW-udC" secondAttribute="top" constant="10" id="WR4-9i-dGX"/>
<constraint firstAttribute="bottom" secondItem="Bj6-79-KCV" secondAttribute="bottom" constant="15" id="Zcr-wn-bN2"/>
<constraint firstAttribute="trailing" secondItem="Bj6-79-KCV" secondAttribute="trailing" constant="20" id="pUA-fE-0v2"/>
<constraint firstAttribute="height" constant="120" id="shM-dD-W05"/>
<constraint firstItem="W49-dR-oEY" firstAttribute="leading" secondItem="FsO-FW-udC" secondAttribute="leading" constant="20" id="xPb-F4-shJ"/>
</constraints>
</view>
</subviews>
@ -110,14 +145,18 @@
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="labelInitial" destination="rIZ-YY-RnK" id="Vig-Eh-vlW"/>
<outlet property="agentAccountLabel" destination="VyT-Xs-vLr" id="fmZ-HV-Vg8"/>
<outlet property="agentNameLabel" destination="llO-GY-kgJ" id="4mw-n7-lra"/>
<outlet property="branchNameLabel" destination="e6I-QA-szH" id="Gzm-Tz-N0q"/>
<outlet property="countryFlagImageView" destination="W49-dR-oEY" id="Brn-Wy-e7p"/>
<outlet property="labelRecipientName" destination="xrV-Uw-p0g" id="9p4-Ge-kc8"/>
<outlet property="paymentMethodNameLabel" destination="fp5-32-al9" id="njs-fj-vVZ"/>
</connections>
</tableViewCell>
</prototypes>
</tableView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Swipe left to “Edit” or “Delete” recipient profile." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BNw-Op-I8T">
<rect key="frame" x="10" y="122" width="355" height="14.5"/>
<rect key="frame" x="10" y="122" width="355" height="14"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
@ -151,10 +190,11 @@
<placeholder placeholderIdentifier="IBFirstResponder" id="vG9-wp-waO" userLabel="First Responder" sceneMemberID="firstResponder"/>
<tapGestureRecognizer id="LhF-Qk-byx"/>
</objects>
<point key="canvasLocation" x="668" y="233"/>
<point key="canvasLocation" x="668" y="232.53373313343329"/>
</scene>
</scenes>
<resources>
<image name="flag_south_korea" width="512" height="512"/>
<image name="ic-sendmoney" width="20.5" height="20.5"/>
<image name="ic_recipient" width="42" height="42"/>
</resources>

8
GME Remit/Modules/SendMoneyModules/ResendExchange/User Interface/View/ResendExchangeViewController.swift

@ -241,12 +241,12 @@ class ResendExchangeViewController: UIViewController {
func convertReciepient(model: ResendReceiver) -> Recipient {
var reciepient = Recipient()
reciepient.firstName = model.rFullName
reciepient.recipientId = self.resendInfoModel?.remitDetial?.receiverId
reciepient.reasonId = self.resendInfoModel?.remitDetial?.purposeOfRemittance
reciepient.relationId = self.resendInfoModel?.remitDetial?.relWithSender
reciepient.id = self.resendInfoModel?.remitDetial?.receiverId
reciepient.purposeOfRemitID = self.resendInfoModel?.remitDetial?.purposeOfRemittance
reciepient.relationshipID = self.resendInfoModel?.remitDetial?.relWithSender
reciepient.address = model.rAddress
reciepient.country = model.rCountry
reciepient.mobileNumber = model.rMobile
reciepient.mobile = model.rMobile
return reciepient
}

2
GME Remit/Modules/SendMoneyModules/SendMoneyCode/Application Logic/Interactor/SendMoneyCodeInteractor.swift

@ -33,7 +33,7 @@ extension SendMoneyCodeInteractor: SendMoneyCodeInteractorInput {
let customerId = Utility.getMyUserName()
let params = [
"amount": request?.exchangeRateDetail?.autodebitSendingAmount ?? "",
"kftcId": request?.autoDebitAccount?.kftcLogId ?? "",
"kftcId": request?.autoDebitAccount?.kftcAccountId ?? "",
"userId": Utility.getMyUserName()
]
self.service.requestOtp(params: params, customerId: customerId, success: { (message) in

2
GME Remit/Modules/SendMoneyModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift

@ -377,7 +377,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
let senderAmount = senderAmount.stringRemovingComma() // send sAmt amount
let reciepientAmount = reciepientAmount.stringRemovingComma()
let recipientCurrency = selectedCurrencyViewModel?.currency
let reciepientCountryId = reciepient?.countryId
let reciepientCountryId = reciepient?.countryID
let paymentMethod = requestModel?.autoDebitAccount?.type ?? ""
let paymentMethodId = requestModel?.paymemtMode?.id
let payoutPartner = requestModel?.paymemtMode?.payoutPartner

2
GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/Application Logic/Interactor/SendMoneyPaymentModeInteractor.swift

@ -31,7 +31,7 @@ class SendMoneyPaymentModeInteractor {
extension SendMoneyPaymentModeInteractor: SendMoneyPaymentModeInteractorInput {
func viewIsReady(for reciepient: Recipient) {
let countryCode = reciepient.countryCode ?? ""
let id = reciepient.recipientId ?? ""
let id = reciepient.id ?? ""
self.service.fetchInformations(countryCode: countryCode, id: id, success: { (model) in
self.output?.show(model: model?.payoutMode ?? [])
}) { (error) in

5
GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift

@ -35,9 +35,10 @@ extension SendMoneyPaymentModePresenter: SendMoneyPaymentModeModuleInterface {
"IdType" : model.idType ?? "",
"IdNumber": model.idNumber ?? "",
"CustomerFirstName": model.customerFirstName ?? "",
"CustomerLastName": model.reciverLastName ?? "",
"CustomerLastName": model.customerLastName ?? "",
"ReceiverFirstName": model.reciverFirstName ?? "",
"ReceiverLastName": model.reciverLastName ?? "",
"ReceiverLastName1": model.reciverLastName1 ?? "",
"ReceiverLastName2": model.reciverLastName2 ?? "",
"Country": model.country ?? "",
"AccountType": model.accountType ?? "",
"IssuerCode": model.issuerCode ?? "",

5
GME Remit/Modules/SendMoneyModules/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift

@ -205,7 +205,8 @@ class SendMoneyPaymentModeViewController: UIViewController {
validationRequest.customerLastName = ""
validationRequest.reciverFirstName = self.recipient?.firstName
validationRequest.reciverLastName = self.recipient?.lastName
validationRequest.reciverLastName1 = self.recipient?.lastName1
validationRequest.reciverLastName2 = self.recipient?.lastName2
validationRequest.country = self.recipient?.countryCode
validationRequest.accountType = "1" // saving account, current account type ko
validationRequest.issuerCode = self.selectedBank?.code
@ -215,7 +216,7 @@ class SendMoneyPaymentModeViewController: UIViewController {
validationRequest.amount = "10000.0"
validationRequest.processId = ""
validationRequest.bankId = self.selectedBank?.id
validationRequest.receiverCountryId = self.recipient?.countryId
validationRequest.receiverCountryId = self.recipient?.countryID
validationRequest.deliveryMethodId = self.selectedPayoutMode?.id
callingApi = true

8
GME Remit/Modules/SendMoneyModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift

@ -62,7 +62,7 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput
func getParams(model: SendMoneyRequestModel, reciepient: Recipient) -> [String: Any] {
guard let username = GMEDB.shared.user.string(.userId) else {return [:]}
let senderId = GMEDB.shared.user.string(.senderId)
let recieverId = reciepient.recipientId
let recieverId = reciepient.id
let params: [String: Any] =
[
@ -89,9 +89,9 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput
"tpPCurr": model.exchangeRateDetail?.reciepientCurrency ?? "",
"foreX_SESSION_ID": model.exchangeRateDetail?.forexId ?? "",
"purposeOfRemittance": reciepient.reasonId ?? "",
"purposeOfRemittance": reciepient.purposeOfRemitID ?? "",
"sourceOfFund": "128",
"relWithSender": reciepient.relationId ?? "",
"relWithSender": reciepient.relationshipID ?? "",
"occupation": "",
"ipAddress": "",
"rState": "",
@ -100,7 +100,7 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput
"isAgreed": "TRUE",
"txnPassword": model.transactionPassword ?? "",
"ReceiverAccountNo": model.paymemtMode?.accountNumber ?? "",
"KftcLogId": model.autoDebitAccount?.kftcLogId ?? "",
"KftcLogId": model.autoDebitAccount?.kftcAccountId ?? "",
"schemeId": model.exchangeRateDetail?.schemeId ?? "",
"isUseBiometric": model.isUseBiometric ?? false
]

4
GME Remit/Modules/SendMoneyModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift

@ -157,10 +157,10 @@ class SendMoneyVerificationViewController: UITableViewController {
}
private func populateRecieversInformations() {
self.fullNameLabel.text = self.reciepient?.getFullName()
self.fullNameLabel.text = self.reciepient?.name
self.addressLabel.text = self.reciepient?.address
self.countryLabel.text = self.reciepient?.country
self.mobileLabel.text = self.reciepient?.mobileNumber
self.mobileLabel.text = self.reciepient?.mobile
}
private func populateTransactionDetails() {

Loading…
Cancel
Save