diff --git a/src/entities/additional-service/api/use-extension-sms-detail-mutation.ts b/src/entities/additional-service/api/sms-payment-notification/use-extension-sms-detail-mutation.ts similarity index 97% rename from src/entities/additional-service/api/use-extension-sms-detail-mutation.ts rename to src/entities/additional-service/api/sms-payment-notification/use-extension-sms-detail-mutation.ts index 683a8b9..c71049b 100644 --- a/src/entities/additional-service/api/use-extension-sms-detail-mutation.ts +++ b/src/entities/additional-service/api/sms-payment-notification/use-extension-sms-detail-mutation.ts @@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error'; import { ExtensionSmsDetailParams, ExtensionSmsDetailResponse -} from '../model/types'; +} from '../../model/types'; import { useMutation, UseMutationOptions diff --git a/src/entities/additional-service/api/use-extension-sms-download-excel-mutation.ts b/src/entities/additional-service/api/sms-payment-notification/use-extension-sms-download-excel-mutation.ts similarity index 97% rename from src/entities/additional-service/api/use-extension-sms-download-excel-mutation.ts rename to src/entities/additional-service/api/sms-payment-notification/use-extension-sms-download-excel-mutation.ts index cc70a45..eeb447e 100644 --- a/src/entities/additional-service/api/use-extension-sms-download-excel-mutation.ts +++ b/src/entities/additional-service/api/sms-payment-notification/use-extension-sms-download-excel-mutation.ts @@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error'; import { ExtensionSmsDownloadExcelParams, ExtensionSmsDownloadExcelResponse -} from '../model/types'; +} from '../../model/types'; import { useMutation, UseMutationOptions diff --git a/src/entities/additional-service/api/use-extension-sms-list-mutation.ts b/src/entities/additional-service/api/sms-payment-notification/use-extension-sms-list-mutation.ts similarity index 97% rename from src/entities/additional-service/api/use-extension-sms-list-mutation.ts rename to src/entities/additional-service/api/sms-payment-notification/use-extension-sms-list-mutation.ts index 4b972a3..6ae4e27 100644 --- a/src/entities/additional-service/api/use-extension-sms-list-mutation.ts +++ b/src/entities/additional-service/api/sms-payment-notification/use-extension-sms-list-mutation.ts @@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error'; import { ExtensionSmsListParams, ExtensionSmsListResponse -} from '../model/types'; +} from '../../model/types'; import { useMutation, UseMutationOptions diff --git a/src/entities/additional-service/api/use-extension-sms-resend-mutation.ts b/src/entities/additional-service/api/sms-payment-notification/use-extension-sms-resend-mutation.ts similarity index 97% rename from src/entities/additional-service/api/use-extension-sms-resend-mutation.ts rename to src/entities/additional-service/api/sms-payment-notification/use-extension-sms-resend-mutation.ts index a011084..7f83497 100644 --- a/src/entities/additional-service/api/use-extension-sms-resend-mutation.ts +++ b/src/entities/additional-service/api/sms-payment-notification/use-extension-sms-resend-mutation.ts @@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error'; import { ExtensionSmsResendParams, ExtensionSmsResendResponse -} from '../model/types'; +} from '../../model/types'; import { useMutation, UseMutationOptions diff --git a/src/entities/additional-service/model/types.ts b/src/entities/additional-service/model/types.ts index c0cb44b..253fb5e 100644 --- a/src/entities/additional-service/model/types.ts +++ b/src/entities/additional-service/model/types.ts @@ -29,10 +29,11 @@ export enum AdditionalServiceCategory { AccountHolderAuth = 'AccountHolderAuth', AccountHolderSearch = 'AccountHolderSearch', LinkPaymentHistory = 'LinkPaymentHistory', - LinkPaymentPending = 'LinkPaymentPending', + LinkPaymentWait = 'LinkPaymentWait', FundAccountTransfer = 'FundAccountTransfer', FundAccountResult = 'FundAccountResult', SettlementAgency = 'SettlementAgency', + SMSPayment = 'SMSPayment', Payout = 'Payout', Ars = 'Ars', } @@ -106,6 +107,11 @@ export interface FilterProps { setFilterOn: (filterOn: boolean) => void; } +// ======================================== +// SMS 결제 통보 관련 타입들 +// ======================================== + + // ======================================== // 키인결제 관련 타입들 // ======================================== @@ -321,7 +327,7 @@ export interface LinkPaymentHistoryFilterProps extends FilterProps { setSendMethod: (sendMethod: LinkPaymentSendMethod) => void; } -export interface LinkPaymentPendingSendFilterProps extends FilterProps { +export interface LinkPaymentWaitFilterProps extends FilterProps { mid: string; searchType: LinkPaymentSearchType; searchKeyword: string; @@ -714,6 +720,7 @@ export interface ExtensionKeyinApplyResponse { // ======================================== // SMS 결제알림 확장 서비스 +// ======================================== export interface ExtensionSmsResendParams extends ExtensionRequestParams { tid: string; } @@ -723,12 +730,12 @@ export interface ExtensionSmsResendResponse { } export interface ExtensionSmsListParams extends ExtensionRequestParams { - tid: string; searchCl: string; searchValue: string; fromDate: string; toDate: string; smsCl: string; + page?: DefaultRequestPagination; } export interface ExtensionSmsListItemProps { @@ -766,11 +773,10 @@ export interface ExtensionSmsDetailResponse { receiverName: string; sendMessage: string; } - - - +// ======================================== // 알림톡 확장 서비스 +// ======================================== export interface SendMerchantInfoItem { cardApprovalFlag: boolean; cardCancelFlag: boolean; diff --git a/src/entities/additional-service/ui/info-wrap/payment-info-wrap.tsx b/src/entities/additional-service/ui/info-wrap/payment-info-wrap.tsx index e412f31..bfc0419 100644 --- a/src/entities/additional-service/ui/info-wrap/payment-info-wrap.tsx +++ b/src/entities/additional-service/ui/info-wrap/payment-info-wrap.tsx @@ -52,7 +52,7 @@ export const PaymentInfoWrap = ({ - }{(additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) && + }{(additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) && <>
  • 진행상태 diff --git a/src/entities/additional-service/ui/info-wrap/title-info-wrap.tsx b/src/entities/additional-service/ui/info-wrap/title-info-wrap.tsx index 7d968b0..3377704 100644 --- a/src/entities/additional-service/ui/info-wrap/title-info-wrap.tsx +++ b/src/entities/additional-service/ui/info-wrap/title-info-wrap.tsx @@ -58,7 +58,7 @@ export const TitleInfoWrap = ({ )} {/*링크결제_발송대기*/} - {additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending && ( + {additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait && ( <> <>
    diff --git a/src/entities/additional-service/ui/link-payment/detail/detail-deets-Info-section.tsx b/src/entities/additional-service/ui/link-payment/detail/detail-deets-Info-section.tsx deleted file mode 100644 index ba7ac62..0000000 --- a/src/entities/additional-service/ui/link-payment/detail/detail-deets-Info-section.tsx +++ /dev/null @@ -1,38 +0,0 @@ -interface DetailDeetsInfoSectionProps { - deetsInfo?: any; - show?: boolean; - onClickToShowInfo?: () => void; -} - -export const DetailDeetsInfoSection = ({ - deetsInfo, - show, - onClickToShowInfo -}: DetailDeetsInfoSectionProps) => { - - return ( - <> -
    -
    상세 정보
    -
      -
    • - 이메일 - -
      • -
    • - 휴대폰번호 - 01073937470 -
      • -
    • - 상품명 - 곰돌이 -
      • -
    • - 주문번호 - mod201705545050 -
      • -
    -
    - - ) -} \ No newline at end of file diff --git a/src/entities/additional-service/ui/link-payment/detail/detail-payment-info-section.tsx b/src/entities/additional-service/ui/link-payment/detail/detail-payment-info-section.tsx deleted file mode 100644 index b31b54c..0000000 --- a/src/entities/additional-service/ui/link-payment/detail/detail-payment-info-section.tsx +++ /dev/null @@ -1,50 +0,0 @@ -interface DetailPaymentInfoSectionProps { - paymentInfo?: any; - show?: boolean; - onClickToShowInfo?: () => void; -} - -export const DetailPaymentInfoSection = ({ - paymentInfo, - show, - onClickToShowInfo -}: DetailPaymentInfoSectionProps) => { - - return ( - <> -
    -
    결제 정보
    -
      -
    • - 구매자명 - 김*환 -
      • -
    • - 발송수단 - SMS -
      • -
    • - 발송일자 - 2025.06.08 -
      • -
    • - 결제상태(실패횟수) - 미완료(2) -
      • -
    • - 결제수단 - 신용카드 -
      • -
    • - 결제일자 - -
      • -
    • - 결제유효일자 - 2025.06.08 -
      • -
    -
    - - ) -} \ No newline at end of file diff --git a/src/entities/additional-service/ui/link-payment/detail/detail-pending-payment-info-section.tsx b/src/entities/additional-service/ui/link-payment/detail/detail-pending-payment-info-section.tsx deleted file mode 100644 index 4da7e68..0000000 --- a/src/entities/additional-service/ui/link-payment/detail/detail-pending-payment-info-section.tsx +++ /dev/null @@ -1,58 +0,0 @@ -interface DetailPendingPaymentInfoSectionProps { - paymentInfo?: any; - show?: boolean; - onClickToShowInfo?: () => void; -} - -export const DetailPaymentInfoSection = ({ - paymentInfo, - show, - onClickToShowInfo -}: DetailPendingPaymentInfoSectionProps) => { - - return ( - <> -
    -
    결제 정보
    -
      -
    • - 진행상태 - 발송요청 -
      • -
    • - 요청일자 - 2025.06.05 -
      • -
    • - 결제유효일자 - 2025.06.08 -
      • -
    • - 발송수단 - SMS -
      • -
    • - 구매자명 - 김*환 -
      • -
    • - 이메일 - -
      • -
    • - 휴대폰번호 - 01073937470 -
      • -
    • - 상품명 - 곰돌이 -
      • -
    • - 주문번호 - moid201705545050 -
      • -
    -
    - - ) -} \ No newline at end of file diff --git a/src/entities/additional-service/ui/link-payment/filter/link-payment-pending-send-filter.tsx b/src/entities/additional-service/ui/link-payment/filter/link-payment-pending-send-filter.tsx index ba948b5..99d6ef6 100644 --- a/src/entities/additional-service/ui/link-payment/filter/link-payment-pending-send-filter.tsx +++ b/src/entities/additional-service/ui/link-payment/filter/link-payment-pending-send-filter.tsx @@ -4,7 +4,7 @@ import { IMAGE_ROOT } from '@/shared/constants/common'; import { motion } from 'framer-motion'; import { ChangeEvent, useState } from 'react'; import { - LinkPaymentPendingSendFilterProps, + LinkPaymentWaitFilterProps, LinkPaymentSearchType, LinkPaymentSendMethod, LinkPaymentSendingStatus, @@ -15,7 +15,7 @@ import { FilterDateOptions } from '@/entities/common/model/types'; import { FilterCalendar } from '@/shared/ui/filter/calendar'; import { FilterButtonGroups } from '@/shared/ui/filter/button-groups'; -export const LinkPaymentPendingSendFilter = ({ +export const LinkPaymentWaitSendFilter = ({ filterOn, setFilterOn, mid, @@ -32,7 +32,7 @@ export const LinkPaymentPendingSendFilter = ({ setEndDate, setSendMethod, setSendingStatus -}: LinkPaymentPendingSendFilterProps) => { +}: LinkPaymentWaitFilterProps) => { const [filterMid, setFilterMid] = useState(mid); diff --git a/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx b/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx index d3903d7..3bf6c27 100644 --- a/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx +++ b/src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx @@ -1,7 +1,7 @@ import moment from 'moment'; import { IMAGE_ROOT } from "@/shared/constants/common"; import { useState, useEffect } from "react"; -import { LinkPaymentPendingSendFilter } from "./filter/link-payment-pending-send-filter"; +import { LinkPaymentWaitSendFilter } from "./filter/link-payment-pending-send-filter"; import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { PATHS } from "@/shared/constants/paths"; import { LinkPaymentWaitList } from "./link-payment-wait-list"; @@ -164,7 +164,7 @@ export const LinkPaymentWaitSendWrap = () => {
    - { setEndDate={setEndDate} setSendMethod={setSendMethod} setSendingStatus={setSendingStatus} - > + > ) } \ No newline at end of file diff --git a/src/entities/additional-service/ui/list-item.tsx b/src/entities/additional-service/ui/list-item.tsx index 37366eb..908ea6a 100644 --- a/src/entities/additional-service/ui/list-item.tsx +++ b/src/entities/additional-service/ui/list-item.tsx @@ -89,7 +89,7 @@ export const ListItem = ({ else if (paymentStatus === "INACTIVE") { rs = 'gray'; } - } else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) { + } else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) { if (processStatus === "SEND_REQUEST") { rs = 'blue' } else { @@ -132,7 +132,7 @@ export const ListItem = ({ } }); } - else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) { + else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) { navigate(PATHS.additionalService.linkPayment.pendingDetail, { state: { additionalServiceCategory: additionalServiceCategory, @@ -214,7 +214,7 @@ export const ListItem = ({ str = `${accountNo}` } else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory || - additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending + additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait ) { if (sendMethod === "SMS") { str = `${"buyerName"}(${"휴대폰 번호"})` @@ -285,7 +285,7 @@ export const ListItem = ({ ); } } - else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) { + else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) { rs.push(
    {getProcessStatusText(processStatus)} @@ -353,7 +353,7 @@ export const ListItem = ({ ); } else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory || - additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending + additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait ) { rs.push(
    diff --git a/src/pages/additional-service/link-payment/link-payment-wait-detail-page.tsx b/src/pages/additional-service/link-payment/link-payment-wait-detail-page.tsx index 11fa9a8..3cf032c 100644 --- a/src/pages/additional-service/link-payment/link-payment-wait-detail-page.tsx +++ b/src/pages/additional-service/link-payment/link-payment-wait-detail-page.tsx @@ -103,14 +103,14 @@ export const LinkPaymentWaitDetailPage = () => {