nicepayments/nice-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.bpsoft.co.kr/nicepayments/nice-app-web

Browse Source
This commit is contained in:
focp212@naver.com
2025-09-24 09:51:51 +09:00
parent 4e4d0fd554 152510e514
commit 0b5f6e9d8f
14 changed files with 32 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/entities/additional-service/api/use-extension-sms-detail-mutation.ts → src/entities/additional-service/api/sms-payment-notification/use-extension-sms-detail-mutation.ts
View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsDetailParams,
ExtensionSmsDetailResponse
} from '../model/types';
} from '../../model/types';
import {
useMutation,
UseMutationOptions

2
src/entities/additional-service/api/use-extension-sms-download-excel-mutation.ts → src/entities/additional-service/api/sms-payment-notification/use-extension-sms-download-excel-mutation.ts
View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsDownloadExcelParams,
ExtensionSmsDownloadExcelResponse
} from '../model/types';
} from '../../model/types';
import {
useMutation,
UseMutationOptions

2
src/entities/additional-service/api/use-extension-sms-list-mutation.ts → src/entities/additional-service/api/sms-payment-notification/use-extension-sms-list-mutation.ts
View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsListParams,
ExtensionSmsListResponse
} from '../model/types';
} from '../../model/types';
import {
useMutation,
UseMutationOptions

2
src/entities/additional-service/api/use-extension-sms-resend-mutation.ts → src/entities/additional-service/api/sms-payment-notification/use-extension-sms-resend-mutation.ts
View File

@@ -5,7 +5,7 @@ import { CBDCAxiosError } from '@/shared/@types/error';
import {
ExtensionSmsResendParams,
ExtensionSmsResendResponse
} from '../model/types';
} from '../../model/types';
import {
useMutation,
UseMutationOptions

18
src/entities/additional-service/model/types.ts
View File

@@ -30,10 +30,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',
}
@@ -107,6 +108,11 @@ export interface FilterProps {
setFilterOn: (filterOn: boolean) => void;
}
// ========================================
// SMS 결제 통보 관련 타입들
// ========================================
// ========================================
// 키인결제 관련 타입들
// ========================================
@@ -322,7 +328,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;
@@ -716,6 +722,7 @@ export interface ExtensionKeyinApplyResponse {
// ========================================
// SMS 결제알림 확장 서비스
// ========================================
export interface ExtensionSmsResendParams extends ExtensionRequestParams {
tid: string;
}
@@ -725,12 +732,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 {
@@ -768,11 +775,10 @@ export interface ExtensionSmsDetailResponse {
receiverName: string;
sendMessage: string;
}
// ========================================
// 알림톡 확장 서비스
// ========================================
export interface SendMerchantInfoItem {
cardApprovalFlag: boolean;
cardCancelFlag: boolean;

2
src/entities/additional-service/ui/info-wrap/payment-info-wrap.tsx
View File

@@ -52,7 +52,7 @@ export const PaymentInfoWrap = ({
</span>
</li>
</>
}{(additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) &&
}{(additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) &&
<>
<li className="kv-row">
<span className="k">진행상태</span>

2
src/entities/additional-service/ui/info-wrap/title-info-wrap.tsx
View File

@@ -58,7 +58,7 @@ export const TitleInfoWrap = ({
</>
)}
{/*링크결제_발송대기*/}
{additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending && (
{additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait && (
<>
<>
<div className="num-amount">

38
src/entities/additional-service/ui/link-payment/detail/detail-deets-Info-section.tsx
View File

@@ -1,38 +0,0 @@
interface DetailDeetsInfoSectionProps {
deetsInfo?: any;
show?: boolean;
onClickToShowInfo?: () => void;
}
export const DetailDeetsInfoSection = ({
deetsInfo,
show,
onClickToShowInfo
}: DetailDeetsInfoSectionProps) => {
return (
<>
<div className="txn-section">
<div className="section-title">상세 정보</div>
<ul className="kv-list">
<li className="kv-row">
<span className="k">이메일</span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k">휴대폰번호</span>
<span className="v">01073937470</span>
</li>
<li className="kv-row">
<span className="k">상품명</span>
<span className="v">곰돌이</span>
</li>
<li className="kv-row">
<span className="k">주문번호</span>
<span className="v">mod201705545050</span>
</li>
</ul>
</div>
</>
)
}

50
src/entities/additional-service/ui/link-payment/detail/detail-payment-info-section.tsx
View File

@@ -1,50 +0,0 @@
interface DetailPaymentInfoSectionProps {
paymentInfo?: any;
show?: boolean;
onClickToShowInfo?: () => void;
}
export const DetailPaymentInfoSection = ({
paymentInfo,
show,
onClickToShowInfo
}: DetailPaymentInfoSectionProps) => {
return (
<>
<div className="txn-section">
<div className="section-title">결제 정보</div>
<ul className="kv-list">
<li className="kv-row">
<span className="k">구매자명</span>
<span className="v">김*환</span>
</li>
<li className="kv-row">
<span className="k">발송수단</span>
<span className="v">SMS</span>
</li>
<li className="kv-row">
<span className="k">발송일자</span>
<span className="v">2025.06.08</span>
</li>
<li className="kv-row">
<span className="k">결제상태(실패횟수)</span>
<span className="v">미완료(2)</span>
</li>
<li className="kv-row">
<span className="k">결제수단</span>
<span className="v">신용카드</span>
</li>
<li className="kv-row">
<span className="k">결제일자</span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k">결제유효일자</span>
<span className="v">2025.06.08</span>
</li>
</ul>
</div>
</>
)
}

58
src/entities/additional-service/ui/link-payment/detail/detail-pending-payment-info-section.tsx
View File

@@ -1,58 +0,0 @@
interface DetailPendingPaymentInfoSectionProps {
paymentInfo?: any;
show?: boolean;
onClickToShowInfo?: () => void;
}
export const DetailPaymentInfoSection = ({
paymentInfo,
show,
onClickToShowInfo
}: DetailPendingPaymentInfoSectionProps) => {
return (
<>
<div className="txn-section">
<div className="section-title">결제 정보</div>
<ul className="kv-list">
<li className="kv-row">
<span className="k">진행상태</span>
<span className="v">발송요청</span>
</li>
<li className="kv-row">
<span className="k">요청일자</span>
<span className="v">2025.06.05</span>
</li>
<li className="kv-row">
<span className="k">결제유효일자</span>
<span className="v">2025.06.08</span>
</li>
<li className="kv-row">
<span className="k">발송수단</span>
<span className="v">SMS</span>
</li>
<li className="kv-row">
<span className="k">구매자명</span>
<span className="v">김*환</span>
</li>
<li className="kv-row">
<span className="k">이메일</span>
<span className="v"></span>
</li>
<li className="kv-row">
<span className="k">휴대폰번호</span>
<span className="v">01073937470</span>
</li>
<li className="kv-row">
<span className="k">상품명</span>
<span className="v">곰돌이</span>
</li>
<li className="kv-row">
<span className="k">주문번호</span>
<span className="v">moid201705545050</span>
</li>
</ul>
</div>
</>
)
}

6
src/entities/additional-service/ui/link-payment/filter/link-payment-pending-send-filter.tsx
View File

@@ -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<string>(mid);

8
src/entities/additional-service/ui/link-payment/link-payment-wait-send-wrap.tsx
View File

@@ -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 = () => {
<LinkPaymentWaitList
listItems={listItems}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentPending}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentWait}
></LinkPaymentWaitList>
<div className="apply-row">
<button
@@ -172,7 +172,7 @@ export const LinkPaymentWaitSendWrap = () => {
onClick={() => onClickToNavigate()}
>결제 신청</button>
</div>
<LinkPaymentPendingSendFilter
<LinkPaymentWaitSendFilter
filterOn={filterOn}
setFilterOn={setFilterOn}
mid={mid}
@@ -189,7 +189,7 @@ export const LinkPaymentWaitSendWrap = () => {
setEndDate={setEndDate}
setSendMethod={setSendMethod}
setSendingStatus={setSendingStatus}
></LinkPaymentPendingSendFilter>
></LinkPaymentWaitSendFilter>
</>
)
}

10
src/entities/additional-service/ui/list-item.tsx
View File

@@ -91,7 +91,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 {
@@ -134,7 +134,7 @@ export const ListItem = ({
}
});
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) {
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) {
navigate(PATHS.additionalService.linkPayment.pendingDetail, {
state: {
additionalServiceCategory: additionalServiceCategory,
@@ -229,7 +229,7 @@ export const ListItem = ({
str = `${accountNo}`;
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory ||
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait
) {
if (sendMethod === "SMS") {
str = `${"buyerName"}(${"휴대폰 번호"})`;
@@ -303,7 +303,7 @@ export const ListItem = ({
);
}
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending) {
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait) {
rs.push(
<div className="transaction-details">
<span>{getProcessStatusText(processStatus)}</span>
@@ -384,7 +384,7 @@ export const ListItem = ({
);
}
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory ||
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentWait
) {
rs.push(
<div className="transaction-amount">

4
src/pages/additional-service/link-payment/link-payment-wait-detail-page.tsx
View File

@@ -103,14 +103,14 @@ export const LinkPaymentWaitDetailPage = () => {
<div className="tab-pane sub active">
<div className="pay-top">
<TitleInfoWrap
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentPending}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentWait}
titleInfo={titleInfo}
></TitleInfoWrap>
<div className="txn-divider minus"></div>
<PaymentInfoWrap
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentPending}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentWait}
paymentInfo={paymentInfo}
></PaymentInfoWrap>
</div>