diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 1b225cfe..8d340b8c 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -330,6 +330,7 @@ A2ECF90D202312AE0009F481 /* ExchangeRateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2ECF90C202312AE0009F481 /* ExchangeRateViewController.swift */; }; A2FD3AED2052566A00404EA9 /* NotificationModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2FD3AEC2052566A00404EA9 /* NotificationModel.swift */; }; A2FD3AEF2052568900404EA9 /* NotificationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2FD3AEE2052568900404EA9 /* NotificationViewModel.swift */; }; + BE4B1C97227C926700E923E8 /* NSError+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE4B1C96227C926700E923E8 /* NSError+Ext.swift */; }; BE657159227C90C5000E0DF1 /* ValidationTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE657158227C90C5000E0DF1 /* ValidationTextField.swift */; }; BE74AFBA227C8FF200F05CE7 /* AddAccountModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE74AF91227C8FF100F05CE7 /* AddAccountModuleInterface.swift */; }; BE74AFBB227C8FF200F05CE7 /* KFTCBankList.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE74AF94227C8FF100F05CE7 /* KFTCBankList.swift */; }; @@ -2574,6 +2575,7 @@ A2FD3AEE2052568900404EA9 /* NotificationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationViewModel.swift; sourceTree = ""; }; B645CB5C66870B30AC5720DD /* Pods-GMERemittanceUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GMERemittanceUITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-GMERemittanceUITests/Pods-GMERemittanceUITests.release.xcconfig"; sourceTree = ""; }; B7F20D7B2ABA65B2B56F1DD1 /* Pods-GME Remit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GME Remit.debug.xcconfig"; path = "Pods/Target Support Files/Pods-GME Remit/Pods-GME Remit.debug.xcconfig"; sourceTree = ""; }; + BE4B1C96227C926700E923E8 /* NSError+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSError+Ext.swift"; sourceTree = ""; }; BE657158227C90C5000E0DF1 /* ValidationTextField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ValidationTextField.swift; sourceTree = ""; }; BE74AF91227C8FF100F05CE7 /* AddAccountModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AddAccountModuleInterface.swift; sourceTree = ""; }; BE74AF94227C8FF100F05CE7 /* KFTCBankList.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KFTCBankList.swift; sourceTree = ""; }; @@ -4714,6 +4716,7 @@ D96848C8212D3AEB00EF12B1 /* ExtensionJSON.swift */, D95B7042213F9A2C0053CC3D /* CALayerExtension.swift */, D96BD1222164870C00DFE7D8 /* DateFormatterExtension.swift */, + BE4B1C96227C926700E923E8 /* NSError+Ext.swift */, ); path = Extension; sourceTree = ""; @@ -13708,6 +13711,7 @@ BE74AFBC227C8FF200F05CE7 /* AddAccountService.swift in Sources */, D96A4FF92146625C00CFD507 /* RegisterInteractor.swift in Sources */, D97D58D72240D34900EFB27E /* ResendDetail.swift in Sources */, + BE4B1C97227C926700E923E8 /* NSError+Ext.swift in Sources */, BE74AFC0227C8FF200F05CE7 /* AddAccountPresenter.swift in Sources */, 7301978B22535135001954AB /* KycModuleInterface.swift in Sources */, 7301979722535135001954AB /* kycForm1Service.swift in Sources */, diff --git a/GMERemittance/AppDelegate.swift b/GMERemittance/AppDelegate.swift index 6c51f62d..41f2d913 100644 --- a/GMERemittance/AppDelegate.swift +++ b/GMERemittance/AppDelegate.swift @@ -20,7 +20,7 @@ import IQKeyboardManagerSwift import LGSideMenuController import Localize_Swift -let server: Server = .uat +let server: Server = .stagging var overlayView: UIView? @UIApplicationMain diff --git a/GMERemittance/Extension/NSError+Ext.swift b/GMERemittance/Extension/NSError+Ext.swift new file mode 100644 index 00000000..976c73e9 --- /dev/null +++ b/GMERemittance/Extension/NSError+Ext.swift @@ -0,0 +1,15 @@ +// +// NSError+Ext.swift +// GME Remit +// +// Created by InKwon Kim on 04/05/2019. +// Copyright © 2019 Gobal Money Express Co. Ltd. All rights reserved. +// + +import Foundation + +extension NSError { + convenience init(domain: String, code: Int, message: String) { + self.init(domain: domain, code: code, userInfo: [NSLocalizedDescriptionKey: message]) + } +} diff --git a/GMERemittance/Model/Account.swift b/GMERemittance/Model/Account.swift index ea8cdf1b..3968b1c2 100644 --- a/GMERemittance/Model/Account.swift +++ b/GMERemittance/Model/Account.swift @@ -173,3 +173,23 @@ class KFTCURL: Mappable { value <- map["location"] } } + +class KFTCVerifyAccount: Mappable { + var errorCode: String? + var msg: String? + var id: String? + var extra: String? + var extra2: String? + var data: String? + + required init?(map: Map) {} + + func mapping(map: Map) { + self.errorCode <- map["ErrorCode"] + self.msg <- map["Msg"] + self.id <- map["Id"] + self.extra <- map["Extra"] + self.extra2 <- map["Extra2"] + self.data <- map["Data"] + } +}