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

Info type updated

pull/1/head
Dibya Malla 4 years ago
parent
4411f378fd
commit
19e4c38b0a
9 changed files with 40 additions and 56 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. 4
      GME Remit/APIs/Router/APIRouter.swift
  2. 7
      GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/Application Logic/Service/ExistingUserKycService.swift
  3. 3
      GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/Presenter/ExistingUserKycPresenter.swift
  4. 2
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/Application Logic/Interactor/KYCVerifyStep1Interactor.swift
  5. 1
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/Application Logic/Model/PictureInfoModel.swift
  6. 7
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/Application Logic/Service/KYCVerifyStep1Service.swift
  7. 46
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift
  8. 20
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard
  9. 6
      GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumber.storyboard

4
GME Remit/APIs/Router/APIRouter.swift
View File

@ -832,7 +832,7 @@ extension APIRouter {
case .submitKYC(let model):
return [
"type": "0",
"type": model.type,
"employeerName": model.personalInformation?.employeerName ?? "",
"sourceOfFund": model.personalInformation?.sourceOfFund ?? "",
"monthlyIncome": model.personalInformation?.monthlyIncome ?? "",
@ -847,7 +847,7 @@ extension APIRouter {
case .submitExistingCustomerKYC(let model):
return [
"type": "0",
"type": model.type,
"employeerName": model.personalInformation?.employeerName ?? "",
"sourceOfFund": model.personalInformation?.sourceOfFund ?? "",
"monthlyIncome": model.personalInformation?.monthlyIncome ?? "",

7
GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/Application Logic/Service/ExistingUserKycService.swift
View File

@ -89,6 +89,13 @@ class ExistingUserKycService: ExistingUserKycServiceType {
}
}
//facePicture
if let image = model?.facePicture {
if let data = getCompressedImage(base64: image) {
images["facePicture"] = data
}
}
return images
}
}

3
GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/Presenter/ExistingUserKycPresenter.swift
View File

@ -288,6 +288,9 @@ extension ExistingUserKycPresenter: ExistingUserKycInteractorOutput {
case .innerStep1:
storedPersonalInfo.onNext(storedModel.personalInformation)
storedPersonalSuccess.onNext(message)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
self.storedPersonalSuccess.onNext(nil)
}
case .innerStep2:
storedPictureInformation.onNext(storedModel.pictures)

2
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/Application Logic/Interactor/KYCVerifyStep1Interactor.swift
View File

@ -44,7 +44,7 @@ extension KYCVerifyStep1Interactor: KYCVerifyStep1InteractorInput {
saveModel = model
if let storedData = self.storedModel {
saveModel?.personalInformation = model.personalInformation ?? storedData.personalInformation
saveModel?.pictures = model.pictures ?? storedData.pictures
saveModel?.pictures = model.pictures
service.saveKycInfo(
with: saveModel!,
success: {[weak self] in

1
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/Application Logic/Model/PictureInfoModel.swift
View File

@ -6,7 +6,6 @@
// Copyright © 2020 Gobal Money Express Co. Ltd. All rights reserved.
//
import ObjectMapper
struct PictureInfoModel: Mappable {

7
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/Application Logic/Service/KYCVerifyStep1Service.swift
View File

@ -88,6 +88,13 @@ class KYCVerifyStep1Service: KYCVerifyStep1ServiceType {
}
}
//facePicture
if let image = model?.facePicture {
if let data = getCompressedImage(base64: image) {
images["facePicture"] = data
}
}
return images
}

46
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift
View File

@ -91,46 +91,14 @@ class KYCVerifyStep1Presenter: ViewModelType {
input.additionalIDImage,
input.facePicture
).map { (isValid, frontIdImage, backIdImage, sideIdImage, additionalIdImage, facePicture) -> PictureInfoModel? in
return isValid ? PictureInfoModel(idFront: frontIdImage, idBack: backIdImage, idSide: sideIdImage, additionalId: additionalIdImage, facePicture: facePicture) : nil
return isValid ? PictureInfoModel(
idFront: frontIdImage,
idBack: backIdImage,
idSide: sideIdImage,
additionalId: additionalIdImage,
facePicture: facePicture
) : nil
}
/*
let newPersonalInfo = Driver.combineLatest(
input.isValidPersonalInfo,
input.idType,
input.additionalIdType,
Driver.combineLatest(
input.employeerName,
input.sourceOfFund,
input.monthlyIncome,
input.mobile,
input.businessType,
input.email,
input.address,
model.map{$0.personalInformation?.nativeCountry}.asDriverOnErrorJustComplete()
).map({ (employeerName, sourceOfFund, monthlyIncome, mobile, businessType, email, address, nativeCountry) -> PersonalInfoModel in
return PersonalInfoModel(
email: email,
address: address,
visaStatus: nil,
sourceOfFund: sourceOfFund?.id,
monthlyIncome: monthlyIncome?.id,
mobile: mobile,
idType: nil,
additionalIdType: nil,
businessType: businessType?.id,
nativeCountry: nativeCountry,
employeerName: employeerName
)
})
).map { (isValid, idType, additionalIdType, info) -> PersonalInfoModel? in
if isValid{
var personalInfo = info
personalInfo.idType = idType?.id
personalInfo.additionalIdType = additionalIdType?.id
return personalInfo
}
return nil
}*/
let newPersonalInfo = Driver.combineLatest(
input.isValidPersonalInfo,

20
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1.storyboard
View File

@ -20,7 +20,7 @@
<!--KYCVerifyStep1-->
<scene sceneID="R60-Pu-Hpy">
<objects>
<viewController storyboardIdentifier="KYCVerifyStep1ViewController" title="KYCVerifyStep1" id="HSb-ou-7T5" customClass="KYCVerifyStep1ViewController" customModule="Fast_Remit" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="KYCVerifyStep1ViewController" title="KYCVerifyStep1" id="HSb-ou-7T5" customClass="KYCVerifyStep1ViewController" customModule="JME_Remit" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Vtt-Oi-3ge">
<rect key="frame" x="0.0" y="0.0" width="375" height="1700"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@ -65,7 +65,7 @@
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="VPI-Qr-7ea">
<rect key="frame" x="0.0" y="30" width="315" height="416"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Employer Name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TV5-Pc-Gg6" customClass="ValidationTextField" customModule="Fast_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Employer Name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TV5-Pc-Gg6" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="315" height="45"/>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
@ -80,7 +80,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Select Occupation"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Full Name (Shown in your id card)" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="byd-K4-3eK" customClass="ValidationTextField" customModule="Fast_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Full Name (Shown in your id card)" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="byd-K4-3eK" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="53" width="315" height="45"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="nvn-C2-ZwS"/>
@ -98,7 +98,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Select Source Of Fund"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Gender" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="g3f-ps-0B2" customClass="ValidationTextField" customModule="Fast_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Gender" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="g3f-ps-0B2" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="106" width="315" height="45"/>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
@ -113,7 +113,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Monthly Income"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Date of birth" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="tYu-as-9PW" customClass="ValidationTextField" customModule="Fast_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Date of birth" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="tYu-as-9PW" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="159" width="315" height="45"/>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
@ -128,7 +128,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Mobile Number"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="City" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="36b-sy-wJ9" customClass="ValidationTextField" customModule="Fast_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="City" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="36b-sy-wJ9" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="212" width="315" height="45"/>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
@ -143,7 +143,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Employee/Business Type"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="E-mail" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="uC6-BE-YHM" customClass="ValidationTextField" customModule="Fast_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="E-mail" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="uC6-BE-YHM" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="265" width="315" height="45"/>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
@ -161,7 +161,7 @@
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X8s-Hf-tXj">
<rect key="frame" x="0.0" y="318" width="315" height="45"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Address" textAlignment="natural" minimumFontSize="12" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="kmb-93-d6k" customClass="ValidationTextField" customModule="Fast_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Address" textAlignment="natural" minimumFontSize="12" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="kmb-93-d6k" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="283" height="45"/>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>
@ -233,7 +233,7 @@
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="YhF-dT-Rqc">
<rect key="frame" x="0.0" y="481" width="315" height="151"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Full Name (Shown in your id card)" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Vgo-ox-p7M" customClass="ValidationTextField" customModule="Fast_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Full Name (Shown in your id card)" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Vgo-ox-p7M" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="315" height="45"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="Zpz-DS-Fui"/>
@ -251,7 +251,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Id Type"/>
</userDefinedRuntimeAttributes>
</textField>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="E-mail" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="FSM-6E-es0" customClass="ValidationTextField" customModule="Fast_Remit" customModuleProvider="target">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="E-mail" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="FSM-6E-es0" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="0.0" y="53" width="315" height="45"/>
<color key="textColor" name="ThemeText"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Regular" family="San Francisco Display" pointSize="14"/>

6
GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumber.storyboard
View File

@ -29,13 +29,13 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Register to Fast Remit" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LeV-76-r6T">
<rect key="frame" x="16" y="20" width="343" height="29"/>
<rect key="frame" x="16" y="20" width="343" height="28"/>
<fontDescription key="fontDescription" name="SanFranciscoDisplay-Bold" family="San Francisco Display" pointSize="24"/>
<color key="textColor" name="ThemeRedWhite"/>
<nil key="highlightedColor"/>
</label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="ID Number" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="opg-Rc-4OT" customClass="ValidationTextField" customModule="JME_Remit" customModuleProvider="target">
<rect key="frame" x="16" y="69" width="343" height="50"/>
<rect key="frame" x="16" y="68" width="343" height="50"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="7dm-tW-nUV"/>
</constraints>
@ -53,7 +53,7 @@
</userDefinedRuntimeAttributes>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ofc-cS-vUI">
<rect key="frame" x="16" y="139" width="343" height="50"/>
<rect key="frame" x="16" y="138" width="343" height="50"/>
<color key="backgroundColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="50" id="Dkn-eL-xat"/>

Write Preview
Loading…
Cancel
Save