Browse Source

bug fixed

pull/1/head
gme_2 6 years ago
parent
commit
0803995d93
  1. 2
      GMERemittance/AppDelegate.swift
  2. 4
      GMERemittance/Extension/UIViewControllerExtension.swift
  3. 20
      GMERemittance/Model/User.swift
  4. 2
      GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift

2
GMERemittance/AppDelegate.swift

@ -240,7 +240,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
if (UserDefaults.standard.object(forKey: "com.gmeremit.loginStatus") as! Bool) {
guard (UserDefaults.standard.object(forKey: "com.gmeremit.isKYCSubmitted") as! Bool) else {
guard (UserDefaults.standard.object(forKey: UserKeys.kyc) as! Bool) == true else {
let storyboard = UIStoryboard.init(name: "Main", bundle: Bundle.main)
if let KYCPersonalInfoViewController = storyboard.instantiateViewController(withIdentifier: "KYCPersonalInfoViewController") as? KYCPersonalInfoViewController {

4
GMERemittance/Extension/UIViewControllerExtension.swift

@ -9,10 +9,6 @@
import Foundation
import UIKit
import MBProgressHUD
// ccr
// MARK: Alerts

20
GMERemittance/Model/User.swift

@ -14,17 +14,11 @@ protocol Login: ApiServiceType {
}
extension Login {
func _login(userId: String, password: String ,success: @escaping (User?) -> (), failure: @escaping (Error) -> ()) {
func _login(userId: String, password: String, success: @escaping (User?) -> (), failure: @escaping (Error) -> ()) {
let params = [ "userId": userId, "password": password ]
let url = baseUrl + "users/access-code"
auth.request(method: .post, url: url, params: params, success: { (response: UserContainer ) in
if (response.errorCode ?? "") == "1" {
let error = NSError.init(domain: "Network", code: 0, userInfo: [NSLocalizedDescriptionKey : response.message ?? ""])
failure(error)
}else {
let model = response.data
success(model)
}
auth.request(method: .post, url: url, params: params,needsAuthorization: false, success: { (response: User ) in
success(response)
}) { (error) in
failure(error)
}
@ -97,12 +91,12 @@ class User: Mappable {
var availableBalance: String?
var accessCode: String?
var dpUrl: String?
var kyc: String?
var verified: String?
var active: String?
var kyc: Bool?
var verified: Bool?
var active: Bool?
var primaryBankName: String?
var cmRegistrationId: String?
var isReferred: String?
var isReferred: Bool?
var country: String?
var province: String?
var provinceId: String?

2
GMERemittance/Module/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift

@ -89,8 +89,6 @@ class SendMoneyParentViewController: UIViewController {
self.presenter?.viewIsReady()
self.setupViewControllers()
self.addPaymentModeViewController()
}
override func viewWillAppear(_ animated: Bool) {

Loading…
Cancel
Save