Browse Source

Merge remote-tracking branch 'refs/remotes/origin/3.4.0(1)_domestic_limit'

Conflicts:
	GME Remit/Modules/RemittanceModules/OverseasModules/SelectCoupon/User Interface/View/SelectCoupon.storyboard
pull/1/head
Jeongbae Kong 4 years ago
parent
commit
7cc8939f0b
  1. 2
      GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/Presenter/DomesticRemitPresenter.swift
  2. 14
      GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/DomesticRemitViewController.swift
  3. 2
      GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift
  4. 2
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift

2
GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/Presenter/DomesticRemitPresenter.swift

@ -25,8 +25,6 @@ class DomesticRemitPresenter {
case banks case banks
case autodebit case autodebit
} }
} }
// MARK: DomesticRemit module interface // MARK: DomesticRemit module interface

14
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 biggerError = "amount_bigger_error_text".localized()
let minimumError = "amount_minimum_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) .disposed(by: disposeBag)

2
GME Remit/Modules/RemittanceModules/DomesticModules/DomesticRemit/User Interface/View/ViewModel/DomesticRemitViewModel.swift

@ -190,7 +190,7 @@ class DomesticRemitViewModel: ViewModelType {
let balanceNumber = Double(balance) else { let balanceNumber = Double(balance) else {
return amount > 9999 return amount > 9999
} }
return (realSendAmount <= Int(balanceNumber) ? true : false) && amount > 9999
return (realSendAmount <= Int(balanceNumber) ? true : false) && amount > 9999 && amount <= 6500000
} }
let receiptTrigger = PublishSubject<DomesticRemitResponseModel>() let receiptTrigger = PublishSubject<DomesticRemitResponseModel>()

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

@ -317,7 +317,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
} }
private func setCoupon() { private func setCoupon() {
guard guard
let selectedCoupon = applyDefaultCoupon, let selectedCoupon = applyDefaultCoupon,
// selectedCoupon.couponType == "1", // selectedCoupon.couponType == "1",

Loading…
Cancel
Save