- 계좌 점유 인증 페이지 , 계좌 성명 조회 페이지 수정
- 알림톡_서비스 설정 수정 - 일부 부정확한 페이지 UI 수정
This commit is contained in:
@@ -83,9 +83,6 @@ export const AccountHolderAuthPage = () => {
|
||||
|
||||
const onClickToAuthStatus = (val: AccountHolderAuthStatus) => {
|
||||
setAuthStatus(val);
|
||||
callList({
|
||||
status: val
|
||||
});
|
||||
};
|
||||
|
||||
|
||||
@@ -97,7 +94,7 @@ export const AccountHolderAuthPage = () => {
|
||||
if (selectedEmail) {
|
||||
const params: ExtensionAccountHolderAuthDownloadExcelParams = { // 추후 수정필요
|
||||
mid: mid,
|
||||
//email: selectedEmail,
|
||||
email: selectedEmail,
|
||||
fromDate: fromDate,
|
||||
toDate: toDate,
|
||||
authStatus: authStatus
|
||||
@@ -160,6 +157,10 @@ export const AccountHolderAuthPage = () => {
|
||||
<SortTypeBox
|
||||
sortType={sortType}
|
||||
onClickToSort={onClickToSort}
|
||||
sortOptions={[
|
||||
{ key: SortTypeKeys.LATEST, label: '최신순' },
|
||||
{ key: SortTypeKeys.OLDEST, label: '오래된순' }
|
||||
]}
|
||||
></SortTypeBox>
|
||||
<div className="excrow">
|
||||
<div className="full-menu-keywords no-padding">
|
||||
|
||||
@@ -21,9 +21,7 @@ import { getAuthResultStatusText } from '@/entities/additional-service/model/fac
|
||||
export const AccountHolderAuthDetailPage = () => {
|
||||
const { navigate } = useNavigate();
|
||||
const location = useLocation();
|
||||
|
||||
const { mid, tid } = location.state || {};
|
||||
|
||||
const [detail, setDetail] = useState<ExtensionAccountHolderAuthDetailResponse>();
|
||||
|
||||
useSetHeaderTitle('계좌점유인증 상세');
|
||||
@@ -59,8 +57,8 @@ export const AccountHolderAuthDetailPage = () => {
|
||||
<div className="pay-top">
|
||||
<div className="num-amount">
|
||||
<span className="amount">{detail?.accountName}</span>
|
||||
<span className="amount">{detail?.accountNo}</span>
|
||||
</div>
|
||||
<span className="num-store">{detail?.accountNo}</span>
|
||||
<div className="num-day">{getDate(detail?.requestDate)}</div>
|
||||
</div>
|
||||
<div className="detail-divider"></div>
|
||||
@@ -97,12 +95,7 @@ export const AccountHolderAuthDetailPage = () => {
|
||||
</li>
|
||||
<li className="kv-row">
|
||||
<span className="k">실패 사유</span>
|
||||
{detail?.authResult !== "MATCHED" &&
|
||||
<span className="v">{getAuthResultStatusText(detail?.authResult)}</span>
|
||||
}
|
||||
{detail?.authResult === "MATCHED" &&
|
||||
<span className="v">-</span>
|
||||
}
|
||||
<span className="v">{detail?.failReason ? getAuthResultStatusText(detail?.failReason) : '-' }</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@@ -88,7 +88,7 @@ export const AccountHolderSearchPage = () => {
|
||||
if (selectedEmail) {
|
||||
downloadExcel({
|
||||
mid: mid,
|
||||
//email: selectedEmail,
|
||||
email: selectedEmail,
|
||||
searchCl: searchCl,
|
||||
searchValue: searchValue,
|
||||
fromDate: startDate,
|
||||
@@ -111,9 +111,6 @@ export const AccountHolderSearchPage = () => {
|
||||
|
||||
const onClickToTransactionStatus = (val: AccountHolderResultStatus) => {
|
||||
setResultStatus(val);
|
||||
callList({
|
||||
resultStatus: val
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
@@ -169,6 +166,10 @@ export const AccountHolderSearchPage = () => {
|
||||
<SortTypeBox
|
||||
sortType={sortType}
|
||||
onClickToSort={onClickToSort}
|
||||
sortOptions={[
|
||||
{ key: SortTypeKeys.LATEST, label: '최신순' },
|
||||
{ key: SortTypeKeys.OLDEST, label: '오래된순' }
|
||||
]}
|
||||
></SortTypeBox>
|
||||
<div className="excrow">
|
||||
<div className="full-menu-keywords no-padding">
|
||||
|
||||
@@ -73,7 +73,7 @@ export const AccountHolderSearchDetailPage = () => {
|
||||
</li>
|
||||
<li className="kv-row">
|
||||
<span className="k">조회 일시</span>
|
||||
<span className="v">{detail?.requestDate}</span>
|
||||
<span className="v">{getDate(detail?.requestDate)}</span>
|
||||
</li>
|
||||
<li className="kv-row">
|
||||
<span className="k">결과</span>
|
||||
@@ -81,7 +81,7 @@ export const AccountHolderSearchDetailPage = () => {
|
||||
</li>
|
||||
<li className="kv-row">
|
||||
<span className="k">실패사유</span>
|
||||
<span className="v">{detail?.failReason}</span>
|
||||
<span className="v">{detail?.failReason ? detail?.failReason : '-' }</span>
|
||||
</li>
|
||||
<li className="kv-row">
|
||||
<span className="k">은행</span>
|
||||
|
||||
@@ -14,7 +14,7 @@ import { useStore } from '@/shared/model/store';
|
||||
|
||||
export const AccountHolderSearchRequestPage = () => {
|
||||
const { navigate } = useNavigate();
|
||||
|
||||
const userMid = useStore.getState().UserStore.mid;
|
||||
const midOptions = useStore.getState().UserStore.selectOptionsMids
|
||||
const bankList = useStore.getState().CommonStore.bankList
|
||||
|
||||
@@ -28,7 +28,7 @@ export const AccountHolderSearchRequestPage = () => {
|
||||
const { mutateAsync: accountHolderSearchRequest } = useExtensionAccountHolderSearchRequestMutation();
|
||||
|
||||
const [formData, setFormData] = useState({
|
||||
mid: '',
|
||||
mid: userMid,
|
||||
bankCode: '',
|
||||
accountNo: ''
|
||||
})
|
||||
|
||||
@@ -3,15 +3,15 @@ import { PATHS } from '@/shared/constants/paths';
|
||||
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
|
||||
import { HeaderType } from '@/entities/common/model/types';
|
||||
import { IMAGE_ROOT } from '@/shared/constants/common';
|
||||
import {
|
||||
useSetHeaderTitle,
|
||||
useSetHeaderType,
|
||||
useSetFooterMode,
|
||||
import {
|
||||
useSetHeaderTitle,
|
||||
useSetHeaderType,
|
||||
useSetFooterMode,
|
||||
useSetOnBack
|
||||
} from '@/widgets/sub-layout/use-sub-layout';
|
||||
import { useExtensionAlimtalkSettingDetailMutation } from '@/entities/additional-service/api/alimtalk/use-extansion-alimtalk-setting-detail-mutation';
|
||||
import { useExtensionAlimtalkSettingSaveMutation } from '@/entities/additional-service/api/alimtalk/use-extansion-alimtalk-setting-save-mutation';
|
||||
import {
|
||||
import {
|
||||
AlimtalkSettingFlagKeys,
|
||||
ExtensionAlimtalkSettingDetailParams,
|
||||
ExtensionAlimtalkSettingDetailResponse,
|
||||
@@ -22,13 +22,14 @@ import {
|
||||
import { useEffect, useState } from 'react';
|
||||
import { AlimTalkSettingServiceRow } from '@/entities/additional-service/ui/alimtalk/setting-service-row';
|
||||
import { useStore } from '@/shared/model/store';
|
||||
import { snackBar } from '@/shared/lib';
|
||||
|
||||
export const AlimtalkSettingPage = () => {
|
||||
const { navigate } = useNavigate();
|
||||
const userMid = useStore.getState().UserStore.mid;
|
||||
|
||||
const [mid, setMid] = useState<string>(userMid);
|
||||
|
||||
|
||||
const [merchantCardApprovalFlag, setMerchantCardApprovalFlag] = useState<boolean>(false);
|
||||
const [merchantCardCancelFlag, setMerchantCardCancelFlag] = useState<boolean>(false);
|
||||
const [merchantBankApprovalFlag, setMerchantBankApprovalFlag] = useState<boolean>(false);
|
||||
@@ -54,10 +55,10 @@ export const AlimtalkSettingPage = () => {
|
||||
};
|
||||
|
||||
alimtalkSettingDetail(params).then((rs: ExtensionAlimtalkSettingDetailResponse) => {
|
||||
let sendMerchantInfo = rs.content[0]?.sendMerchantInfo;
|
||||
let sendUserInfo = rs.content[0]?.sendUserInfo;
|
||||
let sendMerchantInfo = rs.sendMerchantInfo;
|
||||
let sendUserInfo = rs.sendUserInfo;
|
||||
|
||||
if(sendMerchantInfo){
|
||||
if (sendMerchantInfo) {
|
||||
setMerchantCardApprovalFlag((sendMerchantInfo?.cardApprovalFlag || false));
|
||||
setMerchantCardCancelFlag(sendMerchantInfo?.cardCancelFlag || false);
|
||||
setMerchantBankApprovalFlag(sendMerchantInfo?.bankApprovalFlag || false);
|
||||
@@ -66,7 +67,7 @@ export const AlimtalkSettingPage = () => {
|
||||
setMerchantVirtureAccountDepositCompleteFlag(sendMerchantInfo?.virtureAccountDepositCompleteFlag || false);
|
||||
setMerchantVirtureAccountRefundFlag(sendMerchantInfo?.virtureAccountRefundFlag || false);
|
||||
}
|
||||
if(sendUserInfo){
|
||||
if (sendUserInfo) {
|
||||
setUserCardApprovalFlag(sendUserInfo?.cardApprovalFlag || false);
|
||||
setUserCardCancelFlag(sendUserInfo?.cardCancelFlag || false);
|
||||
setUserBankApprovalFlag(sendUserInfo?.bankApprovalFlag || false);
|
||||
@@ -79,7 +80,7 @@ export const AlimtalkSettingPage = () => {
|
||||
};
|
||||
|
||||
const callSettingSave = () => {
|
||||
let params: ExtensionAlimtalkSettingSaveParams = {
|
||||
let params: ExtensionAlimtalkSettingSaveParams = {
|
||||
mid: mid,
|
||||
sendMerchantInfo: {
|
||||
cardApprovalFlag: merchantCardApprovalFlag,
|
||||
@@ -100,9 +101,14 @@ export const AlimtalkSettingPage = () => {
|
||||
virtureAccountRefundFlag: userVirtureAccountRefundFlag
|
||||
},
|
||||
};
|
||||
alimtalkSettingSave(params).then((rs) => {
|
||||
console.log(rs);
|
||||
});
|
||||
alimtalkSettingSave(params)
|
||||
.then((rs) => {
|
||||
snackBar("저장을 성공하였습니다.");
|
||||
})
|
||||
.catch((error) => {
|
||||
const failReason = error?.response?.data?.message || error?.message || "알 수 없는 오류";
|
||||
snackBar(`[실패] ${failReason}`);
|
||||
});
|
||||
};
|
||||
|
||||
useSetHeaderTitle('알림톡 결제통보');
|
||||
@@ -152,52 +158,52 @@ export const AlimtalkSettingPage = () => {
|
||||
<div className="service-section">
|
||||
<AlimTalkSettingServiceRow
|
||||
title='신용카드(승인)'
|
||||
merchantFlag={ merchantCardApprovalFlag }
|
||||
userFlag={ userCardApprovalFlag }
|
||||
setMerchantFlag={ setMerchantCardApprovalFlag }
|
||||
setUserFlag={ setUserCardApprovalFlag }
|
||||
merchantFlag={merchantCardApprovalFlag}
|
||||
userFlag={userCardApprovalFlag}
|
||||
setMerchantFlag={setMerchantCardApprovalFlag}
|
||||
setUserFlag={setUserCardApprovalFlag}
|
||||
></AlimTalkSettingServiceRow>
|
||||
<AlimTalkSettingServiceRow
|
||||
title='신용카드(취소)'
|
||||
merchantFlag={ merchantBankApprovalFlag }
|
||||
userFlag={ userCardCancelFlag }
|
||||
setMerchantFlag={ setMerchantBankApprovalFlag }
|
||||
setUserFlag={ setUserCardCancelFlag }
|
||||
merchantFlag={merchantBankApprovalFlag}
|
||||
userFlag={userCardCancelFlag}
|
||||
setMerchantFlag={setMerchantBankApprovalFlag}
|
||||
setUserFlag={setUserCardCancelFlag}
|
||||
></AlimTalkSettingServiceRow>
|
||||
<AlimTalkSettingServiceRow
|
||||
title='계좌이체(승인)'
|
||||
merchantFlag={ merchantBankApprovalFlag }
|
||||
userFlag={ userBankApprovalFlag }
|
||||
setMerchantFlag={ setMerchantBankApprovalFlag }
|
||||
setUserFlag={ setUserBankApprovalFlag }
|
||||
merchantFlag={merchantBankApprovalFlag}
|
||||
userFlag={userBankApprovalFlag}
|
||||
setMerchantFlag={setMerchantBankApprovalFlag}
|
||||
setUserFlag={setUserBankApprovalFlag}
|
||||
></AlimTalkSettingServiceRow>
|
||||
<AlimTalkSettingServiceRow
|
||||
title='계좌이체(취소)'
|
||||
merchantFlag={ merchantBankCancelFlag }
|
||||
userFlag={ userBankCancelFlag }
|
||||
setMerchantFlag={ setMerchantBankCancelFlag }
|
||||
setUserFlag={ setUserBankCancelFlag }
|
||||
merchantFlag={merchantBankCancelFlag}
|
||||
userFlag={userBankCancelFlag}
|
||||
setMerchantFlag={setMerchantBankCancelFlag}
|
||||
setUserFlag={setUserBankCancelFlag}
|
||||
></AlimTalkSettingServiceRow>
|
||||
<AlimTalkSettingServiceRow
|
||||
title='가상계좌(입금요청)'
|
||||
merchantFlag={ merchantVirtureAccountDepositRequestFlag }
|
||||
userFlag={ userVirtureAccountDepositRequestFlag }
|
||||
setMerchantFlag={ setMerchantVirtureAccountDepositRequestFlag }
|
||||
setUserFlag={ setUserVirtureAccountDepositRequestFlag }
|
||||
merchantFlag={merchantVirtureAccountDepositRequestFlag}
|
||||
userFlag={userVirtureAccountDepositRequestFlag}
|
||||
setMerchantFlag={setMerchantVirtureAccountDepositRequestFlag}
|
||||
setUserFlag={setUserVirtureAccountDepositRequestFlag}
|
||||
></AlimTalkSettingServiceRow>
|
||||
<AlimTalkSettingServiceRow
|
||||
title='가상계좌(입금완료)'
|
||||
merchantFlag={ merchantVirtureAccountDepositCompleteFlag }
|
||||
userFlag={ userVirtureAccountDepositCompleteFlag }
|
||||
setMerchantFlag={ setMerchantVirtureAccountDepositCompleteFlag }
|
||||
setUserFlag={ setUserVirtureAccountDepositCompleteFlag }
|
||||
merchantFlag={merchantVirtureAccountDepositCompleteFlag}
|
||||
userFlag={userVirtureAccountDepositCompleteFlag}
|
||||
setMerchantFlag={setMerchantVirtureAccountDepositCompleteFlag}
|
||||
setUserFlag={setUserVirtureAccountDepositCompleteFlag}
|
||||
></AlimTalkSettingServiceRow>
|
||||
<AlimTalkSettingServiceRow
|
||||
title='가상계좌(환불)'
|
||||
merchantFlag={ merchantVirtureAccountRefundFlag }
|
||||
userFlag={ userVirtureAccountRefundFlag }
|
||||
setMerchantFlag={ setMerchantVirtureAccountRefundFlag }
|
||||
setUserFlag={ setUserVirtureAccountRefundFlag }
|
||||
merchantFlag={merchantVirtureAccountRefundFlag}
|
||||
userFlag={userVirtureAccountRefundFlag}
|
||||
setMerchantFlag={setMerchantVirtureAccountRefundFlag}
|
||||
setUserFlag={setUserVirtureAccountRefundFlag}
|
||||
></AlimTalkSettingServiceRow>
|
||||
</div>
|
||||
</div>
|
||||
@@ -205,7 +211,7 @@ export const AlimtalkSettingPage = () => {
|
||||
<div className="apply-row">
|
||||
<button
|
||||
className="btn-50 btn-blue flex-1"
|
||||
onClick={ () => onClickToSave() }
|
||||
onClick={() => onClickToSave()}
|
||||
>저장</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -117,9 +117,6 @@ export const ArsListPage = () => {
|
||||
};
|
||||
const onClickToPaymentStatus = (val: PaymentStatus) => {
|
||||
setPaymentStatus(val);
|
||||
callList({
|
||||
paymentStatus: val
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
@@ -103,9 +103,6 @@ export const FaceAuthPage = () => {
|
||||
|
||||
const onClickToAuthResult = (val: FaceAuthResult) => {
|
||||
setAuthResult(val);
|
||||
callList({
|
||||
authResult: val
|
||||
});
|
||||
};
|
||||
|
||||
const getListDateGroup = () => {
|
||||
|
||||
@@ -14,7 +14,6 @@ import { useExtensionFundAccountTransferDetailMutation } from '@/entities/additi
|
||||
import { ExtensionFundAccountTransferDetailParams, ExtensionFundAccountTransferDetailResponse, ExtensionFundAccountTransferRegistParams, ExtensionFundAccountTransferRequestParams, ExtensionFundAccountTransferRequestResponse, FundAccountStatus } from '@/entities/additional-service/model/fund-account/types';
|
||||
import { getFundAccountStatusName } from '@/entities/additional-service/model/fund-account/constant';
|
||||
import moment from 'moment';
|
||||
import { useExtensionFundAccountTransferRegistMutation } from '@/entities/additional-service/api/fund-account/use-extension-fund-account-transfer-regist-mutation';
|
||||
import { snackBar } from '@/shared/lib';
|
||||
import { useExtensionFundAccountTransferRequestMutation } from '@/entities/additional-service/api/fund-account/use-extension-fund-account-transfer-request-mutation';
|
||||
|
||||
@@ -76,9 +75,9 @@ export const FundAccountTransferDetailPage = () => {
|
||||
></NumericFormat>
|
||||
</span>
|
||||
</div>
|
||||
<div className="num-store">{detail?.amount}({detail?.accountName})</div>
|
||||
<div className="num-store">{detail?.accountName}({detail?.accountNo})</div>
|
||||
<div className="num-day">
|
||||
{detail?.registDate ? moment(detail.registDate, 'YYYYMMDDHHmmss').format('YYYY.MM.DD') : '-'}
|
||||
{detail?.registDate ? moment(detail.registDate, 'YYYYMMDDHHmmss').format('YYYY.MM.DD HH:mm:ss') : '-'}
|
||||
</div>
|
||||
</div>
|
||||
<div className="detail-divider"></div>
|
||||
@@ -98,7 +97,7 @@ export const FundAccountTransferDetailPage = () => {
|
||||
<li className="kv-row">
|
||||
<span className="k">요청일자</span>
|
||||
<span className="v">
|
||||
{detail?.requestDate ? moment(detail.requestDate, 'YYYYMMDDHHmmss').format('YYYY.MM.DD HH:mm:ss') : '-'}
|
||||
{detail?.requestDate ? moment(detail.requestDate, 'YYYYMMDDHHmmss').format('YYYY.MM.DD') : '-'}
|
||||
</span>
|
||||
</li>
|
||||
<li className="kv-row">
|
||||
|
||||
@@ -123,9 +123,6 @@ export const KeyInPaymentPage = () => {
|
||||
|
||||
const onClickToPaymentStatus = (val: KeyInPaymentPaymentStatus) => {
|
||||
setPaymentStatus(val);
|
||||
callList({
|
||||
status: val
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
@@ -145,11 +145,10 @@ export const PayoutListPage = () => {
|
||||
]);
|
||||
|
||||
const getListDateGroup = () => {
|
||||
let rs: JSX.Element[] = [];
|
||||
let rs= [];
|
||||
let date = '';
|
||||
let list: PayoutContent[] = [];
|
||||
let list= [];
|
||||
for (let i = 0; i < listItems.length; i++) {
|
||||
// requestDate 또는 settlementDate format: "20211018140420" (YYYYMMDDHHmmss)
|
||||
let itemDateStr = '';
|
||||
if (searchDateType === PayoutSearchDateType.REQUEST_DATE) {
|
||||
itemDateStr = listItems[i]?.requestDate || '';
|
||||
@@ -161,7 +160,6 @@ export const PayoutListPage = () => {
|
||||
date = itemDate;
|
||||
}
|
||||
if (date !== itemDate) {
|
||||
// 날짜가 바뀌면 이전 리스트를 푸시 (날짜 업데이트 전에!)
|
||||
if (list.length > 0) {
|
||||
rs.push(
|
||||
<ListDateGroup
|
||||
@@ -173,7 +171,7 @@ export const PayoutListPage = () => {
|
||||
></ListDateGroup>
|
||||
);
|
||||
}
|
||||
date = itemDate; // 그 다음에 날짜 업데이트
|
||||
date = itemDate;
|
||||
list = [];
|
||||
}
|
||||
list.push(listItems[i] as any);
|
||||
|
||||
Reference in New Issue
Block a user