diff --git a/GMERemittance/Module/SendMoneyReceipt/Application Logic/Interactor/SendMoneyReceiptInteractor.swift b/GMERemittance/Module/SendMoneyReceipt/Application Logic/Interactor/SendMoneyReceiptInteractor.swift index b6e3bd99..1c6cf1f7 100644 --- a/GMERemittance/Module/SendMoneyReceipt/Application Logic/Interactor/SendMoneyReceiptInteractor.swift +++ b/GMERemittance/Module/SendMoneyReceipt/Application Logic/Interactor/SendMoneyReceiptInteractor.swift @@ -14,7 +14,7 @@ class SendMoneyReceiptInteractor { weak var output: SendMoneyReceiptInteractorOutput? private let service: SendMoneyReceiptServiceType - var transactionId: String! = "123467" + var transactionId: String! // MARK: Initialization diff --git a/GMERemittance/Module/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift b/GMERemittance/Module/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift index e2d0fdc3..7ba9b552 100644 --- a/GMERemittance/Module/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift +++ b/GMERemittance/Module/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift @@ -21,7 +21,7 @@ protocol FetchSendMoneyRecieptList: ApiServiceType { extension FetchSendMoneyRecieptList { func fetch(transactionId: String, success: @escaping (SendMoneyReciept?) -> (), failure: @escaping (Error) -> ()) { let url = baseUrl + "mobile/receipt/" + transactionId - self.auth.request(method: .get, url: url, params: nil, success: { (response: SendMoneyRecieptContainer) in + self.auth.request(method: .post, url: url, params: nil, success: { (response: SendMoneyRecieptContainer) in if (response.errorCode ?? "") == "1" { let error = NSError.init(domain: "Network", code: 0, userInfo: [NSLocalizedDescriptionKey : response.message ?? ""]) failure(error) diff --git a/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard b/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard index 16ea8de1..bb6c5255 100644 --- a/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard +++ b/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard @@ -1,5 +1,5 @@ - + @@ -27,24 +27,6 @@ - - - - - - - - - - - - - - - - - - diff --git a/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift b/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift index 3a8c4293..2291c463 100644 --- a/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift +++ b/GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift @@ -119,8 +119,8 @@ extension SendMoneyReceiptViewController: SendMoneyReceiptViewInterface { } func show(error: String) { - let model = self.createMockModel() - self.reciept = model +// let model = self.createMockModel() +// self.reciept = model self.alert(message: error) } diff --git a/GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift b/GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift index 06f869db..5b07caa0 100644 --- a/GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift +++ b/GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift @@ -142,7 +142,6 @@ class SendMoneyVerificationViewController: UITableViewController { // MARK: SendMoneyVerificationViewInterface extension SendMoneyVerificationViewController: SendMoneyVerificationViewInterface { func show(model: SendMoneySubmitModelContainer?) { - self.alertWithOk(message: model?.message , title: "Alert!", okTitle: "OK", style: UIAlertControllerStyle.alert, OkStyle: .default) { if let id = model?.id { self.presenter?.openReciept(transactionId: id) @@ -153,6 +152,7 @@ extension SendMoneyVerificationViewController: SendMoneyVerificationViewInterfac } func show(error: String) { +// self.presenter?.openReciept(transactionId: "1235") self.alert(message: error) } diff --git a/GMERemittance/Module/SendMoneyVerification/User Interface/Wireframe/SendMoneyVerificationWireframe.swift b/GMERemittance/Module/SendMoneyVerification/User Interface/Wireframe/SendMoneyVerificationWireframe.swift index ca4fc32b..383628c1 100644 --- a/GMERemittance/Module/SendMoneyVerification/User Interface/Wireframe/SendMoneyVerificationWireframe.swift +++ b/GMERemittance/Module/SendMoneyVerification/User Interface/Wireframe/SendMoneyVerificationWireframe.swift @@ -35,7 +35,8 @@ extension SendMoneyVerificationWireframe: SendMoneyVerificationWireframeInput { func openReciept(transactionId: String) { if let navigation = self.view.navigationController { - self.reciptWireframe.openReciept(transactionId: transactionId, source: navigation) + reciptWireframe.openReciept(transactionId: transactionId, source: navigation) + } }