diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 79443f77..21e9ce43 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -650,6 +650,11 @@ 9FD261181FD00458007A511D /* GME RemitUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FD261171FD00458007A511D /* GME RemitUITests.swift */; }; A25AC5E8ABE8F4D673E0E23C /* Pods_GMERemittanceTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FAF65434A568194C42395975 /* Pods_GMERemittanceTests.framework */; }; B28F83785E653C4FCC6E5788 /* Pods_GMERemittanceUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 834CF738D8A5B7292E373A1F /* Pods_GMERemittanceUITests.framework */; }; + BC0FB8E62AAE260200C9D59A /* PostalInformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC0FB8E52AAE260200C9D59A /* PostalInformation.swift */; }; + BC0FB8E82AAE272A00C9D59A /* PostalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC0FB8E72AAE272A00C9D59A /* PostalData.swift */; }; + BC0FB8EA2AAE27DF00C9D59A /* Address.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC0FB8E92AAE27DF00C9D59A /* Address.swift */; }; + BC0FB9652AB4C74100C9D59A /* AddressCityViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BC0FB9642AB4C74100C9D59A /* AddressCityViewController.swift */; }; + BC0FB9672AB56CD500C9D59A /* AddressCityViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = BC0FB9662AB56CD500C9D59A /* AddressCityViewController.storyboard */; }; BE4B1C97227C926700E923E8 /* NSError+Ext.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE4B1C96227C926700E923E8 /* NSError+Ext.swift */; }; BEC9AFFC224FC49C00A2DA06 /* BiometricAuthenticationModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC9AFE9224FC49C00A2DA06 /* BiometricAuthenticationModuleInterface.swift */; }; BEC9AFFD224FC49C00A2DA06 /* BiometricAuthenticationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEC9AFEC224FC49C00A2DA06 /* BiometricAuthenticationService.swift */; }; @@ -1555,7 +1560,7 @@ 949C5F7928B2013800E50E31 /* InviteUserViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = InviteUserViewInterface.swift; sourceTree = ""; }; 9F983C0B2024883D001DCB3F /* UIColor+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Ext.swift"; sourceTree = ""; }; 9FA00FBD1FEE69AF0049753E /* UIView+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Ext.swift"; sourceTree = ""; }; - 9FD260F41FD00458007A511D /* JME Remit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "JME Remit.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9FD260F41FD00458007A511D /* IME London.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "IME London.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 9FD260F71FD00458007A511D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 9FD260FC1FD00458007A511D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 9FD260FE1FD00458007A511D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -1567,6 +1572,11 @@ 9FD261171FD00458007A511D /* GME RemitUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GME RemitUITests.swift"; sourceTree = ""; }; 9FD261191FD00458007A511D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A122A469B588D608F544863C /* Pods-GMERemittanceTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GMERemittanceTests.debug.xcconfig"; path = "Target Support Files/Pods-GMERemittanceTests/Pods-GMERemittanceTests.debug.xcconfig"; sourceTree = ""; }; + BC0FB8E52AAE260200C9D59A /* PostalInformation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostalInformation.swift; sourceTree = ""; }; + BC0FB8E72AAE272A00C9D59A /* PostalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostalData.swift; sourceTree = ""; }; + BC0FB8E92AAE27DF00C9D59A /* Address.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Address.swift; sourceTree = ""; }; + BC0FB9642AB4C74100C9D59A /* AddressCityViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressCityViewController.swift; sourceTree = ""; }; + BC0FB9662AB56CD500C9D59A /* AddressCityViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = AddressCityViewController.storyboard; sourceTree = ""; }; BE4B1C96227C926700E923E8 /* NSError+Ext.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSError+Ext.swift"; sourceTree = ""; }; BEC9AFE9224FC49C00A2DA06 /* BiometricAuthenticationModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationModuleInterface.swift; sourceTree = ""; }; BEC9AFEC224FC49C00A2DA06 /* BiometricAuthenticationService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BiometricAuthenticationService.swift; sourceTree = ""; }; @@ -4845,6 +4855,8 @@ 7EC9DDFF24A9AEBD004A0AD8 /* Models */, 7E364CE924A4455A007D6E02 /* PasswordInputViewController.swift */, 7E364CEA24A4455A007D6E02 /* PasswordInputViewController.xib */, + BC0FB9642AB4C74100C9D59A /* AddressCityViewController.swift */, + BC0FB9662AB56CD500C9D59A /* AddressCityViewController.storyboard */, ); path = Shared; sourceTree = ""; @@ -4870,7 +4882,10 @@ children = ( 7EC9DE0024A9AECE004A0AD8 /* RewardProduct.swift */, 7EC9DE0224A9AEEC004A0AD8 /* Branch.swift */, + BC0FB8E92AAE27DF00C9D59A /* Address.swift */, 7EC9DE0424A9AF65004A0AD8 /* BranchContainer.swift */, + BC0FB8E52AAE260200C9D59A /* PostalInformation.swift */, + BC0FB8E72AAE272A00C9D59A /* PostalData.swift */, 7EC9DE0824A9C1E0004A0AD8 /* BankInformation.swift */, ); path = Models; @@ -5897,7 +5912,7 @@ 9FD260F51FD00458007A511D /* Products */ = { isa = PBXGroup; children = ( - 9FD260F41FD00458007A511D /* JME Remit.app */, + 9FD260F41FD00458007A511D /* IME London.app */, 9FD261081FD00458007A511D /* GMERemittanceTests.xctest */, 9FD261131FD00458007A511D /* GMERemittanceUITests.xctest */, 739F817A234ADA75003ABCF3 /* SnapshotUITest.xctest */, @@ -7330,7 +7345,7 @@ 282F6A5F296483AE00E324FF /* Algorithms */, ); productName = GMERemittance; - productReference = 9FD260F41FD00458007A511D /* JME Remit.app */; + productReference = 9FD260F41FD00458007A511D /* IME London.app */; productType = "com.apple.product-type.application"; }; 9FD261071FD00458007A511D /* GMERemittanceTests */ = { @@ -7535,6 +7550,7 @@ 5565FF231FE275E5002934E9 /* SanFranciscoText-BoldItalic.otf in Resources */, 5565FF221FE275E5002934E9 /* SanFranciscoDisplay-Light.otf in Resources */, 73149F6B22E5AF8000D66B26 /* LauncherScreen.storyboard in Resources */, + BC0FB9672AB56CD500C9D59A /* AddressCityViewController.storyboard in Resources */, D9B7ADF92130048E009B0564 /* ExchangeRates.storyboard in Resources */, 73AEFF7A2334A13100A967FB /* TransactionHistoryGroup.storyboard in Resources */, 404654BA24E6666F000E5BFB /* PINKeyboardView.xib in Resources */, @@ -8592,6 +8608,7 @@ D950BED421549242008367A1 /* HomeInteractorIO.swift in Sources */, 73195AB622FD14D500151434 /* SetupRecipientInteractor.swift in Sources */, 7389600A22C2F208003FEA90 /* TablePresenterModuleInterface.swift in Sources */, + BC0FB9652AB4C74100C9D59A /* AddressCityViewController.swift in Sources */, 281EF60728ACCC4D0092E5E6 /* HowToDepositWireframe.swift in Sources */, 73551A5926E5B1290030B302 /* OtpVerificationService.swift in Sources */, 540E0CA42A555F4D0023FA8B /* ChooseKycDocumentTypeInteractorIO.swift in Sources */, @@ -8600,6 +8617,7 @@ 049E61A51FF0AE9D00817C76 /* UrlManager.swift in Sources */, 7EDBFC2924B3098E00AD5D4D /* WithdrawFromWalletDetailWireframe.swift in Sources */, 89739E3B24459A630016251B /* SendMoneyReceiptPresenter.swift in Sources */, + BC0FB8E82AAE272A00C9D59A /* PostalData.swift in Sources */, 73341C90238F4FE900394676 /* UILabel+Ext.swift in Sources */, D9AFE856215C7166005F3A25 /* HomeCollectionTableViewCell.swift in Sources */, DDCDF66D2A0ACBDB00124D00 /* AllRecipientsWireframeInput.swift in Sources */, @@ -8707,12 +8725,14 @@ 738714BB237CE86E0038FCB1 /* InboundReceiptViewController.swift in Sources */, 73168A2322F3D01A00878038 /* TablePresenterProtocol.swift in Sources */, EC2D9C232826C68E00996921 /* SlipUploadViewController.swift in Sources */, + BC0FB8EA2AAE27DF00C9D59A /* Address.swift in Sources */, 7327567F23B0456400BF66C5 /* ManageAgreementServiceType.swift in Sources */, D950BEDE215496F6008367A1 /* HomeRemainingLimitTableViewCell.swift in Sources */, 28AB139528E552C200191695 /* NotificationDetailInteractorIO.swift in Sources */, 7388821922CDF20F00592960 /* UITextField+Ext.swift in Sources */, 73B6D68C230640D400A0CB6E /* BranchModel.swift in Sources */, 737262582705A749004086B8 /* RenewIDServiceType.swift in Sources */, + BC0FB8E62AAE260200C9D59A /* PostalInformation.swift in Sources */, 73D3F3E3270C65B5006C3F97 /* CDDIViewControllerViewController.swift in Sources */, 7389601122C2F208003FEA90 /* TablePresenterWireframe.swift in Sources */, 73FBBF2423F231A8009D7627 /* DetailNotificationService.swift in Sources */, @@ -8931,7 +8951,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; + EXCLUDED_ARCHS = arm64; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; @@ -8996,6 +9016,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + EXCLUDED_ARCHS = arm64; FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; @@ -9027,17 +9048,18 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 11; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = 68KRG7GPAV; + DEVELOPMENT_TEAM = 926Z34F5DW; ENABLE_BITCODE = NO; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", "$(PROJECT_DIR)", ); INFOPLIST_FILE = "GME Remit/Supported Files/Info.plist"; - INFOPLIST_KEY_CFBundleDisplayName = "JME Remit"; + INFOPLIST_KEY_CFBundleDisplayName = "IME London"; IPHONEOS_DEPLOYMENT_TARGET = 13.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -9047,15 +9069,15 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 1.6.2; + MARKETING_VERSION = 2.0.0; ONLY_ACTIVE_ARCH = YES; "OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der"; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", "-ObjC", ); - PRODUCT_BUNDLE_IDENTIFIER = com.japan.jmeremit; - PRODUCT_NAME = "JME Remit"; + PRODUCT_BUNDLE_IDENTIFIER = com.imelondon; + PRODUCT_NAME = "IME London"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "GME Remit/Supported Files/GMERemittance-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -9073,11 +9095,11 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit/GME RemitRelease.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 11; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = 68KRG7GPAV; + DEVELOPMENT_TEAM = 926Z34F5DW; ENABLE_BITCODE = NO; - EXCLUDED_ARCHS = ""; + EXCLUDED_ARCHS = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", @@ -9085,7 +9107,7 @@ ); GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = "GME Remit/Supported Files/Info.plist"; - INFOPLIST_KEY_CFBundleDisplayName = "JME Remit"; + INFOPLIST_KEY_CFBundleDisplayName = "IME London"; IPHONEOS_DEPLOYMENT_TARGET = 13.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -9095,14 +9117,14 @@ "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", ); - MARKETING_VERSION = 1.6.2; + MARKETING_VERSION = 2.0.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(OTHER_LDFLAGS)", "-ObjC", ); - PRODUCT_BUNDLE_IDENTIFIER = com.japan.jmeremit; - PRODUCT_NAME = "JME Remit"; + PRODUCT_BUNDLE_IDENTIFIER = com.imelondon; + PRODUCT_NAME = "IME London"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OBJC_BRIDGING_HEADER = "GME Remit/Supported Files/GMERemittance-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; diff --git a/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme b/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme index 78c135cc..b0251dfd 100644 --- a/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme +++ b/GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme @@ -15,21 +15,17 @@ - - - - - + - - + + - - + + - + + + + + @@ -92,7 +104,7 @@ diff --git a/GME Remit/.DS_Store b/GME Remit/.DS_Store index 691bec8f..c2afabad 100644 Binary files a/GME Remit/.DS_Store and b/GME Remit/.DS_Store differ diff --git a/GME Remit/APIs/RestApiManager.swift b/GME Remit/APIs/RestApiManager.swift index 0d45d9e6..b82880b0 100644 --- a/GME Remit/APIs/RestApiManager.swift +++ b/GME Remit/APIs/RestApiManager.swift @@ -65,9 +65,15 @@ class RestApiMananger { let lang = Utility.getLanguageHeader(for: currentLanguage) //live value - return ["Authorization": "Basic " + ("5220221D2E737FD60C28243:fUjXn2r5" + - ":" + getUUID()).toBase64(), - "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", +// return ["Authorization": "Basic " + ("5220221D2E737FD60C28243:fUjXn2r5" + +// ":" + getUUID()).toBase64(), +// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", +// "Content-Type": "application/json", +// "lang" : lang +// ] + + return ["Authorization": "Basic " + ("cGRTSTlvRERKbXNUbThZOTpjUWVUaFdtWjoxMWk=" + getUUID()).toBase64(), + "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", "Content-Type": "application/json", "lang" : lang ] @@ -88,6 +94,13 @@ class RestApiMananger { let lang = Utility.getLanguageHeader(for: currentLanguage) //live value +// return [ +// "Authorization": "Bearer " + accessCode, +// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", +// "Content-Type": "application/json", +// "clientId": Utility.getMyKftcClientId(), +// "lang" : lang +// ] return [ "Authorization": "Bearer " + accessCode, "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", diff --git a/GME Remit/APIs/Router/APIRouter.swift b/GME Remit/APIs/Router/APIRouter.swift index 3b581e08..a6492535 100644 --- a/GME Remit/APIs/Router/APIRouter.swift +++ b/GME Remit/APIs/Router/APIRouter.swift @@ -55,6 +55,8 @@ enum APIRouter { // MARK: - New User Registration case verifyIdNumber(id: String, type: String, fullName: String, dob: String) case newUserRegister(model: NewUserRegisterModel, fcmToken: String) + case searchPostalCode(id: String, code: String) + case fetchCountryAndGender case submitKYC(model: KYCSaveInformation) case requestRegistrationOTP(userId: String) case requestBeneficiaryOTP(userId: String, receiverID: String) @@ -144,18 +146,28 @@ extension APIRouter: ApiServiceType { let lang = Utility.getLanguageHeader(for: currentLanguage) // live value - let authValue = "5220221D2E737FD60C28243:fUjXn2r5:\(uuid)".toBase64() +// let authValue = "5220221D2E737FD60C28243:fUjXn2r5:\(uuid)".toBase64() + let authValue = "cGRTSTlvRERKbXNUbThZOTpjUWVUaFdtWjoxMWk=" // // uat value // let authValue = "162021E171B825A55C52024823:cQeThWmZ:11i;\(uuid)".toBase64() // live value +// return [ +// "Authorization": "Basic \(authValue)", +// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", +// "Content-Type": "application/json", +// "lang" : lang, +// "uuid" : self.uuid +// ] + return [ "Authorization": "Basic \(authValue)", - "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", + "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", "Content-Type": "application/json", + "clientId": "pdSI9oDDJmsTm8Y9", "lang" : lang, - "uuid" : self.uuid + "uuid" : "27af9a45-6b32-4866-a859-5ff6e40114e9" ] // uat value @@ -173,16 +185,25 @@ extension APIRouter: ApiServiceType { let accessCode = GMEDB.shared.user.string(.accessCode) ?? "" let currentLanguage = Localize.currentLanguage() let lang = Utility.getLanguageHeader(for: currentLanguage) - + let authValue = "cGRTSTlvRERKbXNUbThZOTpjUWVUaFdtWjoxMWk=" //live token +// return [ +// "Authorization": "Bearer " + accessCode, +// "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", +// "Content-Type": "application/json", +// "clientId": Utility.getMyKftcClientId(), +// "lang" : lang, +// "uuid" : self.uuid +// ] + return [ - "Authorization": "Bearer " + accessCode, - "GME-TOKEN" : "@NcRfTjWnZr4u7x!A%D*G-KaPdSgVkXp", + "Authorization": "Basic \(authValue)", + "GME-TOKEN" : "39587YT398@FBQOW8RY3#948R7GB@CNEQW987GF87$TD18$1981..919@@##joghndvberteiru", "Content-Type": "application/json", - "clientId": Utility.getMyKftcClientId(), + "clientId": "pdSI9oDDJmsTm8Y9", "lang" : lang, - "uuid" : self.uuid + "uuid" : "27af9a45-6b32-4866-a859-5ff6e40114e9" ] @@ -660,6 +681,10 @@ extension APIRouter { return "\(baseUrlWithoutVersion)v3/validation" case .newUserRegister: return "\(baseUrlWithoutVersion)v1/mobile/newUserRegister" + case .searchPostalCode: + return "\(baseUrlWithoutVersion)v3/mobile/AddressLookup" + case .fetchCountryAndGender: + return "\(baseUrlWithoutVersion)v1/mobile/loadForm/login-kyc" case .requestRegistrationOTP: return "\(baseUrlWithoutVersion)v1/mobile/requestOTP" case .requestBeneficiaryOTP: @@ -801,6 +826,10 @@ extension APIRouter { return .post case .newUserRegister: return .post + case .searchPostalCode: + return .post + case .fetchCountryAndGender: + return .get case .requestRegistrationOTP: return .post case .requestBeneficiaryOTP: @@ -966,6 +995,13 @@ extension APIRouter { "FullName": model.fullName ?? "", "DOB": model.dob ?? "", "Password": model.password ?? "", + "Mobilenumber": model.mobileNumber ?? "", + "PostalCode" : model.postalCode ?? "", + "Gender" : model.gender ?? "", + "City" :model.city ?? "", + "Address1": model.address1, + "Address2": model.address2, + "Nationality": model.nationality, "ConfirmPassword": model.confirmPassword ?? "", "clientId": Utility.getCliendId(), "uuid": self.uuid, @@ -977,6 +1013,15 @@ extension APIRouter { "referralCode": model.referralCode ?? "" ] + case .searchPostalCode(let id, let code): + return [ + "UserId": id, + "PostalCode": code + ] + + case .fetchCountryAndGender: + return nil + case .requestRegistrationOTP(let userId): return [ "userId": userId, diff --git a/GME Remit/APIs/UrlManager.swift b/GME Remit/APIs/UrlManager.swift index b695aefe..d516b9ec 100644 --- a/GME Remit/APIs/UrlManager.swift +++ b/GME Remit/APIs/UrlManager.swift @@ -17,9 +17,9 @@ class UrlManager { let baseSocialURL = "" - let liveServerUrl = "https://mobile.japanremit.com:8443/api/" // "https://mobile.japanremit.com:8443/api/" + // let liveServerUrl = "https://mobile.japanremit.com:8443/api/" // "https://mobile.japanremit.com:8443/api/" let testUrl = "https://sandboxapi.japanremit.com:8083/api/" //"http://202.166.220.36:8083/api/" - + let liveServerUrl = "http://77.68.15.91:1082/api/" init() { switch server { case .live: diff --git a/GME Remit/Extensions/UIColor+Ext.swift b/GME Remit/Extensions/UIColor+Ext.swift index b7497d40..fe862fac 100644 --- a/GME Remit/Extensions/UIColor+Ext.swift +++ b/GME Remit/Extensions/UIColor+Ext.swift @@ -44,7 +44,7 @@ extension UIColor { } class var theme2E89FF: UIColor { - return UIColor.init(hex: "#2E89FF") + return UIColor.init(hex: "#262262") } class var themeGreen: UIColor { diff --git a/GME Remit/Models/Request/NewRegisterRequestModel.swift b/GME Remit/Models/Request/NewRegisterRequestModel.swift index db356317..24eb8599 100644 --- a/GME Remit/Models/Request/NewRegisterRequestModel.swift +++ b/GME Remit/Models/Request/NewRegisterRequestModel.swift @@ -18,6 +18,15 @@ class NewUserRegisterModel: Serializer { var confirmPassword: String? var referralCode: String? + var mobileNumber: String? + var gender: String? + var email: String? + var postalCode: String? + var address1: String? + var address2: String? + var city: String? + var nationality: String? + func serialize() -> [String : String] { var dict = ["":""] dict["ResidenceCardNumber"] = self.residenceCardNumber ?? "" @@ -27,6 +36,16 @@ class NewUserRegisterModel: Serializer { dict["Password"] = self.password ?? "" dict["ConfirmPassword"] = self.confirmPassword ?? "" dict["referralCode"] = self.referralCode ?? "" + + dict["MobileNumber"] = self.mobileNumber ?? "" + dict["Gender"] = self.gender ?? "" + dict["Email"] = self.email ?? "" + dict["PostalCode"] = self.postalCode ?? "" + dict["Address1"] = self.address1 ?? "" + dict["Address2"] = self.address2 ?? "" + dict["City"] = self.city ?? "" + dict["Nationality"] = self.nationality ?? "" + return dict } diff --git a/GME Remit/Modules/HowToDeposit/User Interface/View/HowToDeposit.storyboard b/GME Remit/Modules/HowToDeposit/User Interface/View/HowToDeposit.storyboard index 072fbd08..99905ef3 100644 --- a/GME Remit/Modules/HowToDeposit/User Interface/View/HowToDeposit.storyboard +++ b/GME Remit/Modules/HowToDeposit/User Interface/View/HowToDeposit.storyboard @@ -1,9 +1,9 @@ - + - + @@ -21,7 +21,7 @@ - + @@ -30,16 +30,16 @@ - + -