From df68c38ddb9c4b8b98210ea652f420736a776316 Mon Sep 17 00:00:00 2001 From: Jeongbae Kong Date: Thu, 7 May 2020 11:26:00 +0900 Subject: [PATCH] done developing domestic remit - need to add multi language --- .../Presenter/DomesticRemitPresenter.swift | 2 -- .../View/DomesticRemitViewController.swift | 14 ++++++++++++-- .../View/ViewModel/DomesticRemitViewModel.swift | 2 +- .../User Interface/View/SelectCoupon.storyboard | 12 ++++++------ .../View/SendMoneyExchangeRateViewController.swift | 2 +- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/Presenter/DomesticRemitPresenter.swift b/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/Presenter/DomesticRemitPresenter.swift index 3b73810c..17cc9a0c 100644 --- a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/Presenter/DomesticRemitPresenter.swift +++ b/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/Presenter/DomesticRemitPresenter.swift @@ -25,8 +25,6 @@ class DomesticRemitPresenter { case banks case autodebit } - - } // MARK: DomesticRemit module interface diff --git a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/DomesticRemitViewController.swift b/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/DomesticRemitViewController.swift index 9530b1de..b6ab68b0 100644 --- a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/DomesticRemitViewController.swift +++ b/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/DomesticRemitViewController.swift @@ -275,8 +275,18 @@ extension DomesticRemitViewController { let biggerError = "amount_bigger_error_text".localized() let minimumError = "amount_minimum_error_text".localized() - self.amountTextField.errorMessage = - amount > 9999 ? biggerError : minimumError + if isAvailable == false && amount > 6500000 { + self.amountTextField.errorMessage = "Cannot exceed 6,500,000KRW" + } else { + self.amountTextField.errorMessage = + amount > 9999 ? biggerError : minimumError + + } + + + +// self.amountTextField.errorMessage = +// amount > 9999 ? biggerError : minimumError }) .disposed(by: disposeBag) diff --git a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift b/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift index 48da4ce0..99659384 100644 --- a/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift +++ b/GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift @@ -190,7 +190,7 @@ class DomesticRemitViewModel: ViewModelType { let balanceNumber = Double(balance) else { return amount > 9999 } - return (realSendAmount <= Int(balanceNumber) ? true : false) && amount > 9999 + return (realSendAmount <= Int(balanceNumber) ? true : false) && amount > 9999 && amount <= 6500000 } let receiptTrigger = PublishSubject() diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SelectCoupon/User Interface/View/SelectCoupon.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SelectCoupon/User Interface/View/SelectCoupon.storyboard index acf91818..eba97750 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/SelectCoupon/User Interface/View/SelectCoupon.storyboard +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SelectCoupon/User Interface/View/SelectCoupon.storyboard @@ -152,10 +152,10 @@ - + - +