diff --git a/src/entities/additional-service/model/types.ts b/src/entities/additional-service/model/types.ts index 0cbfddd..29015ac 100644 --- a/src/entities/additional-service/model/types.ts +++ b/src/entities/additional-service/model/types.ts @@ -122,9 +122,9 @@ export interface FilterProps { export enum KeyInPaymentTransactionStatus { ALL = 'ALL', - APPROVE = 'APPROVE', - ALL_CANCEL = 'ALL_CANCEL', - AFTER_CANCEL = 'AFTER_CANCEL' + APPROVAL = 'APPROVAL', + PRE_CANCEL = 'PRE_CANCEL', + POST_CANCEL = 'POST_CANCEL' } export interface KeyInPaymentListItem { @@ -587,7 +587,7 @@ export interface ExtensionLinkPayWaitDeleteRespone { export interface ExtensionAccountHolderAuthListParams extends ExtensionRequestParams { fromDate: string; toDate: string; - authStatus: String; + authStatus: string; page?: DefaultRequestPagination; } diff --git a/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx b/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx index 814be91..3e72f0f 100644 --- a/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx +++ b/src/entities/additional-service/ui/key-in-payment/filter/key-in-payment-filter.tsx @@ -65,9 +65,9 @@ export const KeyInPaymentFilter = ({ let transactionStatusOption = [ { name: '전체', value: KeyInPaymentTransactionStatus.ALL }, - { name: '승인', value: KeyInPaymentTransactionStatus.APPROVE }, - { name: '전취소', value: KeyInPaymentTransactionStatus.ALL_CANCEL }, - { name: '후취소', value: KeyInPaymentTransactionStatus.AFTER_CANCEL }, + { name: '승인', value: KeyInPaymentTransactionStatus.APPROVAL }, + { name: '전취소', value: KeyInPaymentTransactionStatus.PRE_CANCEL }, + { name: '후취소', value: KeyInPaymentTransactionStatus.POST_CANCEL }, ] return ( diff --git a/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx b/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx index 5c5abca..37a713a 100644 --- a/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx +++ b/src/pages/additional-service/key-in-payment/key-in-payment-page.tsx @@ -21,9 +21,9 @@ import { KeyInPaymentList } from '@/entities/additional-service/ui/key-in-paymen // contant로 옮기기 const requestStatusBtnGroup = [ { name: '전체', value: KeyInPaymentTransactionStatus.ALL }, - { name: '승인', value: KeyInPaymentTransactionStatus.APPROVE }, - { name: '전취소', value: KeyInPaymentTransactionStatus.ALL_CANCEL }, - { name: '후취소', value: KeyInPaymentTransactionStatus.AFTER_CANCEL } + { name: '승인', value: KeyInPaymentTransactionStatus.APPROVAL }, + { name: '전취소', value: KeyInPaymentTransactionStatus.PRE_CANCEL }, + { name: '후취소', value: KeyInPaymentTransactionStatus.POST_CANCEL } ]; export const KeyInPaymentPage = () => { @@ -76,6 +76,8 @@ export const KeyInPaymentPage = () => { page: pageParam }; + console.log("Request Info: ", listParams) + keyinList(listParams).then((rs) => { setListItems(assembleData(rs.content)); }); @@ -132,6 +134,7 @@ export const KeyInPaymentPage = () => { }; const onClickToTransactionStatus = (val: KeyInPaymentTransactionStatus) => { + console.log("TransactionStatus Test: ", val) setTransactionStatus(val); callList({ val: val }); };