diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 9a54d33e..df060f00 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -7565,7 +7565,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; @@ -7605,7 +7605,7 @@ CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; diff --git a/GME Remit/APIs/UrlManager.swift b/GME Remit/APIs/UrlManager.swift index 65d683bf..a9a14244 100644 --- a/GME Remit/APIs/UrlManager.swift +++ b/GME Remit/APIs/UrlManager.swift @@ -18,7 +18,7 @@ class UrlManager { let baseSocialURL = "" let liveServerUrl = "http://203.223.132.110:9093/api/" - let testUrl = "http://211.25.249.199:9093/api/" + let testUrl = "http://202.166.220.36:8083/api/" init() { switch server { diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift index 51b5f91f..bbc2010c 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift @@ -102,7 +102,7 @@ class ExistingUserKycViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() self.isFirst = (self.step == .first) - let url = URL(string: "http://211.25.249.199:9093/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html")! + let url = URL(string: "http://202.166.220.36:8083/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html")! self.termsWebView.load(URLRequest(url: url)) self.termsWebView.scrollView.bounces = false setup() @@ -788,6 +788,7 @@ extension ExistingUserKycViewController: WKNavigationDelegate, UIScrollViewDeleg func setWebViewDelegate() { termsWebView.scrollView.delegate = self termsWebView.navigationDelegate = self + checkButton.isEnabled = false } func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { diff --git a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift index f7f54f9b..273bbdf1 100644 --- a/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift +++ b/GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift @@ -995,6 +995,7 @@ extension KYCVerifyStep1ViewController: WKNavigationDelegate, UIScrollViewDelega func setWebViewDelegate() { termsWebView.scrollView.delegate = self termsWebView.navigationDelegate = self + checkButton.isEnabled = false } func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift index ed0035c2..b657af8d 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift @@ -178,7 +178,8 @@ class SendMoneyReceiptViewController: UIViewController { if self.receiptParent == .report { self.navigationController?.popViewController(animated: true) } else { - self.navigationController?.popViewController(animated: true) + //self.navigationController?.popViewController(animated: true) + self.navigationController?.popToRootViewController(animated: true) } } // MARK: Other Functions diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift index 67d3a40f..6ff3a079 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift @@ -86,7 +86,7 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput "ReceiverId": recieverId ?? "", "DeliveryMethodId": model.paymemtMode?.id ?? "", "PBranch": model.branch?.id ?? "", -// "PAgent": model.bank?.id ?? "", + "PAgent": model.bank?.id ?? "", "PaymentType": "wallet", "PCurr": model.exchangeRateDetail?.reciepientCurrency ?? "", "CollCurr": "JPY", diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift index 34bb1cd1..9167341f 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift @@ -87,7 +87,7 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput { "ReceiverId": recieverId ?? "", "DeliveryMethodId": model.paymemtMode?.id ?? "", "PBranch": model.branch?.id ?? "", - // "PAgent": model.bank?.id ?? "", + "PAgent": model.bank?.id ?? "", "PaymentType": "wallet", "PCurr": model.exchangeRateDetail?.reciepientCurrency ?? "", "CollCurr": "JPY", diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift index a2b01fb2..8e4d4268 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift @@ -54,7 +54,7 @@ class TermsAndConditionViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - let url = URL(string: "http://211.25.249.199:9093/Document/TermsAndConditions/Trx_TermsAndConditions.html")! + let url = URL(string: "http://202.166.220.36:8083/Document/TermsAndConditions/Trx_TermsAndConditions.html")! self.webView.load(URLRequest(url: url)) self.webView.scrollView.bounces = false self.setup() @@ -159,6 +159,7 @@ extension TermsAndConditionViewController: WKNavigationDelegate, UIScrollViewDel func setWebViewDelegate() { webView.scrollView.delegate = self webView.navigationDelegate = self + self.agreementButton.isEnabled = false } func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {