diff --git a/src/entities/payment/ui/info-wrap.tsx b/src/entities/payment/ui/info-wrap.tsx index c53fc63..4fc3013 100644 --- a/src/entities/payment/ui/info-wrap.tsx +++ b/src/entities/payment/ui/info-wrap.tsx @@ -154,7 +154,6 @@ export const InfoWrap = () => { }; paymentCard(params).then((rs: PaymentCardResponse) => { - console.log(rs); setSettlementPeriod(rs.settlementPeriod); setGeneralTabItems(rs.generalTab.items); setInstallmentTabItems(rs.installmentTab.items); @@ -173,7 +172,6 @@ export const InfoWrap = () => { }; paymentNonCard(params).then((rs: PaymentNonCardResponse) => { - console.log(rs); setSettlementPeriod(rs.settlementPeriod); setFeeRanges(rs.accountTransferData.feeRanges); setBankFees(rs.accountTransferData.bankFees); diff --git a/src/entities/transaction/ui/detail/all-transaction-detail.tsx b/src/entities/transaction/ui/detail/all-transaction-detail.tsx index d9786fb..f9394c5 100644 --- a/src/entities/transaction/ui/detail/all-transaction-detail.tsx +++ b/src/entities/transaction/ui/detail/all-transaction-detail.tsx @@ -96,18 +96,6 @@ export const AllTransactionDetail = ({ } }, [detailOn]); - const onClickToNavigate = (path: string) => { - let timeout = setTimeout(() => { - clearTimeout(timeout); - navigate(PATHS.transaction.allTransaction.cancel, { - state: { - serviceCode: serviceCode, - tid: tid - } - }); - }, 10); - }; - const onClickToCancel = () => { if(checkGrant(menuId, 'X')){ let msg = t('transaction.confirmCancel'); diff --git a/src/pages/transaction/transaction-pages.tsx b/src/pages/transaction/transaction-pages.tsx index 5a7900d..fe1f6f0 100644 --- a/src/pages/transaction/transaction-pages.tsx +++ b/src/pages/transaction/transaction-pages.tsx @@ -1,7 +1,6 @@ import { Route, Routes } from 'react-router-dom'; import { ROUTE_NAMES } from '@/shared/constants/route-names'; import { AllTransactionListPage } from './all-transaction/list-page'; -import { AllTransactionCancelPage } from './all-transaction/cancel-page'; import { CashReceiptListPage } from './cash-receipt/list-page'; import { CashReceitHandWrittenIssuancePage } from './cash-receipt/hand-written-issuance-page'; import { EscrowListPage } from './escrow/list-page'; @@ -14,7 +13,6 @@ export const TransactionPages = () => { } /> - } /> } /> diff --git a/src/shared/constants/paths.ts b/src/shared/constants/paths.ts index 6dd655e..f1d94f7 100644 --- a/src/shared/constants/paths.ts +++ b/src/shared/constants/paths.ts @@ -19,11 +19,7 @@ export const PATHS: RouteNamesType = { list: generatePath( `${ROUTE_NAMES.transaction.base}${ROUTE_NAMES.transaction.allTransaction.base}`, ROUTE_NAMES.transaction.allTransaction.list, - ), - cancel: generatePath( - `${ROUTE_NAMES.transaction.base}${ROUTE_NAMES.transaction.allTransaction.base}`, - ROUTE_NAMES.transaction.allTransaction.cancel, - ), + ) }, cashReceipt: { base: generatePath(`${ROUTE_NAMES.transaction.base}${ROUTE_NAMES.transaction.cashReceipt.base}`), @@ -34,14 +30,14 @@ export const PATHS: RouteNamesType = { handWrittenIssuance: generatePath( `${ROUTE_NAMES.transaction.base}${ROUTE_NAMES.transaction.cashReceipt.base}`, ROUTE_NAMES.transaction.cashReceipt.handWrittenIssuance, - ), + ) }, escrow: { base: generatePath(`${ROUTE_NAMES.transaction.base}${ROUTE_NAMES.transaction.escrow.base}`), list: generatePath( `${ROUTE_NAMES.transaction.base}${ROUTE_NAMES.transaction.escrow.base}`, ROUTE_NAMES.transaction.escrow.list, - ), + ) }, billing: { base: generatePath(`${ROUTE_NAMES.transaction.base}${ROUTE_NAMES.transaction.billing.base}`), @@ -52,23 +48,23 @@ export const PATHS: RouteNamesType = { charge: generatePath( `${ROUTE_NAMES.transaction.base}${ROUTE_NAMES.transaction.billing.base}`, ROUTE_NAMES.transaction.billing.charge, - ), + ) } }, settlement: { base: generatePath(ROUTE_NAMES.settlement.base), calendar: generatePath(ROUTE_NAMES.settlement.base, ROUTE_NAMES.settlement.calendar), - list: generatePath(ROUTE_NAMES.settlement.base, ROUTE_NAMES.settlement.list), + list: generatePath(ROUTE_NAMES.settlement.base, ROUTE_NAMES.settlement.list) }, merchant: { base: generatePath(ROUTE_NAMES.merchant.base), info: generatePath(ROUTE_NAMES.merchant.base, ROUTE_NAMES.merchant.info), - registrationStatus: generatePath(ROUTE_NAMES.merchant.base, ROUTE_NAMES.merchant.registrationStatus), + registrationStatus: generatePath(ROUTE_NAMES.merchant.base, ROUTE_NAMES.merchant.registrationStatus) }, payment: { base: generatePath(ROUTE_NAMES.payment.base), info: generatePath(ROUTE_NAMES.payment.base, ROUTE_NAMES.payment.info), - notificationData: generatePath(ROUTE_NAMES.payment.base, ROUTE_NAMES.payment.notificationData), + notificationData: generatePath(ROUTE_NAMES.payment.base, ROUTE_NAMES.payment.notificationData) }, account: { base: generatePath(ROUTE_NAMES.account.base), @@ -76,45 +72,45 @@ export const PATHS: RouteNamesType = { base: generatePath(`${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.user.base}`), manage: generatePath( `${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.user.base}`, - ROUTE_NAMES.account.user.manage, + ROUTE_NAMES.account.user.manage ), loginAuthInfo: generatePath( `${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.user.base}`, - ROUTE_NAMES.account.user.loginAuthInfo, + ROUTE_NAMES.account.user.loginAuthInfo ), accountAuth: generatePath( `${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.user.base}`, - ROUTE_NAMES.account.user.accountAuth, + ROUTE_NAMES.account.user.accountAuth ), menuAuth: generatePath( `${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.user.base}`, - ROUTE_NAMES.account.user.menuAuth, + ROUTE_NAMES.account.user.menuAuth ), addAccount: generatePath( `${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.user.base}`, - ROUTE_NAMES.account.user.addAccount, - ), + ROUTE_NAMES.account.user.addAccount + ) }, password: { base: generatePath(`${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.password.base}`), manage: generatePath( `${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.password.base}`, - ROUTE_NAMES.account.password.manage, + ROUTE_NAMES.account.password.manage ), modifyLoginPassword: generatePath( `${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.password.base}`, - ROUTE_NAMES.account.password.modifyLoginPassword, + ROUTE_NAMES.account.password.modifyLoginPassword ), modifyCancelPassword: generatePath( `${ROUTE_NAMES.account.base}${ROUTE_NAMES.account.password.base}`, - ROUTE_NAMES.account.password.modifyCancelPassword, - ), + ROUTE_NAMES.account.password.modifyCancelPassword + ) } }, vatReturn: { base: generatePath(ROUTE_NAMES.vatReturn.base), list: generatePath(ROUTE_NAMES.vatReturn.base, ROUTE_NAMES.vatReturn.list), - reference: generatePath(ROUTE_NAMES.vatReturn.base, ROUTE_NAMES.vatReturn.reference), + reference: generatePath(ROUTE_NAMES.vatReturn.base, ROUTE_NAMES.vatReturn.reference) }, additionalService: { base: generatePath(ROUTE_NAMES.additionalService.base), @@ -123,7 +119,7 @@ export const PATHS: RouteNamesType = { base: generatePath(`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.ars.base}`), list: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.ars.base}`, - ROUTE_NAMES.additionalService.ars.list, + ROUTE_NAMES.additionalService.ars.list ), request: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.ars.base}`, @@ -142,12 +138,12 @@ export const PATHS: RouteNamesType = { ), request: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.keyInPayment.base}`, - ROUTE_NAMES.additionalService.keyInPayment.request, + ROUTE_NAMES.additionalService.keyInPayment.request ), requestSuccess: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.keyInPayment.base}`, - ROUTE_NAMES.additionalService.keyInPayment.requestSuccess, - ), + ROUTE_NAMES.additionalService.keyInPayment.requestSuccess + ) }, smsPaymentNotification: generatePath(ROUTE_NAMES.additionalService.base, ROUTE_NAMES.additionalService.smsPaymentNotification), accountHolderSearch: { @@ -158,7 +154,7 @@ export const PATHS: RouteNamesType = { ), request: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.accountHolderSearch.base}`, - ROUTE_NAMES.additionalService.accountHolderSearch.request, + ROUTE_NAMES.additionalService.accountHolderSearch.request ) }, accountHolderAuth: { @@ -172,7 +168,7 @@ export const PATHS: RouteNamesType = { base: generatePath(`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`), shippingHistory: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`, - ROUTE_NAMES.additionalService.linkPayment.shippingHistory, + ROUTE_NAMES.additionalService.linkPayment.shippingHistory ), pendingSend: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`, @@ -180,23 +176,23 @@ export const PATHS: RouteNamesType = { ), request: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`, - ROUTE_NAMES.additionalService.linkPayment.request, + ROUTE_NAMES.additionalService.linkPayment.request ), requestConfirm: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`, - ROUTE_NAMES.additionalService.linkPayment.requestConfirm, + ROUTE_NAMES.additionalService.linkPayment.requestConfirm ), confirmSuccess: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`, - ROUTE_NAMES.additionalService.linkPayment.confirmSuccess, + ROUTE_NAMES.additionalService.linkPayment.confirmSuccess ), detail: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`, - ROUTE_NAMES.additionalService.linkPayment.detail, + ROUTE_NAMES.additionalService.linkPayment.detail ), pendingDetail: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`, - ROUTE_NAMES.additionalService.linkPayment.pendingDetail, + ROUTE_NAMES.additionalService.linkPayment.pendingDetail ), separateApproval: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.linkPayment.base}`, @@ -207,67 +203,67 @@ export const PATHS: RouteNamesType = { base: generatePath(`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.alimtalk.base}`), list: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.alimtalk.base}`, - ROUTE_NAMES.additionalService.alimtalk.list, + ROUTE_NAMES.additionalService.alimtalk.list ), setting: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.alimtalk.base}`, - ROUTE_NAMES.additionalService.alimtalk.setting, + ROUTE_NAMES.additionalService.alimtalk.setting ), }, fundAccount: { base: generatePath(`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.fundAccount.base}`), transferList: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.fundAccount.base}`, - ROUTE_NAMES.additionalService.fundAccount.transferList, + ROUTE_NAMES.additionalService.fundAccount.transferList ), transferRequest: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.fundAccount.base}`, - ROUTE_NAMES.additionalService.fundAccount.transferRequest, + ROUTE_NAMES.additionalService.fundAccount.transferRequest ), resultList: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.fundAccount.base}`, - ROUTE_NAMES.additionalService.fundAccount.resultList, + ROUTE_NAMES.additionalService.fundAccount.resultList ), }, settlementAgency: { base: generatePath(`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.settlementAgency.base}`), manage: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.settlementAgency.base}`, - ROUTE_NAMES.additionalService.settlementAgency.manage, + ROUTE_NAMES.additionalService.settlementAgency.manage ), deposit: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.settlementAgency.base}`, - ROUTE_NAMES.additionalService.settlementAgency.deposit, + ROUTE_NAMES.additionalService.settlementAgency.deposit ), member: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.settlementAgency.base}`, - ROUTE_NAMES.additionalService.settlementAgency.member, + ROUTE_NAMES.additionalService.settlementAgency.member ), register: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.settlementAgency.base}`, - ROUTE_NAMES.additionalService.settlementAgency.register, + ROUTE_NAMES.additionalService.settlementAgency.register ), detail: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.settlementAgency.base}`, - ROUTE_NAMES.additionalService.settlementAgency.detail, + ROUTE_NAMES.additionalService.settlementAgency.detail ), }, payout: { base: generatePath(`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.payout.base}`), list: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.payout.base}`, - ROUTE_NAMES.additionalService.payout.list, + ROUTE_NAMES.additionalService.payout.list ), request: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.payout.base}`, - ROUTE_NAMES.additionalService.payout.request, + ROUTE_NAMES.additionalService.payout.request ), }, faceAuth: { base: generatePath(`${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.faceAuth.base}`), list: generatePath( `${ROUTE_NAMES.additionalService.base}${ROUTE_NAMES.additionalService.faceAuth.base}`, - ROUTE_NAMES.additionalService.faceAuth.list, + ROUTE_NAMES.additionalService.faceAuth.list ), } }, @@ -277,38 +273,38 @@ export const PATHS: RouteNamesType = { base: generatePath(`${ROUTE_NAMES.support.base}${ROUTE_NAMES.support.notice.base}`), list: generatePath( `${ROUTE_NAMES.support.base}${ROUTE_NAMES.support.notice.base}`, - ROUTE_NAMES.support.notice.list, + ROUTE_NAMES.support.notice.list ), }, faq: { base: generatePath(`${ROUTE_NAMES.support.base}${ROUTE_NAMES.support.faq.base}`), list: generatePath( `${ROUTE_NAMES.support.base}${ROUTE_NAMES.support.faq.base}`, - ROUTE_NAMES.support.notice.list, + ROUTE_NAMES.support.notice.list ), }, qna: { base: generatePath(`${ROUTE_NAMES.support.base}${ROUTE_NAMES.support.qna.base}`), list: generatePath( `${ROUTE_NAMES.support.base}${ROUTE_NAMES.support.qna.base}`, - ROUTE_NAMES.support.qna.list, + ROUTE_NAMES.support.qna.list ), register: generatePath( `${ROUTE_NAMES.support.base}${ROUTE_NAMES.support.qna.base}`, - ROUTE_NAMES.support.qna.register, + ROUTE_NAMES.support.qna.register ), }, }, setting: generatePath(ROUTE_NAMES.setting), alarm: { base: generatePath(ROUTE_NAMES.alarm.base), - list: generatePath(ROUTE_NAMES.alarm.base, ROUTE_NAMES.alarm.list), + list: generatePath(ROUTE_NAMES.alarm.base, ROUTE_NAMES.alarm.list) }, xkeypad: generatePath(ROUTE_NAMES.xkeypad), xkeypadSample: generatePath(ROUTE_NAMES.xkeypadSample), taxInvoice: { base: generatePath(ROUTE_NAMES.taxInvoice.base), - sample: generatePath(ROUTE_NAMES.taxInvoice.base, ROUTE_NAMES.taxInvoice.sample), + sample: generatePath(ROUTE_NAMES.taxInvoice.base, ROUTE_NAMES.taxInvoice.sample) } }; diff --git a/src/shared/constants/route-names.ts b/src/shared/constants/route-names.ts index 0a0bc3f..8775de2 100644 --- a/src/shared/constants/route-names.ts +++ b/src/shared/constants/route-names.ts @@ -5,7 +5,6 @@ export const ROUTE_NAMES = { allTransaction: { base: '/all-transaction/*', list: 'list', - cancel: 'cancel', }, cashReceipt: { base: '/cash-receipt/*',