From acaf32b914da64374ae0c92527cb9c8b67096794 Mon Sep 17 00:00:00 2001
From: james <devikkim@gmail.com>
Date: Thu, 9 May 2019 14:08:26 +0900
Subject: [PATCH] add payoutPartner field in SendMoneyBank model

---
 .../Model/SendMoneyPaymentModeModel.swift     |  2 +
 .../View/SendMoneyPaymentMode.storyboard      | 97 ++++++-------------
 .../SendMoneyPaymentModeViewController.swift  |  7 +-
 3 files changed, 37 insertions(+), 69 deletions(-)

diff --git a/GMERemittance/Model/SendMoneyPaymentModeModel.swift b/GMERemittance/Model/SendMoneyPaymentModeModel.swift
index 9e7e2f3c..47fd7107 100644
--- a/GMERemittance/Model/SendMoneyPaymentModeModel.swift
+++ b/GMERemittance/Model/SendMoneyPaymentModeModel.swift
@@ -84,6 +84,7 @@ class SendMoneyBank: Mappable {
     var accountValidationRequired: String?
     var payCurrency: [String]?
     var code: String?
+    var payoutPartner: String?
     
     init() {
         
@@ -102,6 +103,7 @@ class SendMoneyBank: Mappable {
         payCurrency <- map["PayCurrency"]
         branches <- map["BranchList"]
         code <- map["Code"]
+        payoutPartner <- map["PayoutPartner"]
     }
 }
 
diff --git a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard
index 926deed4..2be7dcab 100644
--- a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard	
+++ b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard	
@@ -35,8 +35,8 @@
                             <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">
-                                        <rect key="frame" x="0.0" y="10" width="375" height="600"/>
+                                    <view contentMode="scaleToFill" placeholderIntrinsicWidth="375" placeholderIntrinsicHeight="442" translatesAutoresizingMaskIntoConstraints="NO" id="7a0-Vr-Gxf">
+                                        <rect key="frame" x="0.0" y="0.0" width="375" height="442"/>
                                         <subviews>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="VSx-DH-XAq">
                                                 <rect key="frame" x="0.0" y="5" width="375" height="189"/>
@@ -159,7 +159,7 @@
                                                 </constraints>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Fbe-6n-L1t">
-                                                <rect key="frame" x="10" y="204" width="355" height="248"/>
+                                                <rect key="frame" x="10" y="204" width="355" height="154"/>
                                                 <subviews>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="mXq-Xl-S9G">
                                                         <rect key="frame" x="0.0" y="0.0" width="355" height="45"/>
@@ -203,90 +203,53 @@
                                                             <constraint firstAttribute="height" constant="44" id="jdo-Q3-Jot"/>
                                                         </constraints>
                                                     </stackView>
-                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="NtF-Fp-J94">
-                                                        <rect key="frame" x="0.0" y="164" width="355" height="84"/>
-                                                        <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zkg-Jg-50L" userLabel=" ">
-                                                                <rect key="frame" x="0.0" y="0.0" width="355" height="40"/>
-                                                                <constraints>
-                                                                    <constraint firstAttribute="height" constant="40" id="Ila-sV-PNl"/>
-                                                                </constraints>
-                                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                <nil key="textColor"/>
-                                                                <nil key="highlightedColor"/>
-                                                            </label>
-                                                            <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Nmj-RU-jnT">
-                                                                <rect key="frame" x="0.0" y="40" width="355" height="44"/>
-                                                                <subviews>
-                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qBL-yq-Fdj">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="70" height="44"/>
-                                                                        <constraints>
-                                                                            <constraint firstAttribute="width" constant="70" id="0xZ-xA-aRO"/>
-                                                                        </constraints>
-                                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                        <nil key="textColor"/>
-                                                                        <nil key="highlightedColor"/>
-                                                                    </label>
-                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Cx6-ys-QIl">
-                                                                        <rect key="frame" x="70" y="0.0" width="215" height="44"/>
-                                                                        <color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
-                                                                        <constraints>
-                                                                            <constraint firstAttribute="height" constant="44" id="34x-dS-hzV"/>
-                                                                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="Tyf-BC-U6g"/>
-                                                                        </constraints>
-                                                                        <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="18"/>
-                                                                        <state key="normal" title="Continue">
-                                                                            <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                        </state>
-                                                                        <connections>
-                                                                            <action selector="_continue:" destination="HSb-ou-7T5" eventType="touchUpInside" id="YBE-LG-ORi"/>
-                                                                        </connections>
-                                                                    </button>
-                                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6nW-6y-Cs3">
-                                                                        <rect key="frame" x="285" y="0.0" width="70" height="44"/>
-                                                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                        <nil key="textColor"/>
-                                                                        <nil key="highlightedColor"/>
-                                                                    </label>
-                                                                </subviews>
-                                                                <constraints>
-                                                                    <constraint firstItem="6nW-6y-Cs3" firstAttribute="width" secondItem="qBL-yq-Fdj" secondAttribute="width" id="R2W-VF-XWJ"/>
-                                                                </constraints>
-                                                            </stackView>
-                                                        </subviews>
-                                                    </stackView>
                                                 </subviews>
                                             </stackView>
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Cx6-ys-QIl">
+                                                <rect key="frame" x="87.5" y="378" width="200" height="44"/>
+                                                <color key="backgroundColor" red="0.92941176469999998" green="0.10980392160000001" blue="0.14117647059999999" alpha="1" colorSpace="calibratedRGB"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="height" constant="44" id="34x-dS-hzV"/>
+                                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="200" id="Tyf-BC-U6g"/>
+                                                </constraints>
+                                                <fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="18"/>
+                                                <state key="normal" title="Continue">
+                                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                </state>
+                                                <connections>
+                                                    <action selector="_continue:" destination="HSb-ou-7T5" eventType="touchUpInside" id="YBE-LG-ORi"/>
+                                                </connections>
+                                            </button>
                                         </subviews>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                         <constraints>
                                             <constraint firstAttribute="trailing" secondItem="Fbe-6n-L1t" secondAttribute="trailing" constant="10" id="1kM-Nj-nie"/>
-                                            <constraint firstAttribute="height" constant="600" id="1nl-Ej-z5m"/>
                                             <constraint firstItem="Fbe-6n-L1t" firstAttribute="top" secondItem="VSx-DH-XAq" secondAttribute="bottom" constant="10" id="KEc-9A-Zu2"/>
                                             <constraint firstItem="VSx-DH-XAq" firstAttribute="leading" secondItem="7a0-Vr-Gxf" secondAttribute="leading" id="XcE-jg-azX"/>
                                             <constraint firstAttribute="trailing" secondItem="VSx-DH-XAq" secondAttribute="trailing" id="YDr-AC-UKF"/>
+                                            <constraint firstItem="Cx6-ys-QIl" firstAttribute="centerX" secondItem="7a0-Vr-Gxf" secondAttribute="centerX" id="bxa-J8-igP"/>
+                                            <constraint firstAttribute="bottom" secondItem="Cx6-ys-QIl" secondAttribute="bottom" constant="20" id="ipI-Zu-8qg"/>
                                             <constraint firstItem="Fbe-6n-L1t" firstAttribute="leading" secondItem="7a0-Vr-Gxf" secondAttribute="leading" constant="10" id="oFN-1T-jkf"/>
                                             <constraint firstItem="VSx-DH-XAq" firstAttribute="top" secondItem="7a0-Vr-Gxf" secondAttribute="top" constant="5" id="q8b-X8-Hql"/>
+                                            <constraint firstItem="Cx6-ys-QIl" firstAttribute="top" secondItem="Fbe-6n-L1t" secondAttribute="bottom" constant="20" id="uek-mJ-JsZ"/>
                                         </constraints>
                                     </view>
                                 </subviews>
                                 <constraints>
-                                    <constraint firstItem="7a0-Vr-Gxf" firstAttribute="top" secondItem="Bsf-zV-Yqr" secondAttribute="top" constant="10" id="6Md-0L-rBQ"/>
-                                    <constraint firstItem="7a0-Vr-Gxf" firstAttribute="leading" secondItem="Bsf-zV-Yqr" secondAttribute="leading" id="FCe-hd-kj2"/>
-                                    <constraint firstAttribute="trailing" secondItem="7a0-Vr-Gxf" secondAttribute="trailing" id="LJa-Qs-FLH"/>
-                                    <constraint firstAttribute="bottom" secondItem="7a0-Vr-Gxf" secondAttribute="bottom" id="xJ4-O1-uo4"/>
+                                    <constraint firstAttribute="trailing" secondItem="7a0-Vr-Gxf" secondAttribute="trailing" id="GkX-cJ-lKv"/>
+                                    <constraint firstItem="7a0-Vr-Gxf" firstAttribute="top" secondItem="Bsf-zV-Yqr" secondAttribute="top" id="NI3-yB-wnM"/>
+                                    <constraint firstItem="7a0-Vr-Gxf" firstAttribute="leading" secondItem="Bsf-zV-Yqr" secondAttribute="leading" id="hg6-TW-zTX"/>
+                                    <constraint firstAttribute="bottom" secondItem="7a0-Vr-Gxf" secondAttribute="bottom" id="qB5-xU-B7U"/>
+                                    <constraint firstItem="7a0-Vr-Gxf" firstAttribute="width" secondItem="Bsf-zV-Yqr" secondAttribute="width" id="srh-Ce-Ccu"/>
                                 </constraints>
                             </scrollView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
-                            <constraint firstItem="7a0-Vr-Gxf" firstAttribute="width" secondItem="9Uc-9s-KgO" secondAttribute="width" id="5Tw-vU-cSW"/>
-                            <constraint firstAttribute="trailing" secondItem="Bsf-zV-Yqr" secondAttribute="trailing" id="Lyg-b4-zbC"/>
-                            <constraint firstItem="Bsf-zV-Yqr" firstAttribute="leading" secondItem="9Uc-9s-KgO" secondAttribute="leading" id="USU-tO-dzK"/>
-                            <constraint firstItem="Bsf-zV-Yqr" firstAttribute="top" secondItem="9Uc-9s-KgO" secondAttribute="top" id="flr-iE-XLI"/>
-                            <constraint firstItem="PYB-Kq-ghm" firstAttribute="top" secondItem="Bsf-zV-Yqr" secondAttribute="bottom" id="oGj-t4-k8l"/>
-                            <constraint firstItem="Bsf-zV-Yqr" firstAttribute="leading" secondItem="9Uc-9s-KgO" secondAttribute="leading" id="x7I-y9-3R5"/>
-                            <constraint firstAttribute="trailing" secondItem="Bsf-zV-Yqr" secondAttribute="trailing" id="zwG-1Z-6Xg"/>
+                            <constraint firstItem="PYB-Kq-ghm" firstAttribute="top" secondItem="Bsf-zV-Yqr" secondAttribute="bottom" id="7nJ-Gj-KDE"/>
+                            <constraint firstItem="Bsf-zV-Yqr" firstAttribute="leading" secondItem="9Uc-9s-KgO" secondAttribute="leading" id="Blj-31-a7e"/>
+                            <constraint firstAttribute="trailing" secondItem="Bsf-zV-Yqr" secondAttribute="trailing" id="jkn-QY-72k"/>
+                            <constraint firstItem="Bsf-zV-Yqr" firstAttribute="top" secondItem="9Uc-9s-KgO" secondAttribute="top" id="qXX-Ke-NSs"/>
                         </constraints>
                     </view>
                     <connections>
diff --git a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift
index 31977dbc..a6289c33 100644
--- a/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift	
+++ b/GMERemittance/Module/SendMoney/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift	
@@ -93,7 +93,11 @@ class SendMoneyPaymentModeViewController: UIViewController {
     var selectedBank: SendMoneyBank? {
         didSet {
             self.bankTextField.text = selectedBank?.name
-
+            
+            if let payoutParter =  self.selectedBank?.payoutPartner {
+                self.selectedPayoutMode?.payoutPartner = payoutParter
+            }
+            
             let shouldShowBranch = (self.selectedBank?.branchRequired ?? "false").lowercased() == "true"
 //            self.branchStackView.isHidden = !shouldShowBranch
             if shouldShowBranch {
@@ -219,7 +223,6 @@ class SendMoneyPaymentModeViewController: UIViewController {
                         self.presenter?.validate(model: validationRequest)
                     }
                 }
-                
             }
         }