Browse Source

shown account number if required

pull/1/head
gme_2 6 years ago
parent
commit
8b8c07ba4a
  1. 1
      GMERemittance/Library/CountryWithFlagPicker/CountryPickerViewController.swift
  2. 18
      GMERemittance/Model/SendMoneyPaymentModeModel.swift
  3. 2
      GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard
  4. 27
      GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift

1
GMERemittance/Library/CountryWithFlagPicker/CountryPickerViewController.swift

@ -15,6 +15,7 @@ enum PickerTitle: String {
case relation = "Relation"
case transferReasons = "Transfer Reason"
case bank = "Bank"
case branch = "Branch"
}
class CountryPickerViewController: UIViewController {

18
GMERemittance/Model/SendMoneyPaymentModeModel.swift

@ -72,6 +72,7 @@ class SendMoneyBank: Mappable {
var id: String?
var name: String?
var branchRequired: String?
var branches: [SendMoneyBankBranch]?
var accountRequired: String?
var accountValidationRequired: String?
var payCurrency: [String]?
@ -87,5 +88,22 @@ class SendMoneyBank: Mappable {
accountRequired <- map["IsAccountRequired"]
accountValidationRequired <- map["IsAccountValidation"]
payCurrency <- map["PayCurrency"]
branches <- map["BranchList"]
}
}
class SendMoneyBankBranch: Mappable {
var id: String?
var name: String?
required init?(map: Map) {
}
func mapping(map: Map) {
id <- map["Id"]
name <- map["Name"]
}
}

2
GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard

@ -30,7 +30,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Bsf-zV-Yqr">
<scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bsf-zV-Yqr">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7a0-Vr-Gxf">

27
GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift

@ -63,9 +63,19 @@ class SendMoneyPaymentModeViewController: UIViewController {
let shouldShowBranch = (self.selectedBank?.branchRequired ?? "false").lowercased() == "true"
self.branchStackView.isHidden = false
let shouldShowAccountNumber = (self.selectedBank?.accountRequired ?? "false").lowercased() == "true"
self.accountNumberStackView.isHidden = !shouldShowAccountNumber
// branchStackView.isHidden = !shouldShowBranch
}
}
var selectedBranch: SendMoneyBankBranch? {
didSet {
self.branchTextField.text = selectedBranch?.name
}
}
// MARK: VC's Life cycle
override func viewDidLoad() {
@ -115,6 +125,23 @@ class SendMoneyPaymentModeViewController: UIViewController {
self.present(viewcontroller, animated: true, completion: nil)
}
private func showBranchPickerView() {
let viewcontroller = self.getPickerViewController()
let branches = self.selectedBank?.branches ?? []
let names = branches.compactMap({$0.name})
viewcontroller.data = names
viewcontroller.type = PickerTitle.branch
viewcontroller.doneAction = self.branchSelected
viewcontroller.defaultSelectedData = [self.selectedBranch?.name ?? ""]
self.present(viewcontroller, animated: true, completion: nil)
}
func branchSelected(branches: [String]) {
let _branches = self.selectedBank?.branches ?? []
let _branch = _branches.filter({($0.name ?? "") == (branches.first ?? "") }).first
self.selectedBranch = _branch
}
func bankSelected(banks: [String]) {
let _banks = self.selectedPayoutMode?.bankList ?? []
let _bank = _banks.filter({($0.name ?? "") == (banks.first ?? "") }).first

Loading…
Cancel
Save