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

Merge pull request '#381' (#6) from #381 into feature/bugfixes 

Reviewed-on: http://202.166.220.79:3000/JME-JAPAN/JME-IOS/pulls/6
pull/7/head
Yajan 3 years ago
parent
bf06ceb75a a8dae902ba
commit
bb836ed62a
8 changed files with 12 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      GME Remit.xcodeproj/project.pbxproj
  2. 2
      GME Remit/APIs/UrlManager.swift
  3. 3
      GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift
  4. 1
      GME Remit/Modules/RegisterModules/UserAuthentication/KYCVerifyStep1/User Interface/View/KYCVerifyStep1ViewController.swift
  5. 3
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
  6. 2
      GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift
  7. 2
      GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift
  8. 3
      GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift

4
GME Remit.xcodeproj/project.pbxproj
View File

@ -7565,7 +7565,7 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
CURRENT_PROJECT_VERSION = 11;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV; DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
@ -7605,7 +7605,7 @@
CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements"; CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
CODE_SIGN_IDENTITY = "iPhone Developer"; CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 10;
CURRENT_PROJECT_VERSION = 11;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = 68KRG7GPAV; DEVELOPMENT_TEAM = 68KRG7GPAV;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;

2
GME Remit/APIs/UrlManager.swift
View File

@ -18,7 +18,7 @@ class UrlManager {
let baseSocialURL = "" let baseSocialURL = ""
let liveServerUrl = "http://203.223.132.110:9093/api/" 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() { init() {
switch server { switch server {

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

@ -102,7 +102,7 @@ class ExistingUserKycViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
self.isFirst = (self.step == .first) 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.load(URLRequest(url: url))
self.termsWebView.scrollView.bounces = false self.termsWebView.scrollView.bounces = false
setup() setup()
@ -788,6 +788,7 @@ extension ExistingUserKycViewController: WKNavigationDelegate, UIScrollViewDeleg
func setWebViewDelegate() { func setWebViewDelegate() {
termsWebView.scrollView.delegate = self termsWebView.scrollView.delegate = self
termsWebView.navigationDelegate = self termsWebView.navigationDelegate = self
checkButton.isEnabled = false
} }
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {

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

@ -995,6 +995,7 @@ extension KYCVerifyStep1ViewController: WKNavigationDelegate, UIScrollViewDelega
func setWebViewDelegate() { func setWebViewDelegate() {
termsWebView.scrollView.delegate = self termsWebView.scrollView.delegate = self
termsWebView.navigationDelegate = self termsWebView.navigationDelegate = self
checkButton.isEnabled = false
} }
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {

3
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
View File

@ -178,7 +178,8 @@ class SendMoneyReceiptViewController: UIViewController {
if self.receiptParent == .report { if self.receiptParent == .report {
self.navigationController?.popViewController(animated: true) self.navigationController?.popViewController(animated: true)
} else { } else {
self.navigationController?.popViewController(animated: true)
//self.navigationController?.popViewController(animated: true)
self.navigationController?.popToRootViewController(animated: true)
} }
} }
// MARK: Other Functions // MARK: Other Functions

2
GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/Application Logic/Interactor/SendMoneyVerificationInteractor.swift
View File

@ -86,7 +86,7 @@ extension SendMoneyVerificationInteractor: SendMoneyVerificationInteractorInput
"ReceiverId": recieverId ?? "", "ReceiverId": recieverId ?? "",
"DeliveryMethodId": model.paymemtMode?.id ?? "", "DeliveryMethodId": model.paymemtMode?.id ?? "",
"PBranch": model.branch?.id ?? "", "PBranch": model.branch?.id ?? "",
// "PAgent": model.bank?.id ?? "",
"PAgent": model.bank?.id ?? "",
"PaymentType": "wallet", "PaymentType": "wallet",
"PCurr": model.exchangeRateDetail?.reciepientCurrency ?? "", "PCurr": model.exchangeRateDetail?.reciepientCurrency ?? "",
"CollCurr": "JPY", "CollCurr": "JPY",

2
GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift
View File

@ -87,7 +87,7 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput {
"ReceiverId": recieverId ?? "", "ReceiverId": recieverId ?? "",
"DeliveryMethodId": model.paymemtMode?.id ?? "", "DeliveryMethodId": model.paymemtMode?.id ?? "",
"PBranch": model.branch?.id ?? "", "PBranch": model.branch?.id ?? "",
// "PAgent": model.bank?.id ?? "",
"PAgent": model.bank?.id ?? "",
"PaymentType": "wallet", "PaymentType": "wallet",
"PCurr": model.exchangeRateDetail?.reciepientCurrency ?? "", "PCurr": model.exchangeRateDetail?.reciepientCurrency ?? "",
"CollCurr": "JPY", "CollCurr": "JPY",

3
GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift
View File

@ -54,7 +54,7 @@ class TermsAndConditionViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
super.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.load(URLRequest(url: url))
self.webView.scrollView.bounces = false self.webView.scrollView.bounces = false
self.setup() self.setup()
@ -159,6 +159,7 @@ extension TermsAndConditionViewController: WKNavigationDelegate, UIScrollViewDel
func setWebViewDelegate() { func setWebViewDelegate() {
webView.scrollView.delegate = self webView.scrollView.delegate = self
webView.navigationDelegate = self webView.navigationDelegate = self
self.agreementButton.isEnabled = false
} }
func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) { func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {

Write Preview
Loading…
Cancel
Save