diff --git a/src/entities/transaction/ui/section/amount-info-section.tsx b/src/entities/transaction/ui/section/amount-info-section.tsx index 7057a63..07e9e02 100644 --- a/src/entities/transaction/ui/section/amount-info-section.tsx +++ b/src/entities/transaction/ui/section/amount-info-section.tsx @@ -36,11 +36,7 @@ export const AmountInfoSection = ({ const openSubItems: Record> = { // 신용카드 - '01': ['transactionAmount', 'pointAmount', 'couponAmount', - 'escrowFee', 'kakaoMoneyAmount', 'kakaoPointAmount', - 'kakaoDiscountAmount', 'naverPointAmount', 'tossMoneyAmount', - 'tossDiscountAmount', 'paycoPointAmount', 'paycoCouponAmount' - ], + '01': ['transactionAmount', 'pointAmount', 'couponAmount', 'escrowFee'], // 계좌이체 '02': ['mid', 'transactionRequestAmount', 'transactionAmount', 'escrowFee'], // 가상계좌 @@ -58,6 +54,22 @@ export const AmountInfoSection = ({ // 티머니페이 '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) => { @@ -359,7 +371,7 @@ export const AmountInfoSection = ({ ·  카카오즉시할인 @@ -395,7 +407,7 @@ export const AmountInfoSection = ({ ·  토스할인 diff --git a/src/entities/transaction/ui/section/settlement-info-section.tsx b/src/entities/transaction/ui/section/settlement-info-section.tsx index 38b0177..94cfab3 100644 --- a/src/entities/transaction/ui/section/settlement-info-section.tsx +++ b/src/entities/transaction/ui/section/settlement-info-section.tsx @@ -117,7 +117,7 @@ export const SettlementInfoSection = ({ <>
  • ·  승인정산일 - { moment(settlementInfo?.approvalSettlementDate).format('YYYY.MM.DD') } + { settlementInfo?.approvalSettlementDate? moment(settlementInfo?.approvalSettlementDate).format('YYYY.MM.DD'): '' }
  • ·  승인정산금액 @@ -132,7 +132,7 @@ export const SettlementInfoSection = ({
  • ·  취소정산일 - { moment(settlementInfo?.cancelSettlementDate).format('YYYY.MM.DD') } + { settlementInfo?.cancelSettlementDate? moment(settlementInfo?.cancelSettlementDate).format('YYYY.MM.DD'): '' }
  • ·  취소정산금액 diff --git a/src/pages/transaction/escrow/detail-page.tsx b/src/pages/transaction/escrow/detail-page.tsx index 9d026c3..0752c8f 100644 --- a/src/pages/transaction/escrow/detail-page.tsx +++ b/src/pages/transaction/escrow/detail-page.tsx @@ -75,7 +75,7 @@ export const EscrowDetailPage = () => { tid: tid || paramTid, }; escrowDetail(escroDetailParams).then((rs: DetailResponse) => { - setAmountInfo(rs.amountInfo || {}); + setAmountInfo(rs.paymentInfo || {}); setImportantInfo(rs.importantInfo || {}); setEscrowInfo(rs.escrowInfo || {}); setPaymentInfo(rs.paymentInfo || {}); @@ -132,7 +132,7 @@ export const EscrowDetailPage = () => { return ( <>
    -
    +
    @@ -160,6 +160,7 @@ export const EscrowDetailPage = () => { transactionCategory={ TransactionCategory.Escrow } paymentInfo={ paymentInfo } isOpen={ showPaymentInfo } + serviceCode={ serviceCode } onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) } >