From de71295a1889bab694f677cd1be103ebcef1ca7c Mon Sep 17 00:00:00 2001 From: HyeonJongKim Date: Fri, 14 Nov 2025 11:32:27 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EA=B0=80=EB=A7=B9=EC=A0=90=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=5F=20=EB=93=B1=EB=A1=9D=ED=98=84=ED=99=A9=20=5F=20?= =?UTF-8?q?=EC=97=90=EC=8A=A4=ED=81=AC=EB=A1=9C=20=EA=B0=80=EC=9E=85?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EC=84=B9=EC=85=98=20=EC=97=90=EC=8A=A4?= =?UTF-8?q?=ED=81=AC=EB=A1=9C=20=EA=B0=80=EC=9E=85=20=20Enum=20Value=20?= =?UTF-8?q?=EB=8B=A4=EA=B5=AD=EC=96=B4=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/merchant/model/constant.ts | 17 ++++++++++++++--- .../merchant/ui/section/escrow-section.tsx | 3 ++- src/locales/en.json | 10 ++++++++-- src/locales/ko.json | 11 +++++++++-- 4 files changed, 33 insertions(+), 8 deletions(-) diff --git a/src/entities/merchant/model/constant.ts b/src/entities/merchant/model/constant.ts index ec653fd..e4d6a95 100644 --- a/src/entities/merchant/model/constant.ts +++ b/src/entities/merchant/model/constant.ts @@ -1,13 +1,24 @@ import { TFunction } from 'i18next'; -import { UsageStatus } from './types'; +import { EscrowStatus, UsageStatus } from './types'; export const getUsageStatusName = (t: TFunction, usageStatus?: string): string => { if (!usageStatus) return ''; const statusMap: Record = { - [UsageStatus.AVAILABLE]: t('merchant.available'), - [UsageStatus.SUSPENDED]: t('merchant.suspended'), + [UsageStatus.AVAILABLE]: t('merchant.usageStatus.available'), + [UsageStatus.SUSPENDED]: t('merchant.usageStatus.suspended'), }; return statusMap[usageStatus] || usageStatus; +}; + +export const getEscrowStatusName = (t: TFunction, escrowStatus?: string): string => { + if (!escrowStatus) return ''; + + const statusMap: Record = { + [EscrowStatus.ACTIVE]: t('merchant.escrowStatus.active'), + [EscrowStatus.INACTIVE]: t('merchant.escrowStatus.inactive') + }; + + return statusMap[escrowStatus] || escrowStatus; }; \ No newline at end of file diff --git a/src/entities/merchant/ui/section/escrow-section.tsx b/src/entities/merchant/ui/section/escrow-section.tsx index 0ca5a1c..6f250c5 100644 --- a/src/entities/merchant/ui/section/escrow-section.tsx +++ b/src/entities/merchant/ui/section/escrow-section.tsx @@ -1,6 +1,7 @@ import { useTranslation } from 'react-i18next'; import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow'; import { Escrow, SectionKeys } from '../../model/types'; +import { getEscrowStatusName } from '../../model/constant'; import SlideDown from 'react-slidedown'; import 'react-slidedown/lib/slidedown.css'; import { useEffect, useState } from 'react'; @@ -66,7 +67,7 @@ export const EscrowSection = ({
  • {t('merchant.nicecrowJoin')} - { escrowStatus } + { getEscrowStatusName(t, escrowStatus) }
  • {t('merchant.location')} diff --git a/src/locales/en.json b/src/locales/en.json index d942325..4f4877e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1313,8 +1313,14 @@ "businessAddress": "Business Address", "websiteUrl": "Website URL", "onlineRegistrationStatus": "Online Registration Status", - "available": "Available", - "suspended": "Suspended", + "usageStatus": { + "available": "Available", + "suspended": "Suspended" + }, + "escrowStatus": { + "active": "Active", + "inactive": "Inactive" + }, "status": "Status", "issueDate": "Issue Date", "contractStatus": "Contract Status", diff --git a/src/locales/ko.json b/src/locales/ko.json index 33fa853..71e30ae 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -1298,6 +1298,7 @@ "infoNotice": "※ 가맹점 정보는 앱에서 수정할 수 없습니다.\nPC 가맹점 관리자에서 설정해 주세요.", "cardReviewStatus": "신용카드 심사현황", "escrowRegistrationStatus": "에스크로 가입현황", + "settlementAccount": "정산계좌", "bank": "은행", "accountNumber": "계좌번호", @@ -1314,8 +1315,14 @@ "businessAddress": "사업장주소", "websiteUrl": "홈페이지 주소", "onlineRegistrationStatus": "온라인 등록현황", - "available": "사용 가능", - "suspended": "사용 중지", + "usageStatus": { + "available": "사용 가능", + "suspended": "사용 중지" + }, + "escrowStatus": { + "active": "가입", + "inactive": "미가입" + }, "status": "상태", "issueDate": "발급일자", "contractStatus": "계약완료 여부",