From 897b9a376c56fe83c2b8de8ea53d6b9c61e3e854 Mon Sep 17 00:00:00 2001 From: gme_2 Date: Wed, 24 Oct 2018 18:08:28 +0900 Subject: [PATCH] status changed in transaction report --- .../SendMoneyVerificationInteractor.swift | 2 +- .../TransactionHistoryPresenter.swift | 22 ++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/GMERemittance/Module/SendMoney/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift b/GMERemittance/Module/SendMoney/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift index 8202ad48..a4d79b67 100644 --- a/GMERemittance/Module/SendMoney/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift +++ b/GMERemittance/Module/SendMoney/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift @@ -72,7 +72,7 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput "foreX_SESSION_ID": model.exchangeRateDetail?.forexId ?? "", "purposeOfRemittance": reciepient.reasonId ?? "", - "sourceOfFund": "", + "sourceOfFund": "128", "relWithSender": reciepient.relationId ?? "", "occupation": "", "ipAddress": "", diff --git a/GMERemittance/Module/TransactionHistory/User Interface/Presenter/TransactionHistoryPresenter.swift b/GMERemittance/Module/TransactionHistory/User Interface/Presenter/TransactionHistoryPresenter.swift index 14297661..1d179889 100644 --- a/GMERemittance/Module/TransactionHistory/User Interface/Presenter/TransactionHistoryPresenter.swift +++ b/GMERemittance/Module/TransactionHistory/User Interface/Presenter/TransactionHistoryPresenter.swift @@ -87,7 +87,27 @@ extension TransactionHistoryPresenter: TransactionHistoryInteractorOutput { func show(models: [TransactionModel]) { self.view?.hideLoading() - self.models = models + var _models = models + let _newModels: [TransactionModel] = _models.map({ + let status = ($0.payStatus ?? "").lowercased() + + let statusIsPaid = status == TransactionModelType.paid.rawValue.lowercased() + let statusIsUnpaid = status == TransactionModelType.unpaid.rawValue.lowercased() + let statusIsCancel = status == "Cancel".lowercased() + + + let shouldNotUpdateStatus = statusIsPaid || statusIsUnpaid || statusIsCancel + if !shouldNotUpdateStatus { + $0.payStatus = "Unpaid" + return $0 + } + return $0 + }) + + self.models = _newModels + self.filteredModels = self.models } } + +//