Terms and Condition view addittion in Create Beneficiary

GME Remit.xcodeproj/project.pbxproj

@@ -7565,7 +7565,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 19;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 68KRG7GPAV;
 				ENABLE_BITCODE = NO;
@@ -7605,7 +7605,7 @@
 				CODE_SIGN_ENTITLEMENTS = "GME Remit.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 16;
+				CURRENT_PROJECT_VERSION = 19;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 68KRG7GPAV;
 				ENABLE_BITCODE = NO;

GME Remit/Modules/Home/User Interface/View/HomeViewController.swift

@@ -87,7 +87,7 @@ class HomeViewController: UIViewController {
             self.tableView.reloadData()
             updateBalance()
             
-            if hasUpdatedDefaultCredentials == 1 || hasUpdatedDefaultCredentials == 2 || hasUpdatedDefaultCredentials == 3 || hasVerifiedOTP == false || !didSubmitKycAndVerified {
+            if hasUpdatedDefaultCredentials == 1 || hasUpdatedDefaultCredentials == 2 || hasUpdatedDefaultCredentials == 3 || hasUpdatedDefaultCredentials == 4 || hasVerifiedOTP == false || !didSubmitKycAndVerified {
                 self.addDimView()
             } else {
                 self.removeDimView()
@@ -390,6 +390,9 @@ extension HomeViewController {
         case 3:
             changePassword()
             
+        case 4:
+            changeTxnPinMessage()
+            
         default:
             break
         }
@@ -503,7 +506,7 @@ extension HomeViewController {
     
     private func removeAllMessage() {
         blobView.removeFromSuperview()
-        showMessageView(isHidden: false)
+        showMessageView(isHidden: true)
     }
     
     private func showMessageView(isHidden: Bool) {

GME Remit/Modules/Notice/NotificationHistory/User Interface/Presenter/NotificationHistoryPresenter.swift

@@ -63,26 +63,26 @@ class NotificationHistoryPresenter: ViewModelType {
 extension NotificationHistoryPresenter: NotificationHistoryInteractorOutput {
     func setNotices(with model: [NoticeModel]) {
         progressLinker.onNext(false)
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "MM/dd/yyyy HH:mm"
-        
-        let dates = model.compactMap { dateFormatter.date(from: $0.date ?? "") }
-        
-        let sortedDates = dates.sorted { $0 > $1 }
-        
-        print("123123123 \(sortedDates)")
-        
-        let dateStrings = sortedDates.compactMap { dateFormatter.string(from: $0)}
-        
-        print("123123123 \(dateStrings)")
+//        let dateFormatter = DateFormatter()
+//        dateFormatter.dateFormat = "MM/dd/yyyy HH:mm"
+//
+//        let dates = model.compactMap { dateFormatter.date(from: $0.date ?? "") }
+//
+//        let sortedDates = dates.sorted { $0 > $1 }
+//
+//        print("123123123 \(sortedDates)")
+//
+//        let dateStrings = sortedDates.compactMap { dateFormatter.string(from: $0)}
+//
+//        print("123123123 \(dateStrings)")
         
-        let filteredDate = model.sorted(by: { (noticeModel1, noticeModel2) -> Bool in
-            guard let date1 = noticeModel1.date else { return true }
-            guard let date2 = noticeModel2.date else { return false }
-            return date1 > date2
-        })
+//        let filteredDate = model.sorted(by: { (noticeModel1, noticeModel2) -> Bool in
+//            guard let date1 = noticeModel1.date else { return true }
+//            guard let date2 = noticeModel2.date else { return false }
+//            return date1 > date2
+//        })
         
-        self.model.onNext(filteredDate)
+        self.model.onNext(model.reversed())
     }
     
     func setError(with error: Error) {

GME Remit/Modules/Notice/NotificationHistory/User Interface/View/NotificationCell.swift

@@ -19,9 +19,10 @@ class NotificationCell: UITableViewCell {
         dateLabel.text = model.date
         
         if model.isRead == "1" {
-            newIconImageView.image = UIImage(named: "checked")
+            newIconImageView.image = UIImage(named: "Read")
+            newIconImageView.tintColor = UIColor.themeText
         } else {
-            newIconImageView.image = UIImage(named: "uncheck")
+            newIconImageView.image = UIImage(named: "Unread")
         }
     }
 }

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

@@ -12,7 +12,7 @@ import RxCocoa
 import Localize_Swift
 
 enum RecipientParentType: String{
-    case sendmoney, receivers
+    case sendmoney, receivers, addReceiver
 }
 
 class RecipientsViewController: UIViewController {

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

@@ -40,7 +40,7 @@ extension RecipientsWireframe: RecipientsWireframeInput {
     }
     
     func openAddRecipient(with delegate: SetupRecipientDelegate) {
-        SetupRecipientWireframe().openNew(with: delegate, on: view, parentType: self.parentType) {
+        SetupRecipientWireframe().openNew(with: delegate, on: view, parentType: .addReceiver) {
             self.output?.openedSetupRecipient()
         }
     }

GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/SetupRecipientViewController.swift

@@ -333,33 +333,35 @@ extension SetupRecipientViewController {
                                         }
                                      })
                     
-                }else{
+                }
+                if self.parentType == .sendmoney {
+                                        self.alertWithOkCancel(
+                                            type: .normal,
+                                            message: "\(successObject.message ?? "")\n\(message)",
+                                            title: "success_text".localized(),
+                                            okTitle: "yes_text".localized(),
+                                            cancelTitle: "no_text".localized(),
+                                            okAction: { [weak self] in guard let `self` = self else { return }
+                                                self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return }
+                                                    self.delegate?.setupRecieient(
+                                                        self,
+                                                        didSelectRecipientID: successObject.data?.receiverID ?? ""
+                                                    )
+                                                }
+                                            },
+                                            cancelAction: { [weak self] in guard let `self` = self else { return }
+                                                self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return }
+                                                    self.delegate?.setupRecieient(
+                                                        self,
+                                                        didSelectRecipientID: nil
+                                                    )
+                                                }
+                                        })
+                }
+                else {
                     if let data = successObject.data, let delegate = self.delegate {
                         self.delegate?.moveToTermsAndConditionView(at: data, self, delegate: delegate)
                     }
-                   
-//                    self.alertWithOkCancel(
-//                        type: .normal,
-//                        message: "\(successObject.message ?? "")\n\(message)",
-//                        title: "success_text".localized(),
-//                        okTitle: "yes_text".localized(),
-//                        cancelTitle: "no_text".localized(),
-//                        okAction: { [weak self] in guard let `self` = self else { return }
-//                            self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return }
-//                                self.delegate?.setupRecieient(
-//                                    self,
-//                                    didSelectRecipientID: successObject.data?.receiverID ?? ""
-//                                )
-//                            }
-//                        },
-//                        cancelAction: { [weak self] in guard let `self` = self else { return }
-//                            self.dismiss(animated: true) { [weak self] in guard let `self` = self else { return }
-//                                self.delegate?.setupRecieient(
-//                                    self,
-//                                    didSelectRecipientID: nil
-//                                )
-//                            }
-//                    })
                 }
             }).disposed(by: disposeBag)
         

GME Remit/Modules/RegisterModules/UserAuthentication/ExistingUserKyc/User Interface/View/ExistingUserKycViewController.swift

@@ -103,6 +103,7 @@ class ExistingUserKycViewController: UIViewController {
         super.viewDidLoad()
         self.isFirst = (self.step == .first)
         let url = URL(string: "https://mobile.japanremit.com:8443/Document/TermsAndConditions/CustomerReg_TermsAndConditions.html")!
+
         self.termsWebView.load(URLRequest(url: url))
         self.termsWebView.scrollView.bounces = false
         setup()

GME Remit/Modules/RegisterModules/VerifyIDNumber/User Interface/View/VerifyIDNumberViewController.swift

@@ -25,7 +25,7 @@ class VerifyIDNumberViewController: UIViewController {
     private var isValid = false {
         didSet {
             verifyBttn.isEnabled = isValid
-           // verifyBttn.backgroundColor = isValid ? .themeRed : .themeText
+            verifyBttn.backgroundColor = isValid ? .themeRed : .themeText
         }
     }
     
@@ -93,7 +93,7 @@ class VerifyIDNumberViewController: UIViewController {
     func configureLanguage() {
         idNumberTxtField.titleText = StringConstants().residenceIdTitle
         idNumberTxtField.placeholder = StringConstants().residenceIdPlaceholder
-//        idNumberTxtField.errorMessage = StringConstants().residenceIdError
+        idNumberTxtField.errorMessage = StringConstants().residenceIdError
         idNumberTxtField.validCondition = { !$0.isEmpty}
         headerTitle.text = StringConstants().headerTitle
         verifyBttn.setTitle(StringConstants().verifyBtnTitle, for: .normal)

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/Application Logic/Interactor/SendMoneyReceiptInteractor.swift

@@ -29,10 +29,12 @@ class SendMoneyReceiptInteractor {
 // MARK: SendMoneyReceipt interactor input interface
 
 extension SendMoneyReceiptInteractor: SendMoneyReceiptInteractorInput {
-  func viewIsReady(type: ReceiptType) {
+
+    func viewIsReady(type: ReceiptType, receiptParent: ReceiptParent) {
     self.service.fetch(
       type: type,
       transactionId: self.transactionId,
+      receiptParent: receiptParent,
       success: { (model) in
         model.transactionId = self.transactionId
         self.output?.show(model: model)

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/Application Logic/Interactor/SendMoneyReceiptInteractorIO.swift

@@ -7,7 +7,7 @@
 //
 
 protocol SendMoneyReceiptInteractorInput: class {
-  func viewIsReady(type: ReceiptType)
+    func viewIsReady(type: ReceiptType, receiptParent: ReceiptParent)
 }
 
 protocol SendMoneyReceiptInteractorOutput: class {

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptService.swift

@@ -9,55 +9,63 @@
 import Foundation
 
 class SendMoneyReceiptService: SendMoneyReceiptServiceType {
-  func fetch(
-    type: ReceiptType,
-    transactionId: String,
-    success: @escaping (SendMoneyReciept) -> Void,
-    failure: @escaping (Error) -> Void
-  ) {
-    
-    switch type {
-    case .overseas:
-      overseaReciept(transactionId, success: success, failure: failure)
+    func fetch(
+        type: ReceiptType,
+        transactionId: String,
+        receiptParent: ReceiptParent,
+        success: @escaping (SendMoneyReciept) -> Void,
+        failure: @escaping (Error) -> Void
+    ) {
+        
+        switch type {
+        case .overseas:
+            overseaReciept(transactionId, receiptParent, success: success, failure: failure)
+        }
     }
-  }
-  
-  private func overseaReciept(
-    _ transactionId: String,
-    success: @escaping (SendMoneyReciept) -> Void,
-    failure: @escaping (Error) -> Void
-  ) {
-    let url = baseUrl + "/mobile/receipt/" + transactionId
-    self.auth.request(
-      method: .post,
-      url: url,
-      params: nil,
-      success: { (response: SendMoneyRecieptContainer) in
-        if (response.errorCode ?? "") == "1" {
-          let error = NSError(
-            domain: "Network",
-            code: 0,
-            userInfo: [NSLocalizedDescriptionKey : response.message ?? ""]
-          )
-          
-          failure(error)
+    
+    private func overseaReciept(
+        _ transactionId: String,
+        _ receiptParent: ReceiptParent,
+        success: @escaping (SendMoneyReciept) -> Void,
+        failure: @escaping (Error) -> Void
+    ) {
+        let url: String
+        if receiptParent == .notice {
+            url = baseUrl + "/mobile/receipt/" + transactionId + "/Y"
         } else {
-          guard let model = response.data else {
-            let error = NSError(
-              domain: "Network",
-              code: 0,
-              userInfo: [NSLocalizedDescriptionKey : "Data is nil"]
-            )
-            failure(error)
-            return
-          }
-          success(model)
+            url = baseUrl + "/mobile/receipt/" + transactionId
         }
-      },
-      failure: { (error) in
-        failure(error)
-      }
-    )
-  }
-  
+        
+        self.auth.request(
+            method: .post,
+            url: url,
+            params: nil,
+            success: { (response: SendMoneyRecieptContainer) in
+                if (response.errorCode ?? "") == "1" {
+                    let error = NSError(
+                        domain: "Network",
+                        code: 0,
+                        userInfo: [NSLocalizedDescriptionKey : response.message ?? ""]
+                    )
+                    
+                    failure(error)
+                } else {
+                    guard let model = response.data else {
+                        let error = NSError(
+                            domain: "Network",
+                            code: 0,
+                            userInfo: [NSLocalizedDescriptionKey : "Data is nil"]
+                        )
+                        failure(error)
+                        return
+                    }
+                    success(model)
+                }
+            },
+            failure: { (error) in
+                failure(error)
+            }
+        )
+    }
+    
 }

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/Application Logic/Service/SendMoneyReceiptServiceType.swift

@@ -12,6 +12,7 @@ protocol SendMoneyReceiptServiceType: class, ApiServiceType {
   func fetch (
     type: ReceiptType,
     transactionId: String,
+    receiptParent: ReceiptParent,
     success: @escaping (SendMoneyReciept) -> Void,
     failure: @escaping (Error) -> Void
   )

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/Module Interface/SendMoneyReceiptModuleInterface.swift

@@ -7,7 +7,7 @@
 //
 
 protocol SendMoneyReceiptModuleInterface: class {
-    func viewIsReady(type: ReceiptType)
+    func viewIsReady(type: ReceiptType, receiptParent: ReceiptParent)
     func openMail(controlNO: String, transactionId: String, type: MailBoxType)
     func dismiss()
 }

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/Presenter/SendMoneyReceiptPresenter.swift

@@ -22,15 +22,16 @@ class SendMoneyReceiptPresenter {
 // MARK: SendMoneyReceipt module interface
 
 extension SendMoneyReceiptPresenter: SendMoneyReceiptModuleInterface {
+    
   func openMail(controlNO: String, transactionId: String, type: MailBoxType) {
     self.wireframe?.openMail(controlNO: controlNO, transactionId: transactionId, type: type)
   }
   
-  func viewIsReady(type: ReceiptType) {
+    func viewIsReady(type: ReceiptType, receiptParent: ReceiptParent) {
     self.view?.showLoading()
-    self.interactor?.viewIsReady(type: type)
+    self.interactor?.viewIsReady(type: type, receiptParent: receiptParent)
   }
-  
+      
   func dismiss() {
     self.wireframe?.dismiss()
   }

GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift

@@ -135,7 +135,7 @@ class SendMoneyReceiptViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         self.setup()
-        self.presenter?.viewIsReady(type: receiptType)
+        self.presenter?.viewIsReady(type: receiptType, receiptParent: self.receiptParent)
     }
     
     override func viewWillAppear(_ animated: Bool) {

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

@@ -37,8 +37,12 @@ extension TermsAndConditionInteractor: TermsAndConditionInteractorInput {
                 otp: otp,
                 userId: userId,
                 receiverID: receiverID,
-                success: {_ in self.output?.success()},
-                failure: {self.output?.checkOtpError(error: $0)}
+                success: {message in
+                    self.output?.otpSuccess(message: message ?? "")},
+                failure: {
+                    self.output?.checkOtpError(error: $0)
+                    
+                }
             )
         }
     }

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

@@ -21,5 +21,5 @@ protocol TermsAndConditionInteractorOutput: class {
     func checkOtpError(error: Error)
     func showOTPView()
     func show(model: User)
-    func success()
+    func otpSuccess(message: String)
 }

GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/Presenter/TermsAndConditionPresenter.swift

@@ -58,6 +58,11 @@ extension TermsAndConditionPresenter: TermsAndConditionModuleInterface {
 // MARK: TermsAndCondition interactor output interface
 
 extension TermsAndConditionPresenter: TermsAndConditionInteractorOutput {
+    func otpSuccess(message: String) {
+        self.view?.hideLoading()
+        self.view?.showReceiverAddedMessage()
+    }
+    
     func checkOtpError(error: Error) {
         self.view?.hideLoading()
         self.view?.checkOtpError(error: error.localizedDescription)

GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewController.swift

@@ -55,6 +55,7 @@ class TermsAndConditionViewController: UIViewController {
     var isURLLoaded = false
     var fromBeneficiary: Bool = false
     weak var delegate: SetupRecipientDelegate?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         var url: URL?
@@ -62,6 +63,7 @@ class TermsAndConditionViewController: UIViewController {
             self.showLoading()
             url = URL(string: "https://mobile.japanremit.com:8443/Document/TermsAndConditions/BeneReg_TermsAndConditions.html")!
         } else {
+            self.showLoading()
             url = URL(string: "https://mobile.japanremit.com:8443/Document/TermsAndConditions/Trx_TermsAndConditions.html")!
         }
         self.webView.load(URLRequest(url: url!))
@@ -71,6 +73,10 @@ class TermsAndConditionViewController: UIViewController {
         self.continueButton.setTitle("send_money_text".localized(), for: .normal)
     }
     
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        self.fromBeneficiary = false
+    }
     // MARK: IBActions
     @IBAction func agreementClicked(_ sender: UIButton) {
         if isSelected == true {
@@ -139,10 +145,10 @@ extension TermsAndConditionViewController: OtpDelegate {
 }
 // MARK: TermsAndConditionViewInterface
 extension TermsAndConditionViewController: TermsAndConditionViewInterface {
-    func success() {
+    func showReceiverAddedMessage() {
         self.alertWithOkCancel(
             type: .normal,
-            message: "Receiver added Sucessfulyy",
+            message: "Receiver saved sucessfully\n Do you want to send money to \(self.reciepient?.fullName ?? "")?",
             title: "success_text".localized(),
             okTitle: "yes_text".localized(),
             cancelTitle: "no_text".localized(),
@@ -164,6 +170,10 @@ extension TermsAndConditionViewController: TermsAndConditionViewInterface {
             })
     }
     
+    func success() {
+       
+    }
+    
     func showOtpView() {
         guard let viewController = UIStoryboard(name: "OtpVerification", bundle: nil)
                 .instantiateViewController(withIdentifier: "OtpVerificationViewController") as? OtpVerificationViewController else {

GME Remit/Modules/RemittanceModules/OverseasModules/TermsAndCondition/User Interface/View/TermsAndConditionViewInterface.swift

@@ -13,6 +13,7 @@ protocol TermsAndConditionViewInterface: class {
     func show(message: String)
     func show(model: SendMoneySubmitModelContainer?)
     func showOtpView()
+    func showReceiverAddedMessage()
     func checkOtpError(error: String)
     func success()
 }

GME Remit/MultiLanguages/en.lproj/Localizable.strings

@@ -63,7 +63,7 @@
 "kyc_fill_text" = "Verify your Account";
 "kyc_verify_pending_text" = "Verification in Process";
 "change_txn_pin" = "Change Transaction Pin";
-"change_txn_pin_detail" = "We are sending a letter to your address with a Transaction PIN. After you receive it please click here to change your Transaction PIN.";
+"change_txn_pin_detail" = "Please click here to change your Transaction PIN.";
 "penny_test_pending_text" = "Continue the registration process";
 "complete_your_registration_text" = "Kindly complete your registration process with us to start using Japan Money Express services.";
 "verification_in_aproval_process_text" = "Your registration request is in approval process. You will soon be able to use Japan Money Express services.";

GME Remit/MultiLanguages/ne.lproj/Localizable.strings

@@ -912,7 +912,7 @@
 "kyc_fill_text"="तपाईको खाता प्रमाणित गर्नुहोस्";
 "kyc_verify_pending_text"="प्रक्रिया प्रमाणिकरण";
 "change_txn_pin"="लेनदेन पिन परिवर्तन गर्नुहोस्";
-"change_txn_pin_detail"="हामी लेनदेन पिनको साथ तपाईंको ठेगानामा एक पत्र पठाउँदै छौं। तपाईंले यसलाई प्राप्त पछि कृपया यहाँ क्लिक गर्नुहोस् तपाईंको लेनदेन पिन परिवर्तन गर्न।";
+"change_txn_pin_detail"="कृपया यहाँ क्लिक गर्नुहोस् तपाईंको लेनदेन पिन परिवर्तन गर्न।";
 "change_txn_pin_n_pass"="पासवर्ड र लेनदेन पिन परिवर्तन गर्नुहोस्";
 "change_txn_pin_n_pass_detail"="तपाईंको लगईन पासवर्ड र लेनदेन पिन परिवर्तन गर्न कृपया यहाँ क्लिक गर्नुहोस्";
 

GME Remit/Supported Files/Assets.xcassets/Read.imageset/Contents.json

@@ -0,0 +1,24 @@
+{
+  "images" : [
+    {
+      "filename" : "Read.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

GME Remit/Supported Files/Assets.xcassets/Read.imageset/Read.pdf

@@ -0,0 +1 @@
+

GME Remit/Supported Files/Assets.xcassets/Unread.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "Unread.pdf",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GME Remit/Supported Files/Assets.xcassets/Unread.imageset/Unread.pdf

@@ -0,0 +1 @@
+