Browse Source

view improvised paymentMode

pull/1/head
gme_2 6 years ago
parent
commit
b856a6e93a
  1. 1
      GMERemittance/Module/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift
  2. 50
      GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentMode.storyboard
  3. 1
      GMERemittance/Module/SendMoneyPaymentMode/User Interface/View/SendMoneyPaymentModeViewController.swift

1
GMERemittance/Module/SendMoneyPaymentMode/User Interface/Presenter/SendMoneyPaymentModePresenter.swift

@ -37,6 +37,7 @@ extension SendMoneyPaymentModePresenter: SendMoneyPaymentModeModuleInterface {
extension SendMoneyPaymentModePresenter: SendMoneyPaymentModeInteractorOutput {
func show(error: Error) {
self.view?.show(error: error.localizedDescription)
self.view?.hideLoading()
}

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

@ -13,6 +13,9 @@
<array key="SanFranciscoDisplay-Regular.otf">
<string>SanFranciscoDisplay-Regular</string>
</array>
<array key="SanFranciscoDisplay-Semibold.otf">
<string>SanFranciscoDisplay-Semibold</string>
</array>
<array key="SanFranciscoText-Regular.otf">
<string>SanFranciscoText-Regular</string>
</array>
@ -37,19 +40,42 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="600"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="VSx-DH-XAq">
<rect key="frame" x="0.0" y="0.0" width="375" height="159"/>
<rect key="frame" x="0.0" y="5" width="375" height="189"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c7l-8b-hdU">
<rect key="frame" x="0.0" y="0.0" width="375" height="45"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Select Payment Mode" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3VN-xM-pjD">
<rect key="frame" x="0.0" y="0.0" width="375" height="15"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MqK-Ak-atN">
<rect key="frame" x="0.0" y="0.0" width="40" height="45"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="BZT-jj-l5t"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="How would you like to pick your money in Nepal?" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3VN-xM-pjD">
<rect key="frame" x="40" y="0.0" width="295" height="45"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="Miv-8i-Yy1"/>
<constraint firstAttribute="height" constant="45" id="Miv-8i-Yy1"/>
</constraints>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="14"/>
<color key="textColor" red="0.2901960784" green="0.2901960784" blue="0.2901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1M7-yK-7Tq">
<rect key="frame" x="335" y="0.0" width="40" height="45"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="1M7-yK-7Tq" firstAttribute="width" secondItem="MqK-Ak-atN" secondAttribute="width" id="6ur-yx-heY"/>
</constraints>
</stackView>
<collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="oTy-T1-Wgq">
<rect key="frame" x="0.0" y="19" width="375" height="135"/>
<rect key="frame" x="0.0" y="49" width="375" height="135"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="135" id="eXa-KV-M4K"/>
@ -114,7 +140,7 @@
</cells>
</collectionView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" " textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="862-zq-4kP">
<rect key="frame" x="0.0" y="158" width="375" height="1"/>
<rect key="frame" x="0.0" y="188" width="375" height="1"/>
<color key="backgroundColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="0.444762323943662" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="9ha-a3-GvB"/>
@ -125,16 +151,16 @@
</label>
</subviews>
<constraints>
<constraint firstAttribute="height" constant="159" id="Bjk-9C-OxT"/>
<constraint firstAttribute="height" constant="189" id="Bjk-9C-OxT"/>
</constraints>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Fbe-6n-L1t">
<rect key="frame" x="10" y="169" width="355" height="208"/>
<rect key="frame" x="10" y="204" width="355" height="208"/>
<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"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Bank" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wPj-B8-igV">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select Bank" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wPj-B8-igV">
<rect key="frame" x="0.0" y="0.0" width="355" height="45"/>
<color key="textColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
@ -148,7 +174,7 @@
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="PIk-lF-P3k">
<rect key="frame" x="0.0" y="55" width="355" height="45"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Branch" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Und-Nt-uNd">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select Branch" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Und-Nt-uNd">
<rect key="frame" x="0.0" y="0.0" width="355" height="45"/>
<color key="textColor" red="0.29019607843137252" green="0.29019607843137252" blue="0.29019607843137252" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="12"/>
@ -222,7 +248,7 @@
<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="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" id="q8b-X8-Hql"/>
<constraint firstItem="VSx-DH-XAq" firstAttribute="top" secondItem="7a0-Vr-Gxf" secondAttribute="top" constant="5" id="q8b-X8-Hql"/>
</constraints>
</view>
</subviews>

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

@ -125,7 +125,6 @@ class SendMoneyPaymentModeViewController: UIViewController {
}
private func shouldValidateAccount() -> Bool {
return true
return (self.selectedBank?.accountValidationRequired ?? "false").lowercased() == "true"
}

Loading…
Cancel
Save