diff --git a/GMERemittance.xcodeproj/project.pbxproj b/GMERemittance.xcodeproj/project.pbxproj index dafd9138..68bbb249 100644 --- a/GMERemittance.xcodeproj/project.pbxproj +++ b/GMERemittance.xcodeproj/project.pbxproj @@ -311,6 +311,7 @@ D945F125213E1D5100A24824 /* SendMoneyReceiptViewInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = D945F11A213E1D5100A24824 /* SendMoneyReceiptViewInterface.swift */; }; D945F126213E1D5100A24824 /* SendMoneyReceiptViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = D945F11B213E1D5100A24824 /* SendMoneyReceiptViewController.swift */; }; D945F127213E1D5100A24824 /* SendMoneyReceipt.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = D945F11C213E1D5100A24824 /* SendMoneyReceipt.storyboard */; }; + D945F129213E4A9D00A24824 /* SendMoneyReciept.swift in Sources */ = {isa = PBXBuildFile; fileRef = D945F128213E4A9D00A24824 /* SendMoneyReciept.swift */; }; D957DC6C213D05E700FA812D /* SendMoneySubmitResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = D957DC6B213D05E700FA812D /* SendMoneySubmitResponse.swift */; }; D95B5E3921311057000C0B33 /* GmeContactsModuleInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B5E2621311056000C0B33 /* GmeContactsModuleInterface.swift */; }; D95B5E3A21311057000C0B33 /* GmeContactsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = D95B5E2921311056000C0B33 /* GmeContactsService.swift */; }; @@ -711,6 +712,7 @@ D945F11A213E1D5100A24824 /* SendMoneyReceiptViewInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendMoneyReceiptViewInterface.swift; sourceTree = ""; }; D945F11B213E1D5100A24824 /* SendMoneyReceiptViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SendMoneyReceiptViewController.swift; sourceTree = ""; }; D945F11C213E1D5100A24824 /* SendMoneyReceipt.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = SendMoneyReceipt.storyboard; sourceTree = ""; }; + D945F128213E4A9D00A24824 /* SendMoneyReciept.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMoneyReciept.swift; sourceTree = ""; }; D957DC6B213D05E700FA812D /* SendMoneySubmitResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendMoneySubmitResponse.swift; sourceTree = ""; }; D95B5E2621311056000C0B33 /* GmeContactsModuleInterface.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GmeContactsModuleInterface.swift; sourceTree = ""; }; D95B5E2921311056000C0B33 /* GmeContactsService.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GmeContactsService.swift; sourceTree = ""; }; @@ -2102,6 +2104,7 @@ D9030ABC2139113A00A1BCA0 /* SendMoneyAccountValidationRequestModel.swift */, D9768C87213BAE92009E01BC /* User.swift */, D957DC6B213D05E700FA812D /* SendMoneySubmitResponse.swift */, + D945F128213E4A9D00A24824 /* SendMoneyReciept.swift */, ); path = Model; sourceTree = ""; @@ -2907,6 +2910,7 @@ D922D98A21351AAE00D43053 /* SendMoneyExchangeRateWireframeInput.swift in Sources */, D9BF7EE22137CECF00264387 /* CurrencyPickerViewController.swift in Sources */, 9F23DF4F20749DFE0025D6DF /* ExchangeRateMultipleCountryViewController.swift in Sources */, + D945F129213E4A9D00A24824 /* SendMoneyReciept.swift in Sources */, A22162D0202C4A61000E915C /* TabBarViewController.swift in Sources */, D9B7ADF02130048E009B0564 /* ExchangeRatesModuleInterface.swift in Sources */, A252A4CC203ACFA0001EFF4C /* TransactionSuccessViewController.swift in Sources */, diff --git a/GMERemittance/Model/SendMoneyReciept.swift b/GMERemittance/Model/SendMoneyReciept.swift new file mode 100644 index 00000000..8f7bc8d6 --- /dev/null +++ b/GMERemittance/Model/SendMoneyReciept.swift @@ -0,0 +1,93 @@ +// +// SendMoneyReciept.swift +// GMERemittance +// +// Created by gme_2 on 04/09/2018. +// Copyright © 2018 Gobal Money Express Co. Ltd. All rights reserved. +// + +import Foundation +import ObjectMapper + +class SendMoneyReciept: Mappable { + var payMode: String? + var paymentMode: String? + var controNo: String? + var trnsDate: String? + var trnId: String? + var rFirstName: String? + var rMiddleName: String? + var rLastName: String? + var rAddress: String? + var rCountryName: String? + var rContactNo: String? + var rEmail: String? + var relationWithSender: String? + var rState: String? + var payoutCountry: String? + var transactionDate: String? + var recieverAmount: String? + var agentBank: String? + var paymentMethod: String? + var accountNo: String? + var payoutBankBranch: String? + var collAmount: String? + var exRate: String? + var serviceCharge: String? + var payoutAmount: String? + var payoutMode: String? + + + required init?(map: Map) { + + } + + + func mapping(map: Map) { + payMode <- map["payMode"] + paymentMode <- map["PaymentMode"] + controNo <- map["controlNo"] + trnsDate <- map["trnsDate"] + trnId <- map["trnId"] + rFirstName <- map["rFirstName"] + rMiddleName <- map["rMiddleName"] + rLastName <- map["rLastName"] + rAddress <- map["rAddress"] + rCountryName <- map["rCountryName"] + rContactNo <- map["rContactNo"] + rEmail <- map["rEmail"] + relationWithSender <- map["relWithSender"] + rState <- map["rState"] + payoutCountry <- map["payoutCountry"] + transactionDate <- map["trnDate"] + recieverAmount <- map["pAmount"] + agentBank <- map["pAgentBank"] + paymentMethod <- map["paymentMethod"] + accountNo <- map["accountNo"] + payoutBankBranch <- map["payoutBankBranch"] + collAmount <- map["collAmount"] + exRate <- map["exRate"] + serviceCharge <- map["serviceCharge"] + payoutAmount <- map["payOutAmount"] + payoutMode <- map["payOutMode"] + } +} + + +class SendMoneyRecieptContainer: Mappable { + var errorCode: String? + var message: String? + var id: String? + var data: [SendMoneyReciept]? + + required init?(map: Map) { + + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + id <- map["Id"] + message <- map["Msg"] + data <- map["Data"] + } +} diff --git a/GMERemittance/Module/EditReciepient/User Interface/View/EditReciepientViewController.swift b/GMERemittance/Module/EditReciepient/User Interface/View/EditReciepientViewController.swift index 36a892ec..9185cf81 100644 --- a/GMERemittance/Module/EditReciepient/User Interface/View/EditReciepientViewController.swift +++ b/GMERemittance/Module/EditReciepient/User Interface/View/EditReciepientViewController.swift @@ -39,7 +39,6 @@ class EditReciepientViewController: UIViewController { } } - var selectedCountry: SendMoneyCountryViewModel? { didSet { self.countryTextField.text = selectedCountry?.name diff --git a/GMERemittance/Module/SendMoneyReceipt/Application Logic/Interactor/SendMoneyReceiptInteractor.swift b/GMERemittance/Module/SendMoneyReceipt/Application Logic/Interactor/SendMoneyReceiptInteractor.swift index bd0e4f45..268a6d5d 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! + var transactionId: String! = "123467" // MARK: Initialization diff --git a/GMERemittance/Module/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift b/GMERemittance/Module/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift index 999d41e2..3908f81c 100644 --- a/GMERemittance/Module/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift +++ b/GMERemittance/Module/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift @@ -11,3 +11,8 @@ import Foundation protocol SendMoneyReceiptServiceType: class { } + + +protocol FetchRecieptList { +// func fetch(transactionId: String, ) +}