Browse Source

navigation for display status

v0.17
Dibya 1 year ago
parent
commit
10ca8ac3cd
  1. 1
      GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/Recipient.swift
  2. 29
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift
  3. 4
      GME Remit/Modules/RecipientModules/Recipients/User Interface/Wireframe/RecipientsWireframe.swift

1
GME Remit/Modules/RecipientModules/Recipients/Application Logic/Model/Recipient/Recipient.swift

@ -211,6 +211,7 @@ class RecentTransactions: Mappable {
var paidDate: String?
var payoutAgent: String?
var displayActions: String?
var mailType: MailBoxType?
required init?(map: Map) {}

29
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift

@ -283,10 +283,19 @@ extension RecipientsViewController {
cell.selectionStyle = .none
cell.setModel(with: element)
cell.didTappedEditDetails = { [weak self] model in
if let selectedTransaction = model {
if let navigation = self?.navigationController {
SendMoneyReceiptWireframe().openReciept(transactionId: selectedTransaction.tranId ?? "", source: navigation)
if var selectedTransaction = model {
let displayStatus = model?.displayActions?.lowercased()
if displayStatus == DisplayOption.amend.rawValue {
selectedTransaction.mailType = MailBoxType.edit
self?.editTrigger.onNext(selectedTransaction)
} else if displayStatus == DisplayOption.cancelamend.rawValue {
selectedTransaction.mailType = MailBoxType.edit
self?.editTrigger.onNext(selectedTransaction)
} else if displayStatus == "" {
self?.viewModel.presenter?.openReceipt(model: selectedTransaction)
}
// if selectedTransaction.displayActions?.uppercased() == "PAYMENT" {
@ -306,9 +315,19 @@ extension RecipientsViewController {
cell.didTappedResendDetails = { [weak self] model in
if let selectedTransaction = model {
if var selectedTransaction = model {
let displayStatus = model?.displayActions?.lowercased()
if displayStatus == DisplayOption.reject.rawValue || displayStatus == DisplayOption.cancel.rawValue || displayStatus == DisplayOption.amend.rawValue {
if displayStatus == DisplayOption.reject.rawValue {
selectedTransaction.mailType = MailBoxType.pending
self?.editTrigger.onNext(selectedTransaction)
} else if displayStatus == DisplayOption.cancel.rawValue {
selectedTransaction.mailType = MailBoxType.cancel
self?.editTrigger.onNext(selectedTransaction)
} else if displayStatus == DisplayOption.amend.rawValue {
selectedTransaction.mailType = MailBoxType.edit
self?.editTrigger.onNext(selectedTransaction)
} else if displayStatus == DisplayOption.cancelamend.rawValue {
selectedTransaction.mailType = MailBoxType.pending
self?.editTrigger.onNext(selectedTransaction)
}

4
GME Remit/Modules/RecipientModules/Recipients/User Interface/Wireframe/RecipientsWireframe.swift

@ -57,8 +57,8 @@ extension RecipientsWireframe: RecipientsWireframeInput {
}
func openEdit(model: RecentTransactions) {
if let navigation = self.view.navigationController {
MessageComposeWireframe().openMail(controlNO: model.controlNo ?? "", transactionId: model.tranId ?? "", type: MailBoxType.cancel, source: navigation)
if let navigation = self.view.navigationController, let type = model.mailType {
MessageComposeWireframe().openMail(controlNO: model.controlNo ?? "", transactionId: model.tranId ?? "", type: type, source: navigation)
}
}

Loading…
Cancel
Save