IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'dev-swift-d' of http://202.166.220.79:3000/JME-JAPAN/JME-IOS into dev-swift-d

v0.17
Suraj Lohani 1 year ago
parent
63ce914657 4667915328
commit
a55195156c
20 changed files with 239 additions and 150 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      .DS_Store
  2. 48
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
  3. 18
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib
  4. 8
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift
  5. 8
      GME Remit/Modules/Home/User Interface/View/Home.storyboard
  6. 9
      GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift
  7. 1
      GME Remit/Modules/Profile/ProfileViewController.swift
  8. 22
      GME Remit/Modules/RecipientModules/Recipients/Module Interface/RecipientsModuleInterface.swift
  9. 4
      GME Remit/Modules/RecipientModules/Recipients/User Interface/Presenter/RecipientsPresenter.swift
  10. 42
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/TransferListTableViewCell.swift
  11. 21
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
  12. 44
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift
  13. 48
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModel.swift
  14. 6
      GME Remit/Modules/RecipientModules/Recipients/User Interface/Wireframe/RecipientsWireframe.swift
  15. 1
      GME Remit/Modules/RecipientModules/Recipients/User Interface/Wireframe/RecipientsWireframeInputOutput.swift
  16. 79
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
  17. 11
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
  18. 5
      GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift
  19. 8
      GME Remit/Modules/SideMenu/Setting.storyboard
  20. 6
      GME Remit/Modules/SideMenu/SettingViewController.swift

BIN
.DS_Store
View File

48
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
View File

@ -85,37 +85,49 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDM-LN-544">
<rect key="frame" x="0.0" y="0.0" width="265" height="195"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="DHQ-Um-OF3">
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="DHQ-Um-OF3">
<rect key="frame" x="16" y="16" width="249" height="163"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bank_deposit" translatesAutoresizingMaskIntoConstraints="NO" id="hqc-cx-rzh">
<rect key="frame" x="0.0" y="61.5" width="40" height="40"/>
<rect key="frame" x="0.0" y="0.0" width="40" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="2AX-wg-DHd"/>
<constraint firstAttribute="width" constant="40" id="jBV-OA-jx3"/>
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Cnn-41-XDg">
<rect key="frame" x="48" y="56.5" width="161" height="50"/>
<rect key="frame" x="56" y="0.0" width="193" height="92"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="IME Pay Mobile Wallet" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ae7-L0-gY3">
<rect key="frame" x="0.0" y="0.0" width="161" height="14"/>
<rect key="frame" x="0.0" y="0.0" width="193" height="14"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="4" translatesAutoresizingMaskIntoConstraints="NO" id="Lh7-U6-fWO">
<rect key="frame" x="0.0" y="22" width="161" height="28"/>
<rect key="frame" x="0.0" y="22" width="193" height="70"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="doi-P7-z1R">
<rect key="frame" x="0.0" y="0.0" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O58-Ke-fq6">
<rect key="frame" x="0.0" y="18.5" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9uL-wQ-mZd">
<rect key="frame" x="0.0" y="0.0" width="161" height="12"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
<rect key="frame" x="0.0" y="37" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jsp-NN-jLM">
<rect key="frame" x="0.0" y="16" width="161" height="12"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="12"/>
<rect key="frame" x="0.0" y="55.5" width="193" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
@ -123,25 +135,13 @@
</stackView>
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sb6-dg-9Kc">
<rect key="frame" x="217" y="65.5" width="32" height="32"/>
<constraints>
<constraint firstAttribute="width" constant="32" id="gJS-vx-kSM"/>
<constraint firstAttribute="height" constant="32" id="wDK-0a-BFM"/>
</constraints>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="plain" image="ic_delete3"/>
<connections>
<action selector="deleteAction:" destination="Zvf-x1-Wi5" eventType="touchUpInside" id="E6X-6Z-oTi"/>
</connections>
</button>
</subviews>
</stackView>
</subviews>
<color key="backgroundColor" red="0.1803921568627451" green="0.53725490196078429" blue="1" alpha="0.038622723509933773" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="DHQ-Um-OF3" firstAttribute="top" secondItem="ZDM-LN-544" secondAttribute="top" constant="16" id="IPG-sG-484"/>
<constraint firstAttribute="trailing" secondItem="DHQ-Um-OF3" secondAttribute="trailing" id="Va2-wU-p6e"/>
<constraint firstAttribute="trailing" secondItem="DHQ-Um-OF3" secondAttribute="trailing" id="JfO-A7-ABO"/>
<constraint firstAttribute="bottom" secondItem="DHQ-Um-OF3" secondAttribute="bottom" constant="16" id="hMX-bV-B8j"/>
<constraint firstItem="DHQ-Um-OF3" firstAttribute="leading" secondItem="ZDM-LN-544" secondAttribute="leading" constant="16" id="s4K-Rw-9Ce"/>
</constraints>
@ -160,8 +160,9 @@
</tableViewCellContentView>
<connections>
<outlet property="AcBranchLabel" destination="jsp-NN-jLM" id="xDJ-Y2-c78"/>
<outlet property="AcNameLabel" destination="O58-Ke-fq6" id="KVS-Xt-oRd"/>
<outlet property="AcNumberLabel" destination="9uL-wQ-mZd" id="Pks-mP-OJX"/>
<outlet property="deleteButtonOutlet" destination="sb6-dg-9Kc" id="eib-yA-E3c"/>
<outlet property="idNumberLabel" destination="doi-P7-z1R" id="6QK-2D-gYe"/>
<outlet property="indicatorButton" destination="g1X-nk-DT1" id="4vj-vA-Y9D"/>
<outlet property="localizedNameLabel" destination="Ae7-L0-gY3" id="Ksl-Xn-apk"/>
<outlet property="walletInfoView" destination="ZDM-LN-544" id="QlL-Ah-8f5"/>
@ -238,7 +239,6 @@
<image name="backIconBlack" width="21" height="16"/>
<image name="bank_deposit" width="54" height="54"/>
<image name="circle" catalog="system" width="128" height="123"/>
<image name="ic_delete3" width="24" height="24"/>
<namedColor name="ThemeBlack">
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</namedColor>

18
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.xib
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Image references" minToolsVersion="12.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
@ -52,7 +52,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="Cqd-2Y-S86">
<rect key="frame" x="128" y="0.0" width="455" height="136"/>
<rect key="frame" x="128" y="0.0" width="455" height="137"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="CCk-EB-IRl">
<rect key="frame" x="0.0" y="0.0" width="455" height="28"/>
@ -86,7 +86,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="nLI-6r-icB">
<rect key="frame" x="0.0" y="36" width="455" height="28"/>
<rect key="frame" x="0.0" y="36" width="455" height="29"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-smartphone-94" translatesAutoresizingMaskIntoConstraints="NO" id="dgU-AV-hy1">
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
@ -97,7 +97,7 @@
</constraints>
</imageView>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="W5h-nA-8vi">
<rect key="frame" x="32" y="0.0" width="423" height="28"/>
<rect key="frame" x="32" y="0.0" width="423" height="29"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mobile Number" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fsd-2X-Yg1">
<rect key="frame" x="0.0" y="0.0" width="423" height="12"/>
@ -106,8 +106,8 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="9860636112" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eC0-je-pC7">
<rect key="frame" x="0.0" y="12" width="423" height="16"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="16"/>
<rect key="frame" x="0.0" y="12" width="423" height="17"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
@ -116,7 +116,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="WAL-nn-fmB">
<rect key="frame" x="0.0" y="72" width="455" height="28"/>
<rect key="frame" x="0.0" y="73" width="455" height="28"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-people-94" translatesAutoresizingMaskIntoConstraints="NO" id="0e3-j0-Rkg">
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>
@ -146,7 +146,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" alignment="top" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="NUo-GK-jR6">
<rect key="frame" x="0.0" y="108" width="455" height="28"/>
<rect key="frame" x="0.0" y="109" width="455" height="28"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icons8-location-94" translatesAutoresizingMaskIntoConstraints="NO" id="sMg-xb-OHS">
<rect key="frame" x="0.0" y="0.0" width="24" height="24"/>

8
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift
View File

@ -63,7 +63,13 @@ class BeneficiaryDetailViewController: UIViewController {
if reciptent?.hasVerifiedOTP ?? false {
presenter?.gotoSendMoney(self.reciptent, selectedPayments)
} else {
let vc = TermsAndConditionWireframe().getMainView()
let termsViewController = TermsAndConditionWireframe().getMainView() as? TermsAndConditionViewController
termsViewController?.reciepient = self.reciptent
termsViewController?.paymentModel = selectedPayments
termsViewController?.fromBeneficiary = true
if let termsViewController = termsViewController {
self.navigationController?.push(termsViewController, animated: true)
}
}
}

8
GME Remit/Modules/Home/User Interface/View/Home.storyboard
View File

@ -154,14 +154,14 @@
<color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MOB000110" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2D3-BA-yV3">
<rect key="frame" x="16" y="36" width="109" height="32.5"/>
<fontDescription key="fontDescription" name="FONTSPRINGDEMO-VolteSemiboldRegular" family="FONTSPRING DEMO - Volte Semibold" pointSize="20"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MOB447110" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2D3-BA-yV3">
<rect key="frame" x="16" y="36" width="92.5" height="32.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0B9-0a-Jlt">
<rect key="frame" x="133" y="44" width="13" height="17"/>
<rect key="frame" x="116.5" y="44" width="13" height="17"/>
<constraints>
<constraint firstAttribute="width" constant="13" id="PY1-YE-0vx"/>
<constraint firstAttribute="height" constant="17" id="a2I-Sr-5OW"/>

9
GME Remit/Modules/Loyality Points/User Interface/Wireframe/LoyalityPointsWireframe.swift
View File

@ -11,6 +11,7 @@ import UIKit
class LoyalityPointsWireframe {
weak var view: UIViewController!
private lazy var recipientsWireframe: RecipientsWireframe = { RecipientsWireframe() }()
private lazy var allRecipientsWireframe: AllRecipientsWireframe = { AllRecipientsWireframe() }()
}
extension LoyalityPointsWireframe: LoyalityPointsWireframeInput {
@ -34,8 +35,12 @@ extension LoyalityPointsWireframe: LoyalityPointsWireframeInput {
}
func openSendMoneyView() {
if let navVC = view.navigationController {
navVC.push(recipientsWireframe.getMainView(), animated: true)
// if let navVC = view.navigationController {
// navVC.push(allRecipientsWireframe.getMainView(), animated: true)
// }
if let navigation = view.navigationController {
AllRecipientsWireframe().openAllRecipients(source: navigation)
}
}
}

1
GME Remit/Modules/Profile/ProfileViewController.swift
View File

@ -94,6 +94,7 @@ class ProfileViewController: UIViewController {
func show() {
let name = GMEDB.shared.user.string(.firstName)
let isVerified = GMEDB.shared.user.string(.verified)
self.labelUserName?.text = name?.uppercased()
self.labelMobileNumber.text = GMEDB.shared.user.string(.mobileNumber)
self.labelEmail.text = GMEDB.shared.user.string(.email)

22
GME Remit/Modules/RecipientModules/Recipients/Module Interface/RecipientsModuleInterface.swift
View File

@ -7,15 +7,17 @@
//
protocol RecipientsModuleInterface: class {
func fetchRecipients(isRefresh: Bool)
func openSendMoneyCalculate(who recipient: Recipient)
func openAddRecipient(with delegate: SetupRecipientDelegate)
func openEditRecipient(who recipient: Recipient, with delegate: SetupRecipientDelegate)
func fetchRecipients(isRefresh: Bool)
func openSendMoneyCalculate(who recipient: Recipient)
func openAddRecipient(with delegate: SetupRecipientDelegate)
func openEditRecipient(who recipient: Recipient, with delegate: SetupRecipientDelegate)
func openEdit(model: RecentTransactions)
func deleteRecipient(who recipient: Recipient)
func didSelect( _ reciptent: Recipient)
// func checkOtp(otp: String, userId: String, receiverID: String)
//
// func requestOtp(viewController: SetupRecipientViewController, userId: String, receiverID: String)
func deleteRecipient(who recipient: Recipient)
func didSelect( _ reciptent: Recipient)
func openReceipt(model: RecentTransactions)
// func checkOtp(otp: String, userId: String, receiverID: String)
//
// func requestOtp(viewController: SetupRecipientViewController, userId: String, receiverID: String)
}

4
GME Remit/Modules/RecipientModules/Recipients/User Interface/Presenter/RecipientsPresenter.swift
View File

@ -40,6 +40,10 @@ extension RecipientsPresenter: RecipientsModuleInterface {
func openEdit(model: RecentTransactions) {
wireframe?.openEdit(model: model)
}
func openReceipt(model: RecentTransactions) {
wireframe?.openReceipt(model: model)
}
func deleteRecipient(who recipient: Recipient) {
viewModel?.progress(isShow: true)

42
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Cell/TransferListTableViewCell.swift
View File

@ -5,6 +5,7 @@ import UIKit
class TransferListTableViewCell: UITableViewCell {
var didTappedEditDetails: ( (RecentTransactions?) -> ())?
var didTappedResendDetails: ( (RecentTransactions?) -> ())?
@IBOutlet weak var additionalTextLabel: UILabel!
@IBOutlet weak var nameLabel: UILabel!
@ -54,16 +55,42 @@ class TransferListTableViewCell: UITableViewCell {
dateLabel.text = model?.sendDate ?? ""
nameLabel.text = model?.user?.uppercased()
additionalTextLabel.text = model?.payoutMode?.uppercased()
let status = model?.payStatus?.uppercased()
if status == "PAYMENT" {
let status = model?.payStatus?.lowercased()
if status == PaymentStatus.paid.rawValue {
statusLabel.setTitle("Successful", for: .normal)
statusLabel.backgroundColor = .themeGreen
editButton.setTitle("View Status", for: .normal)
} else if status == "PENDING" {
} else if (status == PaymentStatus.paid.rawValue || status == PaymentStatus.readyToCollect.rawValue || status == PaymentStatus.unpaid.rawValue || status == PaymentStatus.processing.rawValue || status == PaymentStatus.pending.rawValue ){
statusLabel.setTitle("Pending", for: .normal)
statusLabel.backgroundColor = .themeBlue
} else if status == PaymentStatus.cancelled.rawValue {
statusLabel.setTitle("Cancel", for: .normal)
statusLabel.backgroundColor = .themeRed
editButton.setTitle("Edit Details", for: .normal)
}
let displayStatus = model?.displayActions?.lowercased()
if displayStatus == DisplayOption.reject.rawValue {
editButton.isHidden = true
resendButton.isHidden = false
resendButton.setTitle("Cancel Transaction", for: .normal)
}else if displayStatus == DisplayOption.cancel.rawValue {
editButton.isHidden = true
resendButton.isHidden = false
resendButton.setTitle("Request to Cancel", for: .normal)
}else if displayStatus == DisplayOption.amend.rawValue {
editButton.isHidden = true
resendButton.isHidden = false
resendButton.setTitle("Edit Detail", for: .normal)
}else if displayStatus == DisplayOption.cancelamend.rawValue {
editButton.isHidden = false
resendButton.isHidden = false
editButton.setTitle("Edit Detail", for: .normal)
resendButton.setTitle("Request to Cancel", for: .normal)
}else {
resendButton.isHidden = true
editButton.isHidden = false
editButton.setTitle("View Status", for: .normal)
}
self.initialsLabel.text = nameInitials
self.model = model
}
@ -79,5 +106,10 @@ class TransferListTableViewCell: UITableViewCell {
@IBAction func didTappedEditDetailsButton(_ sender: Any) {
didTappedEditDetails?(model)
}
@IBAction func didTappedResendDetailsButton(_ sender: Any) {
didTappedResendDetails?(model)
}
}

21
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/Recipients.storyboard
View File

@ -577,30 +577,33 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Updated jun 20, 2022 @11:10 AM" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eoe-x2-QPv">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Updated jun 20, 2022 @11:10 AM" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eoe-x2-QPv">
<rect key="frame" x="61" y="49" width="258" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.37957057820000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Text line 2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jnX-kl-zkA">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Text line 2" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jnX-kl-zkA">
<rect key="frame" x="61" y="71.5" width="60" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.37957057820000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Text line 3" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e0Z-oA-9sX">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Text line 3" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e0Z-oA-9sX">
<rect key="frame" x="137" y="71.5" width="60.5" height="14.5"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.37957057820000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="5n0-KR-313">
<rect key="frame" x="16" y="106" width="295" height="31"/>
<rect key="frame" x="16" y="97" width="295" height="40"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S6N-R0-I6w">
<rect key="frame" x="0.0" y="0.0" width="146.5" height="31"/>
<rect key="frame" x="0.0" y="0.0" width="146.5" height="40"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="yyz-Hz-Gbt"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="Edit Details">
@ -611,13 +614,19 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="V4Y-CS-dqf">
<rect key="frame" x="148.5" y="0.0" width="146.5" height="31"/>
<rect key="frame" x="148.5" y="0.0" width="146.5" height="40"/>
<color key="backgroundColor" red="0.18039215689999999" green="0.53725490200000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="eTb-3x-1Zy"/>
</constraints>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<state key="normal" title="Resend">
<color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="didTappedResendDetailsButton:" destination="K6H-Ti-Vmr" eventType="touchUpInside" id="u3n-Y7-8eu"/>
</connections>
</button>
</subviews>
</stackView>

44
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift
View File

@ -130,6 +130,7 @@ extension RecipientsViewController {
tableView.refreshControl = refreshControl
tableView.separatorColor = .themeBorderColor
setBinding()
NotificationCenter.default.addObserver(
@ -159,7 +160,7 @@ extension RecipientsViewController {
fetchTrigger: viewWillAppear,
refreshTrigger: tableView.refreshControl!.rx.controlEvent(.valueChanged).asDriver(),
// addTrigger: addRecipientTapGestureRecognizer.rx.event.mapToVoid().asDriverOnErrorJustComplete(),
// selectTrigger: tableView.rx.itemSelected.asDriver(),
selectTrigger: tableView.rx.itemSelected.asDriver(),
editTrigger: editTrigger.asDriverOnErrorJustComplete(),
deleteTrigger: deleteTrigger.asDriverOnErrorJustComplete(),
needEditTrigger: needEditTrigger.asDriverOnErrorJustComplete(),
@ -214,13 +215,43 @@ extension RecipientsViewController {
cell.setModel(with: element)
cell.didTappedEditDetails = { [weak self] model in
if let selectedTransaction = model {
if selectedTransaction.payStatus?.uppercased() == "PAYMENT" {
if let navigation = self?.navigationController {
SendMoneyReceiptWireframe().openReciept(transactionId: selectedTransaction.tranId ?? "", source: navigation)
}
} else if selectedTransaction.payStatus?.uppercased() == "PENDING" {
if let navigation = self?.navigationController {
SendMoneyReceiptWireframe().openReciept(transactionId: selectedTransaction.tranId ?? "", source: navigation)
}
// if selectedTransaction.displayActions?.uppercased() == "PAYMENT" {
// if let navigation = self?.navigationController {
// SendMoneyReceiptWireframe().openReciept(transactionId: selectedTransaction.tranId ?? "", source: navigation)
// }
// } else if selectedTransaction.displayActions?.uppercased() == "PENDING" {
// self?.editTrigger.onNext(selectedTransaction)
// }else {
//
// }
// self?.editTrigger.onNext(selectedTransaction)
}
}
cell.didTappedResendDetails = { [weak self] model in
if let selectedTransaction = model {
let displayStatus = model?.displayActions?.lowercased()
if displayStatus == DisplayOption.reject.rawValue || displayStatus == DisplayOption.cancel.rawValue || displayStatus == DisplayOption.amend.rawValue {
self?.editTrigger.onNext(selectedTransaction)
}
// if selectedTransaction.displayActions?.uppercased() == "PAYMENT" {
// if let navigation = self?.navigationController {
// SendMoneyReceiptWireframe().openReciept(transactionId: selectedTransaction.tranId ?? "", source: navigation)
// }
// } else if selectedTransaction.displayActions?.uppercased() == "PENDING" {
// self?.editTrigger.onNext(selectedTransaction)
// }else {
//
// }
}
}
// cell.hero.modifiers = [.fade, .scale(0.7)]
@ -288,6 +319,7 @@ extension RecipientsViewController {
// MARK: - UITableViewDelegate
extension RecipientsViewController: UITableViewDelegate {
func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
view.endEditing(true)
}

48
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/ViewModel/RecipientsViewModel.swift
View File

@ -16,7 +16,7 @@ class RecipientsViewModel: ViewModelType {
let fetchTrigger: Driver<Void>
let refreshTrigger: Driver<Void>
// let addTrigger: Driver<Void>
// let selectTrigger: Driver<IndexPath>
let selectTrigger: Driver<IndexPath>
let editTrigger: Driver<RecentTransactions>
let deleteTrigger: Driver<Recipient>
let needEditTrigger: Driver<Void>
@ -78,45 +78,13 @@ class RecipientsViewModel: ViewModelType {
return transactions.filter {( $0.user?.lowercased().contains(searchText.lowercased()) ?? false )}
}.asDriverOnErrorJustComplete()
// input.selectTrigger
// .withLatestFrom(recipients) { (indexPath, recipients) -> Recipient in
// return recipients[indexPath.row]
// }
// .drive(onNext: { [weak self] in guard let `self` = self else { return }
// self.selectedRecipient = $0
//
// guard let paymentMode = self.selectedRecipient?.paymentMethod else {
// self.isNeedEditRecipient.onNext(())
// return
// }
//
// if paymentMode.id == nil {
// self.isNeedEditRecipient.onNext(())
// return
// }
//
// if self.selectedRecipient?.isForceUpdate?.uppercased() == "Y" {
// self.isNeedEditRecipient.onNext(())
// return
// }
//
// if self.selectedRecipient?.isPartnerChanged == "1" {
// self.isPartnerChanged.onNext(())
// return
// }
//
// // allow user to send money to verified beneficiary only otherwise redirect to terms and condition
// if self.selectedRecipient?.hasVerifiedOTP == false {
// //open t&C
// if let recepient = self.selectedRecipient, let viewController = viewController {
// self.moveToTermsAndConditionViewForReceipient(at: recepient, viewController, delegate: self)
// }
//
// }else if let receipnt = self.selectedRecipient{
// self.presenter?.openSendMoneyCalculate(who: receipnt)
// }
// })
// .disposed(by: disposeBag)
input.selectTrigger
.withLatestFrom(transactions) { (indexPath, recipients) -> RecentTransactions in
return recipients[indexPath.row]
}
.drive(onNext: { [weak self] in guard let `self` = self else { return }
self.presenter?.openReceipt(model: $0)
}).disposed(by: disposeBag)
input.editTrigger
.drive(onNext: { [weak self] in guard let `self` = self else { return }

6
GME Remit/Modules/RecipientModules/Recipients/User Interface/Wireframe/RecipientsWireframe.swift
View File

@ -62,6 +62,12 @@ extension RecipientsWireframe: RecipientsWireframeInput {
}
}
func openReceipt(model: RecentTransactions) {
if let navigation = self.view.navigationController {
SendMoneyReceiptWireframe().openReciept(transactionId: model.tranId ?? "", source: navigation)
}
}
func goNextStep(who recipient: Recipient) {
if self.parentType == .receivers{
return

1
GME Remit/Modules/RecipientModules/Recipients/User Interface/Wireframe/RecipientsWireframeInputOutput.swift
View File

@ -14,6 +14,7 @@ protocol RecipientsWireframeInput: WireframeInput {
func openEdit(model: RecentTransactions)
func goNextStep(who recipient: Recipient)
func goToBeneficeries(_ reciptent: Recipient)
func openReceipt(model: RecentTransactions)
}

79
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina5_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@ -50,31 +50,31 @@
<rect key="frame" x="0.0" y="0.0" width="355" height="270"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transfer Successful!" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="JkE-DM-feU">
<rect key="frame" x="78.666666666666686" y="170.33333333333334" width="198" height="25.666666666666657"/>
<rect key="frame" x="77.666666666666671" y="168.33333333333334" width="199.66666666666663" height="26.333333333333343"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Semibold" family="San Francisco Display" pointSize="22"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N0H-j3-s7Q">
<rect key="frame" x="177.66666666666666" y="204" width="0.0" height="0.0"/>
<rect key="frame" x="177.66666666666666" y="202.66666666666666" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="30"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Send to" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pLY-tl-YiX">
<rect key="frame" x="146" y="212" width="63.333333333333343" height="21"/>
<rect key="frame" x="147.33333333333334" y="210.66666666666666" width="60.333333333333343" height="21.666666666666657"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<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="oTd-t6-aTn">
<rect key="frame" x="177.66666666666666" y="241" width="0.0" height="0.0"/>
<rect key="frame" x="177.66666666666666" y="240.33333333333331" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="24"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="JME Control No. XXXXXXXXX" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NUp-Lj-dKf">
<rect key="frame" x="58.666666666666671" y="249" width="237.66666666666663" height="21"/>
<rect key="frame" x="62.333333333333329" y="248.33333333333329" width="230.66666666666669" height="21.666666666666657"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -120,25 +120,32 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Please make payment of" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ep6-Oj-aXg">
<rect key="frame" x="89.333333333333329" y="99" width="176.66666666666669" height="18.666666666666671"/>
<rect key="frame" x="92" y="99" width="171" height="19.333333333333329"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Medium" family="San Francisco Display" pointSize="16"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<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="Jcm-Pf-Svb">
<rect key="frame" x="177.66666666666666" y="125.66666666666669" width="0.0" height="0.0"/>
<rect key="frame" x="177.66666666666666" y="126.33333333333331" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="19"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6W5-fI-bNq">
<rect key="frame" x="10" y="133.66666666666669" width="335" height="189"/>
<rect key="frame" x="10" y="134.33333333333331" width="335" height="188.33333333333331"/>
<string key="text">to JME within next working day to transmit this request. request.After payment please check
notices to get JME Number for this transfer.</string>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Gge-7S-SaJ">
<rect key="frame" x="68" y="261" width="259" height="50"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" red="0.1803921568627451" green="0.53725490196078429" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
@ -172,13 +179,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Transaction" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0F1-wm-gWq" userLabel="Relation">
<rect key="frame" x="0.0" y="0.0" width="72.333333333333329" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="75.666666666666671" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Qz4-OT-jiF">
<rect key="frame" x="72.333333333333329" y="0.0" width="240.66666666666669" height="50"/>
<rect key="frame" x="75.666666666666671" y="0.0" width="237.33333333333331" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -214,13 +221,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="253" verticalHuggingPriority="251" text="Receiver" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hpj-CZ-7qv" userLabel="Email">
<rect key="frame" x="0.0" y="0.0" width="54.666666666666664" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="55.333333333333336" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="dxd-Uq-v7o">
<rect key="frame" x="56.666666666666657" y="0.0" width="256.33333333333337" height="50"/>
<rect key="frame" x="57.333333333333329" y="0.0" width="255.66666666666669" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -244,17 +251,11 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Address" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YY3-KP-E09" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="51.666666666666664" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="313" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Gge-7S-SaJ">
<rect key="frame" x="53.666666666666657" y="0.0" width="259.33333333333337" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
</subviews>
@ -273,13 +274,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Mobile No." lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bTl-Ab-V1o" userLabel="Mobile">
<rect key="frame" x="0.0" y="0.0" width="68.333333333333329" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="67.333333333333329" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="SJg-la-JAc">
<rect key="frame" x="70.333333333333329" y="0.0" width="242.66666666666669" height="50"/>
<rect key="frame" x="69.333333333333329" y="0.0" width="243.66666666666669" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -305,13 +306,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="900" text="Payout Agent" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1bL-P8-CBf" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="84.666666666666671" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="85" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ertserggfdhfdsdfgdsdfgertserggfdhfdsdfgdsdfgertserggfdhfdsdfgdsdfgertserggfdhfdsdfgd" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="98o-ui-Lmx">
<rect key="frame" x="86.666666666666671" y="0.0" width="226.33333333333331" height="50"/>
<rect key="frame" x="87" y="0.0" width="226" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -336,13 +337,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="Total Sent Amount" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aV9-MU-U9F" userLabel="Relation">
<rect key="frame" x="0.0" y="0.0" width="115.33333333333333" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="117" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="joO-Vx-01A">
<rect key="frame" x="117.33333333333336" y="0.0" width="195.66666666666663" height="50"/>
<rect key="frame" x="119" y="0.0" width="194" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -365,13 +366,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="300" verticalHuggingPriority="251" horizontalCompressionResistancePriority="900" text="Branch" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tPz-r0-qXQ" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="45" height="0.0"/>
<rect key="frame" x="0.0" y="0.0" width="45.666666666666664" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="gWt-Rx-LIV">
<rect key="frame" x="47" y="0.0" width="266" height="0.0"/>
<rect key="frame" x="47.666666666666657" y="0.0" width="265.33333333333337" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -394,13 +395,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Account Number" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AIR-Co-29n" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="106.33333333333333" height="0.0"/>
<rect key="frame" x="0.0" y="0.0" width="107.33333333333333" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="Mle-zI-ZDV">
<rect key="frame" x="108.33333333333336" y="0.0" width="204.66666666666663" height="0.0"/>
<rect key="frame" x="109.33333333333336" y="0.0" width="203.66666666666663" height="0.0"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -423,13 +424,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Service Fee" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="52t-h8-txs" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="73.666666666666671" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="73" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="5Mm-Rr-tjC">
<rect key="frame" x="75.666666666666671" y="0.0" width="237.33333333333331" height="50"/>
<rect key="frame" x="75" y="0.0" width="238" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -452,13 +453,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Ex Rate" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pTI-kV-y2i" userLabel="Reciever">
<rect key="frame" x="0.0" y="0.0" width="49" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="47.333333333333336" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="E9N-rz-5eO">
<rect key="frame" x="51" y="0.0" width="262" height="50"/>
<rect key="frame" x="49.333333333333343" y="0.0" width="263.66666666666663" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -481,13 +482,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Total Payout Amount" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rr9-dg-u1G" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="130.33333333333334" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="132" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="63I-2O-WVX">
<rect key="frame" x="132.33333333333337" y="0.0" width="180.66666666666663" height="50"/>
<rect key="frame" x="134" y="0.0" width="179" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
@ -510,13 +511,13 @@ notices to get JME Number for this transfer.</string>
<rect key="frame" x="13" y="0.0" width="313" height="50"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="Reward Points Used" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ugu-An-VCc" userLabel="Agent">
<rect key="frame" x="0.0" y="0.0" width="128.33333333333334" height="50"/>
<rect key="frame" x="0.0" y="0.0" width="126.66666666666667" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Regular" family="San Francisco Text" pointSize="14"/>
<color key="textColor" name="ThemeText"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="LAy-kI-YrS">
<rect key="frame" x="130.33333333333337" y="0.0" width="182.66666666666663" height="50"/>
<rect key="frame" x="128.66666666666663" y="0.0" width="184.33333333333337" height="50"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Bold" family="San Francisco Text" pointSize="14"/>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>

11
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
View File

@ -383,3 +383,14 @@ enum DisplayOption: String {
case amend = "amend"
case pending = "pending"
}
enum PaymentStatus: String {
case paid = "paid"
case readyToCollect = "ready to collect"
case unpaid = "unpaid"
case processing = "processing"
case pending = "pending"
case cancelled = "cancelled"
}

5
GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift
View File

@ -56,6 +56,7 @@ class TermsAndConditionViewController: UIViewController {
// MARK: VC's Life cycle
var isURLLoaded = false
var fromBeneficiary: Bool = false
var isBeneficiaryDetail: Bool = false
weak var delegate: SetupRecipientDelegate?
override func viewDidLoad() {
@ -101,6 +102,10 @@ class TermsAndConditionViewController: UIViewController {
let userId = GMEDB.shared.user.string(.userId) ?? ""
print("userId:\(userId)")
self.presenter?.requestOtp(userId: userId, receiverID: self.reciepient?.receiverID ?? "")
}
else if self.isBeneficiaryDetail == true {
let userId = GMEDB.shared.user.string(.userId) ?? ""
self.presenter?.requestOtp(userId: userId, receiverID: self.paymentModel?.receiverId ?? "")
} else {
askPassword()
}

8
GME Remit/Modules/SideMenu/Setting.storyboard
View File

@ -63,7 +63,7 @@
</subviews>
</stackView>
<stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="r5D-EE-JVM">
<rect key="frame" x="80" y="232" width="215" height="16"/>
<rect key="frame" x="90.5" y="232" width="194" height="16"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MOB000110" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5Hd-kg-Yh4">
<rect key="frame" x="0.0" y="0.0" width="83" height="16"/>
@ -87,8 +87,8 @@
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="kSp-BU-O0l">
<rect key="frame" x="199" y="0.0" width="16" height="16"/>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="kSp-BU-O0l">
<rect key="frame" x="194" y="0.0" width="16" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="16" id="vmk-nY-QKg"/>
</constraints>
@ -310,7 +310,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MSU-xb-tWA">
<rect key="frame" x="327" y="0.0" width="16" height="55"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="41C-LK-IVs">
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="verified_user" translatesAutoresizingMaskIntoConstraints="NO" id="41C-LK-IVs">
<rect key="frame" x="0.0" y="19.5" width="16" height="16"/>
<constraints>
<constraint firstAttribute="width" constant="16" id="GLb-In-rxs"/>

6
GME Remit/Modules/SideMenu/SettingViewController.swift
View File

@ -161,6 +161,12 @@ class SettingViewController: UIViewController {
}
override func viewDidLoad() {
super.viewDidLoad()
let isVerified = GMEDB.shared.user.string(.verified) ?? ""
print("isver", isVerified)
if (isVerified != "1") {
verificationStatusButton.isHidden = true
}
NotificationCenter.default.addObserver(
self,
selector: #selector(setText),

Write Preview
Loading…
Cancel
Save