diff --git a/src/entities/transaction/model/types.ts b/src/entities/transaction/model/types.ts index 4f2c26d..1802176 100644 --- a/src/entities/transaction/model/types.ts +++ b/src/entities/transaction/model/types.ts @@ -1,8 +1,8 @@ -import { - DefaulResponsePagination, - DefaultRequestPagination, - SortTypeKeys, - SuccessResult +import { + DefaulResponsePagination, + DefaultRequestPagination, + SortTypeKeys, + SuccessResult } from '@/entities/common/model/types'; export enum CancelTabKeys { @@ -243,7 +243,7 @@ export interface BillingListResponse extends DefaulResponsePagination { content: Array; }; -export interface AllTransactionListSummaryParams extends AllTransactionListParams {} +export interface AllTransactionListSummaryParams extends AllTransactionListParams { } export interface AllTransactionListSummaryResponse { totalCount: number; @@ -280,7 +280,7 @@ export interface CashReceiptListParams { searchNumber?: string; page?: DefaultRequestPagination }; -export interface CashReceiptSummaryParams extends CashReceiptListParams {}; +export interface CashReceiptSummaryParams extends CashReceiptListParams { }; export interface CashReceiptSummaryResponse { approvalCount: number; @@ -315,7 +315,7 @@ export interface CashReceiptExcelDownloadParams { transactionType: CashReceiptTransactionType; processResult: CashReceiptProcessResult; }; -export interface CashReceiptExcelDownloadResponse {}; +export interface CashReceiptExcelDownloadResponse { }; export interface EscrowListParams { mid?: string; searchType?: string; @@ -337,7 +337,7 @@ export interface EscrowDownloadExcelParams { deliveryStatus: EscrowDeliveryStatus; settlementStatus: EscrowSettlementStatus; }; -export interface EscrowDownloadExcelResponse {}; +export interface EscrowDownloadExcelResponse { }; export interface BillingListParams { mid?: string; @@ -363,7 +363,7 @@ export interface BillingExcelParams { processResult: BillingProcessResult, paymentMethod: BillingPaymentMethod }; -export interface BillingExcelResponse {}; +export interface BillingExcelResponse { }; export interface AllTransactionDetailParams { serviceCode?: string; @@ -393,7 +393,7 @@ export interface AmountInfo { multiCouponAmount?: number; receiptAmount?: number; cupDepositAmount?: number; - + customerName?: string; amount?: number; supplyAmount?: number; @@ -436,7 +436,7 @@ export interface ImportantInfo { requestDate?: string; cancelDate?: string; goodsName?: string; - + orderNumber?: string; paymentMethod?: string; productName?: string; @@ -620,7 +620,7 @@ export interface DepositInfo { export interface DetailResponse { amount?: number; customerName?: string; - amountDetail?: AmountInfo; + amountDetail?: AmountInfo; amountInfo?: AmountInfo; importantInfo?: ImportantInfo; paymentInfo?: PaymentInfo; @@ -650,10 +650,10 @@ export interface InfoSectionProps extends DetailResponse { export interface TransactionDownloadExcelParams extends AllTransactionListParams { email: string; }; -export interface TransactionDownloadExcelResponse {}; +export interface TransactionDownloadExcelResponse { }; -export interface AllTransactionCancelParams{ +export interface AllTransactionCancelParams { tid: string; cancelAmount: number; cancelPassword: string; @@ -670,7 +670,7 @@ export interface AllTransactionCancelParams{ serviceCode: string; }; export interface AllTransactionCancelResponse { - + }; export interface AllTransactionCancelInfoParams { serviceCode: string; @@ -707,7 +707,7 @@ export interface DebtPreventionCancelDisplayInfo { }; export interface DebtPreventionCancelRequestInfo { - tid: string; + tid: string; mid: string; gid: string; aid: string; diff --git a/src/entities/transaction/ui/all-transaction-cancel.tsx b/src/entities/transaction/ui/all-transaction-cancel.tsx index effd92b..08d1f9f 100644 --- a/src/entities/transaction/ui/all-transaction-cancel.tsx +++ b/src/entities/transaction/ui/all-transaction-cancel.tsx @@ -113,7 +113,7 @@ export const AllTransactionCancel = ({ const callTransactionCancel = () => { if(debtPreventionCancelDisplayInfo?.isCancel === false){ - snackBar('취소요청이 불가능 합니다.'); + snackBar(t('transaction.cancel.requestNotPossible')); } else{ let transactionCancelParams: AllTransactionCancelParams = { @@ -135,7 +135,7 @@ export const AllTransactionCancel = ({ transactionCancel(transactionCancelParams).then((rs: any) => { console.log(rs); if(rs.resultCode === "2024") { - snackBar(rs.resultMessage); + snackBar(t('transaction.cancel.passwordGroup.pleaseCheckPassword')); setRequestSuccess(false); } else { setRequestSuccess(true); @@ -148,7 +148,7 @@ export const AllTransactionCancel = ({ } }); } - + }; const onClickToClose = () => { diff --git a/src/entities/transaction/ui/detail/escrow-detail.tsx b/src/entities/transaction/ui/detail/escrow-detail.tsx index 618e09a..7f8d1b5 100644 --- a/src/entities/transaction/ui/detail/escrow-detail.tsx +++ b/src/entities/transaction/ui/detail/escrow-detail.tsx @@ -8,7 +8,7 @@ import { EscrowInfoSection } from '@/entities/transaction/ui/section/escrow-info 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 { +import { TransactionCategory, EscrowDetailParams, DetailResponse, @@ -19,7 +19,8 @@ import { SettlementInfo, InfoSectionKeys, MerchantInfo, - AmountInfo + AmountInfo, + EscrowDeliveryStatus } from '@/entities/transaction/model/types'; import { useEscrowMailResendMutation } from '@/entities/transaction/api/use-escrow-mail-resend-mutation'; import { MerchantInfoSection } from '@/entities/transaction/ui/section/merchant-info-section'; @@ -101,7 +102,7 @@ export const EscrowDetail = ({ const onClickToShowMailResend = () => { - if(checkGrant(menuId, 'X')){ + if(checkGrant(menuId, 'W')){ setDownloadBottomSheetOn(true); } else{ @@ -228,10 +229,14 @@ export const EscrowDetail = ({
- + disabled={ + escrowInfo?.deliveryStatus !== EscrowDeliveryStatus.DELIVERY_INSERT && + escrowInfo?.deliveryStatus !== EscrowDeliveryStatus.DELIVERY_COMPLETE + } + >{ t('escrow.mailResend') }
{ !!downloadBottomSheetOn && diff --git a/src/locales/en.json b/src/locales/en.json index 90385ce..b9c0d78 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -715,8 +715,10 @@ }, "passwordGroup": { "cancelPassword": "Cancel Password", - "passwordMismatch": "Password Mismatch" + "passwordMismatch": "Password Mismatch", + "pleaseCheckPassword": "Please check your cancel password." }, + "requestNotPossible": "Cancellation request is not possible.", "afterDeposit": { "title": "Transaction Cancel (After Deposit Cancel)", "notice": "The requested transaction cancellation can be processed after deposit.", @@ -761,7 +763,8 @@ }, "escrow": { "title": "Escrow", - "detailTitle": "Escrow Details" + "detailTitle": "Escrow Details", + "mailResend": "Resend Email" }, "billing": { "title": "Billing", diff --git a/src/locales/ko.json b/src/locales/ko.json index 58a75df..876d675 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -715,8 +715,10 @@ }, "passwordGroup": { "cancelPassword": "취소 비밀번호", - "passwordMismatch": "비밀번호 불일치" + "passwordMismatch": "비밀번호 불일치", + "pleaseCheckPassword": "취소비밀번호를 확인해주세요." }, + "requestNotPossible": "취소요청이 불가능합니다.", "afterDeposit": { "title": "거래취소(입금 후 취소)", "notice": "요청하신 거래취소는 입금 후 취소처리 가능합니다.", @@ -761,7 +763,8 @@ }, "escrow": { "title": "에스크로", - "detailTitle": "에스크로 상세" + "detailTitle": "에스크로 상세", + "mailResend": "메일 재발송" }, "billing": { "title": "빌링", diff --git a/src/pages/additional-service/payout/list-page.tsx b/src/pages/additional-service/payout/list-page.tsx index fc5cc4e..867b9c8 100644 --- a/src/pages/additional-service/payout/list-page.tsx +++ b/src/pages/additional-service/payout/list-page.tsx @@ -59,7 +59,7 @@ export const PayoutListPage = () => { const [status, setStatus] = useState(PayoutDisbursementStatus.ALL); const [minAmount, setMinAmount] = useState(); const [maxAmount, setMaxAmount] = useState(); - + const [downloadBottomSheetOn, setDownloadBottomSheetOn] = useState(false); const [detailOn, setDetailOn] = useState(false); @@ -150,7 +150,7 @@ export const PayoutListPage = () => { && rs.content.length === DEFAULT_PAGE_PARAM.size ); }).catch((e: any) => { - if(e.response?.data?.error?.message){ + if (e.response?.data?.error?.message) { snackBar(e.response?.data?.error?.message); return; } @@ -166,12 +166,12 @@ export const PayoutListPage = () => { }; const onRequestDownloadExcel = ( - selectedMode: DownloadSelectedMode, - userEmail?: string - ) => { - if(selectedMode === DownloadSelectedMode.EMAIL + selectedMode: DownloadSelectedMode, + userEmail?: string + ) => { + if (selectedMode === DownloadSelectedMode.EMAIL && userEmail - ){ + ) { const params: ExtensionPayoutExcelParams = { mid: mid, email: userEmail, @@ -181,7 +181,7 @@ export const PayoutListPage = () => { extensionPayoutExcel(params).then((rs: ExtensionPayoutExcelResponse) => { console.log('Excel Download Status:', rs); }).catch((e: any) => { - if(e.response?.data?.error?.message){ + if (e.response?.data?.error?.message) { snackBar(e.response?.data?.error?.message); return; } @@ -303,7 +303,7 @@ export const PayoutListPage = () => {