dotrans

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",

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

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

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
     }

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 ?? "",

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)

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)

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

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

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() {