From 75d344eab9255013cd75a33c98ef65b910269a38 Mon Sep 17 00:00:00 2001
From: InKwon James Kim <devikkim@gmail.com>
Date: Mon, 10 Jun 2019 18:33:25 +0900
Subject: [PATCH] add Estimated earning points at SendMoneyVerification

---
 .../Model/SendMoneyExchangeRate.swift         |  2 +-
 GMERemittance/Model/SendMoneyReciept.swift    |  3 +-
 .../Model/SendMoneySubmitResponse.swift       |  2 +
 .../View/BiometricAuthentication.storyboard   |  5 +-
 .../SendMoneyExchangeRateViewController.swift | 59 ++++++++++---------
 .../SendMoneyVerificationViewController.swift | 15 ++++-
 bn.lproj/Localizable.strings                  |  3 +
 en.lproj/Localizable.strings                  |  3 +
 id.lproj/Localizable.strings                  |  3 +
 km.lproj/Localizable.strings                  |  4 ++
 ko.lproj/Localizable.strings                  |  4 ++
 mn.lproj/Localizable.strings                  |  4 ++
 my-MM.lproj/Localizable.strings               |  3 +
 my.lproj/Localizable.strings                  |  4 ++
 ne.lproj/Localizable.strings                  |  4 ++
 ru-RU.lproj/Localizable.strings               |  3 +
 si.lproj/Localizable.strings                  |  4 ++
 th.lproj/Localizable.strings                  |  3 +
 uz.lproj/Localizable.strings                  |  4 ++
 vi-VN.lproj/Localizable.strings               |  3 +
 20 files changed, 99 insertions(+), 36 deletions(-)

diff --git a/GMERemittance/Model/SendMoneyExchangeRate.swift b/GMERemittance/Model/SendMoneyExchangeRate.swift
index 1ff8d98b..12e96490 100644
--- a/GMERemittance/Model/SendMoneyExchangeRate.swift
+++ b/GMERemittance/Model/SendMoneyExchangeRate.swift
@@ -61,7 +61,7 @@ class SendMoneyExchangeRateModel: Mappable {
       schemeId != "",
       let name = couponName,
       let type = couponType,
-      let value = discountValue else {
+      let value = discountValue?.likeCommaMoney() else {
       return "0"
     }
     
diff --git a/GMERemittance/Model/SendMoneyReciept.swift b/GMERemittance/Model/SendMoneyReciept.swift
index 43c27132..7c8e5c81 100644
--- a/GMERemittance/Model/SendMoneyReciept.swift
+++ b/GMERemittance/Model/SendMoneyReciept.swift
@@ -76,11 +76,10 @@ class SendMoneyReciept: Mappable {
       let name = couponName,
       name != "",
       let type = discountType,
-      let value = discountValue else {
+      let value = discountValue?.likeCommaMoney() else {
         return "N/A"
     }
     
-    
     if type == "1", let percent = discountPercent {
       return "\(name) \(percent)% (-\(value) KRW)"
     }
diff --git a/GMERemittance/Model/SendMoneySubmitResponse.swift b/GMERemittance/Model/SendMoneySubmitResponse.swift
index b0e7544a..07292163 100644
--- a/GMERemittance/Model/SendMoneySubmitResponse.swift
+++ b/GMERemittance/Model/SendMoneySubmitResponse.swift
@@ -16,6 +16,7 @@ class SendMoneySubmitModelContainer: Mappable {
     var errorCode: String?
     var message: String?
     var id: String?
+    var extra2: String?
     var data: SendMoneySubmitModel?
     
     required init?(map: Map) {
@@ -27,6 +28,7 @@ class SendMoneySubmitModelContainer: Mappable {
         id <- map["Id"]
         message <- map["Msg"]
         data <- map["Data"]
+        extra2 <- map["Extra2"]
     }
 }
 
diff --git a/GMERemittance/Module/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthentication.storyboard b/GMERemittance/Module/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthentication.storyboard
index 17518787..eda64ea9 100644
--- a/GMERemittance/Module/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthentication.storyboard	
+++ b/GMERemittance/Module/BiometricAuthModules/BiometricAuthentication/User Interface/View/BiometricAuthentication.storyboard	
@@ -24,7 +24,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="characterWrap" translatesAutoresizingMaskIntoConstraints="NO" id="aC8-3V-QpF">
-                                <rect key="frame" x="87.5" y="531" width="200" height="50"/>
+                                <rect key="frame" x="56.5" y="531" width="262.5" height="50"/>
                                 <color key="backgroundColor" red="0.18823529411764706" green="0.24313725490196078" blue="0.62352941176470589" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="50" id="AYP-6K-T6b"/>
@@ -55,8 +55,9 @@
                             <constraint firstItem="fGb-qm-Mdn" firstAttribute="trailing" secondItem="aO1-jS-d16" secondAttribute="trailing" constant="20" id="PXt-b5-dBL"/>
                             <constraint firstItem="aO1-jS-d16" firstAttribute="centerX" secondItem="fGb-qm-Mdn" secondAttribute="centerX" id="Sef-hv-5aX"/>
                             <constraint firstItem="aO1-jS-d16" firstAttribute="centerY" secondItem="fGb-qm-Mdn" secondAttribute="centerY" multiplier="0.55:1" id="TSI-fC-T95"/>
-                            <constraint firstItem="aC8-3V-QpF" firstAttribute="width" relation="lessThanOrEqual" secondItem="9Uc-9s-KgO" secondAttribute="width" multiplier="0.9:1" id="bW5-zZ-Nms"/>
+                            <constraint firstItem="aC8-3V-QpF" firstAttribute="width" relation="greaterThanOrEqual" secondItem="9Uc-9s-KgO" secondAttribute="width" multiplier="0.7:1" id="bW5-zZ-Nms"/>
                             <constraint firstItem="wjU-xq-xRN" firstAttribute="centerY" secondItem="fGb-qm-Mdn" secondAttribute="centerY" multiplier="0.3:1" id="kiz-S3-bEe"/>
+                            <constraint firstItem="aC8-3V-QpF" firstAttribute="width" relation="lessThanOrEqual" secondItem="9Uc-9s-KgO" secondAttribute="width" id="yhj-Jp-OSL"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="fGb-qm-Mdn"/>
                     </view>
diff --git a/GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
index 74be5347..8a43a588 100644
--- a/GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift	
+++ b/GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift	
@@ -60,9 +60,9 @@ class SendMoneyExchangeRateViewController: UIViewController {
       if let _action = action {
         switch _action {
         case .calculate:
-          self.continueButton.setTitle("calculate_text".localized(), for: .normal)
+          continueButton.setTitle("calculate_text".localized(), for: .normal)
         case ._continue:
-          self.continueButton.setTitle("continue_text".localized(), for: .normal)
+          continueButton.setTitle("continue_text".localized(), for: .normal)
         }
       }
     }
@@ -70,7 +70,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
   
   private var currencyInfoViewModel: [SendMoneyExchangeRateCurrencyViewModel]? {
     didSet {
-      self.selectedCurrencyViewModel =  self.currencyInfoViewModel?.first
+      selectedCurrencyViewModel =  currencyInfoViewModel?.first
     }
   }
   
@@ -83,10 +83,8 @@ class SendMoneyExchangeRateViewController: UIViewController {
       let serviceCharge = exchangeRateModel?.transferFee ?? "0.00"
       let transferFee = serviceCharge != "0.00" ? "-\(serviceCharge)" : "\(serviceCharge)"
       
-      self.transferFeeInfoLabel.text = transferFee + " (" + "transfer_fee_included_text".localized() + ")"
-      
-      let exchangeRate = exchangeRateModel?.exchangeRate ?? ""
-      exchangeRateLabel.text = exchangeRate + " (" + "current_exchange_rate_text".localized() + ")"
+      transferFeeInfoLabel.text = "\(transferFee) (\("transfer_fee_included_text".localized()))"
+      exchangeRateLabel.text = "\(exchangeRateModel?.exchangeRate ?? "") (\("current_exchange_rate_text".localized()))"
       
       setCoupon()
       
@@ -110,24 +108,24 @@ class SendMoneyExchangeRateViewController: UIViewController {
     }
   }
   
-  private var coupons: [Coupon]? {
-    didSet {
-      
-    }
-  }
-  
+  private var coupons: [Coupon]?
   private var calcBy = ""
   
   private var currencies: [String]? {
     didSet {
       let models: [SendMoneyExchangeRateCurrencyViewModel] =
-        (currencies ?? []).map {
+        (currencies ?? []).map {[weak self] in
+          guard let `self` = self else {
+            return SendMoneyExchangeRateCurrencyViewModel()
+          }
+          
           let viewmodel = SendMoneyExchangeRateCurrencyViewModel()
           viewmodel.countryCode = self.reciepient?.countryCode ?? ""
           viewmodel.currency = $0
           return viewmodel
         }
-      self.currencyInfoViewModel = models
+      
+      currencyInfoViewModel = models
     }
   }
   
@@ -172,6 +170,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
     action = .calculate
     
     senderTextField.becomeFirstResponder()
+    senderTextField.delegate = self
     
     calcBy = "c"
     [backgroundViewCountryLabel1, backgroundViewCountryLabel2].forEach { $0?.layer.cornerRadius = 5 }
@@ -182,19 +181,8 @@ class SendMoneyExchangeRateViewController: UIViewController {
     }
     
     configureLanguage()
-    
-    
-//    senderTextField.inputView?.keyboardToolbar.doneBarButton.title = "Calculate"
-//    senderTextField.inputView?.keyboardToolbar.doneBarButton.setTarget(self, action: #selector(calculateRate(_:)))
-//    reciepientTextField.inputView?.keyboardToolbar.doneBarButton.title = "Calculate"
-//    reciepientTextField.inputView?.keyboardToolbar.doneBarButton.setTarget(self, action: #selector(calculateRate(_:)))
-    
   }
-//  @objc private func calculateRate(_ sender: Any){
-//    print("calcuate!")
-////    sender.resignFirstResponder()
-//  }
-  
+
   private func configureLanguage() {
     youSendTitleLabel.text = "you_send_text".localized()
     recipientGetsTitleLabel.text = "recepient_gets_text".localized()
@@ -234,7 +222,7 @@ class SendMoneyExchangeRateViewController: UIViewController {
   
   private func currencySelected(models: [SendMoneyExchangeRateCurrencyViewModel?]) {
     if let model = models.first {
-      self.selectedCurrencyViewModel = model
+      selectedCurrencyViewModel = model
       calcBy.lowercased() == "c" ? (reciepientTextField.text = "") : (senderTextField.text = "")
     }
   }
@@ -247,8 +235,10 @@ class SendMoneyExchangeRateViewController: UIViewController {
     transferFeeInfoLabel.alpha = 0
     exchangeInfoStackView.isHidden = true
     exchangeInfoStackView.alpha = 0
+    
     let dropDownImage = #imageLiteral(resourceName: "dropdown_white").withRenderingMode(UIImageRenderingMode.alwaysTemplate)
     let image = dropDownImage
+    
     dropDownImageView.image = image
     dropDownImageView.tintColor = UIColor.white
     setCountryFlag(countryCode: reciepient?.countryCode ?? "")
@@ -327,7 +317,6 @@ class SendMoneyExchangeRateViewController: UIViewController {
     calculateExchangeRate(senderAmount: senderAmount, reciepientAmount: reciepientAmount, calcBy: calcBy)
   }
   
-  
   private func goToVerification() {
     exchangeRateModel?.calcBy = calcBy
     exchangeRateModel?.reciepientCurrency = selectedCurrencyViewModel?.currency ?? ""
@@ -397,3 +386,15 @@ extension SendMoneyExchangeRateViewController {
     self.viewWillAppear(true)
   }
 }
+
+// MARK: - UITextFieldDelegate
+extension SendMoneyExchangeRateViewController: UITextFieldDelegate {
+  func textFieldDidEndEditing(_ textField: UITextField) {
+    switch textField {
+    case senderTextField:
+      calculate()
+    default:
+      break
+    }
+  }
+}
diff --git a/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift
index 0898dcc0..9ec5adcc 100644
--- a/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift	
+++ b/GMERemittance/Module/SendMoney/SendMoneyVerification/User Interface/View/SendMoneyVerificationViewController.swift	
@@ -211,9 +211,20 @@ class SendMoneyVerificationViewController: UITableViewController {
 // MARK: SendMoneyVerificationViewInterface
 extension SendMoneyVerificationViewController: SendMoneyVerificationViewInterface {
   func show(model: SendMoneySubmitModelContainer?) {
-    self.alertWithOk(type: .normal, message: model?.message , title: "Success", okTitle: "OK", style: UIAlertControllerStyle.alert, OkStyle: .default) {
+    guard let message = model?.message, let expectedPoint = model?.extra2 else {
+      return
+    }
+    let successMessage = "\(message)\n(\("estimated_earning_points_text".localized()): \(expectedPoint.likeCommaMoney() ?? "0"))"
+    self.alertWithOk(
+      type: .normal,
+      message: successMessage,
+      title: "Success",
+      okTitle: "OK",
+      style: UIAlertControllerStyle.alert,
+      OkStyle: .default
+    ) {
       if let id = model?.id {
-        self.presenter?.openReciept(transactionId:  id)
+        self.presenter?.openReciept(transactionId: id)
       }else {
         self.alert(message: "No Transaction recievied.")
       }
diff --git a/bn.lproj/Localizable.strings b/bn.lproj/Localizable.strings
index 62514f47..d6cf01d9 100644
--- a/bn.lproj/Localizable.strings
+++ b/bn.lproj/Localizable.strings
@@ -484,3 +484,6 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = " কুপণ";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
diff --git a/en.lproj/Localizable.strings b/en.lproj/Localizable.strings
index 427146a7..0bf68b39 100644
--- a/en.lproj/Localizable.strings
+++ b/en.lproj/Localizable.strings
@@ -487,3 +487,6 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "Coupon";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
diff --git a/id.lproj/Localizable.strings b/id.lproj/Localizable.strings
index ab825a25..7cafbd50 100644
--- a/id.lproj/Localizable.strings
+++ b/id.lproj/Localizable.strings
@@ -478,3 +478,6 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "Coupon";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
diff --git a/km.lproj/Localizable.strings b/km.lproj/Localizable.strings
index d7b10916..e1d536f6 100644
--- a/km.lproj/Localizable.strings
+++ b/km.lproj/Localizable.strings
@@ -491,3 +491,7 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "ប័ណ្ណរង្វាន់";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
+
diff --git a/ko.lproj/Localizable.strings b/ko.lproj/Localizable.strings
index 1d045e58..32ab6487 100644
--- a/ko.lproj/Localizable.strings
+++ b/ko.lproj/Localizable.strings
@@ -494,3 +494,7 @@
 // Coupon
 "used_coupon_title_text" = "사용한 쿠폰";
 "coupon_text" = "쿠폰";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "적립 예상 포인트";
+
diff --git a/mn.lproj/Localizable.strings b/mn.lproj/Localizable.strings
index 3824f38b..08bfc31e 100644
--- a/mn.lproj/Localizable.strings
+++ b/mn.lproj/Localizable.strings
@@ -490,3 +490,7 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "Купон";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
+
diff --git a/my-MM.lproj/Localizable.strings b/my-MM.lproj/Localizable.strings
index 1a7b1186..30b36dc1 100644
--- a/my-MM.lproj/Localizable.strings
+++ b/my-MM.lproj/Localizable.strings
@@ -465,3 +465,6 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "ကူပြန္";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
diff --git a/my.lproj/Localizable.strings b/my.lproj/Localizable.strings
index 9d415dd7..c14ccd51 100644
--- a/my.lproj/Localizable.strings
+++ b/my.lproj/Localizable.strings
@@ -499,3 +499,7 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "ကူပြန္";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
+
diff --git a/ne.lproj/Localizable.strings b/ne.lproj/Localizable.strings
index 8c2d4778..322d3f59 100644
--- a/ne.lproj/Localizable.strings
+++ b/ne.lproj/Localizable.strings
@@ -490,3 +490,7 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "कुपन ";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
+
diff --git a/ru-RU.lproj/Localizable.strings b/ru-RU.lproj/Localizable.strings
index 1a2a10dd..b6edc38e 100644
--- a/ru-RU.lproj/Localizable.strings
+++ b/ru-RU.lproj/Localizable.strings
@@ -490,3 +490,6 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "Coupon";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
diff --git a/si.lproj/Localizable.strings b/si.lproj/Localizable.strings
index 449baf75..9e9a1020 100644
--- a/si.lproj/Localizable.strings
+++ b/si.lproj/Localizable.strings
@@ -497,3 +497,7 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "කූපනය";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
+
diff --git a/th.lproj/Localizable.strings b/th.lproj/Localizable.strings
index e3e8aaba..871c35d2 100644
--- a/th.lproj/Localizable.strings
+++ b/th.lproj/Localizable.strings
@@ -496,3 +496,6 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "คูปอง";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
diff --git a/uz.lproj/Localizable.strings b/uz.lproj/Localizable.strings
index bdeceaec..d3c3cdfc 100644
--- a/uz.lproj/Localizable.strings
+++ b/uz.lproj/Localizable.strings
@@ -493,3 +493,7 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "Coupon";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";
+
diff --git a/vi-VN.lproj/Localizable.strings b/vi-VN.lproj/Localizable.strings
index 42a4d025..dee46796 100644
--- a/vi-VN.lproj/Localizable.strings
+++ b/vi-VN.lproj/Localizable.strings
@@ -489,3 +489,6 @@
 // Coupon
 "used_coupon_title_text" = "Used Coupon";
 "coupon_text" = "Coupon";
+
+// SendMoney For Reward
+"estimated_earning_points_text" = "Estimated earning points";