Browse Source

shown recipet from server

pull/1/head
gme_2 6 years ago
parent
commit
0c894ee7ba
  1. 2
      GMERemittance/Module/SendMoneyReceipt/Application Logic/Interactor/SendMoneyReceiptInteractor.swift
  2. 2
      GMERemittance/Module/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift
  3. 20
      GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
  4. 4
      GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
  5. 2
      GMERemittance/Module/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
  6. 3
      GMERemittance/Module/SendMoneyVerification/User Interface/Wireframe/SendMoneyVerificationWireframe.swift

2
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

2
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)

20
GMERemittance/Module/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="HSb-ou-7T5">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
@ -27,24 +27,6 @@
</array>
</customFonts>
<scenes>
<!--SendMoneyReceipt-->
<scene sceneID="R60-Pu-Hpy">
<objects>
<placeholder placeholderIdentifier="IBFirstResponder" id="8je-5K-XuW" userLabel="First Responder" sceneMemberID="firstResponder"/>
<viewController title="SendMoneyReceipt" id="HSb-ou-7T5" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="y1H-iV-BwG"/>
<viewControllerLayoutGuide type="bottom" id="PYB-Kq-ghm"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="9Uc-9s-KgO">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
</viewController>
</objects>
<point key="canvasLocation" x="-91" y="233"/>
</scene>
<!--Send Money Receipt View Controller-->
<scene sceneID="Lui-MN-Sv6">
<objects>

4
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)
}

2
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)
}

3
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)
}
}

Loading…
Cancel
Save