From af9ef64b7a1cdffc35e5dca45474c051f20b5b9e Mon Sep 17 00:00:00 2001 From: Dibya Date: Thu, 25 May 2023 15:34:29 +0545 Subject: [PATCH] dotrans --- GME Remit.xcodeproj/project.pbxproj | 1 - .../View/BeneficiaryDetailViewController.swift | 2 +- .../View/RecipientsViewController.swift | 8 ++++---- .../View/SendMoneyParentViewController.swift | 3 ++- .../TermsAndConditionInteractor.swift | 17 +++++++++++------ .../TermsAndConditionInteractorIO.swift | 2 +- .../TermsAndConditionModuleInterface.swift | 2 +- .../Presenter/TermsAndConditionPresenter.swift | 4 ++-- .../View/TermsAndConditionViewController.swift | 3 +-- .../View/DatePickerViewController.swift | 1 - 10 files changed, 23 insertions(+), 20 deletions(-) diff --git a/GME Remit.xcodeproj/project.pbxproj b/GME Remit.xcodeproj/project.pbxproj index 2065696e..31ebda95 100644 --- a/GME Remit.xcodeproj/project.pbxproj +++ b/GME Remit.xcodeproj/project.pbxproj @@ -8919,7 +8919,6 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = 68KRG7GPAV; ENABLE_BITCODE = NO; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/GME\\ Remit/ThirdParty/virtualKeyboard/mtk_module", diff --git a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift index 1557da14..e6d185c7 100644 --- a/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift +++ b/GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift @@ -62,7 +62,7 @@ class BeneficiaryDetailViewController: UIViewController { let termsViewController = TermsAndConditionWireframe().getMainView() as? TermsAndConditionViewController termsViewController?.reciepient = self.reciptent termsViewController?.paymentModel = selectedPayments - termsViewController?.fromBeneficiary = true + termsViewController?.isBeneficiaryDetail = true if let termsViewController = termsViewController { self.navigationController?.push(termsViewController, animated: true) } diff --git a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift index d2ac9d06..553c246d 100644 --- a/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift +++ b/GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift @@ -61,9 +61,9 @@ class RecipientsViewController: UIViewController { } @IBAction func cancelDate(_ sender: UIButton) { - from = "" - to = "" - self.viewModel.fetchTransaction(fromDate: "", toDate: "", pageCount: "", countryCode: "") + from = Calendar.current.date(byAdding: .weekOfMonth, value: -1, to: Date())!.asString(style: .medium) + to = Date().asString(style: .medium) + self.viewModel.fetchTransaction(fromDate: from ?? "", toDate: to ?? "", pageCount: "", countryCode: "") } @IBAction func dateTapped(_ sender: UIButton) { @@ -154,7 +154,7 @@ extension RecipientsViewController { // all setup should be done here // viewAddRecipient.hero.id = "setupRecipient" - self.fromDateLabel.text = Calendar.current.date(byAdding: .month, value: -1, to: Date())!.asString(style: .medium) + self.fromDateLabel.text = Calendar.current.date(byAdding: .weekOfMonth, value: -1, to: Date())!.asString(style: .medium) self.toDateLabel.text = Date().asString(style: .medium) self.tableView.isScrollEnabled = false diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift index b1a1d873..967b544a 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift @@ -204,7 +204,8 @@ class SendMoneyParentViewController: UIViewController { termsViewController = TermsAndConditionWireframe().getMainView() as? TermsAndConditionViewController termsViewController?.reciepient = self.receipient - sendMoneyExchangeRateViewController?.paymentModel = self.paymentModel + termsViewController?.paymentModel = self.paymentModel + termsViewController?.isBeneficiaryDetail = true termsViewController?.requestModel = self.requestModel termsViewController?.hudDelegate = self } diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift index af439865..6706d74c 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift @@ -56,8 +56,8 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput { } - func submit(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel) { - let params = self.getParams(model: model, reciepient: reciepient, cddiModel: cddiModel, paymentModel: paymentModel) + func submit(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel?, fromBeneficiaryDetail: Bool) { + let params = self.getParams(model: model, reciepient: reciepient, cddiModel: cddiModel, paymentModel: paymentModel, fromBeneficiaryDetail: fromBeneficiaryDetail) self.service.submit( params: params, success: { (response) in @@ -103,16 +103,21 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput { } } - func getParams(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel) -> [String: Any] { + func getParams(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel?, fromBeneficiaryDetail: Bool) -> [String: Any] { guard let username = GMEDB.shared.user.string(.userId) else {return [:]} let senderId = GMEDB.shared.user.string(.senderId) - let recieverId = paymentModel.receiverId - + var receiverID = "" + if fromBeneficiaryDetail { + receiverID = paymentModel?.receiverId ?? "" + } else { + receiverID = reciepient.receiverID ?? "" + } + let params: [String: Any] = [ "User": username, "SenderId": senderId ?? "", - "ReceiverId": recieverId ?? "", + "ReceiverId": receiverID, "DeliveryMethodId": model.paymemtMode?.id ?? "", "PBranch": model.branch?.id ?? "", "PAgent": model.bank?.id ?? "", diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractorIO.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractorIO.swift index b919f1db..74d50d3c 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractorIO.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractorIO.swift @@ -8,7 +8,7 @@ protocol TermsAndConditionInteractorInput: class { func makeApiRequest() - func submit(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel) + func submit(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel?, fromBeneficiaryDetail: Bool) func fetchUserInfo() func checkOTP(otp: String, userId: String, receiverID: String) func requestOTP(userId: String, receiverID: String) diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Module Interface/TermsAndConditionModuleInterface.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Module Interface/TermsAndConditionModuleInterface.swift index a40cc8c8..e78ccde0 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Module Interface/TermsAndConditionModuleInterface.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Module Interface/TermsAndConditionModuleInterface.swift @@ -8,7 +8,7 @@ protocol TermsAndConditionModuleInterface: class { func makeApiRequest() - func submit(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel) + func submit(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel?, fromBeneficiaryDetail: Bool) func openReciept(transactionId: String) func saveRecipient(at recipient: Recipient) func validateAccount(with validateAccountModel: ValidateAccountRequest, recipient: Recipient) diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/Presenter/TermsAndConditionPresenter.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/Presenter/TermsAndConditionPresenter.swift index a8ccf078..07783e32 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/Presenter/TermsAndConditionPresenter.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/Presenter/TermsAndConditionPresenter.swift @@ -45,9 +45,9 @@ extension TermsAndConditionPresenter: TermsAndConditionModuleInterface { self.interactor?.makeApiRequest() } - func submit(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel) { + func submit(model: SendMoneyRequestModel, reciepient: Recipient, cddiModel: CDDIRequestData, paymentModel: PaymentMethodModel?, fromBeneficiaryDetail: Bool) { self.view?.showLoading() - self.interactor?.submit(model: model, reciepient: reciepient, cddiModel: cddiModel, paymentModel: paymentModel) + self.interactor?.submit(model: model, reciepient: reciepient, cddiModel: cddiModel, paymentModel: paymentModel, fromBeneficiaryDetail: fromBeneficiaryDetail) } func openReciept(transactionId: String) { diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift index 64fad062..a4beb7be 100644 --- a/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift +++ b/GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift @@ -37,14 +37,13 @@ class TermsAndConditionViewController: UIViewController { let model = self.requestModel, let reciepient = self.reciepient, let password = self.password, - let paymentModel = self.paymentModel, password != "" else { return } model.transactionPassword = password print(password) - self.presenter?.submit(model: model, reciepient: reciepient, cddiModel: cddiInfoModel, paymentModel: paymentModel) + self.presenter?.submit(model: model, reciepient: reciepient, cddiModel: cddiInfoModel, paymentModel: self.paymentModel, fromBeneficiaryDetail: self.isBeneficiaryDetail) } } diff --git a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/DatePickerViewController.swift b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/DatePickerViewController.swift index fa25b040..1c4a20a7 100644 --- a/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/DatePickerViewController.swift +++ b/GME Remit/Modules/RemittanceModules/TransactionHistoryModules/TransactionHistory/User Interface/View/DatePickerViewController.swift @@ -89,7 +89,6 @@ class DatePickerViewController: UIViewController { toDatePicker.date = Date() handleToDatePicker(sender: toDatePicker) - searchButton.backgroundColor = .themeRed } func configureLanguage() {