From 08c540118c038f0e66be95ae29bcba17732ec8a2 Mon Sep 17 00:00:00 2001 From: InKwon James Kim Date: Thu, 14 Nov 2019 17:15:39 +0900 Subject: [PATCH] implement inbound transaction history & inbound receipt --- GME Remit.xcodeproj/project.pbxproj | 108 +++ GME Remit/APIs/Router/APIRouter.swift | 5 +- .../Models/Response/TransactionModel.swift | 25 +- .../View/AutoDebitViewController.swift | 3 +- .../View/InboundAccounts.storyboard | 16 +- .../ManageAccountGroupViewController.swift | 2 + .../View/RechargePayment.storyboard | 14 +- .../Model/PenneyTestRequest.swift | 3 +- .../AddInboundAccountPresenter.swift | 10 +- .../View/AddInboundAccount.storyboard | 4 +- .../AddInboundAccountViewController.swift | 3 + .../InboundPennyTestSubmitPresenter.swift | 10 +- ...InboundPennyTestSubmitViewController.swift | 9 + .../InboundPennyTestSubmitWireframe.swift | 1 + ...InboundPennyTestSubmitWireframeInput.swift | 1 - .../Interactor/InboundReceiptInteractor.swift | 38 ++ .../InboundReceiptInteractorIO.swift | 16 + .../Service/InboundReceiptService.swift | 13 + .../Service/InboundReceiptServiceType.swift | 11 + .../Presenter/InboundReceiptPresenter.swift | 70 ++ .../View/InboundReceipt.storyboard | 632 ++++++++++++++++++ .../View/InboundReceiptViewController.swift | 180 +++++ .../Wireframe/InboundReceiptWireframe.swift | 52 ++ .../InboundReceiptWireframeInput.swift | 13 + .../View/SendMoneyReceipt.storyboard | 18 +- .../TransactionHistoryModuleInterface.swift | 1 + .../TransactionHistoryPresenter.swift | 9 +- .../View/Cell/InboundTransactionCell.swift | 27 +- .../View/TransactionHistory.storyboard | 36 +- .../TransactionHistoryViewController.swift | 12 +- .../TransactionHistoryWireframe.swift | 5 + .../TransactionHistoryWireframeInput.swift | 4 +- .../bankCI/ibk.imageset/ibk.png | Bin 7586 -> 7593 bytes 33 files changed, 1296 insertions(+), 55 deletions(-) create mode 100644 GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/Application Logic/Interactor/InboundReceiptInteractor.swift create mode 100644 GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/Application Logic/Interactor/InboundReceiptInteractorIO.swift create mode 100644 GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/Application Logic/Service/InboundReceiptService.swift create mode 100644 GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/Application Logic/Service/InboundReceiptServiceType.swift create mode 100644 GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/Presenter/InboundReceiptPresenter.swift create mode 100644 GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/View/InboundReceipt.storyboard create mode 100644 GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/View/InboundReceiptViewController.swift create mode 100644 GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/Wireframe/InboundReceiptWireframe.swift create mode 100644 GME Remit/Modules/RemittanceModules/InboundModules/InboundReceipt/User Interface/Wireframe/InboundReceiptWireframeInput.swift diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 8dc50ee1..db200b59 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -329,6 +329,15 @@ 7383F43E22DF15B8003D6393 /* UserDefaultsWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7383F43D22DF15B8003D6393 /* UserDefaultsWrapper.swift */; }; 7384B28222CB377300DD04D9 /* GMEAlertViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7384B28022CB377300DD04D9 /* GMEAlertViewController.swift */; }; 7384B28322CB377300DD04D9 /* GMEAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7384B28122CB377300DD04D9 /* GMEAlertViewController.xib */; }; + 738714B3237CE86E0038FCB1 /* InboundReceiptService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738714A5237CE86D0038FCB1 /* InboundReceiptService.swift */; }; + 738714B4237CE86E0038FCB1 /* InboundReceiptServiceType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738714A6237CE86D0038FCB1 /* InboundReceiptServiceType.swift */; }; + 738714B5237CE86E0038FCB1 /* InboundReceiptInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738714A8237CE86D0038FCB1 /* InboundReceiptInteractor.swift */; }; + 738714B6237CE86E0038FCB1 /* InboundReceiptInteractorIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738714A9237CE86D0038FCB1 /* InboundReceiptInteractorIO.swift */; }; + 738714B7237CE86E0038FCB1 /* InboundReceiptPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738714AC237CE86D0038FCB1 /* InboundReceiptPresenter.swift */; }; + 738714B8237CE86E0038FCB1 /* InboundReceiptWireframeInput.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738714AE237CE86D0038FCB1 /* InboundReceiptWireframeInput.swift */; }; + 738714B9237CE86E0038FCB1 /* InboundReceiptWireframe.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738714AF237CE86D0038FCB1 /* InboundReceiptWireframe.swift */; }; + 738714BA237CE86E0038FCB1 /* InboundReceipt.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 738714B1237CE86D0038FCB1 /* InboundReceipt.storyboard */; }; + 738714BB237CE86E0038FCB1 /* InboundReceiptViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738714B2237CE86D0038FCB1 /* InboundReceiptViewController.swift */; }; 7388821922CDF20F00592960 /* UITextField+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7388821822CDF20F00592960 /* UITextField+Ext.swift */; }; 7388A6D822E17F9400A57891 /* CountryEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7388A6D722E17F9400A57891 /* CountryEnum.swift */; }; 7389600A22C2F208003FEA90 /* TablePresenterModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73895FF722C2F208003FEA90 /* TablePresenterModuleInterface.swift */; }; @@ -2661,6 +2670,15 @@ 7383F43D22DF15B8003D6393 /* UserDefaultsWrapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsWrapper.swift; sourceTree = ""; }; 7384B28022CB377300DD04D9 /* GMEAlertViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GMEAlertViewController.swift; sourceTree = ""; }; 7384B28122CB377300DD04D9 /* GMEAlertViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GMEAlertViewController.xib; sourceTree = ""; }; + 738714A5237CE86D0038FCB1 /* InboundReceiptService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboundReceiptService.swift; sourceTree = ""; }; + 738714A6237CE86D0038FCB1 /* InboundReceiptServiceType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboundReceiptServiceType.swift; sourceTree = ""; }; + 738714A8237CE86D0038FCB1 /* InboundReceiptInteractor.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboundReceiptInteractor.swift; sourceTree = ""; }; + 738714A9237CE86D0038FCB1 /* InboundReceiptInteractorIO.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboundReceiptInteractorIO.swift; sourceTree = ""; }; + 738714AC237CE86D0038FCB1 /* InboundReceiptPresenter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboundReceiptPresenter.swift; sourceTree = ""; }; + 738714AE237CE86D0038FCB1 /* InboundReceiptWireframeInput.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboundReceiptWireframeInput.swift; sourceTree = ""; }; + 738714AF237CE86D0038FCB1 /* InboundReceiptWireframe.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboundReceiptWireframe.swift; sourceTree = ""; }; + 738714B1237CE86D0038FCB1 /* InboundReceipt.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = InboundReceipt.storyboard; sourceTree = ""; }; + 738714B2237CE86D0038FCB1 /* InboundReceiptViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InboundReceiptViewController.swift; sourceTree = ""; }; 7388821822CDF20F00592960 /* UITextField+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Ext.swift"; sourceTree = ""; }; 7388A6D722E17F9400A57891 /* CountryEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountryEnum.swift; sourceTree = ""; }; 73895FF722C2F208003FEA90 /* TablePresenterModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TablePresenterModuleInterface.swift; sourceTree = ""; }; @@ -6806,6 +6824,86 @@ path = GMEAlert; sourceTree = ""; }; + 738714A1237CE86D0038FCB1 /* InboundReceipt */ = { + isa = PBXGroup; + children = ( + 738714A2237CE86D0038FCB1 /* Application Logic */, + 738714AA237CE86D0038FCB1 /* User Interface */, + ); + path = InboundReceipt; + sourceTree = ""; + }; + 738714A2237CE86D0038FCB1 /* Application Logic */ = { + isa = PBXGroup; + children = ( + 738714A3237CE86D0038FCB1 /* Model */, + 738714A4237CE86D0038FCB1 /* Service */, + 738714A7237CE86D0038FCB1 /* Interactor */, + ); + path = "Application Logic"; + sourceTree = ""; + }; + 738714A3237CE86D0038FCB1 /* Model */ = { + isa = PBXGroup; + children = ( + ); + path = Model; + sourceTree = ""; + }; + 738714A4237CE86D0038FCB1 /* Service */ = { + isa = PBXGroup; + children = ( + 738714A5237CE86D0038FCB1 /* InboundReceiptService.swift */, + 738714A6237CE86D0038FCB1 /* InboundReceiptServiceType.swift */, + ); + path = Service; + sourceTree = ""; + }; + 738714A7237CE86D0038FCB1 /* Interactor */ = { + isa = PBXGroup; + children = ( + 738714A8237CE86D0038FCB1 /* InboundReceiptInteractor.swift */, + 738714A9237CE86D0038FCB1 /* InboundReceiptInteractorIO.swift */, + ); + path = Interactor; + sourceTree = ""; + }; + 738714AA237CE86D0038FCB1 /* User Interface */ = { + isa = PBXGroup; + children = ( + 738714AB237CE86D0038FCB1 /* Presenter */, + 738714AD237CE86D0038FCB1 /* Wireframe */, + 738714B0237CE86D0038FCB1 /* View */, + ); + path = "User Interface"; + sourceTree = ""; + }; + 738714AB237CE86D0038FCB1 /* Presenter */ = { + isa = PBXGroup; + children = ( + 738714AC237CE86D0038FCB1 /* InboundReceiptPresenter.swift */, + ); + path = Presenter; + sourceTree = ""; + }; + 738714AD237CE86D0038FCB1 /* Wireframe */ = { + isa = PBXGroup; + children = ( + 738714AE237CE86D0038FCB1 /* InboundReceiptWireframeInput.swift */, + 738714AF237CE86D0038FCB1 /* InboundReceiptWireframe.swift */, + ); + path = Wireframe; + sourceTree = ""; + }; + 738714B0237CE86D0038FCB1 /* View */ = { + isa = PBXGroup; + children = ( + 738714B1237CE86D0038FCB1 /* InboundReceipt.storyboard */, + 738714B2237CE86D0038FCB1 /* InboundReceiptViewController.swift */, + ); + path = View; + sourceTree = ""; + }; 73895FF522C2F208003FEA90 /* TablePresenter */ = { isa = PBXGroup; children = ( @@ -6948,6 +7046,7 @@ 7390459E2378FC5A00CD5D8A /* InboundModules */ = { isa = PBXGroup; children = ( + 738714A1237CE86D0038FCB1 /* InboundReceipt */, 73911167237AA3C300697D27 /* InboundPennyTestSubmit */, 739045A12378FC9400CD5D8A /* AddInboundAccount */, ); @@ -13163,6 +13262,7 @@ D93C26BC22000D630079BF03 /* iPhone_transkey_landscape_alnum_key_0.png in Resources */, D93C2BE222000D660079BF03 /* transkey_input_cap_17.png in Resources */, D93C2A9722000D650079BF03 /* iPad_transkey_number_cmd_2_2_mongolian_down.png in Resources */, + 738714BA237CE86E0038FCB1 /* InboundReceipt.storyboard in Resources */, D93C2A4E22000D650079BF03 /* iPad_transkey_number_cmd_2_english.png in Resources */, 730D78BF227A94F2007E517E /* SearchAddress.storyboard in Resources */, D93C280922000D640079BF03 /* iPad_transkey_landscape_alnum_sym_9.png in Resources */, @@ -15061,6 +15161,7 @@ 73B4C8A522A5F1DE0078D495 /* CouponContainer.swift in Sources */, 73FE883C228A4A8C00A5EB56 /* OrderHistoryPresenter.swift in Sources */, D9B7ADF42130048E009B0564 /* ExchangeRatesInteractor.swift in Sources */, + 738714B8237CE86E0038FCB1 /* InboundReceiptWireframeInput.swift in Sources */, 73BCCDD5228993040057B161 /* RewardGroupWireframeInput.swift in Sources */, 730197A022535135001954AB /* kycForm1ViewController.swift in Sources */, 73911164237A86D500697D27 /* PenneyTestStartResponse.swift in Sources */, @@ -15332,6 +15433,7 @@ D95B5E3A21311057000C0B33 /* GmeContactsService.swift in Sources */, D95B5E3F21311057000C0B33 /* GmeContactsWireframeInput.swift in Sources */, 736E321A230A3CC1005799AA /* UIDevice+Ext.swift in Sources */, + 738714B5237CE86E0038FCB1 /* InboundReceiptInteractor.swift in Sources */, D922D9692135145F00D43053 /* SendMoneyParentWireframeInput.swift in Sources */, D946719821426DFB003924DB /* LoginInteractor.swift in Sources */, 04546C4120329A36007EFE15 /* AboutGMEViewController.swift in Sources */, @@ -15341,12 +15443,14 @@ 733A3B9723554DAF00E6B87E /* RechargePaymentService.swift in Sources */, 730D78C0227A94F2007E517E /* SearchAddressViewController.swift in Sources */, 738FD48C2303E157008B144D /* FieldModel.swift in Sources */, + 738714B9237CE86E0038FCB1 /* InboundReceiptWireframe.swift in Sources */, 732D17972297899400ACEBF1 /* HotLineCell.swift in Sources */, 73549BB2236FDD5600AD75D2 /* RechargeHistoryServiceType.swift in Sources */, 73AEFF762334A13100A967FB /* TransactionHistoryGroupWireframeInputOutput.swift in Sources */, 739045D7237921D500CD5D8A /* ManageAccountGroupInteractorIO.swift in Sources */, 734BF6882353F7D8004E8D60 /* PhoneCardRechargeWireframeInputOutput.swift in Sources */, 73A621642330AD20000FFB5B /* RecentHistoriesPresenter.swift in Sources */, + 738714B3237CE86E0038FCB1 /* InboundReceiptService.swift in Sources */, 73210DA722FBE73100715D6C /* RecipientsWireframe.swift in Sources */, BE74AFD1227C8FF200F05CE7 /* AutoDebitViewInterface.swift in Sources */, 734DD31C2366DA2700BFA7EE /* CheckMark.swift in Sources */, @@ -15431,6 +15535,7 @@ 733A3B9F23554DAF00E6B87E /* RechargePaymentViewController.swift in Sources */, 734BF6842353F7D8004E8D60 /* PhoneCardRechargeInteractor.swift in Sources */, 7372430E235EBABE00FA47DD /* DetailPlanInformation.swift in Sources */, + 738714B6237CE86E0038FCB1 /* InboundReceiptInteractorIO.swift in Sources */, 043770EF21AD04240005B22D /* PennyTestViewInterface.swift in Sources */, 73071AC62296CF9B008840FD /* HotLineServiceType.swift in Sources */, 734BF6852353F7D8004E8D60 /* PhoneCardRechargeInteractorIO.swift in Sources */, @@ -15470,6 +15575,7 @@ 733E8F8D23580BDF0050E499 /* RechargeReceiptService.swift in Sources */, 730D7886227A94E1007E517E /* RedeemViewController.swift in Sources */, D97785A3215DC55F00754079 /* TransactionHistoryWireframeInput.swift in Sources */, + 738714B7237CE86E0038FCB1 /* InboundReceiptPresenter.swift in Sources */, 7383F43622DEB864003D6393 /* GMEDB.swift in Sources */, 73A6216A2330AD20000FFB5B /* RecentHistoriesViewController.swift in Sources */, 04E36E2021AE585200783685 /* PennyTestSubmitWireframeInput.swift in Sources */, @@ -15520,6 +15626,7 @@ D9380D2D2165A2ED00E45156 /* ProfileViewController.swift in Sources */, D945F122213E1D5100A24824 /* SendMoneyReceiptPresenter.swift in Sources */, D92B802A2140C3CB00A25B26 /* MainPresenter.swift in Sources */, + 738714B4237CE86E0038FCB1 /* InboundReceiptServiceType.swift in Sources */, D946719721426DFB003924DB /* LoginServiceType.swift in Sources */, D9DC107821639078008F3C51 /* MessageComposeModuleInterface.swift in Sources */, D9DC107E21639078008F3C51 /* MessageComposeWireframeInput.swift in Sources */, @@ -15551,6 +15658,7 @@ D95B7047213FB5F10053CC3D /* WebLinksViewController.swift in Sources */, 73071AAB2296BE6C008840FD /* HotLine.swift in Sources */, 73071AC82296CF9B008840FD /* HotLineInteractor.swift in Sources */, + 738714BB237CE86E0038FCB1 /* InboundReceiptViewController.swift in Sources */, D92E656A222620A0004D1B3D /* SendMoneyCodeInteractorIO.swift in Sources */, 73168A2322F3D01A00878038 /* TablePresenterProtocol.swift in Sources */, 733A3B8223554AC100E6B87E /* RechargeModel.swift in Sources */, diff --git a/GME Remit/APIs/Router/APIRouter.swift b/GME Remit/APIs/Router/APIRouter.swift index cd5c7bab..089f5026 100644 --- a/GME Remit/APIs/Router/APIRouter.swift +++ b/GME Remit/APIs/Router/APIRouter.swift @@ -481,7 +481,7 @@ extension APIRouter { return "\(baseUrl)/inbound/mobile/bankaccounts/\(senderId)" case .fetchInboundTransactionHistory: let senderId = GMEDB.shared.user.string(.senderId) ?? "" - return "\(baseUrl)/inbound/mobile/transHistory/\(senderId)" + return "\(baseUrl)/inbound/mobile/tranHistory/\(senderId)" } } } @@ -795,7 +795,8 @@ extension APIRouter { case .penneyTestStart(let model, _): return [ - "KftcID": model.kftcID ?? "", + "accountID": model.accountID ?? "", + "accountType": model.accountType ?? "", "BankCode": model.bank.bankCode ?? "", "AccountNo": model.account ] diff --git a/GME Remit/Models/Response/TransactionModel.swift b/GME Remit/Models/Response/TransactionModel.swift index 94e09a2e..adce889b 100644 --- a/GME Remit/Models/Response/TransactionModel.swift +++ b/GME Remit/Models/Response/TransactionModel.swift @@ -30,7 +30,7 @@ class TransactionModelContainer: Mappable { class TransactionModel: Mappable { var user: String? - var transactionId: String? + var transactionId: String? var controlNumber: String? var pAmt: String? var pCurrency: String? @@ -41,6 +41,18 @@ class TransactionModel: Mappable { var sendDate: String? var paidDate: String? + // Inbound + var inboundStatus: String? + var inboundReceivedAmount: String? + var inboundServiceFee: String? + var inboundBankCode: String? + var inboundAccountNo: String? + var inboundBankName: String? + var inboundTranDate: String? + var inboundSenderName: String? + var inboundMobileNo: String? + var inboundControlNo: String? + required init?(map: Map) { } @@ -57,5 +69,16 @@ class TransactionModel: Mappable { payOutMode <- map["PayoutMode"] sendDate <- map["SendDate"] paidDate <- map["PaidDate"] + + inboundStatus <- map["status"] + inboundReceivedAmount <- map["receivedAmount"] + inboundServiceFee <- map["serviceFee"] + inboundBankCode <- map["bankCode"] + inboundAccountNo <- map["accountNo"] + inboundBankName <- map["bank"] + inboundTranDate <- map["tranDate"] + inboundSenderName <- map["senderName"] + inboundMobileNo <- map["MobileNo"] + inboundControlNo <- map["controlNo"] } } diff --git a/GME Remit/Modules/ManageAccountsModules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebitViewController.swift b/GME Remit/Modules/ManageAccountsModules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebitViewController.swift index f90ad52a..f18852f4 100644 --- a/GME Remit/Modules/ManageAccountsModules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebitViewController.swift +++ b/GME Remit/Modules/ManageAccountsModules/AutoDebitModules/AutoDebit/User Interface/View/AutoDebitViewController.swift @@ -275,7 +275,8 @@ extension AutoDebitViewController: AutoDebitTableViewCellDelegate { let bank = BankInformation(bankCode: model?.bankCode, bankName: model?.bankName) let model = PenneyTestRequest( - kftcID: model?.kftcAccountId, + accountID: model?.kftcAccountId, + accountType: "autodebit", bank: bank, account: model?.accountNumMasked ?? "" ) diff --git a/GME Remit/Modules/ManageAccountsModules/InboundAccounts/User Interface/View/InboundAccounts.storyboard b/GME Remit/Modules/ManageAccountsModules/InboundAccounts/User Interface/View/InboundAccounts.storyboard index 836a8503..acc8ec3a 100644 --- a/GME Remit/Modules/ManageAccountsModules/InboundAccounts/User Interface/View/InboundAccounts.storyboard +++ b/GME Remit/Modules/ManageAccountsModules/InboundAccounts/User Interface/View/InboundAccounts.storyboard @@ -156,17 +156,24 @@ + + + + + + + - + @@ -177,7 +184,7 @@ diff --git a/GME Remit/Modules/ManageAccountsModules/ManageAccountGroup/User Interface/View/ManageAccountGroupViewController.swift b/GME Remit/Modules/ManageAccountsModules/ManageAccountGroup/User Interface/View/ManageAccountGroupViewController.swift index 0d087636..5965815a 100644 --- a/GME Remit/Modules/ManageAccountsModules/ManageAccountGroup/User Interface/View/ManageAccountGroupViewController.swift +++ b/GME Remit/Modules/ManageAccountsModules/ManageAccountGroup/User Interface/View/ManageAccountGroupViewController.swift @@ -29,10 +29,12 @@ class ManageAccountGroupViewController: ButtonBarPagerTabStripViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) + title = "Manage Accounts" } override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) + title = "" } override func viewControllers( diff --git a/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePayment.storyboard b/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePayment.storyboard index e263d814..a2b601ed 100644 --- a/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePayment.storyboard +++ b/GME Remit/Modules/PowerCallModules/RechargePayment/User Interface/View/RechargePayment.storyboard @@ -1,9 +1,9 @@ - + - + @@ -285,19 +285,19 @@ Balance - + - + - + - + - + diff --git a/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/Application Logic/Model/PenneyTestRequest.swift b/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/Application Logic/Model/PenneyTestRequest.swift index b9bbe3dc..5a26b25d 100644 --- a/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/Application Logic/Model/PenneyTestRequest.swift +++ b/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/Application Logic/Model/PenneyTestRequest.swift @@ -7,7 +7,8 @@ // struct PenneyTestRequest { - var kftcID: String? + var accountID: String? + var accountType: String? let bank: BankInformation let account: String } diff --git a/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/User Interface/Presenter/AddInboundAccountPresenter.swift b/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/User Interface/Presenter/AddInboundAccountPresenter.swift index f9400515..d5744b0c 100644 --- a/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/User Interface/Presenter/AddInboundAccountPresenter.swift +++ b/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/User Interface/Presenter/AddInboundAccountPresenter.swift @@ -45,9 +45,14 @@ class AddInboundAccountPresenter: ViewModelType { }).disposed(by: disposeBag) let merged = Driver.combineLatest(input.selectedBank, input.account) - .map {(bank, account) -> PenneyTestRequest? in + .map {[weak self] (bank, account) -> PenneyTestRequest? in guard let bank = bank, !account.isEmpty && account.count > 9 else { return nil } - return PenneyTestRequest(bank: bank, account: account) + + guard let model = self?.penneyTestModel else { + return PenneyTestRequest(bank: bank, account: account) + } + + return model } input.addTap.withLatestFrom(merged) {$1} @@ -73,6 +78,7 @@ extension AddInboundAccountPresenter: AddInboundAccountInteractorOutput { func setModel(with selectedPenneyTestModel: PenneyTestRequest?, banks: [BankInformation]) { progressLinker.onNext(false) self.banks.onNext(banks) + self.penneyTestModel = selectedPenneyTestModel self.selectedPenneyTestModel.onNext(selectedPenneyTestModel) } diff --git a/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/User Interface/View/AddInboundAccount.storyboard b/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/User Interface/View/AddInboundAccount.storyboard index e9129d57..70603936 100644 --- a/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/User Interface/View/AddInboundAccount.storyboard +++ b/GME Remit/Modules/RemittanceModules/InboundModules/AddInboundAccount/User Interface/View/AddInboundAccount.storyboard @@ -28,8 +28,8 @@ - @@ -264,19 +264,19 @@ - + - - +