send money reward point finished

GME Remit/AppDelegate.swift

@@ -269,6 +269,7 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
             case .howToDeposit:
                 HowToDepositWireframe().open(on: baseVC)
             case .redirect:
+//                openURL(link: <#T##String#>)
                 break
             default:
                 break
@@ -298,6 +299,21 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
   }
 }
 
+func openURL(userInfo: [String : AnyObject]?) {
+//    guard
+//    let aps = userInfo?["aps"] as? [String: AnyObject],
+//    let destination = aps["category"] as? String,
+//    let destinationType = PushNotificationAction.getAction(target: destination)
+//    guard let webController = UIStoryboard(name: "Storyboard", bundle: nil)
+//        .instantiateViewController(withIdentifier: "WebLinksViewController") as? WebLinksViewController
+//        else { return }
+//    
+////    webController.titleString = item.title ?? "Notification"
+//    webController.url = link
+//    let nav = UINavigationController.init(rootViewController: webController)
+//    NotificationHistoryWireframe().open(on: nav)
+}
+
 extension AppDelegate {
   private func extractDestination(userInfo: [String : AnyObject]?) -> PushNotificationDestination? {
     guard

GME Remit/Models/Response/SendMoneyExchangeRate.swift

@@ -30,6 +30,7 @@ class SendMoneyExchangeRateModel: Mappable {
   var discountPercent: String?
   var discountValue: String?
   var discountedServiceFee: String?
+    var discountedFee: String?
   var note: String?
   init() {}
   

GME Remit/Modules/NotificationList/User Interface/Presenter/NotificationListPresenter.swift

@@ -39,7 +39,6 @@ extension NotificationListPresenter: NotificationListInteractorOutput {
     func setNotificationList(using model: [NotificationList]) {
         view?.progress(isShow: false)
         view?.setNotificationList(using: model)
-        print("asd", model)
     }
     
     func setError(with error: Error) {

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

@@ -187,5 +187,5 @@ struct CDDIRequestData {
     var portofShipment: String?
     var otherSourceOfFund: String?
     var otherPurposeOfRemit: String?
-    
+    var discountedFee: String?
 }

GME Remit/Modules/RemittanceModules/OverseasModules/CDDIViewController/User Interface/View/CDDIViewControllerViewController.swift

@@ -78,7 +78,7 @@ class CDDIViewControllerViewController: UIViewController {
             
         }
         else if self.sourceOfFund.text != "Others (please specify)" && self.purposeOfRemit.text != "Other (please specify)" && self.sourceOfFund.text != "" && self.purposeOfRemit.text != "" && self.checkImportGoodsView() == false {
-            let model = CDDIRequestData(sourceOfFund: fund, purposeOfRemittance: purpose, goodsType: goodsType.text ?? "", goodsOrigin: goodsOrigin.text ?? "", portofShipment: portofShipment.text ?? "", otherSourceOfFund: self.otherSourceOfFund ?? "", otherPurposeOfRemit: self.otherPuposeOfRemit ?? "")
+            let model = CDDIRequestData(sourceOfFund: fund, purposeOfRemittance: purpose, goodsType: goodsType.text ?? "", goodsOrigin: goodsOrigin.text ?? "", portofShipment: portofShipment.text ?? "", otherSourceOfFund: self.otherSourceOfFund ?? "", otherPurposeOfRemit: self.otherPuposeOfRemit ?? "", discountedFee: requestModel?.exchangeRateDetail?.discountedFee)
             actionDelegate?.continueToVerificationAction(model: model)
         }
         

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift

@@ -409,7 +409,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
         exchangeRateModel?.calcBy = calcBy
         exchangeRateModel?.reciepientCurrency = selectedCurrencyViewModel?.currency ?? ""
         exchangeRateModel?.autodebitSendingAmount = getPlainNumbers(number: senderTextField.text!)
-        
+        exchangeRateModel?.discountedFee = rewardTextField.text
         
         actionDelegate?.calculated(model: exchangeRateModel)
         actionDelegate?.continueToCDDI()

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyParent/User Interface/View/SendMoneyParentViewController.swift

@@ -35,7 +35,7 @@ class SendMoneyRequestModel {
     var transactionPassword: String?
     var autoDebitAccount: Account?
     var isUseBiometric: Bool?
-    var discountedFee: Bool?
+    var discountedFee: String?
 }
 
 class SendMoneyParentViewController: UIViewController {
@@ -110,6 +110,7 @@ class SendMoneyParentViewController: UIViewController {
             self.requestModel.paymemtMode?.payCurrency = receipient?.paymentMethod?.currency
             self.requestModel.paymemtMode?.payoutPartner = receipient?.payoutPartner
             self.requestModel.paymemtMode?.accountNumber = receipient?.agent?.accountNumber
+            self.requestModel.discountedFee = cddiModel.discountedFee
         }
     }
     
@@ -384,7 +385,7 @@ class SendMoneyParentViewController: UIViewController {
         verificationViewController.reciepient = self.receipient
         verificationViewController.requestModel = self.requestModel
         verificationViewController.actionDelegate = self
-        
+//        verificationViewController.discountedFee = self.
         self.addChild(verificationViewController)
         
         UIView.transition(
@@ -456,6 +457,7 @@ extension SendMoneyParentViewController: SendMoneyExchangeRateActionDelegate {
     func continueToVerificationAction(model: CDDIRequestData) {
         self.cddiModel = model
         print("model:\(model)")
+        self.requestModel.discountedFee = model.discountedFee
         self.addVerificationViewController()
         self.state = StateButtons.verification
     }

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift

@@ -79,6 +79,7 @@ class SendMoneyVerificationViewController: UITableViewController {
     var presenter: SendMoneyVerificationModuleInterface?
     var reciepient: Recipient?
     var requestModel: SendMoneyRequestModel?
+    var discountedFee: String?
     weak var hudDelegate: HUDStatusDelegate?
     weak var actionDelegate: SendMoneyExchangeRateActionDelegate?
     lazy var pinViewOption: Options = {
@@ -193,7 +194,7 @@ class SendMoneyVerificationViewController: UITableViewController {
         self.countryLabel.text = self.reciepient?.country
         self.mobileLabel.text = self.reciepient?.mobile
         
-        if let rewardPoint = self.requestModel?.rewardPoints {
+        if let rewardPoint = self.requestModel?.discountedFee {
             self.rewardPointStackView.isHidden = false
             self.rewardPointLabel.text = rewardPoint
         } else {

GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/Application Logic/Interactor/TermsAndConditionInteractor.swift

@@ -147,7 +147,8 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput {
           "ReceiverAccountNo": model.paymemtMode?.accountNumber ?? "",
           "ProcessId": "",
   //        "schemeId": "",
-          "isUseBiometric": model.isUseBiometric ?? false
+          "isUseBiometric": model.isUseBiometric ?? false,
+          "discountedFee": model.discountedFee ?? ""
       ]
       
       return params