diff --git a/.DS_Store b/.DS_Store
index ac0344fd..0832aa3f 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/Contents.json b/GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/Contents.json
deleted file mode 100644
index 4599fff4..00000000
--- a/GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "aquarium.jpg",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/aquarium.jpg b/GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/aquarium.jpg
deleted file mode 100644
index 8be30812..00000000
Binary files a/GMERemittance/Assets.xcassets/RewardItems/aquarium.imageset/aquarium.jpg and /dev/null differ
diff --git a/GMERemittance/Assets.xcassets/RewardItems/bose.imageset/Contents.json b/GMERemittance/Assets.xcassets/RewardItems/bose.imageset/Contents.json
deleted file mode 100644
index 10b4b6d5..00000000
--- a/GMERemittance/Assets.xcassets/RewardItems/bose.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "bose.jpg",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/GMERemittance/Assets.xcassets/RewardItems/bose.imageset/bose.jpg b/GMERemittance/Assets.xcassets/RewardItems/bose.imageset/bose.jpg
deleted file mode 100644
index 3596b28a..00000000
Binary files a/GMERemittance/Assets.xcassets/RewardItems/bose.imageset/bose.jpg and /dev/null differ
diff --git a/GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/Contents.json b/GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/Contents.json
deleted file mode 100644
index abf86bd5..00000000
--- a/GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "caribbeanBay.jpg",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/caribbeanBay.jpg b/GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/caribbeanBay.jpg
deleted file mode 100644
index 5a61cbf0..00000000
Binary files a/GMERemittance/Assets.xcassets/RewardItems/caribbeanBay.imageset/caribbeanBay.jpg and /dev/null differ
diff --git a/GMERemittance/Assets.xcassets/RewardItems/everland.imageset/Contents.json b/GMERemittance/Assets.xcassets/RewardItems/everland.imageset/Contents.json
deleted file mode 100644
index b52de096..00000000
--- a/GMERemittance/Assets.xcassets/RewardItems/everland.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "everland.jpg",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/GMERemittance/Assets.xcassets/RewardItems/everland.imageset/everland.jpg b/GMERemittance/Assets.xcassets/RewardItems/everland.imageset/everland.jpg
deleted file mode 100644
index c7119d42..00000000
Binary files a/GMERemittance/Assets.xcassets/RewardItems/everland.imageset/everland.jpg and /dev/null differ
diff --git a/GMERemittance/Assets.xcassets/RewardItems/grill.imageset/Contents.json b/GMERemittance/Assets.xcassets/RewardItems/grill.imageset/Contents.json
deleted file mode 100644
index fa31131f..00000000
--- a/GMERemittance/Assets.xcassets/RewardItems/grill.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "grill.JPG",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/GMERemittance/Assets.xcassets/RewardItems/grill.imageset/grill.JPG b/GMERemittance/Assets.xcassets/RewardItems/grill.imageset/grill.JPG
deleted file mode 100644
index a8cfa335..00000000
Binary files a/GMERemittance/Assets.xcassets/RewardItems/grill.imageset/grill.JPG and /dev/null differ
diff --git a/GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/Contents.json b/GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/Contents.json
deleted file mode 100644
index 3fb25c2f..00000000
--- a/GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "images" : [
- {
- "idiom" : "universal",
- "filename" : "hanriver.jpg",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "version" : 1,
- "author" : "xcode"
- }
-}
\ No newline at end of file
diff --git a/GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/hanriver.jpg b/GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/hanriver.jpg
deleted file mode 100644
index 0c7b4c65..00000000
Binary files a/GMERemittance/Assets.xcassets/RewardItems/hanriver.imageset/hanriver.jpg and /dev/null differ
diff --git a/GMERemittance/Extension/StringExtension.swift b/GMERemittance/Extension/StringExtension.swift
index 37dcbbef..9c6f2d34 100644
--- a/GMERemittance/Extension/StringExtension.swift
+++ b/GMERemittance/Extension/StringExtension.swift
@@ -53,3 +53,13 @@ extension String {
return first + other
}
}
+
+extension String {
+ func likeCommaMoney() -> String? {
+ guard let _ = Int(self) else{
+ return nil
+ }
+
+ return Utility.getCommaSeperatedString(numberString: self)
+ }
+}
diff --git a/GMERemittance/Module/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift b/GMERemittance/Module/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift
index ecea5314..e1c5b93b 100644
--- a/GMERemittance/Module/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift
+++ b/GMERemittance/Module/Home/User Interface/View/Cell/HomeRemainingLimitTableViewCell.swift
@@ -15,6 +15,7 @@ class HomeRemainingLimitTableViewCell: UITableViewCell {
let yearlyLimit = "remaining_limit_text".localized()
}
+ @IBOutlet weak var pointContainerView: UIView!
@IBOutlet weak var pointBackgroundView: UIView!
@IBOutlet weak var amountLabel: UILabel!
@IBOutlet weak var rewardPointAmountLabel: UILabel!
@@ -38,12 +39,13 @@ class HomeRemainingLimitTableViewCell: UITableViewCell {
configureText()
self.rewardTapGesture.addTarget(self, action: #selector(self.rewardTap(_:)))
- self.pointBackgroundView.addGestureRecognizer(self.rewardTapGesture)
- self.pointBackgroundView.isUserInteractionEnabled = true
+ self.pointContainerView.addGestureRecognizer(self.rewardTapGesture)
+ self.pointContainerView.isUserInteractionEnabled = true
- self.rewardPointAmountLabel.text = UserDefaults.standard.string(forKey: UserKeys.rewardPoint)
+ self.rewardPointAmountLabel.text = UserDefaults.standard.string(forKey: UserKeys.rewardPoint)?.likeCommaMoney()
self.pointBackgroundView.layer.cornerRadius = 10
+ pointContainerView.layer.cornerRadius = 10
pointBackgroundView.hero.id = "pointsView"
}
diff --git a/GMERemittance/Module/Home/User Interface/View/Home.storyboard b/GMERemittance/Module/Home/User Interface/View/Home.storyboard
index 5636c950..9786516f 100644
--- a/GMERemittance/Module/Home/User Interface/View/Home.storyboard
+++ b/GMERemittance/Module/Home/User Interface/View/Home.storyboard
@@ -124,28 +124,28 @@
-
+
-
+
-
+
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
@@ -237,6 +249,7 @@
+
diff --git a/GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift b/GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift
index 7a02c9e3..73a31bb3 100644
--- a/GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift
+++ b/GMERemittance/Module/RewardModules/DetailOrder/User Interface/View/DetailOrderViewController.swift
@@ -29,7 +29,7 @@ class DetailOrderViewController: UIViewController {
pickupBranchLabel.text = order.branchName
productNameLabel.text = order.productName
- productPointLabel.text = order.usePoint
+ productPointLabel.text = order.usePoint?.likeCommaMoney()
orderStatusLabel.text = status.message
orderDateLabel.text = order.createdDate
diff --git a/GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift b/GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift
index 65ce59b9..ae923adf 100644
--- a/GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift
+++ b/GMERemittance/Module/RewardModules/OrderHistory/User Interface/View/Cell/OrderCell.swift
@@ -92,7 +92,7 @@ class OrderCell: UITableViewCell {
branchNameLabel.text = model.branchName
orderedProductNameLabel.text = model.productName
- orderedProductPointLabel.text = model.usePoint
+ orderedProductPointLabel.text = model.usePoint?.likeCommaMoney()
orderStatusLabel.layer.cornerRadius = 5
orderStatusLabel.backgroundColor = status.color
diff --git a/GMERemittance/Module/RewardModules/Redeem/User Interface/View/Redeem.storyboard b/GMERemittance/Module/RewardModules/Redeem/User Interface/View/Redeem.storyboard
index 0f0049c2..52c3e2bb 100644
--- a/GMERemittance/Module/RewardModules/Redeem/User Interface/View/Redeem.storyboard
+++ b/GMERemittance/Module/RewardModules/Redeem/User Interface/View/Redeem.storyboard
@@ -47,7 +47,7 @@
-
+
@@ -359,6 +359,7 @@
+
diff --git a/GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift b/GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift
index cde18b03..c863bbf0 100644
--- a/GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift
+++ b/GMERemittance/Module/RewardModules/Redeem/User Interface/View/RedeemViewController.swift
@@ -32,7 +32,7 @@ class RedeemViewController: UIViewController {
guard
let selectedItemName = model?.productName,
- let selectedItemPoint = model?.pointPrice else {
+ let selectedItemPoint = model?.pointPrice?.likeCommaMoney() else {
return
}
@@ -413,10 +413,6 @@ extension RedeemViewController {
}
private func setMultiLanguage(){
-// redeemTitleLabel.text = "redeem_text".localized()
-// pointsWillBeDeductedLabel.text = "points_deducted_text".localized()
-// fromTourRewardPointLabel.text = "from_your_reward_point_text".localized()
-
receiverTitleLabel.text = "receiver_text".localized()
phoneNumberTitleLabel.text = "mobile_number_text".localized()
diff --git a/GMERemittance/Module/RewardModules/Reward/Application Logic/Model/RewardProduct.swift b/GMERemittance/Module/RewardModules/Reward/Application Logic/Model/RewardProduct.swift
index 4cc98523..558306e7 100644
--- a/GMERemittance/Module/RewardModules/Reward/Application Logic/Model/RewardProduct.swift
+++ b/GMERemittance/Module/RewardModules/Reward/Application Logic/Model/RewardProduct.swift
@@ -27,3 +27,4 @@ struct RewardProduct: Mappable {
productImgPath <- map["productImgPath"]
}
}
+
diff --git a/GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift b/GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift
index 901be1e6..7856c304 100644
--- a/GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift
+++ b/GMERemittance/Module/RewardModules/Reward/User Interface/View/Cell/RewardItemCollectionViewCell.swift
@@ -36,7 +36,7 @@ class RewardItemCollectionViewCell: UICollectionViewCell {
}
self.itemNameLabel.text = model?.productName
- self.itemPriceLabel.text = model?.pointPrice
+ self.itemPriceLabel.text = model?.pointPrice?.likeCommaMoney()
self.model = model
self.delegate = delegate
diff --git a/GMERemittance/Module/RewardModules/Reward/User Interface/View/Reward.storyboard b/GMERemittance/Module/RewardModules/Reward/User Interface/View/Reward.storyboard
index 2dc9bd45..b09f42e6 100644
--- a/GMERemittance/Module/RewardModules/Reward/User Interface/View/Reward.storyboard
+++ b/GMERemittance/Module/RewardModules/Reward/User Interface/View/Reward.storyboard
@@ -27,29 +27,29 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -58,7 +58,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
@@ -106,7 +106,7 @@
-
+
@@ -215,7 +215,7 @@
-
+
diff --git a/GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift b/GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift
index d670fd58..615d9a02 100644
--- a/GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift
+++ b/GMERemittance/Module/RewardModules/Reward/User Interface/View/RewardViewController.swift
@@ -52,8 +52,9 @@ class RewardViewController: UIViewController {
title = "reward_group_title_text".localized()
collectionView.setContentOffset(.zero, animated: false)
+ rewardPoint = UserDefaults.standard.string(forKey: UserKeys.rewardPoint)?.likeCommaMoney()
- rewardPoint = UserDefaults.standard.string(forKey: UserKeys.rewardPoint)
+ collectionView.reloadData()
}
override func viewWillDisappear(_ animated: Bool) {
@@ -63,11 +64,7 @@ class RewardViewController: UIViewController {
// MARK: IBActions
@objc func selectLayout(_ sender: UISegmentedControl) {
- switch sender.selectedSegmentIndex {
- case 0: setCollectionViewLayout(0)
- case 1: setCollectionViewLayout(1)
- default: break
- }
+ setCollectionViewLayout(sender.selectedSegmentIndex)
}
// MARK: Other Functions
diff --git a/GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
index 9e543b1b..4f6389f5 100644
--- a/GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
+++ b/GMERemittance/Module/SendMoney/SendMoneyExchangeRate/User Interface/View/SendMoneyExchangeRateViewController.swift
@@ -322,12 +322,13 @@ class SendMoneyExchangeRateViewController: UIViewController {
private func setCoupon(){
if exchangeRateModel?.schemeId != nil &&
exchangeRateModel?.schemeId != "",
- let couponName = exchangeRateModel?.couponName {
+ let couponName = exchangeRateModel?.couponName,
+ let couponType = exchangeRateModel?.couponType{
let discountPercent = exchangeRateModel?.discountPercent ?? ""
let discountValue = exchangeRateModel?.discountValue ?? ""
couponNameLabel.text = couponName
- couponPercentLabel.text = "\(discountPercent)%"
+ couponPercentLabel.text = couponType == "1" ? "\(discountPercent)%" : ""
couponValueLabel.text = "(-\(discountValue) KRW)"
couponsCountLabel.text = ""
} else {
diff --git a/GMERemittance/Module/SendMoney/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift b/GMERemittance/Module/SendMoney/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
index 75f3429f..8c41087a 100644
--- a/GMERemittance/Module/SendMoney/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
+++ b/GMERemittance/Module/SendMoney/SendMoneyReceipt/User Interface/View/SendMoneyReceiptViewController.swift
@@ -169,6 +169,7 @@ class SendMoneyReceiptViewController: UIViewController {
self.doneButton.setTitle(StringConstants().doneText, for: UIControlState.normal)
self.requestToCancelButton.setTitle("request_to_cancel_text".localized(), for: UIControlState.normal)
self.requestToChangeButton.setTitle("request_to_change_text".localized(), for: UIControlState.normal)
+ usedCouponTitleLabel.text = "used_coupon_title_text".localized()
}
func setupBackButton() {