diff --git a/src/entities/settlement/ui/calendar-settlement-item.tsx b/src/entities/settlement/ui/calendar-settlement-item.tsx index 187fa83..cbd62bf 100644 --- a/src/entities/settlement/ui/calendar-settlement-item.tsx +++ b/src/entities/settlement/ui/calendar-settlement-item.tsx @@ -57,6 +57,17 @@ export const CalendarSettlementItem = ({ }); } }; + + const getStatusName = (settlementStatus?: SettlementStatus) => { + let title = ''; + if(settlementStatus === SettlementStatus.COMPLETED){ + title = '정산 확정'; + } + else if(settlementStatus === SettlementStatus.SCHEDULED){ + title = '정산 예정'; + } + return title; + }; const showFilterDate = () => { let rs = []; @@ -77,7 +88,7 @@ export const CalendarSettlementItem = ({ className="settlement-item" onClick={ () => onClickToMoveList(item?.settlementDate) } > -
{ item?.settlementStatus }
+
{ getStatusName(item?.settlementStatus) }
{ moment(item?.settlementDate).format('MM.DD(ddd)') }
diff --git a/src/entities/settlement/ui/list-summary-extend-settlement.tsx b/src/entities/settlement/ui/list-summary-extend-settlement.tsx index 4aeca3a..51d73d4 100644 --- a/src/entities/settlement/ui/list-summary-extend-settlement.tsx +++ b/src/entities/settlement/ui/list-summary-extend-settlement.tsx @@ -25,7 +25,7 @@ export const ListSummaryExtendSettlement = ({
  • {t('settlement.totalPgFee')} - + {t('home.money', { value: new Intl.NumberFormat('en-US').format(pgFeeAmount || 0) })}
  • @@ -37,13 +37,13 @@ export const ListSummaryExtendSettlement = ({
  • {t('settlement.release')} - + {t('home.money', { value: new Intl.NumberFormat('en-US').format(releaseAmount || 0) })}
  • {t('settlement.offset')} - + {t('home.money', { value: new Intl.NumberFormat('en-US').format(offsetAmount || 0) })}
  • diff --git a/src/entities/settlement/ui/list-summary-extend-transaction.tsx b/src/entities/settlement/ui/list-summary-extend-transaction.tsx index 51b61ac..e3ee941 100644 --- a/src/entities/settlement/ui/list-summary-extend-transaction.tsx +++ b/src/entities/settlement/ui/list-summary-extend-transaction.tsx @@ -26,7 +26,7 @@ export const ListSummaryExtendTransaction = ({
  • {t('settlement.paymentFee')} - + {t('home.money', { value: new Intl.NumberFormat('en-US').format(paymentFeeAmount || 0) })}
  • @@ -38,19 +38,19 @@ export const ListSummaryExtendTransaction = ({
  • {t('settlement.authFee')} - + {t('home.money', { value: new Intl.NumberFormat('en-US').format(authFeeAmount || 0) })}
  • VAT - + {t('home.money', { value: new Intl.NumberFormat('en-US').format(vatAmount || 0) })}
  • {t('settlement.preSettlementCancelOffset')} - + {t('home.money', { value: new Intl.NumberFormat('en-US').format(preSettlementCancelOffset || 0) })}
  • diff --git a/src/locales/ko.json b/src/locales/ko.json index c7a9423..299d418 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -468,16 +468,16 @@ }, "searchCriteria": "조회기준", "searchPeriod": "조회기간", - "settlementCompleted": "정산 완료", - "depositScheduled": "입금 예정", + "settlementCompleted": "정산 확정", + "depositScheduled": "정산 예정", "previousMonth": "이전 달", "nextMonth": "다음 달", "previous": "이전", "next": "다음", "scheduled": "예정", - "completed": "완료", + "completed": "확정", "settlementScheduledAmount": "정산 예정 금액", - "settlementCompletedAmount": "정산 완료 금액", + "settlementCompletedAmount": "정산 확정 금액", "settlementInfo": "정산 정보", "transferStatus": "이체상태", "transferId": "이체ID",