diff --git a/GME Remit/Models/ExchangeModel.swift b/GME Remit/Models/ExchangeModel.swift index e869f174..7e59d4b3 100644 --- a/GME Remit/Models/ExchangeModel.swift +++ b/GME Remit/Models/ExchangeModel.swift @@ -9,29 +9,26 @@ import Foundation import ObjectMapper - - - class ExchangeRateModel: Mappable { - var country: String? - var countryCode: String? - var currency: String? - var countryId: String? - var availableServices: [PaymentServiceType]? - - init() {} - - required init?(map: Map) { - - } + var country: String? + var countryCode: String? + var currency: String? + var countryId: String? + var availableServices: [PaymentServiceType]? + + init() {} + + required init?(map: Map) { - func mapping(map: Map) { - country <- map["country"] - countryCode <- map["countryCode"] - currency <- map["currency"] - countryId <- map["countryId"] - availableServices <- map["serviceAvailable"] - } + } + + func mapping(map: Map) { + country <- map["country"] + countryCode <- map["countryCode"] + currency <- map["currency"] + countryId <- map["countryId"] + availableServices <- map["serviceAvailable"] + } } extension ExchangeRateModel: TablePresenterProtocol { @@ -46,47 +43,38 @@ extension ExchangeRateModel: TablePresenterProtocol { } class PaymentServiceType: Mappable { + + var id: String? + var type: String? + var subtitle: String? + + init() {} + + required init?(map: Map) { - var id: String? - var type: String? - var subtitle: String? - - init() {} - - required init?(map: Map) { - - } - - func mapping(map: Map) { - id <- map["id"] - type <- map["text"] - subtitle <- map["description"] - } + } + + func mapping(map: Map) { + id <- map["id"] + type <- map["text"] + subtitle <- map["description"] + } } - class ExchangeRateContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: [ExchangeRateModel]? - - required init?(map: Map) { - - } + var errorCode: String? + var message: String? + var id: String? + var data: [ExchangeRateModel]? + + required init?(map: Map) { - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - id <- map["Id"] - message <- map["Msg"] - data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + id <- map["Id"] + message <- map["Msg"] + data <- map["Data"] + } } - -//"ErrorCode": "0", -//"Msg": "Success", -//"Id": null, -//"data" : { -// -//} - diff --git a/GME Remit/Models/ExchangeRateDetailModel.swift b/GME Remit/Models/ExchangeRateDetailModel.swift index 395b56c3..069c1812 100644 --- a/GME Remit/Models/ExchangeRateDetailModel.swift +++ b/GME Remit/Models/ExchangeRateDetailModel.swift @@ -9,51 +9,42 @@ import Foundation import ObjectMapper -//{ -// "ErrorCode": "0", -// "Msg": "Success", -// "Id": null, -// "Data": { - - - class ExchangeRateDetailModel: Mappable { - var id: String? - var transferFee: String? - var exchangeRate: String? - var recipientAmount: String? - var senderAmount: String? - var senderCurrency: String? + var id: String? + var transferFee: String? + var exchangeRate: String? + var recipientAmount: String? + var senderAmount: String? + var senderCurrency: String? + + required init?(map: Map) { - required init?(map: Map) { - - } - - func mapping(map: Map) { - id <- map["id"] - transferFee <- map["scCharge"] - exchangeRate <- map["exRateDisplay"] - recipientAmount <- map["pAmt"] - senderAmount <- map["collAmt"] - senderCurrency <- map["collCurr"] - } + } + + func mapping(map: Map) { + id <- map["id"] + transferFee <- map["scCharge"] + exchangeRate <- map["exRateDisplay"] + recipientAmount <- map["pAmt"] + senderAmount <- map["collAmt"] + senderCurrency <- map["collCurr"] + } } - class ExchangeRateDetailContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: ExchangeRateDetailModel? - - required init?(map: Map) { - - } + var errorCode: String? + var message: String? + var id: String? + var data: ExchangeRateDetailModel? + + required init?(map: Map) { - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - message <- map["Msg"] - id <- map["Id"] - data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + message <- map["Msg"] + id <- map["Id"] + data <- map["Data"] + } } diff --git a/GME Remit/Models/GmeContacts.swift b/GME Remit/Models/GmeContacts.swift index 2e0cb890..7c6a3965 100644 --- a/GME Remit/Models/GmeContacts.swift +++ b/GME Remit/Models/GmeContacts.swift @@ -10,51 +10,21 @@ import Foundation import ObjectMapper class GmeContacts: Mappable { + + var title: String? + var address: String? + var contactNumber: [String]? + var language: String? + var longitude: String? + var latitiude: String? + + init() {} + + required init?(map: Map) { - var title: String? - var address: String? - var contactNumber: [String]? - var language: String? - var longitude: String? - var latitiude: String? + } + + func mapping(map: Map) { - - init() {} - - required init?(map: Map) { - - } - - func mapping(map: Map) { - - } + } } - - -//Head Office: -//325, Jong-ro, Jongno-gu, 03104 Seoul -//Tel. 1588 6864 -//(Korean Language Support) - -//Dongdaemun Branch: -//315, Jong-ro, Jongno-gu, 03105 Seoul -//(Near Dongdaemun Station Gate 3) -//Tel. 02 763 5559 - -//Hwaseong Branch: -//1102-1, 3.1 Manse-ro, Hyangnam-eup, Hwaseong-si, 18593 Gyeonggi-do -//Tel. 031 354 0450 - -//Ansan Branch: -//Ansan-si, Gyeonggido Dan-Wongu, -//Wongogdong Jung-Angdaero 445 -//(798-12 beonji) 2nd floor -//Tel. 031 3626 740 - -//Gimhae Branch: -//84, Garak-ro, Gimhae-si, Gyeongsangnam-do -//Tel. 055 329 5559 - -//Songu-ri Branch: -//91, Solmoru-ro, Soheul-eup, Pocheon-si, Gyeonggi-do, Korea 11175 (Across from K-Mart) -//Tel. 031-541-1856 diff --git a/GME Remit/Models/KYCResponseModel.swift b/GME Remit/Models/KYCResponseModel.swift index d604199a..da552940 100644 --- a/GME Remit/Models/KYCResponseModel.swift +++ b/GME Remit/Models/KYCResponseModel.swift @@ -9,7 +9,6 @@ import Foundation import ObjectMapper - class KYCResponseContainer: Mappable { var errorCode: String? var message: String? @@ -53,7 +52,6 @@ class KYCResponse: Mappable { var passportUrl: String? var selfieUrl: String? - init() { } diff --git a/GME Remit/Models/KycModel.swift b/GME Remit/Models/KycModel.swift index d93c943c..3d2f034c 100644 --- a/GME Remit/Models/KycModel.swift +++ b/GME Remit/Models/KycModel.swift @@ -9,62 +9,60 @@ import Foundation import ObjectMapper - class KycModelContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: KycModel? - - required init?(map: Map) { - - } + var errorCode: String? + var message: String? + var id: String? + var data: KycModel? + + required init?(map: Map) { - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - message <- map["Msg"] - id <- map["Id"] - data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + message <- map["Msg"] + id <- map["Id"] + data <- map["Data"] + } } class KycModel: Mappable { - var nativeCountry: [KeyValueModel]? - var city: [KeyValueModel]? - var occupations: [KeyValueModel]? - var bank: [KeyValueModel]? - var idType: [VerificationIdType]? - var sourceOfFund: [KeyValueModel]? - - required init?(map: Map) { - - } + var nativeCountry: [KeyValueModel]? + var city: [KeyValueModel]? + var occupations: [KeyValueModel]? + var bank: [KeyValueModel]? + var idType: [VerificationIdType]? + var sourceOfFund: [KeyValueModel]? + + required init?(map: Map) { - func mapping(map: Map) { - nativeCountry <- map["NativeCountry"] - city <- map["City"] - occupations <- map["Occupation"] - bank <- map["Bank"] - idType <- map["IdType"] - sourceOfFund <- map["SourceOfFund"] - } + } + + func mapping(map: Map) { + nativeCountry <- map["NativeCountry"] + city <- map["City"] + occupations <- map["Occupation"] + bank <- map["Bank"] + idType <- map["IdType"] + sourceOfFund <- map["SourceOfFund"] + } } - class VerificationIdType: Mappable { - var id: String? - var text: String? - var dependent: [String]? - - required init?(map: Map) { - - } + var id: String? + var text: String? + var dependent: [String]? + + required init?(map: Map) { - func mapping(map: Map) { - id <- map["id"] - text <- map["text"] - dependent <- map["dependent"] - } + } + + func mapping(map: Map) { + id <- map["id"] + text <- map["text"] + dependent <- map["dependent"] + } } extension VerificationIdType: TablePresenterProtocol { @@ -76,26 +74,24 @@ extension VerificationIdType: TablePresenterProtocol { return nil } - } class KeyValueModel: Mappable { - var id: String? - var text: String? - var code: String? - - required init?(map: Map) { - - } + var id: String? + var text: String? + var code: String? + + required init?(map: Map) { - func mapping(map: Map) { - id <- map["id"] - text <- map["text"] - code <- map["code"] - } + } + + func mapping(map: Map) { + id <- map["id"] + text <- map["text"] + code <- map["code"] + } } - extension KeyValueModel: TablePresenterProtocol { var cellTitle: String? { return text @@ -105,5 +101,4 @@ extension KeyValueModel: TablePresenterProtocol { return nil } - } diff --git a/GME Remit/Models/ResendDetail.swift b/GME Remit/Models/ResendDetail.swift index 33f62175..0a9c89c0 100644 --- a/GME Remit/Models/ResendDetail.swift +++ b/GME Remit/Models/ResendDetail.swift @@ -11,196 +11,186 @@ import ObjectMapper class ResendDetailModelContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: ResendDetail? - - required init?(map: Map) { - - } - - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - message <- map["Msg"] - id <- map["Id"] - data <- map["Data"] - } + var errorCode: String? + var message: String? + var id: String? + var data: ResendDetail? + + required init?(map: Map) { + + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + message <- map["Msg"] + id <- map["Id"] + data <- map["Data"] + } } class ResendDetail: Mappable { - - var exchangeRate: ResendExchangeRate? - var remitDetial: ResendRemitDetail? - var receiver: ResendReceiver? - - required init?(map: Map) {} - - init() {} - - func mapping(map: Map) { - exchangeRate <- map["ExRate"] - remitDetial <- map["RemitDetail"] - receiver <- map["Receiver"] - } + + var exchangeRate: ResendExchangeRate? + var remitDetial: ResendRemitDetail? + var receiver: ResendReceiver? + + required init?(map: Map) {} + + init() {} + + func mapping(map: Map) { + exchangeRate <- map["ExRate"] + remitDetial <- map["RemitDetail"] + receiver <- map["Receiver"] + } } - - - class ResendExchangeRate: Mappable { - - - - var payoutAgent: String? - var schemeId: String? - var payoutPartner: String? - var sCountryId: String? - var pCountryId: String? - var pCountryName: String? - - var sCurrency: String? - var pCurrency: String? - var cAmount: String? - var pAmount: String? - - var serviceType: String? - var calcBy: String? - var processId: String? - - var tpExRate: String? - var tpPCurrnecy: String? - var paymentType: String? - var userId: String? - - required init?(map: Map) {} - - init() {} - - func mapping(map: Map) { - payoutAgent <- map["pAgent"] - schemeId <- map["schemeId"] - payoutPartner <- map["payoutPartner"] - sCountryId <- map["sCountry"] - pCountryId <- map["pCountry"] - pCountryName <- map["pCountryName"] - sCurrency <- map["sCurrency"] - pCurrency <- map["pCurrency"] - cAmount <- map["cAmount"] - pAmount <- map["pAmount"] - serviceType <- map["serviceType"] - calcBy <- map["calcBy"] - processId <- map["processId"] - tpExRate <- map["PaidDate"] - tpPCurrnecy <- map["tpPCurrnecy"] - paymentType <- map["paymentType"] - userId <- map["userId"] - } - + var payoutAgent: String? + var schemeId: String? + var payoutPartner: String? + var sCountryId: String? + var pCountryId: String? + var pCountryName: String? + + var sCurrency: String? + var pCurrency: String? + var cAmount: String? + var pAmount: String? + + var serviceType: String? + var calcBy: String? + var processId: String? + + var tpExRate: String? + var tpPCurrnecy: String? + var paymentType: String? + var userId: String? + + required init?(map: Map) {} + + init() {} + + func mapping(map: Map) { + payoutAgent <- map["pAgent"] + schemeId <- map["schemeId"] + payoutPartner <- map["payoutPartner"] + sCountryId <- map["sCountry"] + pCountryId <- map["pCountry"] + pCountryName <- map["pCountryName"] + sCurrency <- map["sCurrency"] + pCurrency <- map["pCurrency"] + cAmount <- map["cAmount"] + pAmount <- map["pAmount"] + serviceType <- map["serviceType"] + calcBy <- map["calcBy"] + processId <- map["processId"] + tpExRate <- map["PaidDate"] + tpPCurrnecy <- map["tpPCurrnecy"] + paymentType <- map["paymentType"] + userId <- map["userId"] + } + } - class ResendRemitDetail: Mappable { - var user: String? - var senderId: String? - var receiverId: String? - var deliveryMethodId: String? - var pBranch: String? - var pAgent: String? - var pCurr: String? - var collCurr: String? - var collAmt: String? - var payoutAmt: String? - var transferAmt: String? - var serviceCharge: String? - var discount: String? - var exRate: String? - var calBy: String? - var purposeOfRemittance: String? - var sourceOfFund: String? - var relWithSender: String? - var occupation: String? - var ipAddress: String? - var rState: String? - var rLocation: String? - var tpExRate: String? - var tpPCurr: String? - var payOutPartner: String? - var foreXSessionId: String? - var paymentType: String? - var isAgreed: String? - var txnPassword: String? - var processId: String? - var receiverAccountNo: String? - var customerId: String? - var kftcLogId: String? - - required init?(map: Map) {} - - init() {} - - func mapping(map: Map) { - user <- map["User"] - senderId <- map["SenderId"] - receiverId <- map["ReceiverId"] - deliveryMethodId <- map["DeliveryMethodId"] - pBranch <- map["PBranch"] - pAgent <- map["PAgent"] - pCurr <- map["PCurr"] - collCurr <- map["CollCurr"] - collAmt <- map["CollAmt"] - payoutAmt <- map["PayoutAmt"] - transferAmt <- map["TransferAmt"] - serviceCharge <- map["ServiceCharge"] - discount <- map["Discount"] - exRate <- map["ExRate"] - calBy <- map["CalBy"] - purposeOfRemittance <- map["PurposeOfRemittance"] - sourceOfFund <- map["SourceOfFund"] - relWithSender <- map["RelWithSender"] - occupation <- map["Occupation"] - ipAddress <- map["IpAddress"] - rState <- map["RState"] - rLocation <- map["RLocation"] - tpExRate <- map["TpExRate"] - tpPCurr <- map["TpPCurr"] - payOutPartner <- map["PayOutPartner"] - foreXSessionId <- map["FOREX_SESSION_ID"] - paymentType <- map["PaymentType"] - isAgreed <- map["IsAgreed"] - txnPassword <- map["TxnPassword"] - processId <- map["ProcessId"] - receiverAccountNo <- map["ReceiverAccountNo"] - customerId <- map["CustomerId"] - kftcLogId <- map["KftcLogId"] - - } + var user: String? + var senderId: String? + var receiverId: String? + var deliveryMethodId: String? + var pBranch: String? + var pAgent: String? + var pCurr: String? + var collCurr: String? + var collAmt: String? + var payoutAmt: String? + var transferAmt: String? + var serviceCharge: String? + var discount: String? + var exRate: String? + var calBy: String? + var purposeOfRemittance: String? + var sourceOfFund: String? + var relWithSender: String? + var occupation: String? + var ipAddress: String? + var rState: String? + var rLocation: String? + var tpExRate: String? + var tpPCurr: String? + var payOutPartner: String? + var foreXSessionId: String? + var paymentType: String? + var isAgreed: String? + var txnPassword: String? + var processId: String? + var receiverAccountNo: String? + var customerId: String? + var kftcLogId: String? + + required init?(map: Map) {} + + init() {} + + func mapping(map: Map) { + user <- map["User"] + senderId <- map["SenderId"] + receiverId <- map["ReceiverId"] + deliveryMethodId <- map["DeliveryMethodId"] + pBranch <- map["PBranch"] + pAgent <- map["PAgent"] + pCurr <- map["PCurr"] + collCurr <- map["CollCurr"] + collAmt <- map["CollAmt"] + payoutAmt <- map["PayoutAmt"] + transferAmt <- map["TransferAmt"] + serviceCharge <- map["ServiceCharge"] + discount <- map["Discount"] + exRate <- map["ExRate"] + calBy <- map["CalBy"] + purposeOfRemittance <- map["PurposeOfRemittance"] + sourceOfFund <- map["SourceOfFund"] + relWithSender <- map["RelWithSender"] + occupation <- map["Occupation"] + ipAddress <- map["IpAddress"] + rState <- map["RState"] + rLocation <- map["RLocation"] + tpExRate <- map["TpExRate"] + tpPCurr <- map["TpPCurr"] + payOutPartner <- map["PayOutPartner"] + foreXSessionId <- map["FOREX_SESSION_ID"] + paymentType <- map["PaymentType"] + isAgreed <- map["IsAgreed"] + txnPassword <- map["TxnPassword"] + processId <- map["ProcessId"] + receiverAccountNo <- map["ReceiverAccountNo"] + customerId <- map["CustomerId"] + kftcLogId <- map["KftcLogId"] + + } } - - class ResendReceiver: Mappable { - var rFullName: String? - var rAddress: String? - var rCountry: String? - var rMobile: String? - var rCountryCode: String? - var deliveryMethod: String? - var pAgentName: String? - - required init?(map: Map) { - - } - - func mapping(map: Map) { - rFullName <- map["rFullName"] - rAddress <- map["rAddress"] - rCountry <- map["rCountry"] - rMobile <- map["rMobile"] - rCountryCode <- map["rCountryCode"] - deliveryMethod <- map["deliveryMethod"] - pAgentName <- map["pAgentName"] - - } + var rFullName: String? + var rAddress: String? + var rCountry: String? + var rMobile: String? + var rCountryCode: String? + var deliveryMethod: String? + var pAgentName: String? + + required init?(map: Map) { + + } + + func mapping(map: Map) { + rFullName <- map["rFullName"] + rAddress <- map["rAddress"] + rCountry <- map["rCountry"] + rMobile <- map["rMobile"] + rCountryCode <- map["rCountryCode"] + deliveryMethod <- map["deliveryMethod"] + pAgentName <- map["pAgentName"] + + } } - diff --git a/GME Remit/Models/ResendListModel.swift b/GME Remit/Models/ResendListModel.swift index 58b4ade2..f0a71f92 100644 --- a/GME Remit/Models/ResendListModel.swift +++ b/GME Remit/Models/ResendListModel.swift @@ -11,77 +11,72 @@ import ObjectMapper class ResendListModelContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: ResendListModel? + var errorCode: String? + var message: String? + var id: String? + var data: ResendListModel? + + required init?(map: Map) { - required init?(map: Map) { - - } - - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - message <- map["Msg"] - id <- map["Id"] - data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + message <- map["Msg"] + id <- map["Id"] + data <- map["Data"] + } } class ResendListModel: Mappable { + + var account: [Account]? + var transactions: [ResendTransactionModel]? + + required init?(map: Map) {} + + init() {} + + func mapping(map: Map) { + account <- map["Accounts"] + transactions <- map["Transactions"] - var account: [Account]? - var transactions: [ResendTransactionModel]? - - required init?(map: Map) {} - - init() {} - - func mapping(map: Map) { - account <- map["Accounts"] - transactions <- map["Transactions"] - - } + } } - - - class ResendTransactionModel: Mappable { + var transactionId: String? + var cCurrency: String? + var pAmt: String? + var cAmt: String? + var pCurrency: String? + var sendDate: String? + var paidDate: String? + var controlNumber: String? + var recieverName: String? + + var payStatus: String? + var payOutMode: String? + var bankName: String? + var senderName: String? + + required init?(map: Map) {} + + init() {} + + func mapping(map: Map) { - - var transactionId: String? - var cCurrency: String? - var pAmt: String? - var cAmt: String? - var pCurrency: String? - var sendDate: String? - var paidDate: String? - var controlNumber: String? - var recieverName: String? - - var payStatus: String? - var payOutMode: String? - var bankName: String? - var senderName: String? - - required init?(map: Map) {} - - init() {} - - func mapping(map: Map) { - - transactionId <- map["TranId"] - controlNumber <- map["ControlNo"] - pAmt <- map["PayoutAmt"] - pCurrency <- map["PCurr"] - cAmt <- map["CollAmt"] - cCurrency <- map["CollCurr"] - payStatus <- map["PayStatus"] - payOutMode <- map["PayoutMode"] - sendDate <- map["SendDate"] - paidDate <- map["PaidDate"] - recieverName <- map["ReceiverName"] - bankName <- map["BankName"] - } + transactionId <- map["TranId"] + controlNumber <- map["ControlNo"] + pAmt <- map["PayoutAmt"] + pCurrency <- map["PCurr"] + cAmt <- map["CollAmt"] + cCurrency <- map["CollCurr"] + payStatus <- map["PayStatus"] + payOutMode <- map["PayoutMode"] + sendDate <- map["SendDate"] + paidDate <- map["PaidDate"] + recieverName <- map["ReceiverName"] + bankName <- map["BankName"] + } } diff --git a/GME Remit/Models/ResponseMessage.swift b/GME Remit/Models/ResponseMessage.swift index b2c1a419..a27e2fc9 100644 --- a/GME Remit/Models/ResponseMessage.swift +++ b/GME Remit/Models/ResponseMessage.swift @@ -10,19 +10,17 @@ import Foundation import ObjectMapper class ResponseMessage: Mappable { - var errorCode: String? - var message: String? - var id: String? -// var data: SendMoneyPaymentModel? + var errorCode: String? + var message: String? + var id: String? + + required init?(map: Map) { - required init?(map: Map) { - - } - - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - message <- map["Msg"] - id <- map["Id"] -// data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + message <- map["Msg"] + id <- map["Id"] + } } diff --git a/GME Remit/Models/SendMoneyAccountValidationRequestModel.swift b/GME Remit/Models/SendMoneyAccountValidationRequestModel.swift index 2eb5f6af..3f76cb23 100644 --- a/GME Remit/Models/SendMoneyAccountValidationRequestModel.swift +++ b/GME Remit/Models/SendMoneyAccountValidationRequestModel.swift @@ -8,36 +8,22 @@ import Foundation -//let idType = "" -//let idNumber = "" -//let customerFirstName = "" -//let customerLastName = "" -//let reciverFirstName = self.recipient?.firstName -//let reciversLastName = self.recipient?.lastName -//let country = self.recipient?.countryId -//let accountType = "s" // saving account, current account type ko -//let issuerCode = "" -//let accountNo = self.accountTextField.text! -//let bankCode = self.selectedBank?.id -//let payoutPartner = self.selectedPayoutMode?.payoutPartner -//let processId = "" - class SendMoneyAccountValidationRequestModel { - var idType: String? - var idNumber: String? - var amount: String? - var customerFirstName: String? - var customerLastName: String? - var reciverFirstName: String? - var reciverLastName: String? - var country: String? - var accountType: String? - var issuerCode: String? - var accountNo: String? - var bankCode: String? - var payoutPartner: String? - var processId: String? - var bankId: String? - var receiverCountryId: String? - var deliveryMethodId: String? + var idType: String? + var idNumber: String? + var amount: String? + var customerFirstName: String? + var customerLastName: String? + var reciverFirstName: String? + var reciverLastName: String? + var country: String? + var accountType: String? + var issuerCode: String? + var accountNo: String? + var bankCode: String? + var payoutPartner: String? + var processId: String? + var bankId: String? + var receiverCountryId: String? + var deliveryMethodId: String? } diff --git a/GME Remit/Models/SendMoneyCountryModel.swift b/GME Remit/Models/SendMoneyCountryModel.swift index 28d9d34d..a2c2889d 100644 --- a/GME Remit/Models/SendMoneyCountryModel.swift +++ b/GME Remit/Models/SendMoneyCountryModel.swift @@ -9,7 +9,6 @@ import Foundation import ObjectMapper - class District: Mappable { var id: String? var name: String? @@ -41,7 +40,6 @@ class Provience: Mappable { } } - class CountryModel: Mappable { var name: String? var id: String? @@ -64,7 +62,6 @@ class CountryModel: Mappable { } - class TransferReason: Mappable { var id: String? var title: String? @@ -98,12 +95,8 @@ class SendMoneyModel: Mappable { var countries: [CountryModel]? var transferReasons: [TransferReason]? var relations: [Relation]? - -// var idTypes: [[String: String]]? - // TODO: check IDTYPES var receiverIDTypes: [ReceiverIdType]? - required init?(map: Map) { } diff --git a/GME Remit/Models/SendMoneyExchangeRate.swift b/GME Remit/Models/SendMoneyExchangeRate.swift index 51f567e5..056fe1b3 100644 --- a/GME Remit/Models/SendMoneyExchangeRate.swift +++ b/GME Remit/Models/SendMoneyExchangeRate.swift @@ -63,10 +63,9 @@ class SendMoneyExchangeRateModel: Mappable { let name = couponName, let type = discountType, let value = discountValue?.likeCommaMoney() else { - return "0" + return "0" } - if type == "1", let percent = discountPercent { return "\(name) \(percent)% (-\(value) KRW)" } @@ -75,7 +74,6 @@ class SendMoneyExchangeRateModel: Mappable { } } - class SendMoneyExchangeRateModelContainer: Mappable { var errorCode: String? var message: String? @@ -93,5 +91,3 @@ class SendMoneyExchangeRateModelContainer: Mappable { data <- map["Data"] } } - - diff --git a/GME Remit/Models/SendMoneyPaymentModeModel.swift b/GME Remit/Models/SendMoneyPaymentModeModel.swift index ba790a30..937b10c8 100644 --- a/GME Remit/Models/SendMoneyPaymentModeModel.swift +++ b/GME Remit/Models/SendMoneyPaymentModeModel.swift @@ -11,100 +11,99 @@ import ObjectMapper class SendMoneyPaymentModelContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: SendMoneyPaymentModel? - - required init?(map: Map) { - - } + var errorCode: String? + var message: String? + var id: String? + var data: SendMoneyPaymentModel? + + required init?(map: Map) { - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - message <- map["Msg"] - id <- map["Id"] - data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + message <- map["Msg"] + id <- map["Id"] + data <- map["Data"] + } } - class SendMoneyPaymentModel: Mappable { - var name: String? - var id: String? - var code: String? - var payoutMode: [SendMoneyPayoutMode]? - - required init?(map: Map) { - - } + var name: String? + var id: String? + var code: String? + var payoutMode: [SendMoneyPayoutMode]? + + required init?(map: Map) { - func mapping(map: Map) { - name <- map["Name"] - id <- map["Id"] - code <- map["Code"] - payoutMode <- map["PayoutMode"] - } + } + + func mapping(map: Map) { + name <- map["Name"] + id <- map["Id"] + code <- map["Code"] + payoutMode <- map["PayoutMode"] + } } class SendMoneyPayoutMode: Mappable { - var id: String? - var mode: String? - var modeDescription: String? - var payoutPartner: String? - var payCurrency: [String]? - var bankRequired: String? - var bankList: [SendMoneyBank]? - var accountNumber: String? - - required init?(map: Map) { - - } + var id: String? + var mode: String? + var modeDescription: String? + var payoutPartner: String? + var payCurrency: [String]? + var bankRequired: String? + var bankList: [SendMoneyBank]? + var accountNumber: String? + + required init?(map: Map) { - init() {} + } + + init() {} + + func mapping(map: Map) { + id <- map["Id"] + mode <- map["Mode"] + modeDescription <- map["ModeDescription"] + bankList <- map["BankList"] + payoutPartner <- map["PayoutPartner"] + payCurrency <- map["PayCurrency"] + bankRequired <- map["Bankrequired"] - func mapping(map: Map) { - id <- map["Id"] - mode <- map["Mode"] - modeDescription <- map["ModeDescription"] - bankList <- map["BankList"] - payoutPartner <- map["PayoutPartner"] - payCurrency <- map["PayCurrency"] - bankRequired <- map["Bankrequired"] - - } + } } class SendMoneyBank: Mappable { - var id: String? - var name: String? - var branchRequired: String? - var branches: [SendMoneyBankBranch]? - var accountRequired: String? - var accountValidationRequired: String? - var payCurrency: [String]? - var code: String? - var payoutPartner: String? - - init() { - - } + var id: String? + var name: String? + var branchRequired: String? + var branches: [SendMoneyBankBranch]? + var accountRequired: String? + var accountValidationRequired: String? + var payCurrency: [String]? + var code: String? + var payoutPartner: String? + + init() { - required init?(map: Map) { - - } + } + + required init?(map: Map) { - func mapping(map: Map) { - id <- map["Id"] - name <- map["Name"] - branchRequired <- map["BranchRequired"] - accountRequired <- map["IsAccountRequired"] - accountValidationRequired <- map["IsAccountValidation"] - payCurrency <- map["PayCurrency"] - branches <- map["BranchList"] - code <- map["Code"] - payoutPartner <- map["PayoutPartner"] - } + } + + func mapping(map: Map) { + id <- map["Id"] + name <- map["Name"] + branchRequired <- map["BranchRequired"] + accountRequired <- map["IsAccountRequired"] + accountValidationRequired <- map["IsAccountValidation"] + payCurrency <- map["PayCurrency"] + branches <- map["BranchList"] + code <- map["Code"] + payoutPartner <- map["PayoutPartner"] + } } extension SendMoneyBank: TablePresenterProtocol { @@ -115,27 +114,25 @@ extension SendMoneyBank: TablePresenterProtocol { var cellImage: UIImage? { return nil } - - } class SendMoneyBankBranch: Mappable { + + var id: String? + var name: String? + + required init?(map: Map) { - var id: String? - var name: String? - - required init?(map: Map) { - - } - - init() { - - } + } + + init() { - func mapping(map: Map) { - id <- map["Id"] - name <- map["Name"] - } + } + + func mapping(map: Map) { + id <- map["Id"] + name <- map["Name"] + } } extension SendMoneyBankBranch: TablePresenterProtocol { @@ -148,20 +145,19 @@ extension SendMoneyBankBranch: TablePresenterProtocol { } } - class SendMoneyBankBranchContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: [SendMoneyBankBranch]? - required init?(map: Map) { - - } + var errorCode: String? + var message: String? + var id: String? + var data: [SendMoneyBankBranch]? + required init?(map: Map) { - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - message <- map["Msg"] - id <- map["Id"] - data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + message <- map["Msg"] + id <- map["Id"] + data <- map["Data"] + } } diff --git a/GME Remit/Models/SendMoneyReciept.swift b/GME Remit/Models/SendMoneyReciept.swift index 7c8e5c81..c78faa43 100644 --- a/GME Remit/Models/SendMoneyReciept.swift +++ b/GME Remit/Models/SendMoneyReciept.swift @@ -89,7 +89,6 @@ class SendMoneyReciept: Mappable { } - class SendMoneyRecieptContainer: Mappable { var errorCode: String? var message: String? diff --git a/GME Remit/Models/SendMoneySubmitResponse.swift b/GME Remit/Models/SendMoneySubmitResponse.swift index 07292163..af0d8fdf 100644 --- a/GME Remit/Models/SendMoneySubmitResponse.swift +++ b/GME Remit/Models/SendMoneySubmitResponse.swift @@ -9,61 +9,57 @@ import Foundation import ObjectMapper - - - class SendMoneySubmitModelContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var extra2: String? - var data: SendMoneySubmitModel? + var errorCode: String? + var message: String? + var id: String? + var extra2: String? + var data: SendMoneySubmitModel? + + required init?(map: Map) { - required init?(map: Map) { - - } - - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - id <- map["Id"] - message <- map["Msg"] - data <- map["Data"] - extra2 <- map["Extra2"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + id <- map["Id"] + message <- map["Msg"] + data <- map["Data"] + extra2 <- map["Extra2"] + } } - class SendMoneySubmitModel: Mappable { - var id: String? - var charge: String? - var exrate: String? - var senderAmount: String? - var reciepientAmount: String? - var accountLimitPerDay: String? - var minAmountLimitPerTran: String? - var maxAmountLimitPerTran: String? - var schemedId: String? - var exrated: String? - var extra: String? - var remainingLimit: String? + var id: String? + var charge: String? + var exrate: String? + var senderAmount: String? + var reciepientAmount: String? + var accountLimitPerDay: String? + var minAmountLimitPerTran: String? + var maxAmountLimitPerTran: String? + var schemedId: String? + var exrated: String? + var extra: String? + var remainingLimit: String? + + required init?(map: Map) { - required init?(map: Map) { - - } + } + + func mapping(map: Map) { + id <- map["ErrorCode"] + charge <- map["Id"] + exrate <- map["Msg"] + senderAmount <- map["Data"] + reciepientAmount <- map["ErrorCode"] + accountLimitPerDay <- map["Id"] + minAmountLimitPerTran <- map["Msg"] + senderAmount <- map["Data"] + maxAmountLimitPerTran <- map["Msg"] + schemedId <- map["Data"] + extra <- map["Extra"] + remainingLimit <- map["Extra2"] - func mapping(map: Map) { - id <- map["ErrorCode"] - charge <- map["Id"] - exrate <- map["Msg"] - senderAmount <- map["Data"] - reciepientAmount <- map["ErrorCode"] - accountLimitPerDay <- map["Id"] - minAmountLimitPerTran <- map["Msg"] - senderAmount <- map["Data"] - maxAmountLimitPerTran <- map["Msg"] - schemedId <- map["Data"] - extra <- map["Extra"] - remainingLimit <- map["Extra2"] - - } + } } diff --git a/GME Remit/Models/SuccessMessage.swift b/GME Remit/Models/SuccessMessage.swift index aa21cb13..f1729d9d 100644 --- a/GME Remit/Models/SuccessMessage.swift +++ b/GME Remit/Models/SuccessMessage.swift @@ -10,36 +10,35 @@ import Foundation import ObjectMapper class SuccessMessage: Mappable { - var message: String? - var extra: String? - var yearlyLimit: String? + var message: String? + var extra: String? + var yearlyLimit: String? + + required init?(map: Map) { - required init?(map: Map) { - - } - - func mapping(map: Map) { - message <- map["Message"] - extra <- map["Extra"] - yearlyLimit <- map["Extra2"] - } + } + + func mapping(map: Map) { + message <- map["Message"] + extra <- map["Extra"] + yearlyLimit <- map["Extra2"] + } } - class SuccessMessageContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: SuccessMessage? - - required init?(map: Map) { - - } + var errorCode: String? + var message: String? + var id: String? + var data: SuccessMessage? + + required init?(map: Map) { - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - id <- map["Id"] - message <- map["Msg"] - data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + id <- map["Id"] + message <- map["Msg"] + data <- map["Data"] + } } diff --git a/GME Remit/Models/TransactionModel.swift b/GME Remit/Models/TransactionModel.swift index 6bbe2651..94e09a2e 100644 --- a/GME Remit/Models/TransactionModel.swift +++ b/GME Remit/Models/TransactionModel.swift @@ -9,54 +9,53 @@ import Foundation import ObjectMapper - class TransactionModelContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: [TransactionModel]? - - required init?(map: Map) { - - } + var errorCode: String? + var message: String? + var id: String? + var data: [TransactionModel]? + + required init?(map: Map) { - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - message <- map["Msg"] - id <- map["Id"] - data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + message <- map["Msg"] + id <- map["Id"] + data <- map["Data"] + } } class TransactionModel: Mappable { + + var user: String? + var transactionId: String? + var controlNumber: String? + var pAmt: String? + var pCurrency: String? + var cCurrency: String? + var cAmt: String? + var payStatus: String? + var payOutMode: String? + var sendDate: String? + var paidDate: String? + + required init?(map: Map) { - var user: String? - var transactionId: String? - var controlNumber: String? - var pAmt: String? - var pCurrency: String? - var cCurrency: String? - var cAmt: String? - var payStatus: String? - var payOutMode: String? - var sendDate: String? - var paidDate: String? - - required init?(map: Map) { - - } - - func mapping(map: Map) { - user <- map["User"] - transactionId <- map["TranId"] - controlNumber <- map["ControlNo"] - pAmt <- map["PayoutAmt"] - pCurrency <- map["PCurr"] - cAmt <- map["CollAmt"] - cCurrency <- map["CollCurr"] - payStatus <- map["PayStatus"] - payOutMode <- map["PayoutMode"] - sendDate <- map["SendDate"] - paidDate <- map["PaidDate"] - } + } + + func mapping(map: Map) { + user <- map["User"] + transactionId <- map["TranId"] + controlNumber <- map["ControlNo"] + pAmt <- map["PayoutAmt"] + pCurrency <- map["PCurr"] + cAmt <- map["CollAmt"] + cCurrency <- map["CollCurr"] + payStatus <- map["PayStatus"] + payOutMode <- map["PayoutMode"] + sendDate <- map["SendDate"] + paidDate <- map["PaidDate"] + } } diff --git a/GME Remit/Models/WalletStatement.swift b/GME Remit/Models/WalletStatement.swift index cfe06c35..f90949b0 100644 --- a/GME Remit/Models/WalletStatement.swift +++ b/GME Remit/Models/WalletStatement.swift @@ -9,48 +9,40 @@ import Foundation import ObjectMapper - class WalletStatementContainer: Mappable { - var errorCode: String? - var message: String? - var id: String? - var data: [WalletStatement]? - - required init?(map: Map) { - - } + var errorCode: String? + var message: String? + var id: String? + var data: [WalletStatement]? + + required init?(map: Map) { - func mapping(map: Map) { - errorCode <- map["ErrorCode"] - id <- map["Id"] - message <- map["Msg"] - data <- map["Data"] - } + } + + func mapping(map: Map) { + errorCode <- map["ErrorCode"] + id <- map["Id"] + message <- map["Msg"] + data <- map["Data"] + } } class WalletStatement: Mappable { - var transactionDate: String? - var particular: String? - var walletIn: String? - var walletOut: String? - var closingAmount: String? - - required init?(map: Map) { - - } + var transactionDate: String? + var particular: String? + var walletIn: String? + var walletOut: String? + var closingAmount: String? + + required init?(map: Map) { - func mapping(map: Map) { - transactionDate <- map["TransactionDate"] - particular <- map["Particular"] - walletIn <- map["WalletIn"] - walletOut <- map["WalletOut"] - closingAmount <- map["ClosingAmount"] - } + } + + func mapping(map: Map) { + transactionDate <- map["TransactionDate"] + particular <- map["Particular"] + walletIn <- map["WalletIn"] + walletOut <- map["WalletOut"] + closingAmount <- map["ClosingAmount"] + } } - - -//"TransactionDate": "1900.01.01", -//"Particular": "Balance Brought Forward", -//"WalletIn": "0.0000", -//"WalletOut": "0.0000", -//"ClosingAmount": "-85000.0000"