From 511a6c06fd6b9ade26bcfcb437a6c608f2021a11 Mon Sep 17 00:00:00 2001 From: HyeonJongKim Date: Fri, 14 Nov 2025 10:07:49 +0900 Subject: [PATCH] =?UTF-8?q?-=20=EC=A0=95=EC=82=B0=EC=A1=B0=ED=9A=8C=5F?= =?UTF-8?q?=EC=A0=95=EC=82=B0=EB=82=B4=EC=97=AD=5F=20=EA=B1=B0=EB=9E=98?= =?UTF-8?q?=EA=B8=B0=EC=A4=80=20=EC=A1=B0=ED=9A=8C=20Request=20Enum=20Valu?= =?UTF-8?q?e=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/settlement/model/constant.ts | 2 +- src/entities/settlement/model/types.ts | 2 +- .../settlement/ui/detail/settlement-detail.tsx | 6 +++--- .../settlement/ui/info-wrap/amount-info-wrap.tsx | 2 +- src/entities/settlement/ui/list-item.tsx | 6 +++--- src/entities/settlement/ui/list-wrap.tsx | 10 +++++----- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/entities/settlement/model/constant.ts b/src/entities/settlement/model/constant.ts index 3700bf4..632ef81 100644 --- a/src/entities/settlement/model/constant.ts +++ b/src/entities/settlement/model/constant.ts @@ -3,7 +3,7 @@ import { SettlementPaymentMethod, SettlementPeriodType } from './types'; export const getSettlementPeriodTypeBtnGroup = (t: TFunction) => [ {name: t('settlement.periodType.settlementDate'), value: SettlementPeriodType.SETTLEMENT_DATE }, - {name: t('settlement.periodType.transactionDate'), value: SettlementPeriodType.TRANSACTION_DATE } + {name: t('settlement.periodType.transactionDate'), value: SettlementPeriodType.DEPOSIT_DATE } ]; export const getSettlementPaymentMethodOptionsGroup = (t: TFunction) => [ diff --git a/src/entities/settlement/model/types.ts b/src/entities/settlement/model/types.ts index dcd2fab..0f340bc 100644 --- a/src/entities/settlement/model/types.ts +++ b/src/entities/settlement/model/types.ts @@ -14,7 +14,7 @@ export interface SettlementTabProps { }; export enum SettlementPeriodType { SETTLEMENT_DATE = 'SETTLEMENT_DATE', - TRANSACTION_DATE = 'TRANSACTION_DATE', + DEPOSIT_DATE = 'DEPOSIT_DATE', }; export enum SettlementPaymentMethod { ALL = 'ALL', diff --git a/src/entities/settlement/ui/detail/settlement-detail.tsx b/src/entities/settlement/ui/detail/settlement-detail.tsx index 92d4bd7..94ef168 100644 --- a/src/entities/settlement/ui/detail/settlement-detail.tsx +++ b/src/entities/settlement/ui/detail/settlement-detail.tsx @@ -118,7 +118,7 @@ export const SettlementDetail = ({ if(periodType === SettlementPeriodType.SETTLEMENT_DATE && settlementId){ callSettlementDetail(); } - else if(periodType === SettlementPeriodType.TRANSACTION_DATE && tid){ + else if(periodType === SettlementPeriodType.DEPOSIT_DATE && tid){ callTransactionDetail(); } }, [periodType, settlementId, tid]); @@ -157,7 +157,7 @@ export const SettlementDetail = ({
{ moment(settlementDate).format('YYYY.MM.DD') }
} - { (periodType === SettlementPeriodType.TRANSACTION_DATE) && + { (periodType === SettlementPeriodType.DEPOSIT_DATE) &&
@@ -184,7 +184,7 @@ export const SettlementDetail = ({ onClickToShowInfo={ (infoWrapKey) => onClickToShowInfo(infoWrapKey) } > } - { (periodType === SettlementPeriodType.TRANSACTION_DATE) && + { (periodType === SettlementPeriodType.DEPOSIT_DATE) && } - { (periodType === SettlementPeriodType.TRANSACTION_DATE) && + { (periodType === SettlementPeriodType.DEPOSIT_DATE) &&
  • {t('settlement.transactionAmount')} diff --git a/src/entities/settlement/ui/list-item.tsx b/src/entities/settlement/ui/list-item.tsx index bd02dba..c966ce6 100644 --- a/src/entities/settlement/ui/list-item.tsx +++ b/src/entities/settlement/ui/list-item.tsx @@ -29,7 +29,7 @@ export const ListItem = ({ }); } } - else if(periodType === SettlementPeriodType.TRANSACTION_DATE){ + else if(periodType === SettlementPeriodType.DEPOSIT_DATE){ if(setDetailData && tid){ setDetailData({ tid: tid, @@ -44,7 +44,7 @@ export const ListItem = ({ if(periodType === SettlementPeriodType.SETTLEMENT_DATE && settlementAmount){ if(settlementAmount > 0) rs = 'blue'; } - else if(periodType === SettlementPeriodType.TRANSACTION_DATE && transactionAmount){ + else if(periodType === SettlementPeriodType.DEPOSIT_DATE && transactionAmount){ if(transactionAmount > 0) rs = 'blue'; } return rs; @@ -63,7 +63,7 @@ export const ListItem = ({ { (periodType === SettlementPeriodType.SETTLEMENT_DATE) &&
    { `${merchantName}(${mid})` }
    } - { (periodType === SettlementPeriodType.TRANSACTION_DATE) && + { (periodType === SettlementPeriodType.DEPOSIT_DATE) && <>
    { `${approvalNumber || 'NO_NUMBER'}(${mid})` }
    diff --git a/src/entities/settlement/ui/list-wrap.tsx b/src/entities/settlement/ui/list-wrap.tsx index 9cee9a4..a178f26 100644 --- a/src/entities/settlement/ui/list-wrap.tsx +++ b/src/entities/settlement/ui/list-wrap.tsx @@ -98,7 +98,7 @@ export const ListWrap = ({ if(periodType === SettlementPeriodType.SETTLEMENT_DATE){ callSettlementList(type); } - else if(periodType === SettlementPeriodType.TRANSACTION_DATE){ + else if(periodType === SettlementPeriodType.DEPOSIT_DATE){ callTransactionList(type); } }; @@ -486,7 +486,7 @@ export const ListWrap = ({ } } - { (periodType === SettlementPeriodType.TRANSACTION_DATE) && + { (periodType === SettlementPeriodType.DEPOSIT_DATE) && { isOpenSummary && changePeriodType(SettlementPeriodType.SETTLEMENT_DATE) } >{t('settlement.merchantBasis')} changePeriodType(SettlementPeriodType.TRANSACTION_DATE) } + className={ `keyword-tag ${(periodType === SettlementPeriodType.DEPOSIT_DATE)? 'active': ''}` } + onClick={ () => changePeriodType(SettlementPeriodType.DEPOSIT_DATE) } >{t('settlement.transactionBasis')}
@@ -526,7 +526,7 @@ export const ListWrap = ({ getSettlementDateListDateGroup() } - { (periodType === SettlementPeriodType.TRANSACTION_DATE) && + { (periodType === SettlementPeriodType.DEPOSIT_DATE) && getTransactionDateListDateGroup() }