This commit is contained in:
focp212@naver.com
2025-11-20 17:01:07 +09:00
parent 10eb25a9af
commit b9a973b7dd
4 changed files with 23 additions and 12 deletions

View File

@@ -58,6 +58,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 = () => { const showFilterDate = () => {
let rs = []; let rs = [];
for(let i=0;i<newList.length;i++){ for(let i=0;i<newList.length;i++){
@@ -77,7 +88,7 @@ export const CalendarSettlementItem = ({
className="settlement-item" className="settlement-item"
onClick={ () => onClickToMoveList(item?.settlementDate) } onClick={ () => onClickToMoveList(item?.settlementDate) }
> >
<div className={ `settlement-tag ${getClassName()}` }>{ item?.settlementStatus }</div> <div className={ `settlement-tag ${getClassName()}` }>{ getStatusName(item?.settlementStatus) }</div>
<div className="settlement-date"> <div className="settlement-date">
{ moment(item?.settlementDate).format('MM.DD(ddd)') } { moment(item?.settlementDate).format('MM.DD(ddd)') }
</div> </div>

View File

@@ -25,7 +25,7 @@ export const ListSummaryExtendSettlement = ({
</li> </li>
<li className="summary-amount-item"> <li className="summary-amount-item">
<span className="label">{t('settlement.totalPgFee')}</span> <span className="label">{t('settlement.totalPgFee')}</span>
<span className="value minus"> <span className="value">
{t('home.money', { value: new Intl.NumberFormat('en-US').format(pgFeeAmount || 0) })} {t('home.money', { value: new Intl.NumberFormat('en-US').format(pgFeeAmount || 0) })}
</span> </span>
</li> </li>
@@ -37,13 +37,13 @@ export const ListSummaryExtendSettlement = ({
</li> </li>
<li className="summary-amount-item"> <li className="summary-amount-item">
<span className="label">{t('settlement.release')}</span> <span className="label">{t('settlement.release')}</span>
<span className="value link"> <span className="value">
{t('home.money', { value: new Intl.NumberFormat('en-US').format(releaseAmount || 0) })} {t('home.money', { value: new Intl.NumberFormat('en-US').format(releaseAmount || 0) })}
</span> </span>
</li> </li>
<li className="summary-amount-item"> <li className="summary-amount-item">
<span className="label">{t('settlement.offset')}</span> <span className="label">{t('settlement.offset')}</span>
<span className="value minus"> <span className="value">
{t('home.money', { value: new Intl.NumberFormat('en-US').format(offsetAmount || 0) })} {t('home.money', { value: new Intl.NumberFormat('en-US').format(offsetAmount || 0) })}
</span> </span>
</li> </li>

View File

@@ -26,7 +26,7 @@ export const ListSummaryExtendTransaction = ({
</li> </li>
<li className="summary-amount-item"> <li className="summary-amount-item">
<span className="label">{t('settlement.paymentFee')}</span> <span className="label">{t('settlement.paymentFee')}</span>
<span className="value minus"> <span className="value">
{t('home.money', { value: new Intl.NumberFormat('en-US').format(paymentFeeAmount || 0) })} {t('home.money', { value: new Intl.NumberFormat('en-US').format(paymentFeeAmount || 0) })}
</span> </span>
</li> </li>
@@ -38,19 +38,19 @@ export const ListSummaryExtendTransaction = ({
</li> </li>
<li className="summary-amount-item"> <li className="summary-amount-item">
<span className="label">{t('settlement.authFee')}</span> <span className="label">{t('settlement.authFee')}</span>
<span className="value link"> <span className="value">
{t('home.money', { value: new Intl.NumberFormat('en-US').format(authFeeAmount || 0) })} {t('home.money', { value: new Intl.NumberFormat('en-US').format(authFeeAmount || 0) })}
</span> </span>
</li> </li>
<li className="summary-amount-item"> <li className="summary-amount-item">
<span className="label">VAT</span> <span className="label">VAT</span>
<span className="value minus"> <span className="value">
{t('home.money', { value: new Intl.NumberFormat('en-US').format(vatAmount || 0) })} {t('home.money', { value: new Intl.NumberFormat('en-US').format(vatAmount || 0) })}
</span> </span>
</li> </li>
<li className="summary-amount-item"> <li className="summary-amount-item">
<span className="label">{t('settlement.preSettlementCancelOffset')}</span> <span className="label">{t('settlement.preSettlementCancelOffset')}</span>
<span className="value minus"> <span className="value">
{t('home.money', { value: new Intl.NumberFormat('en-US').format(preSettlementCancelOffset || 0) })} {t('home.money', { value: new Intl.NumberFormat('en-US').format(preSettlementCancelOffset || 0) })}
</span> </span>
</li> </li>

View File

@@ -468,16 +468,16 @@
}, },
"searchCriteria": "조회기준", "searchCriteria": "조회기준",
"searchPeriod": "조회기간", "searchPeriod": "조회기간",
"settlementCompleted": "정산 완료", "settlementCompleted": "정산 확정",
"depositScheduled": "입금 예정", "depositScheduled": "정산 예정",
"previousMonth": "이전 달", "previousMonth": "이전 달",
"nextMonth": "다음 달", "nextMonth": "다음 달",
"previous": "이전", "previous": "이전",
"next": "다음", "next": "다음",
"scheduled": "예정", "scheduled": "예정",
"completed": "완료", "completed": "확정",
"settlementScheduledAmount": "정산 예정 금액", "settlementScheduledAmount": "정산 예정 금액",
"settlementCompletedAmount": "정산 완료 금액", "settlementCompletedAmount": "정산 확정 금액",
"settlementInfo": "정산 정보", "settlementInfo": "정산 정보",
"transferStatus": "이체상태", "transferStatus": "이체상태",
"transferId": "이체ID", "transferId": "이체ID",