amount info 수정
This commit is contained in:
@@ -36,11 +36,7 @@ export const AmountInfoSection = ({
|
|||||||
|
|
||||||
const openSubItems: Record<string, Array<string>> = {
|
const openSubItems: Record<string, Array<string>> = {
|
||||||
// 신용카드
|
// 신용카드
|
||||||
'01': ['transactionAmount', 'pointAmount', 'couponAmount',
|
'01': ['transactionAmount', 'pointAmount', 'couponAmount', 'escrowFee'],
|
||||||
'escrowFee', 'kakaoMoneyAmount', 'kakaoPointAmount',
|
|
||||||
'kakaoDiscountAmount', 'naverPointAmount', 'tossMoneyAmount',
|
|
||||||
'tossDiscountAmount', 'paycoPointAmount', 'paycoCouponAmount'
|
|
||||||
],
|
|
||||||
// 계좌이체
|
// 계좌이체
|
||||||
'02': ['mid', 'transactionRequestAmount', 'transactionAmount', 'escrowFee'],
|
'02': ['mid', 'transactionRequestAmount', 'transactionAmount', 'escrowFee'],
|
||||||
// 가상계좌
|
// 가상계좌
|
||||||
@@ -58,6 +54,22 @@ export const AmountInfoSection = ({
|
|||||||
// 티머니페이
|
// 티머니페이
|
||||||
'31': ['mid', 'transactionAmount'],
|
'31': ['mid', 'transactionAmount'],
|
||||||
};
|
};
|
||||||
|
if(newAmountInfo?.partServiceCode === 'E015'){
|
||||||
|
openSubItems['01']?.push('paycoPointAmount');
|
||||||
|
openSubItems['01']?.push('paycoCouponAmount');
|
||||||
|
}
|
||||||
|
else if(newAmountInfo?.partServiceCode === 'E016'){
|
||||||
|
openSubItems['01']?.push('kakaoMoneyAmount');
|
||||||
|
openSubItems['01']?.push('kakaoPointAmount');
|
||||||
|
openSubItems['01']?.push('kakaoDiscountAmount');
|
||||||
|
}
|
||||||
|
else if(newAmountInfo?.partServiceCode === 'E020'){
|
||||||
|
openSubItems['01']?.push('naverPointAmount');
|
||||||
|
}
|
||||||
|
else if(newAmountInfo?.partServiceCode === 'E025'){
|
||||||
|
openSubItems['01']?.push('tossMoneyAmount');
|
||||||
|
openSubItems['01']?.push('tossDiscountAmount');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
const checkValue = (val: any) => {
|
const checkValue = (val: any) => {
|
||||||
@@ -359,7 +371,7 @@ export const AmountInfoSection = ({
|
|||||||
<span className="label">· 카카오즉시할인</span>
|
<span className="label">· 카카오즉시할인</span>
|
||||||
<span className="value">
|
<span className="value">
|
||||||
<NumericFormat
|
<NumericFormat
|
||||||
value={ amountInfo?.supplyAmount }
|
value={ amountInfo?.kakaoDiscountAmount }
|
||||||
thousandSeparator
|
thousandSeparator
|
||||||
displayType="text"
|
displayType="text"
|
||||||
></NumericFormat>
|
></NumericFormat>
|
||||||
@@ -395,7 +407,7 @@ export const AmountInfoSection = ({
|
|||||||
<span className="label">· 토스할인</span>
|
<span className="label">· 토스할인</span>
|
||||||
<span className="value">
|
<span className="value">
|
||||||
<NumericFormat
|
<NumericFormat
|
||||||
value={ amountInfo?.supplyAmount }
|
value={ amountInfo?.tossDiscountAmount }
|
||||||
thousandSeparator
|
thousandSeparator
|
||||||
displayType="text"
|
displayType="text"
|
||||||
></NumericFormat>
|
></NumericFormat>
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ export const SettlementInfoSection = ({
|
|||||||
<>
|
<>
|
||||||
<li className="kv-row">
|
<li className="kv-row">
|
||||||
<span className="k">· 승인정산일</span>
|
<span className="k">· 승인정산일</span>
|
||||||
<span className="v">{ moment(settlementInfo?.approvalSettlementDate).format('YYYY.MM.DD') }</span>
|
<span className="v">{ settlementInfo?.approvalSettlementDate? moment(settlementInfo?.approvalSettlementDate).format('YYYY.MM.DD'): '' }</span>
|
||||||
</li>
|
</li>
|
||||||
<li className="kv-row">
|
<li className="kv-row">
|
||||||
<span className="k">· 승인정산금액</span>
|
<span className="k">· 승인정산금액</span>
|
||||||
@@ -132,7 +132,7 @@ export const SettlementInfoSection = ({
|
|||||||
</li>
|
</li>
|
||||||
<li className="kv-row">
|
<li className="kv-row">
|
||||||
<span className="k">· 취소정산일</span>
|
<span className="k">· 취소정산일</span>
|
||||||
<span className="v">{ moment(settlementInfo?.cancelSettlementDate).format('YYYY.MM.DD') }</span>
|
<span className="v">{ settlementInfo?.cancelSettlementDate? moment(settlementInfo?.cancelSettlementDate).format('YYYY.MM.DD'): '' }</span>
|
||||||
</li>
|
</li>
|
||||||
<li className="kv-row">
|
<li className="kv-row">
|
||||||
<span className="k">· 취소정산금액</span>
|
<span className="k">· 취소정산금액</span>
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ export const EscrowDetailPage = () => {
|
|||||||
tid: tid || paramTid,
|
tid: tid || paramTid,
|
||||||
};
|
};
|
||||||
escrowDetail(escroDetailParams).then((rs: DetailResponse) => {
|
escrowDetail(escroDetailParams).then((rs: DetailResponse) => {
|
||||||
setAmountInfo(rs.amountInfo || {});
|
setAmountInfo(rs.paymentInfo || {});
|
||||||
setImportantInfo(rs.importantInfo || {});
|
setImportantInfo(rs.importantInfo || {});
|
||||||
setEscrowInfo(rs.escrowInfo || {});
|
setEscrowInfo(rs.escrowInfo || {});
|
||||||
setPaymentInfo(rs.paymentInfo || {});
|
setPaymentInfo(rs.paymentInfo || {});
|
||||||
@@ -132,7 +132,7 @@ export const EscrowDetailPage = () => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<main>
|
<main>
|
||||||
<div className="tab-content">
|
<div className="tab-content pb-86">
|
||||||
<div className="tab-pane sub active">
|
<div className="tab-pane sub active">
|
||||||
<div className="option-list">
|
<div className="option-list">
|
||||||
<div className="txn-detail">
|
<div className="txn-detail">
|
||||||
@@ -160,6 +160,7 @@ export const EscrowDetailPage = () => {
|
|||||||
transactionCategory={ TransactionCategory.Escrow }
|
transactionCategory={ TransactionCategory.Escrow }
|
||||||
paymentInfo={ paymentInfo }
|
paymentInfo={ paymentInfo }
|
||||||
isOpen={ showPaymentInfo }
|
isOpen={ showPaymentInfo }
|
||||||
|
serviceCode={ serviceCode }
|
||||||
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
|
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
|
||||||
></PaymentInfoSection>
|
></PaymentInfoSection>
|
||||||
<div className="txn-divider"></div>
|
<div className="txn-divider"></div>
|
||||||
|
|||||||
Reference in New Issue
Block a user