From f7ef9c267a948fd97b7c8680fca601ee265d4cf4 Mon Sep 17 00:00:00 2001 From: Hwang Sang Hwan <137605270+Hrepay@users.noreply.github.com> Date: Tue, 29 Sep 2026 20:10:41 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[#468]=20=EC=B6=95=EC=A0=9C=20=EC=A0=9C?= =?UTF-8?q?=ED=9C=B4=20=EC=95=88=EB=82=B4=20=EB=AC=B8=EA=B5=AC=20=EC=98=81?= =?UTF-8?q?=EC=96=B4=C2=B7=EC=9D=BC=EB=B3=B8=EC=96=B4=C2=B7=EB=B2=A0?= =?UTF-8?q?=ED=8A=B8=EB=82=A8=EC=96=B4=20=EB=B2=88=EC=97=AD=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EATSSU/App/Resources/en.lproj/Localizable.strings | 2 ++ EATSSU/App/Resources/ja.lproj/Localizable.strings | 2 ++ EATSSU/App/Resources/vi.lproj/Localizable.strings | 2 ++ 3 files changed, 6 insertions(+) diff --git a/EATSSU/App/Resources/en.lproj/Localizable.strings b/EATSSU/App/Resources/en.lproj/Localizable.strings index 4b9b3491..9e583b59 100644 --- a/EATSSU/App/Resources/en.lproj/Localizable.strings +++ b/EATSSU/App/Resources/en.lproj/Localizable.strings @@ -177,6 +177,8 @@ "map.map" = "Map"; /// MainMapView - "전체" "map.all" = "All"; +/// 축제 제휴 안내 말풍선 +"map.festivalBannerMessage" = "See 2026 festival partner stores!\nNot valid with other partner deals."; /// "축제" "map.festival" = "Festival"; /// NoDepartmentSheetVC - "학과를 입력하고\n나만의 제휴를 확인해보세요!" diff --git a/EATSSU/App/Resources/ja.lproj/Localizable.strings b/EATSSU/App/Resources/ja.lproj/Localizable.strings index d4faee58..ac2189ef 100644 --- a/EATSSU/App/Resources/ja.lproj/Localizable.strings +++ b/EATSSU/App/Resources/ja.lproj/Localizable.strings @@ -178,6 +178,8 @@ "map.map" = "マップ"; /// MainMapView - "전체" "map.all" = "すべて"; +/// 축제 제휴 안내 말풍선 +"map.festivalBannerMessage" = "2026学園祭の提携店をチェック！\n既存の提携とは併用できません。"; /// "축제" "map.festival" = "学園祭"; /// NoDepartmentSheetVC - "학과를 입력하고\n나만의 제휴를 확인해보세요!" diff --git a/EATSSU/App/Resources/vi.lproj/Localizable.strings b/EATSSU/App/Resources/vi.lproj/Localizable.strings index d40caf70..859b299d 100644 --- a/EATSSU/App/Resources/vi.lproj/Localizable.strings +++ b/EATSSU/App/Resources/vi.lproj/Localizable.strings @@ -178,6 +178,8 @@ "map.map" = "Bản đồ"; /// MainMapView - "전체" "map.all" = "Tất cả"; +/// 축제 제휴 안내 말풍선 +"map.festivalBannerMessage" = "Xem cửa hàng ưu đãi lễ hội 2026!\nKhông áp dụng cùng ưu đãi khác."; /// "축제" "map.festival" = "Lễ hội"; /// NoDepartmentSheetVC - "학과를 입력하고\n나만의 제휴를 확인해보세요!" From dab955ecb92fe07e26126d342db9a1a431848e8c Mon Sep 17 00:00:00 2001 From: Hwang Sang Hwan <137605270+Hrepay@users.noreply.github.com> Date: Tue, 29 Sep 2026 20:11:41 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[#468]=20=EB=A6=AC=EB=B7=B0=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20=EC=8B=9C=20=EB=A9=94=EB=89=B4=20=EC=88=98=EC=97=90?= =?UTF-8?q?=20=EB=94=B0=EB=9D=BC=20=EB=A6=AC=EB=B7=B0=20=EC=A2=85=EB=A5=98?= =?UTF-8?q?=EA=B0=80=20=EB=B0=94=EB=80=8C=EC=A7=80=20=EC=95=8A=EB=8F=84?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SetRateViewController.swift | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/EATSSU/App/Sources/Presentation/Review/ViewController/SetRateViewController.swift b/EATSSU/App/Sources/Presentation/Review/ViewController/SetRateViewController.swift index ba09c54b..98ae3c7a 100644 --- a/EATSSU/App/Sources/Presentation/Review/ViewController/SetRateViewController.swift +++ b/EATSSU/App/Sources/Presentation/Review/ViewController/SetRateViewController.swift @@ -173,14 +173,9 @@ final class SetRateViewController: BaseViewController, UINavigationControllerDel self.selectedList = list self.validMenuIDList = idList self.likedStates = Array(repeating: false, count: list.count) - - if idList.count == 1 { - self.reviewType = .fixed - self.menuID = idList.first - } else { - self.reviewType = .variable - } - + // 리뷰 종류(식단/메뉴)는 init에서 정한다. 메뉴 개수로 바꾸면 + // 메뉴가 1개인 식단 리뷰가 메뉴 리뷰로 전송된다 + setRateView.menuTableView.reloadData() } @@ -345,6 +340,12 @@ final class SetRateViewController: BaseViewController, UINavigationControllerDel } } + /// 제출을 진행하지 못했을 때 다시 제출할 수 있게 되돌린다 + private func restoreSubmitState() { + isReviewSubmitted = false + setRateView.nextButton.isEnabled = true + } + /// 리뷰 작성/수정 완료 후 이전 화면 private func moveToReviewVC() { if let myReviewVC = navigationController?.viewControllers.first(where: { $0 is MyReviewViewController }) as? MyReviewViewController { @@ -404,6 +405,7 @@ extension SetRateViewController { private func sendFixReview() { guard let reviewId = reviewId else { showToast(message: TextLiteral.Review.noReviewInfoForFix) + restoreSubmitState() return } @@ -452,6 +454,7 @@ extension SetRateViewController { private func sendMealReview() { guard let mealId = mealID else { showToast(message: TextLiteral.Review.noMealInfo) + restoreSubmitState() return } @@ -503,6 +506,7 @@ extension SetRateViewController { private func sendMenuReview() { guard let menuId = menuID ?? validMenuIDList.first else { showToast(message: TextLiteral.Review.noMenuInfo) + restoreSubmitState() return }