From 7d158c8a6e4f8f4240d5b60ef17ddd030935390c Mon Sep 17 00:00:00 2001 From: "focp212@naver.com" Date: Wed, 5 Nov 2025 11:10:33 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=84=B8=20=ED=83=9C=EA=B7=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/detail/settlement-detail.tsx | 106 +++++---- src/entities/support/ui/detail/faq-detail.tsx | 10 +- .../support/ui/detail/notice-detail.tsx | 14 +- src/entities/support/ui/detail/qna-detail.tsx | 50 ++-- .../ui/detail/all-transaction-detail.tsx | 131 ++++++----- .../transaction/ui/detail/billing-detail.tsx | 42 ++-- .../ui/detail/cash-receit-detail.tsx | 66 +++--- .../transaction/ui/detail/escrow-detail.tsx | 100 ++++---- .../ui/detail/tax-invoice-detail.tsx | 36 ++- .../all-transaction/detail-page.tsx | 213 ------------------ .../transaction/all-transaction/list-page.tsx | 4 + 11 files changed, 273 insertions(+), 499 deletions(-) delete mode 100644 src/pages/transaction/all-transaction/detail-page.tsx diff --git a/src/entities/settlement/ui/detail/settlement-detail.tsx b/src/entities/settlement/ui/detail/settlement-detail.tsx index 336ead1..4b8ba22 100644 --- a/src/entities/settlement/ui/detail/settlement-detail.tsx +++ b/src/entities/settlement/ui/detail/settlement-detail.tsx @@ -132,64 +132,62 @@ export const SettlementDetail = ({ > -
-
-
- { (periodType === SettlementPeriodType.SETTLEMENT_DATE) && -
-
-
- {i18n.language === 'en' && {t('home.currencySymbol')}} - - {i18n.language !== 'en' && {t('home.currencyWon')}} -
+
+
+ { (periodType === SettlementPeriodType.SETTLEMENT_DATE) && +
+
+
+ {i18n.language === 'en' && {t('home.currencySymbol')}} + + {i18n.language !== 'en' && {t('home.currencyWon')}}
-
{ moment(settlementDate).format('YYYY.MM.DD') }
- } - { (periodType === SettlementPeriodType.TRANSACTION_DATE) && -
-
-
- {i18n.language === 'en' && {t('home.currencySymbol')}} - - {i18n.language !== 'en' && {t('home.currencyWon')}} -
+
{ moment(settlementDate).format('YYYY.MM.DD') }
+
+ } + { (periodType === SettlementPeriodType.TRANSACTION_DATE) && +
+
+
+ {i18n.language === 'en' && {t('home.currencySymbol')}} + + {i18n.language !== 'en' && {t('home.currencyWon')}}
-
{ merchantName }
- } -
- - -
- { (periodType === SettlementPeriodType.SETTLEMENT_DATE) && - onClickToShowInfo(infoWrapKey) } - > - } - { (periodType === SettlementPeriodType.TRANSACTION_DATE) && - onClickToShowInfo(infoWrapKey) } - > - } -
+
{ merchantName }
+
+ } +
+ + +
+ { (periodType === SettlementPeriodType.SETTLEMENT_DATE) && + onClickToShowInfo(infoWrapKey) } + > + } + { (periodType === SettlementPeriodType.TRANSACTION_DATE) && + onClickToShowInfo(infoWrapKey) } + > + }
diff --git a/src/entities/support/ui/detail/faq-detail.tsx b/src/entities/support/ui/detail/faq-detail.tsx index 5dd17bf..0094ef4 100644 --- a/src/entities/support/ui/detail/faq-detail.tsx +++ b/src/entities/support/ui/detail/faq-detail.tsx @@ -56,12 +56,10 @@ export const FaqDetail = ({ >
-
-
-
{ title }
-
-
-
+
+
{ title }
+
+
} diff --git a/src/entities/support/ui/detail/notice-detail.tsx b/src/entities/support/ui/detail/notice-detail.tsx index 2bf183f..0d84023 100644 --- a/src/entities/support/ui/detail/notice-detail.tsx +++ b/src/entities/support/ui/detail/notice-detail.tsx @@ -62,14 +62,12 @@ export const NoticeDetail = ({ >
-
-
-
-
{ result.title }
-
{ result.regDt? moment(result.regDt).format('YYYY.MM.DD'): '' } | { t(`support.notice.categories.${result.informCl}`) }
-
-
-
+
+
+
{ result.title }
+
{ result.regDt? moment(result.regDt).format('YYYY.MM.DD'): '' } | { t(`support.notice.categories.${result.informCl}`) }
+
+
diff --git a/src/entities/support/ui/detail/qna-detail.tsx b/src/entities/support/ui/detail/qna-detail.tsx index 3de69e7..fc41e94 100644 --- a/src/entities/support/ui/detail/qna-detail.tsx +++ b/src/entities/support/ui/detail/qna-detail.tsx @@ -63,35 +63,33 @@ export const QnaDetail = ({ >
-
-
-
-
- {t('support.qna.detailLabels.title')} - { result?.title } -
-
- {t('support.qna.detailLabels.type')} - { result?.requestType? t(`support.qna.categories.${result?.requestType}`): '' } -
-
- {t('support.qna.detailLabels.registrationDate')} - { result?.requestDate? moment(result?.requestDate).format('YYYY.MM.DD'): '' } -
-
- {t('support.qna.detailLabels.answerDate')} - { result?.answerDate? moment(result?.answerDate).format('YYYY.MM.DD'): '' } -
+
+
+
+ {t('support.qna.detailLabels.title')} + { result?.title }
-
-
-
{t('support.qna.detailLabels.inquiryAnswer')}
-
+
+ {t('support.qna.detailLabels.type')} + { result?.requestType? t(`support.qna.categories.${result?.requestType}`): '' }
-
-
{t('support.qna.detailLabels.inquiryContents')}
-
+
+ {t('support.qna.detailLabels.registrationDate')} + { result?.requestDate? moment(result?.requestDate).format('YYYY.MM.DD'): '' }
+
+ {t('support.qna.detailLabels.answerDate')} + { result?.answerDate? moment(result?.answerDate).format('YYYY.MM.DD'): '' } +
+
+
+
+
{t('support.qna.detailLabels.inquiryAnswer')}
+
+
+
+
{t('support.qna.detailLabels.inquiryContents')}
+
diff --git a/src/entities/transaction/ui/detail/all-transaction-detail.tsx b/src/entities/transaction/ui/detail/all-transaction-detail.tsx index c5a075d..7cb4020 100644 --- a/src/entities/transaction/ui/detail/all-transaction-detail.tsx +++ b/src/entities/transaction/ui/detail/all-transaction-detail.tsx @@ -157,72 +157,71 @@ export const AllTransactionDetail = ({ >
-
-
-
- onClickToOpenInfo(infoSectionKey) } - > -
- - { !!paymentInfo && - <> -
- onClickToOpenInfo(infoSectionKey) } - > - - } - { !!transactionInfo && - <> -
- onClickToOpenInfo(infoSectionKey) } - > - - } - { !!settlementInfo && - <> -
- onClickToOpenInfo(infoSectionKey) } - > - - } - { !!partCancelInfo && - <> -
- onClickToOpenInfo(infoSectionKey) } - > - - } -
+ +
+
+ onClickToOpenInfo(infoSectionKey) } + > +
+ + { !!paymentInfo && + <> +
+ onClickToOpenInfo(infoSectionKey) } + > + + } + { !!transactionInfo && + <> +
+ onClickToOpenInfo(infoSectionKey) } + > + + } + { !!settlementInfo && + <> +
+ onClickToOpenInfo(infoSectionKey) } + > + + } + { !!partCancelInfo && + <> +
+ onClickToOpenInfo(infoSectionKey) } + > + + }
diff --git a/src/entities/transaction/ui/detail/billing-detail.tsx b/src/entities/transaction/ui/detail/billing-detail.tsx index f3c6130..13100d5 100644 --- a/src/entities/transaction/ui/detail/billing-detail.tsx +++ b/src/entities/transaction/ui/detail/billing-detail.tsx @@ -73,31 +73,29 @@ export const BillingDetail = ({ >
-
-
-
-
-
-
- { i18n.language === 'en' && { t('home.currencySymbol') } } - - { i18n.language !== 'en' && { t('home.currencyWon') } } -
+
+
+
+
+
+ { i18n.language === 'en' && { t('home.currencySymbol') } } + + { i18n.language !== 'en' && { t('home.currencyWon') } }
-
- { amountInfo?.buyerName } -
-
-
- +
+ { amountInfo?.buyerName } +
+
+
+
diff --git a/src/entities/transaction/ui/detail/cash-receit-detail.tsx b/src/entities/transaction/ui/detail/cash-receit-detail.tsx index 296a58e..ad64a84 100644 --- a/src/entities/transaction/ui/detail/cash-receit-detail.tsx +++ b/src/entities/transaction/ui/detail/cash-receit-detail.tsx @@ -128,44 +128,42 @@ export const CashReceiptDetail = ({ >
-
-
-
- +
+ onClickToOpenInfo(infoSectionKey) } + purposeType={ purposeType } + canDownloadReceipt={ canDownloadReceipt } + > +
+ +
+ { !!detailInfo && + onClickToOpenInfo(infoSectionKey) } - purposeType={ purposeType } - canDownloadReceipt={ canDownloadReceipt } - > -
- -
- { !!detailInfo && - onClickToOpenInfo(infoSectionKey) } - > - } -
+ > + }
- { (issueInfo?.transactionType === CashReceiptTransactionType.APPROVAL) && - (issueInfo?.processResult === '발급완료') && -
- -
- }
+ { (issueInfo?.transactionType === CashReceiptTransactionType.APPROVAL) && + (issueInfo?.processResult === '발급완료') && +
+ +
+ }
-
-
-
- onClickToOpenInfo(infoSectionKey) } - > -
- -
- onClickToOpenInfo(infoSectionKey) } - > -
- onClickToOpenInfo(infoSectionKey) } - > -
- onClickToOpenInfo(infoSectionKey) } - > -
- onClickToOpenInfo(infoSectionKey) } - > -
- onClickToOpenInfo(infoSectionKey) } - > -
+
+
+ onClickToOpenInfo(infoSectionKey) } + > +
+ +
+ onClickToOpenInfo(infoSectionKey) } + > +
+ onClickToOpenInfo(infoSectionKey) } + > +
+ onClickToOpenInfo(infoSectionKey) } + > +
+ onClickToOpenInfo(infoSectionKey) } + > +
+ onClickToOpenInfo(infoSectionKey) } + >
diff --git a/src/entities/vat-return/ui/detail/tax-invoice-detail.tsx b/src/entities/vat-return/ui/detail/tax-invoice-detail.tsx index ef76c96..6fe1a95 100644 --- a/src/entities/vat-return/ui/detail/tax-invoice-detail.tsx +++ b/src/entities/vat-return/ui/detail/tax-invoice-detail.tsx @@ -117,25 +117,23 @@ export const TaxInvoiceDetail = ({ >
-
-
-
- -
- -
- -
- -
+
+
+ +
+ +
+ +
+
diff --git a/src/pages/transaction/all-transaction/detail-page.tsx b/src/pages/transaction/all-transaction/detail-page.tsx deleted file mode 100644 index b817031..0000000 --- a/src/pages/transaction/all-transaction/detail-page.tsx +++ /dev/null @@ -1,213 +0,0 @@ -import { useEffect, useState } from 'react'; -import { useLocation } from 'react-router'; -import { PATHS } from '@/shared/constants/paths'; -import { Dialog } from '@/shared/ui/dialogs/dialog'; -import { overlay } from 'overlay-kit'; -import { useNavigate } from '@/shared/lib/hooks/use-navigate'; -import { useAllTransactionDetailMutation } from '@/entities/transaction/api/use-all-transaction-detail-mutation'; -import { AmountInfoSection } from '@/entities/transaction/ui/section/amount-info-section'; -import { ImportantInfoSection } from '@/entities/transaction/ui/section/important-info-section'; -import { PaymentInfoSection } from '@/entities/transaction/ui/section/payment-info-section'; -import { TransactionInfoSection } from '@/entities/transaction/ui/section/transaction-info-section'; -import { SettlementInfoSection } from '@/entities/transaction/ui/section/settlement-info-section'; -import { PartCancelInfoSection } from '@/entities/transaction/ui/section/part-cancel-info-section'; -import { HeaderType } from '@/entities/common/model/types'; -import { - TransactionCategory, - AllTransactionDetailParams, - DetailResponse, - AmountInfo, - ImportantInfo, - PaymentInfo, - TransactionInfo, - SettlementInfo, - PartCancelInfo, - InfoSectionKeys -} from '@/entities/transaction/model/types'; -import { - useSetOnBack, - useSetHeaderTitle, - useSetHeaderType, - useSetFooterMode -} from '@/widgets/sub-layout/use-sub-layout'; -import { useTranslation } from 'react-i18next'; - -export const AllTransactionDetailPage = () => { - const { navigate } = useNavigate(); - const { t } = useTranslation(); - const location = useLocation(); - const tid = location.state.tid; - const serviceCode = location.state.serviceCode; - - const [amountInfo, setAmountInfo] = useState(); - const [importantInfo, setImportantInfo] = useState(); - const [paymentInfo, setPaymentInfo] = useState(); - const [transactionInfo, setTransactionInfo] = useState(); - const [settlementInfo, setSettlementInfo] = useState(); - const [partCancelInfo, setPartCancelInfo] = useState(); - const [showAmountInfo, setShowAmountInfo] = useState(false); - const [showPaymentInfo, setShowPaymentInfo] = useState(false); - const [showTransactionInfo, setShowTransactionInfo] = useState(false); - const [showSettlementInfo, setShowSettlementInfo] = useState(false); - const [showPartCancelInfo, setShowPartCancelInfo] = useState(false); - - useSetHeaderTitle(t('transaction.detailTitle')); - useSetHeaderType(HeaderType.RightClose); - useSetOnBack(() => { - navigate(PATHS.transaction.allTransaction.list); - }); - useSetFooterMode(false); - - const { mutateAsync: allTransactionDetail } = useAllTransactionDetailMutation(); - - const callDetail = () => { - let allTransactionDetailParams: AllTransactionDetailParams = { - serviceCode: serviceCode, - tid: tid - }; - allTransactionDetail(allTransactionDetailParams).then((rs: DetailResponse) => { - setAmountInfo(rs.amountInfo); - setImportantInfo(rs.importantInfo); - setPaymentInfo(rs.paymentInfo); - setTransactionInfo(rs.transactionInfo); - setSettlementInfo(rs.settlementInfo); - setPartCancelInfo(rs.partCancelInfo); - }); - }; - useEffect(() => { - callDetail(); - }, []); - - const onClickToNavigate = (path: string) => { - let timeout = setTimeout(() => { - clearTimeout(timeout); - navigate(PATHS.transaction.allTransaction.cancel, { - state: { - serviceCode: serviceCode, - tid: tid - } - }); - }, 10) - }; - - const onClickToCancel = () => { - let msg = t('transaction.confirmCancel'); - - overlay.open(({ - isOpen, - close, - unmount - }) => { - return ( - onClickToNavigate(PATHS.transaction.allTransaction.cancel) } - // onConfirmClick={ () => callCancelInfo() } - message={ msg } - buttonLabel={[t('common.cancel'), t('common.confirm')]} - /> - ); - }); - }; - - const onClickToOpenInfo = (infoSectionKey: InfoSectionKeys) => { - if(infoSectionKey === InfoSectionKeys.Amount){ - setShowAmountInfo(!showAmountInfo); - } - else if(infoSectionKey === InfoSectionKeys.Payment){ - setShowPaymentInfo(!showPaymentInfo); - } - else if(infoSectionKey === InfoSectionKeys.Transaction){ - setShowTransactionInfo(!showTransactionInfo); - } - else if(infoSectionKey === InfoSectionKeys.Settlement){ - setShowSettlementInfo(!showSettlementInfo); - } - else if(infoSectionKey === InfoSectionKeys.PartCancel){ - setShowPartCancelInfo(!showPartCancelInfo); - } - }; - - return ( - <> -
-
-
-
-
- onClickToOpenInfo(infoSectionKey) } - > -
- -
- { !!paymentInfo && - <> - onClickToOpenInfo(infoSectionKey) } - > -
- - } - { !!transactionInfo && - <> - onClickToOpenInfo(infoSectionKey) } - > -
- - } - { !!settlementInfo && - <> - onClickToOpenInfo(infoSectionKey) } - > -
- - } - { !!partCancelInfo && - onClickToOpenInfo(infoSectionKey) } - > - } -
-
-
- -
-
-
-
- - ); -}; \ No newline at end of file diff --git a/src/pages/transaction/all-transaction/list-page.tsx b/src/pages/transaction/all-transaction/list-page.tsx index 2a8ba21..96f85f7 100644 --- a/src/pages/transaction/all-transaction/list-page.tsx +++ b/src/pages/transaction/all-transaction/list-page.tsx @@ -33,7 +33,11 @@ import useIntersectionObserver from '@/widgets/intersection-observer'; import { useTranslation } from 'react-i18next'; import { AllTransactionDetail } from '@/entities/transaction/ui/detail/all-transaction-detail'; +/* 거래내역조회 31 */ export const AllTransactionListPage = () => { + const menuGrantsByKey = useStore.getState().UserStore.menuGrantsByKey; + const myGrants = menuGrantsByKey['31']; + const { navigate } = useNavigate(); const { t, i18n } = useTranslation(); const userMid = useStore.getState().UserStore.mid;