Browse Source

Language Added

v0.17
Aashish karn 1 year ago
parent
commit
d6d5bf22a5
  1. 4
      GME Remit.xcodeproj/project.pbxproj
  2. 2
      GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme
  3. 2
      GME Remit/APIs/Router/APIRouter.swift
  4. 4
      GME Remit/Models/Request/NewRegisterRequestModel.swift
  5. 5
      GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift
  6. 6
      GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/Wireframe/NewUserRegisterWireframe.swift
  7. 2
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/Application Logic/Model/KYCSaveInformation.swift
  8. 2
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift
  9. 2
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
  10. 12
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Wireframe/KYCVerifyStep1Wireframe.swift
  11. 14
      GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift
  12. 2
      GME Remit/Modules/RegisterModules/VerifyIDNumber/Module Interface/VerifyIDNumberModuleInterface.swift
  13. 4
      GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/Presenter/VerifyIDNumberPresenter.swift
  14. 2
      GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift
  15. 4
      GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/Wireframe/VerifyIDNumberWireframe.swift
  16. 2
      GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/Wireframe/VerifyIDNumberWireframeInput.swift
  17. 11
      GME Remit/MultiLanguages/si.lproj/Localizable.strings

4
GME Remit.xcodeproj/project.pbxproj

@ -8303,7 +8303,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
);
MARKETING_VERSION = 1.4.9;
MARKETING_VERSION = 1.5.2;
"OTHER_CODE_SIGN_FLAGS[sdk=*]" = "--generate-entitlement-der";
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
@ -8348,7 +8348,7 @@
"$(inherited)",
"$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module",
);
MARKETING_VERSION = 1.4.9;
MARKETING_VERSION = 1.5.2;
OTHER_LDFLAGS = (
"$(OTHER_LDFLAGS)",
"-ObjC",

2
GME Remit.xcodeproj/xcshareddata/xcschemes/GME Remit.xcscheme

@ -61,7 +61,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"

2
GME Remit/APIs/Router/APIRouter.swift

@ -898,6 +898,8 @@ extension APIRouter {
return [
"ResidenceCardNumber": GMEDB.shared.user.string(.userId) ?? "",
"UserId": model.userId ?? "",
"FullName": model.fullName ?? "",
"DOB": model.dob ?? "",
"Password": model.password ?? "",
"ConfirmPassword": model.confirmPassword ?? "",
"clientId": Utility.getCliendId(),

4
GME Remit/Models/Request/NewRegisterRequestModel.swift

@ -12,6 +12,8 @@ class NewUserRegisterModel: Serializer {
var residenceCardNumber: String?
var userId: String?
var fullName: String?
var dob: String?
var password: String?
var confirmPassword: String?
var referralCode: String?
@ -20,6 +22,8 @@ class NewUserRegisterModel: Serializer {
var dict = ["":""]
dict["ResidenceCardNumber"] = self.residenceCardNumber ?? ""
dict["UserId"] = self.userId ?? ""
dict["FullName"] = self.fullName ?? ""
dict["Dob"] = self.dob ?? ""
dict["Password"] = self.password ?? ""
dict["ConfirmPassword"] = self.confirmPassword ?? ""
dict["referralCode"] = self.referralCode ?? ""

5
GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/View/NewUserRegisterViewController.swift

@ -34,6 +34,9 @@ class NewUserRegisterViewController: UIViewController {
// MARK: Properties
var customerType: String = ""
var fullName: String = ""
var dob: String = ""
var presenter: NewUserRegisterModuleInterface?
private var isValid = false {
didSet {
@ -100,6 +103,8 @@ class NewUserRegisterViewController: UIViewController {
@IBAction func registerBttnClicked(_ sender: UIButton) {
let model = NewUserRegisterModel()
model.userId = self.idTextField.text
model.dob = self.dob
model.fullName = self.fullName
model.password = self.passwordTextField.text
model.confirmPassword = self.confirmPasswordTxtField.text
model.referralCode = isValidReferCode ? self.referralCode.text : ""

6
GME Remit/Modules/RegisterModules/NewUserRegister/User Interface/Wireframe/NewUserRegisterWireframe.swift

@ -12,6 +12,8 @@ class NewUserRegisterWireframe {
weak var view: UIViewController!
var customerType: String?
var useNFC: String = ""
var fullName: String = ""
var dob: String = ""
}
extension NewUserRegisterWireframe: NewUserRegisterWireframeInput {
@ -24,6 +26,8 @@ extension NewUserRegisterWireframe: NewUserRegisterWireframeInput {
let presenter = NewUserRegisterPresenter()
let viewController = viewControllerFromStoryboard(of: NewUserRegisterViewController.self)
viewController.customerType = customerType ?? ""
viewController.fullName = fullName
viewController.dob = dob
viewController.presenter = presenter
interactor.output = presenter
presenter.interactor = interactor
@ -39,6 +43,8 @@ extension NewUserRegisterWireframe: NewUserRegisterWireframeInput {
if let navigation = self.view.navigationController {
let wireframe = NewRegisterWireframe()
wireframe.trustDockModel = trudDockModel
wireframe.dob = dob
wireframe.fullName = fullName
wireframe.customerType = customerType ?? ""
wireframe.useNFC = customerType == "FOREIGNER" ? "Y" : "N"
wireframe.pushMainView(in: navigation)

2
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/Application Logic/Model/KYCSaveInformation.swift

@ -11,6 +11,8 @@ struct KYCSaveInformation {
var registrattionType: String = ""
var trustDocID: String = ""
var customerType: String = ""
var fullName: String = ""
var dob: String = ""
var personalInformation: PersonalInfoModel?
var pictures: PictureInfoModel?
}

2
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Presenter/KYCVerifyStep1Presenter.swift

@ -253,6 +253,8 @@ class KYCVerifyStep1Presenter: ViewModelType {
registrattionType: viewController?.redirectToKYC ?? "",
trustDocID: viewController?.trustDockResponse?.id ?? "",
customerType: viewController?.customerType ?? "",
fullName: viewController?.fullName ?? "",
dob: viewController?.dob ?? "",
personalInformation: $0,
pictures: nil
)

2
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift

@ -28,6 +28,8 @@ class KYCVerifyStep1ViewController: UIViewController {
var step: NewRegisterViewController.Step = .first
var isFirst: Bool = true
var customerType: String = ""
var fullName: String = ""
var dob: String = ""
// MARK: Properties
var presenter: KYCVerifyStep1Presenter!

12
GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/Wireframe/KYCVerifyStep1Wireframe.swift

@ -13,6 +13,8 @@ class KYCVerifyStep1Wireframe {
weak var delegate: NewRegisterDelegate?
var step: NewRegisterViewController.Step = .first
var customerType: String = ""
var fullName: String = ""
var dob: String = ""
var trustdockModel: TrustDockResponse?
var redirectTo: String = ""
var useNFC: String = ""
@ -27,6 +29,8 @@ extension KYCVerifyStep1Wireframe: KYCVerifyStep1WireframeInput {
let interactor = KYCVerifyStep1Interactor(service: service)
let presenter = KYCVerifyStep1Presenter()
let viewController = viewControllerFromStoryboard(of: KYCVerifyStep1ViewController.self)
viewController.fullName = fullName
viewController.dob = dob
viewController.customerType = customerType
viewController.redirectToKYC = self.redirectTo
viewController.trustDockResponse = trustdockModel
@ -43,20 +47,24 @@ extension KYCVerifyStep1Wireframe: KYCVerifyStep1WireframeInput {
return viewController
}
func getMainView(with delegate: NewRegisterDelegate?, step: NewRegisterViewController.Step = .first, customerType: String, trustdockModel: TrustDockResponse, redirectTo: String, useNFC: String) -> UIViewController {
func getMainView(with delegate: NewRegisterDelegate?, step: NewRegisterViewController.Step = .first, customerType: String, trustdockModel: TrustDockResponse, redirectTo: String, useNFC: String, fullName: String, dob: String) -> UIViewController {
self.delegate = delegate
self.customerType = customerType
self.trustdockModel = trustdockModel
self.redirectTo = redirectTo
self.useNFC = useNFC
self.fullName = fullName
self.dob = dob
self.step = step
return getMainView()
}
func getMainViewWithoutTrustDock(with delegate: NewRegisterDelegate?, step: NewRegisterViewController.Step = .first, customerType: String, redirectTo: String) -> UIViewController {
func getMainViewWithoutTrustDock(with delegate: NewRegisterDelegate?, step: NewRegisterViewController.Step = .first, customerType: String, redirectTo: String, fullName: String, dob: String) -> UIViewController {
self.delegate = delegate
self.redirectTo = redirectTo
self.customerType = customerType
self.fullName = fullName
self.dob = dob
self.step = step
return getMainView()
}

14
GME Remit/Modules/RegisterModules/UserAuthentication/NewRegister/User Interface/Wireframe/NewRegisterWireframe.swift

@ -15,6 +15,8 @@ class NewRegisterWireframe {
weak var view: UIViewController!
var selectedWireframe = ""
var customerType: String = ""
var fullName: String = ""
var dob: String = ""
var trustDockModel: TrustDockResponse?
var redirectTo: String = "EKYC"
var useNFC: String = ""
@ -41,13 +43,13 @@ extension NewRegisterWireframe: NewRegisterWireframeInput {
step3VC = ExistingUserKycWireframe().getMainView(with: self, step: .terms)
} else {
if let trustDockModel = trustDockModel {
step1VC = KYCVerifyStep1Wireframe().getMainView(with: self, step: .first, customerType: self.customerType, trustdockModel: trustDockModel, redirectTo: redirectTo, useNFC: useNFC)
step2VC = KYCVerifyStep1Wireframe().getMainView(with: self, step: .upload, customerType: self.customerType, trustdockModel: trustDockModel, redirectTo: redirectTo, useNFC: useNFC)
step3VC = KYCVerifyStep1Wireframe().getMainView(with: self, step: .terms, customerType: self.customerType, trustdockModel: trustDockModel, redirectTo: redirectTo, useNFC: useNFC)
step1VC = KYCVerifyStep1Wireframe().getMainView(with: self, step: .first, customerType: self.customerType, trustdockModel: trustDockModel, redirectTo: redirectTo, useNFC: useNFC, fullName: fullName, dob: dob)
step2VC = KYCVerifyStep1Wireframe().getMainView(with: self, step: .upload, customerType: self.customerType, trustdockModel: trustDockModel, redirectTo: redirectTo, useNFC: useNFC, fullName: fullName, dob: dob)
step3VC = KYCVerifyStep1Wireframe().getMainView(with: self, step: .terms, customerType: self.customerType, trustdockModel: trustDockModel, redirectTo: redirectTo, useNFC: useNFC, fullName: fullName, dob: dob)
} else {
step1VC = KYCVerifyStep1Wireframe().getMainViewWithoutTrustDock(with: self, step: .first, customerType: self.customerType, redirectTo: self.redirectTo)
step2VC = KYCVerifyStep1Wireframe().getMainViewWithoutTrustDock(with: self, step: .upload, customerType: self.customerType, redirectTo: self.redirectTo)
step3VC = KYCVerifyStep1Wireframe().getMainViewWithoutTrustDock(with: self, step: .terms, customerType: self.customerType, redirectTo: self.redirectTo)
step1VC = KYCVerifyStep1Wireframe().getMainViewWithoutTrustDock(with: self, step: .first, customerType: self.customerType, redirectTo: self.redirectTo, fullName: fullName, dob: dob)
step2VC = KYCVerifyStep1Wireframe().getMainViewWithoutTrustDock(with: self, step: .upload, customerType: self.customerType, redirectTo: self.redirectTo, fullName: fullName, dob: dob)
step3VC = KYCVerifyStep1Wireframe().getMainViewWithoutTrustDock(with: self, step: .terms, customerType: self.customerType, redirectTo: self.redirectTo, fullName: fullName, dob: dob)
}
}

2
GME Remit/Modules/RegisterModules/VerifyIDNumber/Module Interface/VerifyIDNumberModuleInterface.swift

@ -7,6 +7,6 @@
//
protocol VerifyIDNumberModuleInterface: class {
func newUserRegister(customerType: String)
func newUserRegister(customerType: String, fullName: String, Dob: String)
func verifyIdNumber(id: String, type: String, fullName: String, dob: String)
}

4
GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/Presenter/VerifyIDNumberPresenter.swift

@ -22,8 +22,8 @@ class VerifyIDNumberPresenter {
// MARK: VerifyIDNumber module interface
extension VerifyIDNumberPresenter: VerifyIDNumberModuleInterface {
func newUserRegister(customerType: String) {
self.wireframe?.newUserRegister(customerType: customerType)
func newUserRegister(customerType: String, fullName: String, Dob: String) {
self.wireframe?.newUserRegister(customerType: customerType, fullName: fullName, Dob: Dob)
}
func verifyIdNumber(id: String, type: String, fullName: String, dob: String) {

2
GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift

@ -200,6 +200,6 @@ extension VerifyIDNumberViewController: VerifyIDNumberViewInterface {
return
}
GMEDB.shared.user.set(id, .userId)
self.presenter?.newUserRegister(customerType: self.customerType)
self.presenter?.newUserRegister(customerType: self.customerType, fullName: self.fullNameTxtField.text ?? "", Dob: self.dobTxtField.text ?? "")
}
}

4
GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/Wireframe/VerifyIDNumberWireframe.swift

@ -32,9 +32,11 @@ extension VerifyIDNumberWireframe: VerifyIDNumberWireframeInput {
return viewController
}
func newUserRegister(customerType: String) {
func newUserRegister(customerType: String, fullName: String, Dob: String) {
if let navigation = self.view.navigationController {
let newResigerWireFrame = NewUserRegisterWireframe()
newResigerWireFrame.fullName = fullName
newResigerWireFrame.dob = Dob
newResigerWireFrame.customerType = customerType
newResigerWireFrame.pushMainView(in: navigation)

2
GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/Wireframe/VerifyIDNumberWireframeInput.swift

@ -9,5 +9,5 @@
import Foundation
protocol VerifyIDNumberWireframeInput: WireframeInput {
func newUserRegister(customerType: String)
func newUserRegister(customerType: String, fullName: String, Dob: String)
}

11
GME Remit/MultiLanguages/si.lproj/Localizable.strings

@ -658,3 +658,14 @@
"receiver_wallet_no_text" = "වොලට් අංකය";
"receiver_wallet_no_text_enter" = "වොලට් අංකය ඇතුලත් කරන්න";
"ekyc_registration_title_text" = "EKYC සඳහා ලියාපදිංචිවීම";
"scan_text" = "ස්කෑන් කරන්න";
"scan_doc_text" = "ස්කෑන් කල ලියකියවිලි";
"scan_residence_card_text" = "නේවාසික හැඳුනුම්පත";
"scan_driver_license_text" = "රියදුරුබලපත් අංකය";
"id_number_hint_text" = "හැඳුනුම්පත් අංකය";
"driver_license_hint_text" = "රියදුරු බලපත්‍රය /විදේශ ගමන් බලපත්‍රය";
"invalid_driver_license_text" = "වලංගු නොවන රියදුරු බලපත්‍රය";
"full_name_placeholder_text" = "සම්පූර්ණ නම";
Loading…
Cancel
Save