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

mid 셋팅및 코드 정리

Browse Source
This commit is contained in:
focp212@naver.com
2025-10-10 15:26:04 +09:00
parent 306629be53
commit ced334f90f
41 changed files with 692 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/entities/account/ui/user-manage-wrap.tsx
View File

@@ -5,19 +5,17 @@ import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant';
import { UserManageAuthList } from './user-manage-auth-list';
import { useUserFindMutation } from '@/entities/user/api/use-user-find-mutation';
import { UserListItem } from '@/entities/user/model/types';
import { useStore } from '@/shared/model/store';
export const UserManageWrap = () => {
const midOptions = useStore.getState().UserStore.selectOptionsMids;
const userMid = useStore.getState().UserStore.mid;
const { navigate } = useNavigate();
const { mutateAsync: userFind } = useUserFindMutation();
const [userItems, setUserItems] = useState<Array<UserListItem>>([]);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const midList = [
{ value: 'nictest00m', label: 'nictest00m' },
{ value: 'nictest01m', label: 'nictest01m' },
{ value: 'nictest02m', label: 'nictest02m' },
];
const [mid, setMid] = useState<string>(userMid);
const callList = (mid: string) => {
setPageParam(pageParam);
@@ -44,10 +42,19 @@ export const UserManageWrap = () => {
<>
<div className="ing-list">
<div className="input-wrapper top-select mt-16">
<select value={mid} onChange={e => setMid(e.target.value)}>
{midList.map(item => (
<option key={item.value} value={item.value}>{item.label}</option>
))}
<select
value={mid}
onChange={e => setMid(e.target.value)}
>
{
midOptions.map((value, index) => (
<option
key={ value.value }
value={ value.value }
selected={ (userMid === value.value)? true: false }
>{ value.name }</option>
))
}
</select>
</div>

4
src/entities/additional-service/ui/fund-account/transfer-list-wrap.tsx
View File

@@ -25,15 +25,17 @@ import { useExtensionFundAccountBalanceMutation } from '../../api/fund-account/u
import { NumericFormat } from 'react-number-format';
import { FundAccountTransactionFilter } from '../filter/fund-account-trnasaction-filter';
import { PATHS } from '@/shared/constants/paths';
import { useStore } from '@/shared/model/store';
export const FundAccountTransferListWrap = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState<Record<string, Array<FundAccountTransferContentItem>>>({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [receiveAccountName, setReceiveAccountName] = useState<string>('');
const [receiveAccountNo, setReceiveAccountNo] = useState<string>('');
const [fromDate, setFromDate] = useState(moment().format('YYYYMMDD'));

348
src/entities/additional-service/ui/link-payment/link-payment-history-wrap.tsx
View File

@@ -11,196 +11,198 @@ import { LinkPaymentSearchType, } from "../../model/types";
import { useExtensionLinkPayHistoryListMutation } from '../../api/link-payment/use-extension-link-pay-history-list-mutation';
import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant';
import { useExtensionLinkPayHistoryDownloadExcelMutation } from '../../api/link-payment/use-extension-link-pay-history-download-excel-mutation';
import { useStore } from '@/shared/model/store';
const processResultBtnGroup = [
{ name: '전체', value: ProcessResult.ALL },
{ name: '성공', value: ProcessResult.SUCCESS },
{ name: '실패', value: ProcessResult.FAIL }
]
{ name: '전체', value: ProcessResult.ALL },
{ name: '성공', value: ProcessResult.SUCCESS },
{ name: '실패', value: ProcessResult.FAIL }
];
export const LinkPaymentHistoryWrap = () => {
const { navigate } = useNavigate();
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [filterOn, setFilterOn] = useState<boolean>(false);
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState({});
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [searchType, setSearchType] = useState<LinkPaymentSearchType>(LinkPaymentSearchType.ALL)
const [searchKeyword, setSearchKeyword] = useState<string>('');
const [startDate, setStartDate] = useState(moment().format('YYYY-MM-DD'));
const [endDate, setEndDate] = useState(moment().format('YYYY-MM-DD'));
const [transactionStatus, setTransactionStatus] = useState<LinkPaymentTransactionStatus>(LinkPaymentTransactionStatus.ALL)
const [processResult, setProcessResult] = useState<ProcessResult>(ProcessResult.ALL)
const [sendMethod, setSendMethod] = useState<LinkPaymentSendMethod>(LinkPaymentSendMethod.ALL)
const [filterOn, setFilterOn] = useState<boolean>(false);
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState({});
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>(userMid);
const [searchType, setSearchType] = useState<LinkPaymentSearchType>(LinkPaymentSearchType.ALL)
const [searchKeyword, setSearchKeyword] = useState<string>('');
const [startDate, setStartDate] = useState(moment().format('YYYY-MM-DD'));
const [endDate, setEndDate] = useState(moment().format('YYYY-MM-DD'));
const [transactionStatus, setTransactionStatus] = useState<LinkPaymentTransactionStatus>(LinkPaymentTransactionStatus.ALL)
const [processResult, setProcessResult] = useState<ProcessResult>(ProcessResult.ALL)
const [sendMethod, setSendMethod] = useState<LinkPaymentSendMethod>(LinkPaymentSendMethod.ALL)
const { mutateAsync: linkPayHistoryList } = useExtensionLinkPayHistoryListMutation();
const { mutateAsync: downloadExcel } = useExtensionLinkPayHistoryDownloadExcelMutation();
const { mutateAsync: linkPayHistoryList } = useExtensionLinkPayHistoryListMutation();
const { mutateAsync: downloadExcel } = useExtensionLinkPayHistoryDownloadExcelMutation();
const onClickToNavigate = () => {
navigate(PATHS.additionalService.linkPayment.request)
}
const onClickToNavigate = () => {
navigate(PATHS.additionalService.linkPayment.request)
};
const callList = (option?: {
sortBy?: string,
val?: string
}) => {
pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy;
setPageParam(pageParam);
const callList = (option?: {
sortBy?: string,
val?: string
}) => {
pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy;
setPageParam(pageParam);
let listParams = {
mid: mid,
searchCl: searchType === LinkPaymentSearchType.ALL ? '' : searchType,
searchValue: searchKeyword,
paymentMethod: 'st', // 추후 변경 필요 빼야함
fromDate: startDate,
toDate: endDate,
paymentStatus: transactionStatus === LinkPaymentTransactionStatus.ALL ? '' : transactionStatus,
sendStatus: processResult === ProcessResult.ALL ? '' : processResult,
sendMethod: sendMethod === LinkPaymentSendMethod.ALL ? '' : sendMethod,
page: pageParam
}
let listParams = {
mid: mid,
searchCl: searchType === LinkPaymentSearchType.ALL ? '' : searchType,
searchValue: searchKeyword,
paymentMethod: 'st', // 추후 변경 필요 빼야함
fromDate: startDate,
toDate: endDate,
paymentStatus: transactionStatus === LinkPaymentTransactionStatus.ALL ? '' : transactionStatus,
sendStatus: processResult === ProcessResult.ALL ? '' : processResult,
sendMethod: sendMethod === LinkPaymentSendMethod.ALL ? '' : sendMethod,
page: pageParam
};
linkPayHistoryList(listParams).then((rs) => {
setListItems(assembleData(rs.content));
})
};
linkPayHistoryList(listParams).then((rs) => {
setListItems(assembleData(rs.content));
});
};
const assembleData = (content: Array<LinkPaymentHistoryListItem>) => {
let data: any = {};
if (content && content.length > 0) {
for (let i = 0; i < content?.length; i++) {
let sendDate = content[i]?.sendDate?.substring(0, 8);
let groupDate = moment(sendDate).format('YYYYMMDD');
if (!!groupDate && !data.hasOwnProperty(groupDate)) {
data[groupDate] = [];
}
if (!!groupDate && data.hasOwnProperty(groupDate)) {
data[groupDate].push(content[i]);
}
}
}
console.log('Data : ', data)
return data;
};
const assembleData = (content: Array<LinkPaymentHistoryListItem>) => {
let data: any = {};
if(content && content.length > 0){
for(let i=0;i<content?.length;i++){
let sendDate = content[i]?.sendDate?.substring(0, 8);
let groupDate = moment(sendDate).format('YYYYMMDD');
if(!!groupDate && !data.hasOwnProperty(groupDate)){
data[groupDate] = [];
}
if(!!groupDate && data.hasOwnProperty(groupDate)){
data[groupDate].push(content[i]);
}
}
}
console.log('Data : ', data);
return data;
};
const onClickToDownloadExcel = () => {
downloadExcel({
mid: mid,
searchCl: searchType === LinkPaymentSearchType.ALL ? '' : searchType,
searchValue: searchKeyword,
paymentMethod: 'st', // 추후 변경 필요 빼야함
fromDate: startDate,
toDate: endDate,
paymentStatus: transactionStatus === LinkPaymentTransactionStatus.ALL ? '' : transactionStatus,
sendStatus: processResult === ProcessResult.ALL ? '' : processResult,
sendMethod: sendMethod === LinkPaymentSendMethod.ALL ? '' : sendMethod,
}).then((rs) => {
console.log('Excel Dowload Status : ' + rs.status)
});
};
const onClickToDownloadExcel = () => {
downloadExcel({
mid: mid,
searchCl: (searchType === LinkPaymentSearchType.ALL)? '': searchType,
searchValue: searchKeyword,
paymentMethod: 'st', // 추후 변경 필요 빼야함
fromDate: startDate,
toDate: endDate,
paymentStatus: (transactionStatus === LinkPaymentTransactionStatus.ALL)? '': transactionStatus,
sendStatus: (processResult === ProcessResult.ALL)? '': processResult,
sendMethod: (sendMethod === LinkPaymentSendMethod.ALL)? '': sendMethod,
}).then((rs) => {
console.log('Excel Dowload Status : ' + rs.status);
});
};
const onClickProcessResult = (val: ProcessResult) => {
setProcessResult(val);
}
const onClickProcessResult = (val: ProcessResult) => {
setProcessResult(val);
}
const onClickToSort = (sort: SortByKeys) => {
setSortBy(sort);
callList({ sortBy: sort });
};
const onClickToSort = (sort: SortByKeys) => {
setSortBy(sort);
callList({ sortBy: sort });
};
const onClickToOpenFilter = () => {
setFilterOn(!filterOn);
};
const onClickToOpenFilter = () => {
setFilterOn(!filterOn);
};
useEffect(() => {
callList();
}, []);
useEffect(() => {
callList();
}, []);
return (
<>
<section className="summary-section pt-30">
<div className="credit-controls">
<div>
<input
className="credit-period"
type="text"
value={moment(startDate).format('YYYY.MM.DD') + '-' + moment(endDate).format('YYYY.MM.DD')}
readOnly={true}
/>
<button
className="filter-btn">
<img
src={IMAGE_ROOT + '/ico_setting.svg'}
alt="검색옵션"
onClick={() => onClickToOpenFilter()}
/>
</button>
</div>
<button
className="download-btn"
aria-label="다운로드"
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}
alt="다운로드"
onClick={() => onClickToDownloadExcel()}
/>
</button>
</div>
</section>
return (
<>
<section className="summary-section pt-30">
<div className="credit-controls">
<div>
<input
className="credit-period"
type="text"
value={moment(startDate).format('YYYY.MM.DD') + '-' + moment(endDate).format('YYYY.MM.DD')}
readOnly={true}
/>
<button
className="filter-btn">
<img
src={IMAGE_ROOT + '/ico_setting.svg'}
alt="검색옵션"
onClick={() => onClickToOpenFilter()}
/>
</button>
</div>
<button
className="download-btn"
aria-label="다운로드"
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}
alt="다운로드"
onClick={() => onClickToDownloadExcel()}
/>
</button>
</div>
</section>
<div className="filter-section">
<SortOptionsBox
sortBy={sortBy}
onClickToSort={onClickToSort}
>
</SortOptionsBox>
<div className="excrow">
<div className="full-menu-keywords no-padding">
{
processResultBtnGroup.map((value, index) => (
<span
key={`key-service-code=${index}`}
className={`keyword-tag ${(processResult === value.value) ? 'active' : ''}`}
onClick={() => onClickProcessResult(value.value)}
>{value.name}</span>
))
}
</div>
</div>
</div>
<div className="filter-section">
<SortOptionsBox
sortBy={sortBy}
onClickToSort={onClickToSort}
>
</SortOptionsBox>
<div className="excrow">
<div className="full-menu-keywords no-padding">
{
processResultBtnGroup.map((value, index) => (
<span
key={`key-service-code=${index}`}
className={`keyword-tag ${(processResult === value.value) ? 'active' : ''}`}
onClick={() => onClickProcessResult(value.value)}
>{ value.name }</span>
))
}
</div>
</div>
</div>
<LinkPaymentHistoryList
listItems={listItems}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentHistory}
></LinkPaymentHistoryList>
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={() => onClickToNavigate()}
>결제 신청</button>
</div>
<LinkPaymentHistoryFilter
filterOn={filterOn}
setFilterOn={setFilterOn}
mid={mid}
searchType={searchType}
searchKeyword={searchKeyword}
startDate={startDate}
endDate={endDate}
transactionStatus={transactionStatus}
processResult={processResult}
sendMethod={sendMethod}
setMid={setMid}
setSearchType={setSearchType}
setSearchKeyword={setSearchKeyword}
setStartDate={setStartDate}
setEndDate={setEndDate}
setTransactionStatus={setTransactionStatus}
setProcessResult={setProcessResult}
setSendMethod={setSendMethod}
></LinkPaymentHistoryFilter>
</>
)
<LinkPaymentHistoryList
listItems={listItems}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentHistory}
></LinkPaymentHistoryList>
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={() => onClickToNavigate()}
>결제 신청</button>
</div>
<LinkPaymentHistoryFilter
filterOn={filterOn}
setFilterOn={setFilterOn}
mid={mid}
searchType={searchType}
searchKeyword={searchKeyword}
startDate={startDate}
endDate={endDate}
transactionStatus={transactionStatus}
processResult={processResult}
sendMethod={sendMethod}
setMid={setMid}
setSearchType={setSearchType}
setSearchKeyword={setSearchKeyword}
setStartDate={setStartDate}
setEndDate={setEndDate}
setTransactionStatus={setTransactionStatus}
setProcessResult={setProcessResult}
setSendMethod={setSendMethod}
></LinkPaymentHistoryFilter>
</>
);
}

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

@@ -10,186 +10,190 @@ import { SortOptionsBox } from '../sort-options-box';
import { useExtensionLinkPayWaitListMutation } from '../../api/link-payment/use-extension-link-pay-wait-list-mutation';
import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant';
import { useExtensionLinkPayWaitDownloadExcelMutation } from '../../api/link-payment/use-extension-link-pay-wait-download-excel-mutation';
import { useStore } from '@/shared/model/store';
const sendingStatusBtnGrouup = [
{ name: '전체', value: LinkPaymentSendingStatus.ALL },
{ name: '발송요청', value: LinkPaymentSendingStatus.SEND_REQUEST },
{ name: '발송취소', value: LinkPaymentSendingStatus.SEND_CANCEL }
{ name: '전체', value: LinkPaymentSendingStatus.ALL },
{ name: '발송요청', value: LinkPaymentSendingStatus.SEND_REQUEST },
{ name: '발송취소', value: LinkPaymentSendingStatus.SEND_CANCEL }
]
export const LinkPaymentWaitSendWrap = () => {
const { navigate } = useNavigate();
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [filterOn, setFilterOn] = useState<boolean>(false);
const [mid, setMid] = useState<string>('nictest00m');
const [searchType, setSearchType] = useState<LinkPaymentSearchType>(LinkPaymentSearchType.ALL)
const [searchKeyword, setSearchKeyword] = useState<string>('');
const [startDate, setStartDate] = useState(moment().format('YYYY-MM-DD'));
const [endDate, setEndDate] = useState(moment().format('YYYY-MM-DD'));
const [sendMethod, setSendMethod] = useState<LinkPaymentSendMethod>(LinkPaymentSendMethod.ALL);
const [sendingStatus, setSendingStatus] = useState<LinkPaymentSendingStatus>(LinkPaymentSendingStatus.ALL);
const [listItems, setListItems] = useState({});
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [filterOn, setFilterOn] = useState<boolean>(false);
const [mid, setMid] = useState<string>(userMid);
const [searchType, setSearchType] = useState<LinkPaymentSearchType>(LinkPaymentSearchType.ALL)
const [searchKeyword, setSearchKeyword] = useState<string>('');
const [startDate, setStartDate] = useState(moment().format('YYYY-MM-DD'));
const [endDate, setEndDate] = useState(moment().format('YYYY-MM-DD'));
const [sendMethod, setSendMethod] = useState<LinkPaymentSendMethod>(LinkPaymentSendMethod.ALL);
const [sendingStatus, setSendingStatus] = useState<LinkPaymentSendingStatus>(LinkPaymentSendingStatus.ALL);
const [listItems, setListItems] = useState({});
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const { mutateAsync: pendingSendList } = useExtensionLinkPayWaitListMutation();
const { mutateAsync: downloadExcel } = useExtensionLinkPayWaitDownloadExcelMutation();
const { mutateAsync: pendingSendList } = useExtensionLinkPayWaitListMutation();
const { mutateAsync: downloadExcel } = useExtensionLinkPayWaitDownloadExcelMutation();
const onClickToOpenFilter = () => {
setFilterOn(!filterOn);
};
const onClickToNavigate = () => {
navigate(PATHS.additionalService.linkPayment.request)
const onClickToOpenFilter = () => {
setFilterOn(!filterOn);
};
const onClickToNavigate = () => {
navigate(PATHS.additionalService.linkPayment.request)
}
const callList = (option?: {
sortBy?: string,
val?: string
}) => {
pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy;
setPageParam(pageParam);
let listParams = {
mid: mid,
searchCl: (searchType === LinkPaymentSearchType.ALL)? '': searchType,
searchValue: searchKeyword,
fromDate: startDate,
toDate: endDate,
sendStatus: (sendingStatus === LinkPaymentSendingStatus.ALL)? '': sendingStatus, // 추후 삭제 필요
sendMethod: (sendMethod === LinkPaymentSendMethod.ALL)? '': sendMethod,
processStatus: (sendingStatus === LinkPaymentSendingStatus.ALL)? '': sendingStatus,
page: pageParam
}
const callList = (option?: {
sortBy?: string,
val?: string
}) => {
pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy;
setPageParam(pageParam);
pendingSendList(listParams).then((rs) => {
setListItems(assembleData(rs.content));
});
};
let listParams = {
mid: mid,
searchCl: searchType === LinkPaymentSearchType.ALL ? '' : searchType,
searchValue: searchKeyword,
fromDate: startDate,
toDate: endDate,
sendStatus: sendingStatus === LinkPaymentSendingStatus.ALL ? '' : sendingStatus, // 추후 삭제 필요
sendMethod: sendMethod === LinkPaymentSendMethod.ALL ? '' : sendMethod,
processStatus: sendingStatus === LinkPaymentSendingStatus.ALL ? '' : sendingStatus,
page: pageParam
const assembleData = (content: Array<LinkPaymentWaitListItem>) => {
let data: any = {};
if(content && content.length > 0){
for (let i = 0; i < content?.length; i++) {
let scheduledSendDate = content[i]?.scheduledSendDate?.substring(0, 8);
let groupDate = moment(scheduledSendDate).format('YYYYMMDD');
if(!!groupDate && !data.hasOwnProperty(groupDate)){
data[groupDate] = [];
}
pendingSendList(listParams).then((rs) => {
setListItems(assembleData(rs.content))
})
};
const assembleData = (content: Array<LinkPaymentWaitListItem>) => {
let data: any = {};
if (content && content.length > 0) {
for (let i = 0; i < content?.length; i++) {
let scheduledSendDate = content[i]?.scheduledSendDate?.substring(0, 8);
let groupDate = moment(scheduledSendDate).format('YYYYMMDD');
if (!!groupDate && !data.hasOwnProperty(groupDate)) {
data[groupDate] = [];
}
if (!!groupDate && data.hasOwnProperty(groupDate)) {
data[groupDate].push(content[i]);
}
}
if(!!groupDate && data.hasOwnProperty(groupDate)){
data[groupDate].push(content[i]);
}
console.log('Data : ', data)
return data;
};
}
}
console.log('Data : ', data);
return data;
};
const onClickToDownloadExcel = () => {
downloadExcel({
mid: mid,
searchCl: searchType === LinkPaymentSearchType.ALL ? '' : searchType,
searchValue: searchKeyword,
fromDate: startDate,
toDate: endDate,
sendStatus: sendingStatus === LinkPaymentSendingStatus.ALL ? '' : sendingStatus, // 추후 삭제 필요
sendMethod: sendMethod === LinkPaymentSendMethod.ALL ? '' : sendMethod,
processStatus: sendingStatus === LinkPaymentSendingStatus.ALL ? '' : sendingStatus,
}).then((rs) => {
console.log('Excel Dowload Status : ' + rs.status)
});
};
const onClickToDownloadExcel = () => {
downloadExcel({
mid: mid,
searchCl: (searchType === LinkPaymentSearchType.ALL)? '': searchType,
searchValue: searchKeyword,
fromDate: startDate,
toDate: endDate,
sendStatus: (sendingStatus === LinkPaymentSendingStatus.ALL)? '': sendingStatus, // 추후 삭제 필요
sendMethod: (sendMethod === LinkPaymentSendMethod.ALL)? '': sendMethod,
processStatus: (sendingStatus === LinkPaymentSendingStatus.ALL)? '': sendingStatus,
}).then((rs) => {
console.log('Excel Dowload Status : ' + rs.status);
});
};
const onClickToSort = (sort: SortByKeys) => {
setSortBy(sort);
};
const onClickToSort = (sort: SortByKeys) => {
setSortBy(sort);
};
const onClickSendingStatus = (val: LinkPaymentSendingStatus) => {
setSendingStatus(val);
};
const onClickSendingStatus = (val: LinkPaymentSendingStatus) => {
setSendingStatus(val);
};
useEffect(() => {
callList();
}, []);
return (
<>
<section className="summary-section pt-30">
<div className="credit-controls">
<div>
<input
className="credit-period"
type="text"
value={moment(startDate).format('YYYY.MM.DD') + '-' + moment(endDate).format('YYYY.MM.DD')}
readOnly={true}
/>
<button
className="filter-btn">
<img
src={IMAGE_ROOT + '/ico_setting.svg'}
alt="검색옵션"
onClick={() => onClickToOpenFilter()}
/>
</button>
</div>
<button
className="download-btn"
aria-label="다운로드"
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}
alt="다운로드"
onClick={() => onClickToDownloadExcel()}
/>
</button>
</div>
</section>
useEffect(() => {
callList();
}, []);
<div className="filter-section">
<SortOptionsBox
sortBy={sortBy}
onClickToSort={onClickToSort}
></SortOptionsBox>
<div className="excrow">
<div className="full-menu-keywords no-padding">
{
sendingStatusBtnGrouup.map((value, index) => (
<span
key={`key-service-code=${index}`}
className={`keyword-tag ${(sendingStatus === value.value) ? 'active' : ''}`}
onClick={() => onClickSendingStatus(value.value)}
>{value.name}</span>
))
}
</div>
</div>
</div>
return (
<>
<section className="summary-section pt-30">
<div className="credit-controls">
<div>
<input
className="credit-period"
type="text"
value={moment(startDate).format('YYYY.MM.DD') + '-' + moment(endDate).format('YYYY.MM.DD')}
readOnly={true}
/>
<button
className="filter-btn">
<img
src={IMAGE_ROOT + '/ico_setting.svg'}
alt="검색옵션"
onClick={() => onClickToOpenFilter()}
/>
</button>
</div>
<button
className="download-btn"
aria-label="다운로드"
>
<img
src={IMAGE_ROOT + '/ico_download.svg'}
alt="다운로드"
onClick={() => onClickToDownloadExcel()}
/>
</button>
</div>
</section>
<LinkPaymentWaitList
listItems={listItems}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentWait}
></LinkPaymentWaitList>
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={() => onClickToNavigate()}
>결제 신청</button>
</div>
<LinkPaymentWaitSendFilter
filterOn={filterOn}
setFilterOn={setFilterOn}
mid={mid}
searchType={searchType}
searchKeyword={searchKeyword}
startDate={startDate}
endDate={endDate}
sendMethod={sendMethod}
sendingStatus={sendingStatus}
setMid={setMid}
setSearchType={setSearchType}
setSearchKeyword={setSearchKeyword}
setStartDate={setStartDate}
setEndDate={setEndDate}
setSendMethod={setSendMethod}
setSendingStatus={setSendingStatus}
></LinkPaymentWaitSendFilter>
</>
)
<div className="filter-section">
<SortOptionsBox
sortBy={sortBy}
onClickToSort={onClickToSort}
></SortOptionsBox>
<div className="excrow">
<div className="full-menu-keywords no-padding">
{
sendingStatusBtnGrouup.map((value, index) => (
<span
key={`key-service-code=${index}`}
className={`keyword-tag ${(sendingStatus === value.value) ? 'active' : ''}`}
onClick={() => onClickSendingStatus(value.value)}
>{value.name}</span>
))
}
</div>
</div>
</div>
<LinkPaymentWaitList
listItems={listItems}
additionalServiceCategory={AdditionalServiceCategory.LinkPaymentWait}
></LinkPaymentWaitList>
<div className="apply-row">
<button
className="btn-50 btn-blue flex-1"
onClick={() => onClickToNavigate()}
>결제 신청</button>
</div>
<LinkPaymentWaitSendFilter
filterOn={filterOn}
setFilterOn={setFilterOn}
mid={mid}
searchType={searchType}
searchKeyword={searchKeyword}
startDate={startDate}
endDate={endDate}
sendMethod={sendMethod}
sendingStatus={sendingStatus}
setMid={setMid}
setSearchType={setSearchType}
setSearchKeyword={setSearchKeyword}
setStartDate={setStartDate}
setEndDate={setEndDate}
setSendMethod={setSendMethod}
setSendingStatus={setSendingStatus}
></LinkPaymentWaitSendFilter>
</>
);
}

4
src/entities/home/ui/day-status-box-container1.tsx
View File

@@ -11,11 +11,13 @@ import {
} from '../model/types';
import { useNavigate } from '@/shared/lib/hooks';
import { PATHS } from '@/shared/constants/paths';
import { useStore } from '@/shared/model/store';
export const BoxContainer1 = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [searchDate, setSearchDate] = useState<string>(moment().format('YYYY-MM-DD'));
const [sales, setSales] = useState<Sales>();

4
src/entities/home/ui/day-status-box-container2.tsx
View File

@@ -7,11 +7,13 @@ import { useHomeMonthwMutation } from '../api/use-home-month-mutation';
import { NumericFormat } from 'react-number-format';
import { useNavigate } from '@/shared/lib/hooks';
import { PATHS } from '@/shared/constants/paths';
import { useStore } from '@/shared/model/store';
export const BoxContainer2 = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [searchDate, setSearchDate] = useState<string>(moment().format('YYYY-MM-DD'));
const [sales, setSales] = useState<Sales>();

7
src/entities/payment/ui/notification-data-wrap.tsx
View File

@@ -6,7 +6,7 @@ import { NotifyRow } from './section/notify-row';
export const NotificationDataWrap = () => {
const midOptions = useStore.getState().UserStore.selectOptionsMids;
const mid = useStore.getState().UserStore.mid;
const userMid = useStore.getState().UserStore.mid;
const [merchantInfo, setMerchantInfo] = useState<Record<string, any>>();
const [creditCard, setCreditCard] = useState<Record<string, any>>();
@@ -39,8 +39,8 @@ export const NotificationDataWrap = () => {
callPaymentNotificationData(value);
};
useEffect(() => {
if(!!mid){
callPaymentNotificationData(mid);
if(!!userMid){
callPaymentNotificationData(userMid);
}
}, []);
@@ -56,6 +56,7 @@ export const NotificationDataWrap = () => {
<option
key={ value.value }
value={ value.value }
selected={ (userMid === value.value)? true: false }
>{ value.name }</option>
))
}

29
src/entities/settlement/ui/calandar-wrap.tsx
View File

@@ -11,11 +11,14 @@ import {
SettlementsCalendarResponse,
SettlementStatus
} from '../model/types';
import { useStore } from '@/shared/model/store';
export const CalendarWrap = () => {
moment.locale('ko');
const midOptions = useStore.getState().UserStore.selectOptionsMids;
const userMid = useStore.getState().UserStore.mid;
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [yearMonth, setYearMonth] = useState<string>(moment().format('YYYY-MM'));
const [totalCompletedAmount, setTotalCompletedAmount] = useState<number>(0);
const [totalScheduledAmount, setTotalScheduledAmount] = useState<number>(0);
@@ -28,9 +31,9 @@ export const CalendarWrap = () => {
const { mutateAsync: settlementsCalendar } = useSettlementsCalendarMutation();
const callCalendar = () => {
const callCalendar = (selectedMid: string) => {
let params: SettlementsCalendarParams = {
mid: mid,
mid: selectedMid,
yearMonth: yearMonth
};
settlementsCalendar(params).then((rs: SettlementsCalendarResponse) => {
@@ -85,18 +88,28 @@ export const CalendarWrap = () => {
setYearMonth(newYearMonth);
}
};
const onChangeMid = (value: string) => {
callCalendar(value);
};
useEffect(() => {
callCalendar();
callCalendar(userMid);
}, [yearMonth]);
return (
<>
<div className="calendar-wrap pt-30">
<div className="input-wrapper top-select">
<select>
<option value="1">nicetest00g</option>
<option value="2">nicetest00g</option>
<option value="3">nicetest00g</option>
<select onChange={ (e) => onChangeMid(e.target.value) }>
{
midOptions.map((value, index) => (
<option
key={ value.value }
value={ value.value }
selected={ (userMid === value.value)? true: false }
>{ value.name }</option>
))
}
</select>
</div>

4
src/entities/settlement/ui/list-wrap.tsx
View File

@@ -25,6 +25,7 @@ import {
SettlementsTransactionListContent
} from '../model/types';
import { SortByKeys } from '@/entities/common/model/types';
import { useStore } from '@/shared/model/store';
export interface ListWrapProps {
startDateFromCalendar?: string;
@@ -36,13 +37,14 @@ export const ListWrap = ({
endDateFromCalendar
}: ListWrapProps) => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [settlementDateListItems, setSettlementDateListItems] = useState<Record<string, Array<SettlementsHistoryContent>>>({});
const [transactionDatelistItems, setTransactionDateListItems] = useState<Record<string, Array<SettlementsTransactionListContent>>>({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [periodType, setPeriodType] = useState<SettlementPeriodType>(SettlementPeriodType.SETTLEMENT_DATE);
const [startDate, setStartDate] = useState(startDateFromCalendar? moment(startDateFromCalendar).format('YYYY-MM-DD'): moment().format('YYYY-MM-DD'));
const [endDate, setEndDate] = useState(endDateFromCalendar? moment(endDateFromCalendar).format('YYYY-MM-DD'): moment().format('YYYY-MM-DD'));

7
src/entities/transaction/model/types.ts
View File

@@ -10,7 +10,7 @@ export enum TransactionCategory {
Escrow = 'Escrow',
Billing = 'Billing',
};
export enum InfoWrapKeys {
export enum InfoSectionKeys {
Amount = 'Amount',
Important = 'Important',
Payment = 'Payment',
@@ -451,15 +451,16 @@ export interface BillingDetailResponse extends BillingInfo {
}
export interface DetailInfoProps extends DetailResponse {
export interface InfoSectionProps extends DetailResponse {
transactionCategory?: TransactionCategory;
isOpen?: boolean;
tid?: string;
serviceCode?: string;
purposeType?: CashReceiptPurposeType;
onClickToOpenInfo?: (info: InfoWrapKeys) => void;
onClickToOpenInfo?: (info: InfoSectionKeys) => void;
}
export interface DownloadConfirmationParams {
tid?: string;
};

8
src/entities/transaction/ui/info-wrap/amount-info-wrap.tsx → src/entities/transaction/ui/section/amount-info-section.tsx
View File

@@ -2,18 +2,18 @@ import moment from 'moment';
import { NumericFormat } from 'react-number-format';
import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow';
import { useDownloadConfirmationMutation } from '../../api/use-download-confirmation-mutation';
import { InfoWrapKeys, DetailInfoProps } from '../../model/types';
import { InfoSectionKeys, InfoSectionProps } from '../../model/types';
import { SlideDown } from 'react-slidedown';
import 'react-slidedown/lib/slidedown.css';
export const AmountInfoWrap = ({
export const AmountInfoSection = ({
transactionCategory,
amountInfo,
isOpen,
tid,
serviceCode,
onClickToOpenInfo
}: DetailInfoProps) => {
}: InfoSectionProps) => {
const { mutateAsync: downloadConfirmation } = useDownloadConfirmationMutation();
const subItems: Record<string, Record<string, string>> = {
@@ -100,7 +100,7 @@ export const AmountInfoWrap = ({
const onClickToSetShowInfo = () => {
if(!!onClickToOpenInfo){
onClickToOpenInfo(InfoWrapKeys.Amount);
onClickToOpenInfo(InfoSectionKeys.Amount);
}
};

6
src/entities/transaction/ui/info-wrap/billing-info-wrap.tsx → src/entities/transaction/ui/section/billing-info-section.tsx
View File

@@ -1,9 +1,9 @@
import moment from 'moment';
import { InfoWrapKeys, DetailInfoProps } from '../../model/types';
import { InfoSectionProps } from '../../model/types';
export const BillingInfoWrap = ({
export const BillingInfoSection = ({
billingInfo,
}: DetailInfoProps) => {
}: InfoSectionProps) => {
const getInstallmentMonth = () => {
let rs = [];

8
src/entities/transaction/ui/info-wrap/detail-info-wrap.tsx → src/entities/transaction/ui/section/detail-info-section.tsx
View File

@@ -1,19 +1,19 @@
import moment from 'moment';
import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow';
import { InfoWrapKeys, DetailInfoProps } from '../../model/types';
import { InfoSectionKeys, InfoSectionProps } from '../../model/types';
import { SlideDown } from 'react-slidedown';
import 'react-slidedown/lib/slidedown.css';
export const DetailInfoWrap = ({
export const DetailInfoSection = ({
transactionCategory,
detailInfo,
isOpen,
onClickToOpenInfo
}: DetailInfoProps) => {
}: InfoSectionProps) => {
const onClickToSetOpenInfo = () => {
if(!!onClickToOpenInfo){
onClickToOpenInfo(InfoWrapKeys.Issue);
onClickToOpenInfo(InfoSectionKeys.Issue);
}
};

8
src/entities/transaction/ui/info-wrap/escrow-info-wrap.tsx → src/entities/transaction/ui/section/escrow-info-section.tsx
View File

@@ -1,19 +1,19 @@
import moment from 'moment';
import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow';
import { InfoWrapKeys, DetailInfoProps } from '../../model/types';
import { InfoSectionKeys, InfoSectionProps } from '../../model/types';
import { SlideDown } from 'react-slidedown';
import 'react-slidedown/lib/slidedown.css';
export const EscrowInfoWrap = ({
export const EscrowInfoSection = ({
transactionCategory,
escrowInfo,
isOpen,
onClickToOpenInfo
}: DetailInfoProps) => {
}: InfoSectionProps) => {
const onClickToSetOpenInfo = () => {
if(!!onClickToOpenInfo){
onClickToOpenInfo(InfoWrapKeys.Escrow);
onClickToOpenInfo(InfoSectionKeys.Escrow);
}
};

6
src/entities/transaction/ui/info-wrap/important-info-wrap.tsx → src/entities/transaction/ui/section/important-info-section.tsx
View File

@@ -1,12 +1,12 @@
import moment from 'moment';
import { NumericFormat } from 'react-number-format';
import { InfoWrapKeys, DetailInfoProps, TransactionCategory } from '../../model/types';
import { InfoSectionProps, TransactionCategory } from '../../model/types';
export const ImportantInfoWrap = ({
export const ImportantInfoSection = ({
transactionCategory,
importantInfo,
serviceCode
}: DetailInfoProps) => {
}: InfoSectionProps) => {
const subItems: Record<string, Record<string, string>> = {
ordNo: {name: '주문번호', type: 'string'},

6
src/entities/transaction/ui/info-wrap/issue-info-wrap.tsx → src/entities/transaction/ui/section/issue-info-section.tsx
View File

@@ -1,12 +1,12 @@
import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow';
import { InfoWrapKeys, DetailInfoProps } from '../../model/types';
import { InfoSectionProps } from '../../model/types';
import moment from 'moment';
export const IssueInfoWrap = ({
export const IssueInfoSection = ({
transactionCategory,
issueInfo,
purposeType,
}: DetailInfoProps) => {
}: InfoSectionProps) => {
return (
<>

8
src/entities/transaction/ui/info-wrap/part-cancel-info-wrap.tsx → src/entities/transaction/ui/section/part-cancel-info-section.tsx
View File

@@ -1,17 +1,17 @@
import moment from 'moment';
import { NumericFormat } from 'react-number-format';
import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow';
import { InfoWrapKeys, DetailInfoProps } from '../../model/types';
import { InfoSectionKeys, InfoSectionProps } from '../../model/types';
import { SlideDown } from 'react-slidedown';
import 'react-slidedown/lib/slidedown.css';
export const PartCancelInfoWrap = ({
export const PartCancelInfoSection = ({
transactionCategory,
partCancelInfo,
serviceCode,
isOpen,
onClickToOpenInfo
}: DetailInfoProps) => {
}: InfoSectionProps) => {
const subItems: Record<string, Record<string, string>> = {
originalTid: {name: '원거래 TID', type: 'string'},
@@ -94,7 +94,7 @@ export const PartCancelInfoWrap = ({
const onClickToSetOpenInfo = () => {
if(!!onClickToOpenInfo){
onClickToOpenInfo(InfoWrapKeys.PartCancel);
onClickToOpenInfo(InfoSectionKeys.PartCancel);
}
};

8
src/entities/transaction/ui/info-wrap/payment-info-wrap.tsx → src/entities/transaction/ui/section/payment-info-section.tsx
View File

@@ -1,17 +1,17 @@
import moment from 'moment';
import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow';
import { InfoWrapKeys, DetailInfoProps, TransactionCategory } from '../../model/types';
import { InfoSectionKeys, InfoSectionProps, TransactionCategory } from '../../model/types';
import { NumericFormat } from 'react-number-format';
import { SlideDown } from 'react-slidedown';
import 'react-slidedown/lib/slidedown.css';
export const PaymentInfoWrap = ({
export const PaymentInfoSection = ({
transactionCategory,
paymentInfo,
serviceCode,
isOpen,
onClickToOpenInfo
}: DetailInfoProps) => {
}: InfoSectionProps) => {
const subItems: Record<string, Record<string, string>> = {
approvalAcquire: {name: '승인매입', type: 'string'},
@@ -117,7 +117,7 @@ export const PaymentInfoWrap = ({
const onClickToSetOpenInfo = () => {
if(!!onClickToOpenInfo){
onClickToOpenInfo(InfoWrapKeys.Payment);
onClickToOpenInfo(InfoSectionKeys.Payment);
}
};

8
src/entities/transaction/ui/info-wrap/settlement-info-wrap.tsx → src/entities/transaction/ui/section/settlement-info-section.tsx
View File

@@ -1,17 +1,17 @@
import moment from 'moment';
import { NumericFormat } from 'react-number-format';
import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow';
import { InfoWrapKeys, DetailInfoProps } from '../../model/types';
import { InfoSectionKeys, InfoSectionProps } from '../../model/types';
import { SlideDown } from 'react-slidedown';
import 'react-slidedown/lib/slidedown.css';
export const SettlementInfoWrap = ({
export const SettlementInfoSection = ({
transactionCategory,
settlementInfo,
serviceCode,
isOpen,
onClickToOpenInfo
}: DetailInfoProps) => {
}: InfoSectionProps) => {
const subItems: Record<string, Record<string, string>> = {
approvalSettleDate: {name: '승인정산일', type: 'date'},
@@ -93,7 +93,7 @@ export const SettlementInfoWrap = ({
const onClickToSetOpenInfo = () => {
if(!!onClickToOpenInfo){
onClickToOpenInfo(InfoWrapKeys.Settlement);
onClickToOpenInfo(InfoSectionKeys.Settlement);
}
};

8
src/entities/transaction/ui/info-wrap/transaction-info-wrap.tsx → src/entities/transaction/ui/section/transaction-info-section.tsx
View File

@@ -1,17 +1,17 @@
import moment from 'moment';
import { SectionTitleArrow } from '@/entities/common/ui/section-title-arrow';
import { InfoWrapKeys, DetailInfoProps, TransactionCategory } from '../../model/types';
import { InfoSectionKeys, InfoSectionProps, TransactionCategory } from '../../model/types';
import { NumericFormat } from 'react-number-format';
import { SlideDown } from 'react-slidedown';
import 'react-slidedown/lib/slidedown.css';
export const TransactionInfoWrap = ({
export const TransactionInfoSection = ({
transactionCategory,
transactionInfo,
serviceCode,
isOpen,
onClickToOpenInfo
}: DetailInfoProps) => {
}: InfoSectionProps) => {
const subItems: Record<string, Record<string, string>> = {
buyerName: {name: '구매자명', type: 'string'},
@@ -96,7 +96,7 @@ export const TransactionInfoWrap = ({
const onClickToSetOpenInfo = () => {
if(!!onClickToOpenInfo){
onClickToOpenInfo(InfoWrapKeys.Transaction);
onClickToOpenInfo(InfoSectionKeys.Transaction);
}
};

5
src/entities/vat-return/ui/list-wrap.tsx
View File

@@ -14,13 +14,16 @@ import {
} from '../model/types';
import { useVatReturnListMutation } from '../api/use-vat-return-list-mutation';
import { ListDateGroup } from './list-date-group';
import { useStore } from '@/shared/model/store';
export const ListWrap = () => {
const userMid = useStore.getState().UserStore.mid;
const [filterOn, setFilterOn] = useState<boolean>(false);
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState<Record<string, Array<VatReturnListContent>>>({});
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [startDate, setStartDate] = useState(moment().subtract(1, 'month').format('YYYY.MM'));
const [endDate, setEndDate] = useState(moment().format('YYYY.MM'));
const [receiptType, setReceiptType] = useState<VatReturnReceiptType>(VatReturnReceiptType.ALL);

23
src/pages/account/password/modify-cancel-password-page.tsx
View File

@@ -10,10 +10,14 @@ import {
} from '@/widgets/sub-layout/use-sub-layout';
import { useUserChangeCancelPasswordMutation } from '@/entities/user/api/use-user-change-cancel-password-mutation';
import { snackBar } from '@/shared/lib/toast';
import { useStore } from '@/shared/model/store';
export const PasswordModifyCancelPasswordPage = () => {
const { navigate } = useNavigate();
const [mid, setMid] = useState<string>('nictest00m');
const midOptions = useStore.getState().UserStore.selectOptionsMids;
const userMid = useStore.getState().UserStore.mid;
const [mid, setMid] = useState<string>(userMid);
const [password, setPassword] = useState<string>('');
const [confirmPassword, setConfirmPassword] = useState<string>('');
@@ -74,10 +78,19 @@ export const PasswordModifyCancelPasswordPage = () => {
<div className="user-add">
<div className="ua-row">
<div className="ua-label">가맹점 <span className="red">*</span></div>
<select className="wid-100" value={mid} onChange={(e) => setMid(e.target.value)}>
{midList.map((item) => (
<option key={item.value} value={item.value}>{item.label}</option>
))}
<select
className="wid-100"
onChange={(e) => setMid(e.target.value)}
>
{
midOptions.map((value, index) => (
<option
key={ value.value }
value={ value.value }
selected={ (userMid === value.value)? true: false }
>{ value.name }</option>
))
}
</select>
</div>
<div className="ua-row">

15
src/pages/additional-service/account-holder-auth/account-holder-auth-page.tsx
View File

@@ -19,15 +19,17 @@ import { authStatusBtnGroup } from '@/entities/additional-service/model/account-
import { AccountHolderAuthList } from '@/entities/additional-service/ui/account-holder-auth/account-holder-auth-list';
import { useExtensionAccountHolderAuthDownloadExcelMutation } from '@/entities/additional-service/api/account-holder-auth/use-extension-account-holder-auth-download-excel-mutation';
import { AccountHolderAuthFilter } from '@/entities/additional-service/ui/account-holder-auth/filter/account-holder-auth-filter';
import { useStore } from '@/shared/model/store';
export const AccountHolderAuthPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [fromDate, setFromDate] = useState(moment().format('YYYY-MM-DD'));
const [toDate, setToDate] = useState(moment().format('YYYY-MM-DD'));
const [authStatus, setAuthStatus] = useState<AuthAndTransferStatus>(AuthAndTransferStatus.ALL)
@@ -45,7 +47,7 @@ export const AccountHolderAuthPage = () => {
sortBy?: string,
val?: string
}) => {
pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy;
pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy;
setPageParam(pageParam);
let listParams = {
mid: mid,
@@ -67,15 +69,15 @@ export const AccountHolderAuthPage = () => {
for (let i = 0; i < content?.length; i++) {
let requestDate = content[i]?.requestDate?.substring(0, 8);
let groupDate = moment(requestDate).format('YYYYMMDD');
if (!!groupDate && !data.hasOwnProperty(groupDate)) {
if(!!groupDate && !data.hasOwnProperty(groupDate)){
data[groupDate] = [];
}
if (!!groupDate && data.hasOwnProperty(groupDate)) {
if(!!groupDate && data.hasOwnProperty(groupDate)){
data[groupDate].push(content[i]);
}
}
}
console.log('Data : ', data)
console.log('Data : ', data);
return data;
};
@@ -86,7 +88,7 @@ export const AccountHolderAuthPage = () => {
toDate: toDate,
authStatus: authStatus
}).then((rs) => {
console.log('Excel Downlaod Status : ' + rs.status)
console.log('Excel Downlaod Status : ' + rs.status);
});
}
@@ -108,6 +110,7 @@ export const AccountHolderAuthPage = () => {
useEffect(() => {
callList();
}, []);
return (
<>
<main>

14
src/pages/additional-service/account-holder-search/account-holder-search-page.tsx
View File

@@ -17,6 +17,7 @@ import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant';
import { useExtensionAccountHolderSearchDownloadExcelMutation } from '@/entities/additional-service/api/account-holder-search/use-extension-account-holder-search-download-excel-mutation';
import { SortOptionsBox } from '@/entities/additional-service/ui/sort-options-box';
import { AccountHolderSearchList } from '@/entities/additional-service/ui/account-holder-search/account-holder-search-list';
import { useStore } from '@/shared/model/store';
const resultStatusBtnGroup = [
{ name: '전체', value: ProcessResult.ALL },
@@ -26,12 +27,13 @@ const resultStatusBtnGroup = [
export const AccountHolderSearchPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState({});
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [filterOn, setFilterOn] = useState<boolean>(false);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [searchType, setSearchType] = useState<AccountHolderSearchType>(AccountHolderSearchType.ACCOUNT_NO)
const [searchKeyword, setSearchKeyword] = useState<string>('');
const [startDate, setStartDate] = useState(moment().format('YYYY-MM-DD'));
@@ -72,7 +74,7 @@ export const AccountHolderSearchPage = () => {
}
const assembleData = (content: Array<AccountHolderSearchListItem>) => {
console.log('rs.content:', content)
console.log('rs.content:', content);
let data: any = {};
if (content && content.length > 0) {
for (let i = 0; i < content?.length; i++) {
@@ -86,7 +88,7 @@ export const AccountHolderSearchPage = () => {
}
}
}
console.log('Data : ', data)
console.log('Data : ', data);
return data;
};
@@ -104,7 +106,7 @@ export const AccountHolderSearchPage = () => {
bankCode: bank,
resultStatus: processResult
}).then((rs) => {
console.log('Excel Dowload Status : ' + rs.status)
console.log('Excel Dowload Status : ' + rs.status);
});
};
@@ -115,7 +117,9 @@ export const AccountHolderSearchPage = () => {
const onClickToTransactionStatus = (val: ProcessResult) => {
setProcessResult(val);
callList({ val: val });
callList({
val: val
});
};
useEffect(() => {

6
src/pages/additional-service/alimtalk/list-page.tsx
View File

@@ -26,15 +26,17 @@ import { useExtensionAlimtalkListMutation } from '@/entities/additional-service/
import { useExtensionAlimtalkDownloadExcelMutation } from '@/entities/additional-service/api/alimtalk/use-extansion-alimtalk-download-excel-mutation';
import { ListDateGroup } from '@/entities/additional-service/ui/list-date-group';
import { AdditionalServiceCategory } from '@/entities/additional-service/model/types';
import { useStore } from '@/shared/model/store';
export const AlimtalkListPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState<Record<string, Array<AlimtalkListContent>>>({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [searchCl, setSearchCl] = useState<AlimtalkSearchCl>(AlimtalkSearchCl.BUYER_NAME);
const [searchValue, setSearchValue] = useState<string>();
const [paymentMethod, setPaymentMethod] = useState<string>();
@@ -123,7 +125,7 @@ export const AlimtalkListPage = () => {
const getAlimtalkList = () => {
let rs = [];
if(Object.keys(listItems).length > 0){
for (const [key, value] of Object.entries(listItems)) {
for(const [key, value] of Object.entries(listItems)){
rs.push(
<ListDateGroup
additionalServiceCategory={ AdditionalServiceCategory.Alimtalk }

6
src/pages/additional-service/alimtalk/setting-page.tsx
View File

@@ -21,11 +21,13 @@ import {
} from '@/entities/additional-service/model/alimtalk/types';
import { useEffect, useState } from 'react';
import { AlimTalkSettingServiceRow } from '@/entities/additional-service/ui/alimtalk/setting-service-row';
import { useStore } from '@/shared/model/store';
export const AlimtalkSettingPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [merchantCardApprovalFlag, setMerchantCardApprovalFlag] = useState<boolean>(false);
const [merchantCardCancelFlag, setMerchantCardCancelFlag] = useState<boolean>(false);
@@ -48,7 +50,7 @@ export const AlimtalkSettingPage = () => {
const callSettingDetail = () => {
let params: ExtensionAlimtalkSettingDetailParams = {
mid: mid,
mid: mid
};
alimtalkSettingDetail(params).then((rs: ExtensionAlimtalkSettingDetailResponse) => {

4
src/pages/additional-service/ars/list-page.tsx
View File

@@ -19,15 +19,17 @@ import { AdditionalServiceCategory } from '@/entities/additional-service/model/t
import { SortOptionsBox } from '@/entities/common/ui/sort-options-box';
import { ArsPaymentStatusBtnGroup } from '@/entities/additional-service/model/ars/constant';
import { ArsFilter } from '@/entities/additional-service/ui/filter/ars-filter';
import { useStore } from '@/shared/model/store';
export const ArsListPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState<Record<string, Array<ArsListContent>>>({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [moid, setMoid] = useState<string>('');
const [fromDate, setFromDate] = useState<string>(moment().format('YYYYMMDD'));
const [toDate, setToDate] = useState<string>(moment().format('YYYYMMDD'));

4
src/pages/additional-service/fund-account/transfer-request-page.tsx
View File

@@ -10,12 +10,14 @@ import {
import { useState } from 'react';
import { useExtensionFundAccountTransferRequestMutation } from '@/entities/additional-service/api/fund-account/use-extension-fund-account-transfer-request-mutation';
import { ExtensionFundAccountTransferRequestParams, ExtensionFundAccountTransferRequestResponse } from '@/entities/additional-service/model/fund-account/types';
import { useStore } from '@/shared/model/store';
export const FundAccountTransferRequestPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [mid, setMid] = useState<string>('nictest00m')
const [mid, setMid] = useState<string>(userMid);
const [transferAmount, setTransferAmount] = useState<number>(0);
const [receiveBankCode, setReceiveBankCode] = useState<string>('');
const [receiveAccountNo, setReceiveAccountNo] = useState<string>('');

33
src/pages/additional-service/key-in-payment/key-in-payment-page.tsx
View File

@@ -17,6 +17,7 @@ import { SortOptionsBox } from '@/entities/additional-service/ui/sort-options-bo
import { useExtensionKeyinListMutation } from '@/entities/additional-service/api/use-extension-keyin-list-mutation';
import { DEFAULT_PAGE_PARAM } from '@/entities/common/model/constant';
import { KeyInPaymentList } from '@/entities/additional-service/ui/key-in-payment/key-in-payment-list';
import { useStore } from '@/shared/model/store';
// contant로 옮기기
const requestStatusBtnGroup = [
@@ -28,13 +29,13 @@ const requestStatusBtnGroup = [
export const KeyInPaymentPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [startDate, setStartDate] = useState(moment().format('YYYY-MM-DD'));
const [endDate, setEndDate] = useState(moment().format('YYYY-MM-DD'));
const [transactionStatus, setTransactionStatus] = useState<KeyInPaymentTransactionStatus>(KeyInPaymentTransactionStatus.ALL)
@@ -59,11 +60,11 @@ export const KeyInPaymentPage = () => {
pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy;
setPageParam(pageParam);
let newMinAmount = minAmount;
if (!!minAmount && typeof (minAmount) === 'string') {
if(!!minAmount && typeof (minAmount) === 'string'){
newMinAmount = parseInt(minAmount);
}
let newMaxAmount = maxAmount;
if (!!maxAmount && typeof (maxAmount) === 'string') {
if(!!maxAmount && typeof (maxAmount) === 'string'){
newMaxAmount = parseInt(maxAmount);
}
let listParams = {
@@ -76,7 +77,7 @@ export const KeyInPaymentPage = () => {
page: pageParam
};
console.log("Request Info: ", listParams)
console.log('Request Info: ', listParams);
keyinList(listParams).then((rs) => {
setListItems(assembleData(rs.content));
@@ -84,21 +85,21 @@ export const KeyInPaymentPage = () => {
}
const assembleData = (content: Array<KeyInPaymentListItem>) => {
console.log('rs.content:', content)
console.log('rs.content:', content);
let data: any = {};
if (content && content.length > 0) {
for (let i = 0; i < content?.length; i++) {
for(let i = 0; i < content?.length; i++){
let paymentDate = content[i]?.paymentDate?.substring(0, 8);
let groupDate = moment(paymentDate).format('YYYYMMDD');
if (!!groupDate && !data.hasOwnProperty(groupDate)) {
if(!!groupDate && !data.hasOwnProperty(groupDate)){
data[groupDate] = [];
}
if (!!groupDate && data.hasOwnProperty(groupDate)) {
if(!!groupDate && data.hasOwnProperty(groupDate)){
data[groupDate].push(content[i]);
}
}
}
console.log('Data : ', data)
console.log('Data : ', data);
return data;
};
@@ -109,11 +110,11 @@ export const KeyInPaymentPage = () => {
const onClickToDownloadExcel = () => {
let newMinAmount = minAmount;
if (!!minAmount && typeof (minAmount) === 'string') {
if(!!minAmount && typeof (minAmount) === 'string'){
newMinAmount = parseInt(minAmount);
}
let newMaxAmount = maxAmount;
if (!!maxAmount && typeof (maxAmount) === 'string') {
if(!!maxAmount && typeof (maxAmount) === 'string'){
newMaxAmount = parseInt(maxAmount);
}
downloadExcel({
@@ -124,7 +125,7 @@ export const KeyInPaymentPage = () => {
minAmount: newMinAmount,
maxAmount: newMaxAmount
}).then((rs) => {
console.log('Excel Dowload Status : ' + rs.status)
console.log('Excel Dowload Status : ' + rs.status);
});
};
@@ -134,9 +135,11 @@ export const KeyInPaymentPage = () => {
};
const onClickToTransactionStatus = (val: KeyInPaymentTransactionStatus) => {
console.log("TransactionStatus Test: ", val)
console.log('TransactionStatus Test: ', val);
setTransactionStatus(val);
callList({ val: val });
callList({
val: val
});
};
useEffect(() => {

31
src/pages/additional-service/list-page.tsx
View File

@@ -11,11 +11,14 @@ import {
} from '@/widgets/sub-layout/use-sub-layout';
import { useExtensionListMutation } from '@/entities/additional-service/api/use-extension-list-mutation';
import { ExtensionListParams, ExtensionListResponse } from '@/entities/additional-service/model/types';
import { useStore } from '@/shared/model/store';
export const ListPage = () => {
const { navigate } = useNavigate();
const midOptions = useStore.getState().UserStore.selectOptionsMids;
const userMid = useStore.getState().UserStore.mid;
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const { mutateAsync: extensionList } = useExtensionListMutation();
@@ -26,9 +29,9 @@ export const ListPage = () => {
navigate(PATHS.home);
});
const callExtensionList = () => {
const callExtensionList = (selectedMid: string) => {
let params: ExtensionListParams = {
mid: mid
mid: selectedMid
}
extensionList(params).then((rs: ExtensionListResponse) => {
console.log(rs)
@@ -36,7 +39,7 @@ export const ListPage = () => {
};
useEffect(() => {
callExtensionList();
callExtensionList(userMid);
}, []);
const activeExtensionList = [
@@ -135,6 +138,10 @@ export const ListPage = () => {
return rs;
};
const onChangeMid = (value: string) => {
callExtensionList(value);
};
return (
<>
<main>
@@ -142,11 +149,17 @@ export const ListPage = () => {
<div className="tab-pane sub active">
<div className="ing-list">
<div className="input-wrapper top-select">
<select>
<option value="1">nicetest00g</option>
<option value="2">nicetest00g</option>
<option value="3">nicetest00g</option>
</select>
<select onChange={ (e) => onChangeMid(e.target.value) }>
{
midOptions.map((value, index) => (
<option
key={ value.value }
value={ value.value }
selected={ (userMid === value.value)? true: false }
>{ value.name }</option>
))
}
</select>
</div>
<h3 className="ing-title">사용중인 서비스</h3>
{ getActiveExtensionList() }

8
src/pages/additional-service/payout/list-page.tsx
View File

@@ -27,15 +27,17 @@ import { PayoutFilter } from '@/entities/additional-service/ui/filter/payout-fil
import { PayoutDisbursementStatusBtnGroup } from '@/entities/additional-service/model/payout/constant';
import { ListDateGroup } from '@/entities/additional-service/ui/list-date-group';
import { AdditionalServiceCategory } from '@/entities/additional-service/model/types';
import { useStore } from '@/shared/model/store';
export const PayoutListPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState<Record<string, Array<PayoutContent>>>({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [searchCl, setSearchCl] = useState<PayoutSearchCl>(PayoutSearchCl.REQUEST_DATE);
const [fromDate, setFromDate] = useState<string>(moment().format('YYYYMMDD'));
const [toDate, setToDate] = useState<string>(moment().format('YYYYMMDD'));
@@ -145,7 +147,9 @@ export const PayoutListPage = () => {
};
const onClickToDisbursementStatus = (val: PayoutDisbursementStatus) => {
setDisbursementStatus(val);
callExtensionPayoutList({val: val});
callExtensionPayoutList({
val: val
});
};

4
src/pages/additional-service/payout/request-page.tsx
View File

@@ -12,12 +12,14 @@ import { useState } from "react";
import { useExtensionPayoutRequestMutation } from "@/entities/additional-service/api/payout/use-extension-payout-request-mutation";
import { ExtensionPayoutRequestParams, ExtensionPayoutRequestResponse } from "@/entities/additional-service/model/payout/types";
import NiceCalendar from "@/shared/ui/calendar/nice-calendar";
import { useStore } from "@/shared/model/store";
export const PayoutRequestPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [calendarOpen, setCalendarOpen] = useState<boolean>(false);
const [mid, setMid] = useState<string>('nictest00m')
const [mid, setMid] = useState<string>(userMid);
const [submallId, setSubmallId] = useState<string>('');
const [disbursementAmount, setDisbursementAmount] = useState<number>(0);
const [settlementDate, setSettlementDate] = useState<string>('');

29
src/pages/additional-service/sms-payment/sms-payment-page.tsx
View File

@@ -16,17 +16,20 @@ import { useExtensionSmsDownloadExcelMutation } from '@/entities/additional-serv
import { SmsPaymentList } from '@/entities/additional-service/ui/sms-payment/sms-payment-list';
import { SmsPaymentFilter } from '@/entities/additional-service/ui/sms-payment/sms-payment-filter';
import { useExtensionSmsDetailMutation } from '@/entities/additional-service/api/sms-payment/use-extension-sms-detail-mutation';
import { useStore } from '@/shared/model/store';
export const SmsPaymentPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [bottomSmsPaymentDetailResendOn, setBottomSmsPaymentDetailResendOn] = useState<boolean>(false)
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState({});
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [filterOn, setFilterOn] = useState<boolean>(false);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [selectedTid, setSelectedTid] = useState<string>('');
const [selectedMid, setSelectedMid] = useState<string>('');
const [searchCl, setSearchCl] = useState<SmsPaymentSearchType>(SmsPaymentSearchType.BUYER_NAME)
@@ -48,7 +51,7 @@ export const SmsPaymentPage = () => {
sortBy?: string,
val?: string
}) => {
pageParam.sortBy = (option?.sortBy) ? option.sortBy : sortBy;
pageParam.sortBy = (option?.sortBy)? option.sortBy: sortBy;
setPageParam(pageParam);
let listParams = {
@@ -57,7 +60,7 @@ export const SmsPaymentPage = () => {
searchValue: searchValue,
fromDate: fromDate,
toDate: toDate,
smsCl: smsCl === SmsType.ALL ? '' : smsCl,
smsCl: (smsCl === SmsType.ALL)? '' :smsCl,
page: pageParam
}
@@ -72,25 +75,25 @@ export const SmsPaymentPage = () => {
for (let i = 0; i < content?.length; i++) {
let paymentDate = content[i]?.paymentDate?.substring(0, 8);
let groupDate = moment(paymentDate).format('YYYYMMDD');
if (!!groupDate && !data.hasOwnProperty(groupDate)) {
if(!!groupDate && !data.hasOwnProperty(groupDate)){
data[groupDate] = [];
}
if (!!groupDate && data.hasOwnProperty(groupDate)) {
if(!!groupDate && data.hasOwnProperty(groupDate)){
data[groupDate].push(content[i]);
}
}
}
console.log('Data : ', data)
console.log('Data : ', data);
return data;
};
const callDetail = (selectedMid: string, selectedTid: string) => {
console.log("Selected Mid: ", selectedMid, "Selected Tid: ", selectedTid)
console.log('Selected Mid: ', selectedMid, 'Selected Tid: ', selectedTid);
detail({
mid: selectedMid,
tid: selectedTid
}).then((rs) => {
console.log('Detail info : ', rs)
console.log('Detail info : ', rs);
setSmsDetailData(rs);
})
}
@@ -102,9 +105,9 @@ export const SmsPaymentPage = () => {
searchValue: searchValue,
fromDate: fromDate,
toDate: toDate,
smsCl: smsCl === SmsType.ALL ? '' : smsCl,
smsCl: (smsCl === SmsType.ALL)? '': smsCl,
}).then((rs) => {
console.log('Excel Dowload Status : ' + rs.status)
console.log('Excel Dowload Status : ' + rs.status);
});
}
@@ -163,9 +166,9 @@ export const SmsPaymentPage = () => {
</section>
<div className="detail-divider"></div>
<SmsPaymentList
listItems={listItems}
mid={mid}
onResendClick={onClickToShowDetail}
listItems={ listItems }
mid={ mid }
onResendClick={ onClickToShowDetail }
></SmsPaymentList>
</div>
</div>

60
src/pages/transaction/all-transaction/detail-page.tsx
View File

@@ -5,12 +5,12 @@ import { Dialog } from '@/shared/ui/dialogs/dialog';
import { overlay } from 'overlay-kit';
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { useAllTransactionDetailMutation } from '@/entities/transaction/api/use-all-transaction-detail-mutation';
import { AmountInfoWrap } from '@/entities/transaction/ui/info-wrap/amount-info-wrap';
import { ImportantInfoWrap } from '@/entities/transaction/ui/info-wrap/important-info-wrap';
import { PaymentInfoWrap } from '@/entities/transaction/ui/info-wrap/payment-info-wrap';
import { TransactionInfoWrap } from '@/entities/transaction/ui/info-wrap/transaction-info-wrap';
import { SettlementInfoWrap } from '@/entities/transaction/ui/info-wrap/settlement-info-wrap';
import { PartCancelInfoWrap } from '@/entities/transaction/ui/info-wrap/part-cancel-info-wrap';
import { AmountInfoSection } from '@/entities/transaction/ui/section/amount-info-section';
import { ImportantInfoSection } from '@/entities/transaction/ui/section/important-info-section';
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 { PartCancelInfoSection } from '@/entities/transaction/ui/section/part-cancel-info-section';
import { HeaderType } from '@/entities/common/model/types';
import {
TransactionCategory,
@@ -22,7 +22,7 @@ import {
TransactionInfo,
SettlementInfo,
PartCancelInfo,
InfoWrapKeys
InfoSectionKeys
} from '@/entities/transaction/model/types';
import {
useSetOnBack,
@@ -108,20 +108,20 @@ export const AllTransactionDetailPage = () => {
});
};
const onClickToOpenInfo = (infoWrapKey: InfoWrapKeys) => {
if(infoWrapKey === InfoWrapKeys.Amount){
const onClickToOpenInfo = (infoSectionKey: InfoSectionKeys) => {
if(infoSectionKey === InfoSectionKeys.Amount){
setShowAmountInfo(!showAmountInfo);
}
else if(infoWrapKey === InfoWrapKeys.Payment){
else if(infoSectionKey === InfoSectionKeys.Payment){
setShowPaymentInfo(!showPaymentInfo);
}
else if(infoWrapKey === InfoWrapKeys.Transaction){
else if(infoSectionKey === InfoSectionKeys.Transaction){
setShowTransactionInfo(!showTransactionInfo);
}
else if(infoWrapKey === InfoWrapKeys.Settlement){
else if(infoSectionKey === InfoSectionKeys.Settlement){
setShowSettlementInfo(!showSettlementInfo);
}
else if(infoWrapKey === InfoWrapKeys.PartCancel){
else if(infoSectionKey === InfoSectionKeys.PartCancel){
setShowPartCancelInfo(!showPartCancelInfo);
}
};
@@ -133,52 +133,52 @@ export const AllTransactionDetailPage = () => {
<div className="tab-pane sub active">
<div className="option-list">
<div className="txn-detail">
<AmountInfoWrap
<AmountInfoSection
transactionCategory={ TransactionCategory.AllTransaction }
amountInfo={ amountInfo }
isOpen={ showAmountInfo }
tid={ tid }
serviceCode={ serviceCode }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></AmountInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></AmountInfoSection>
<div className="txn-divider"></div>
<ImportantInfoWrap
<ImportantInfoSection
transactionCategory={ TransactionCategory.AllTransaction }
importantInfo={ importantInfo }
serviceCode={ serviceCode }
></ImportantInfoWrap>
></ImportantInfoSection>
<div className="txn-divider"></div>
<PaymentInfoWrap
<PaymentInfoSection
transactionCategory={ TransactionCategory.AllTransaction }
paymentInfo={ paymentInfo }
serviceCode={ serviceCode }
isOpen={ showPaymentInfo }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></PaymentInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></PaymentInfoSection>
<div className="txn-divider"></div>
<TransactionInfoWrap
<TransactionInfoSection
transactionCategory={ TransactionCategory.AllTransaction }
transactionInfo={ transactionInfo }
serviceCode={ serviceCode }
isOpen={ showTransactionInfo }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></TransactionInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></TransactionInfoSection>
<div className="txn-divider"></div>
<SettlementInfoWrap
<SettlementInfoSection
transactionCategory={ TransactionCategory.AllTransaction }
settlementInfo={ settlementInfo }
serviceCode={ serviceCode }
isOpen={ showSettlementInfo }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></SettlementInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></SettlementInfoSection>
<div className="txn-divider"></div>
<PartCancelInfoWrap
<PartCancelInfoSection
transactionCategory={ TransactionCategory.AllTransaction }
partCancelInfo={ partCancelInfo }
serviceCode={ serviceCode }
isOpen={ showPartCancelInfo }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></PartCancelInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></PartCancelInfoSection>
</div>
</div>
<div className="apply-row">

13
src/pages/transaction/all-transaction/list-page.tsx
View File

@@ -21,9 +21,11 @@ import {
useSetFooterMode,
useSetFooterCurrentPage
} from '@/widgets/sub-layout/use-sub-layout';
import { useStore } from '@/shared/model/store';
export const AllTransactionListPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [serviceCodeOptions, setServiceCodeOptions] = useState<Array<Record<string, any>>>();
const [selectedServiceCode, setSelectedServiceCode] = useState<string>('st');
@@ -32,7 +34,7 @@ export const AllTransactionListPage = () => {
const [listItems, setListItems] = useState({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [moid, setMoid] = useState<string>('');
const [tid, setTid] = useState<string>('');
// const [fromDate, setFromDate] = useState(moment().subtract(1, 'month').format('YYYYMMDD'));
@@ -50,8 +52,7 @@ export const AllTransactionListPage = () => {
const [totalTransactionCount, setTotalTransactionCount] = useState<number>(0);
const [totalTransactionAmount, setTotalTransactionAmount] = useState<number>(0);
useSetHeaderTitle('거래내역 조회');
useSetHeaderType(HeaderType.LeftArrow);
useSetOnBack(() => {
@@ -139,7 +140,7 @@ export const AllTransactionListPage = () => {
{text: '계좌이체', value: 'transfer'},
{text: '휴대폰', value: 'phone'},
{text: '문화상품권', value: 'gift'},
{text: '티머니페이', value: '티머니페이'},
{text: '티머니페이', value: '티머니페이'}
];
setServiceCodeOptions(options);
setSelectedServiceCode('simple');
@@ -149,7 +150,9 @@ export const AllTransactionListPage = () => {
let val = e.target.value;
// onchagne 에서 useState가 즉시 반영 안되므로 값을 직접 바로 넘긴다.
setSelectedServiceCode(val);
callList({val: val});
callList({
val: val
});
};
const getServiceCodeOptions = () => {

6
src/pages/transaction/billing/detail-page.tsx
View File

@@ -3,7 +3,7 @@ import { useLocation } from 'react-router';
import { PATHS } from '@/shared/constants/paths';
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { useBillingDetailMutation } from '@/entities/transaction/api/use-billing-detail-mutation';
import { BillingInfoWrap } from '@/entities/transaction/ui/info-wrap/billing-info-wrap';
import { BillingInfoSection } from '@/entities/transaction/ui/section/billing-info-section';
import { HeaderType } from '@/entities/common/model/types';
import {
TransactionCategory,
@@ -70,9 +70,9 @@ export const BillingDetailPage = () => {
</div>
<div className="txn-divider"></div>
<BillingInfoWrap
<BillingInfoSection
billingInfo={ billingInfo }
></BillingInfoWrap>
></BillingInfoSection>
</div>
</div>
</div>

11
src/pages/transaction/billing/list-page.tsx
View File

@@ -22,13 +22,14 @@ import {
export const BillingListPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const userInfo = useStore((state) => state.UserStore.userInfo);
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [searchType, setSearchType] = useState<BillingSearchType>(BillingSearchType.ALL);
const [searchKeyword, setSearchKeyword] = useState<string>('');
// const [startDate, setStartDate] = useState(moment().subtract(1, 'month').format('YYYY-MM-DD'));
@@ -112,12 +113,16 @@ export const BillingListPage = () => {
};
const onClickToSort = (sort: SortByKeys) => {
setSortBy(sort);
callList({sortBy: sort});
callList({
sortBy: sort
});
};
const onClickToRequestStatus = (val: BillingRequestStatus) => {
setRequestStatus(val);
callList({val: val});
callList({
val: val
});
};
useEffect(() => {

20
src/pages/transaction/cash-receipt/detail-page.tsx
View File

@@ -3,8 +3,8 @@ import { useLocation } from 'react-router';
import { PATHS } from '@/shared/constants/paths';
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { useCashReceiptDetailMutation } from '@/entities/transaction/api/use-cash-receipt-detail-mutation';
import { IssueInfoWrap } from '@/entities/transaction/ui/info-wrap/issue-info-wrap';
import { DetailInfoWrap } from '@/entities/transaction/ui/info-wrap/detail-info-wrap';
import { IssueInfoSection } from '@/entities/transaction/ui/section/issue-info-section';
import { DetailInfoSection } from '@/entities/transaction/ui/section/detail-info-section';
import { HeaderType } from '@/entities/common/model/types';
import {
TransactionCategory,
@@ -12,7 +12,7 @@ import {
DetailResponse,
IssueInfo,
DetailInfo,
InfoWrapKeys,
InfoSectionKeys,
CashReceiptPurposeType
} from '@/entities/transaction/model/types';
import {
@@ -76,8 +76,8 @@ export const CashReceiptDetailPage = () => {
callDetail();
}, []);
const onClickToOpenInfo = (infoWrapKey: InfoWrapKeys) => {
if(infoWrapKey === InfoWrapKeys.Detail){
const onClickToOpenInfo = (infoSectionKey: InfoSectionKeys) => {
if(infoSectionKey === InfoSectionKeys.Detail){
setShowDetailInfo(!showDetailInfo);
}
};
@@ -93,18 +93,18 @@ export const CashReceiptDetailPage = () => {
<div className="tab-pane sub active">
<div className="option-list">
<div className="txn-detail">
<IssueInfoWrap
<IssueInfoSection
transactionCategory={ TransactionCategory.CashReceipt }
issueInfo={ issueInfo }
purposeType={ purposeType }
></IssueInfoWrap>
></IssueInfoSection>
<div className="txn-divider minus"></div>
<DetailInfoWrap
<DetailInfoSection
transactionCategory={ TransactionCategory.CashReceipt }
detailInfo={ detailInfo }
isOpen={ showDetailInfo }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></DetailInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></DetailInfoSection>
</div>
</div>
<div className="apply-row">

74
src/pages/transaction/cash-receipt/list-page.tsx
View File

@@ -19,15 +19,17 @@ import {
useSetFooterMode
} from '@/widgets/sub-layout/use-sub-layout';
import { CashReceiptIssueStatusBtnGroup } from '@/entities/transaction/model/contant';
import { useStore } from '@/shared/model/store';
export const CashReceiptListPage = () => {
const { navigate } = useNavigate();
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [startDate, setStartDate] = useState(moment().subtract(1, 'month').format('YYYY-MM-DD'));
const [endDate, setEndDate] = useState(moment().format('YYYY-MM-DD'));
const [purposeType, setPurposeType] = useState<CashReceiptPurposeType>(CashReceiptPurposeType.ALL);
@@ -61,7 +63,7 @@ export const CashReceiptListPage = () => {
};
cashReceiptList(listParams).then((rs) => {
console.log(rs)
console.log(rs);
setListItems(assembleData(rs.content));
});
@@ -69,13 +71,13 @@ export const CashReceiptListPage = () => {
const assembleData = (content: Array<CashReceiptListItem>) => {
let data: any = {};
if (content && content.length > 0) {
for (let i = 0; i < content?.length; i++) {
if(content && content.length > 0){
for (let i=0;i<content?.length;i++){
let groupDate = moment(content[i]?.transactionDateTime).format('YYYYMMDD');
if (!!groupDate && !data.hasOwnProperty(groupDate)) {
if(!!groupDate && !data.hasOwnProperty(groupDate)){
data[groupDate] = [];
}
if (!!groupDate && data.hasOwnProperty(groupDate)) {
if(!!groupDate && data.hasOwnProperty(groupDate)){
data[groupDate].push(content[i]);
}
}
@@ -96,12 +98,16 @@ export const CashReceiptListPage = () => {
};
const onClickToSort = (sort: SortByKeys) => {
setSortBy(sort);
callList({ sortBy: sort });
callList({
sortBy: sort
});
};
const onClickToIssueStatus = (val: CashReceiptIssueStatus) => {
setIssueStatus(val);
callList({ val: val });
callList({
val: val
});
};
useEffect(() => {
@@ -119,14 +125,14 @@ export const CashReceiptListPage = () => {
<input
type="text"
className="credit-period"
value={moment(startDate).format('YYYY.MM.DD') + '-' + moment(endDate).format('YYYY.MM.DD')}
readOnly={true}
value={ moment(startDate).format('YYYY.MM.DD') + '-' + moment(endDate).format('YYYY.MM.DD') }
readOnly={ true }
/>
<button className="filter-btn">
<img
src={IMAGE_ROOT + '/ico_setting.svg'}
src={ IMAGE_ROOT + '/ico_setting.svg' }
alt="검색옵션"
onClick={() => onClickToOpenFilter()}
onClick={ () => onClickToOpenFilter() }
/>
</button>
</div>
@@ -143,19 +149,19 @@ export const CashReceiptListPage = () => {
<span className="label">승인</span>
<strong className="amount22">
<NumericFormat
value={83745200}
value={ 83745200 }
thousandSeparator
displayType="text"
suffix={'원'}
suffix='원'
></NumericFormat>
</strong>
<span className="count">
<NumericFormat
value={2745}
value={ 2745 }
thousandSeparator
displayType="text"
prefix={'('}
suffix={'건)'}
prefix='('
suffix='건)'
></NumericFormat>
</span>
</div>
@@ -163,19 +169,19 @@ export const CashReceiptListPage = () => {
<span className="label">취소</span>
<strong className="amount19">
<NumericFormat
value={534407}
value={ 534407 }
thousandSeparator
displayType="text"
suffix={'원'}
suffix='원'
></NumericFormat>
</strong>
<span className="count">
<NumericFormat
value={32}
value={ 32 }
thousandSeparator
displayType="text"
prefix={'('}
suffix={'건)'}
prefix='('
suffix='건)'
></NumericFormat>
</span>
</div>
@@ -184,26 +190,26 @@ export const CashReceiptListPage = () => {
<div className="filter-section">
<SortOptionsBox
sortBy={sortBy}
sortBy={ sortBy }
onClickToSort={ onClickToSort }
></SortOptionsBox>
<div>
<div className="full-menu-keywords no-padding">
{
CashReceiptIssueStatusBtnGroup.map((value, index) => (
<span
key={`key-service-code=${index}`}
className={`keyword-tag ${(issueStatus === value.value) ? 'active' : ''}`}
onClick={() => onClickToIssueStatus(value.value)}
>{value.name}</span>
))
}
{
CashReceiptIssueStatusBtnGroup.map((value, index) => (
<span
key={`key-service-code=${index}`}
className={`keyword-tag ${(issueStatus === value.value) ? 'active' : ''}`}
onClick={() => onClickToIssueStatus(value.value)}
>{value.name}</span>
))
}
</div>
</div>
</div>
<CashReceiptList
listItems={listItems}
transactionCategory={TransactionCategory.CashReceipt}
listItems={ listItems }
transactionCategory={ TransactionCategory.CashReceipt }
></CashReceiptList>
</div>
</div>

55
src/pages/transaction/escrow/detail-page.tsx
View File

@@ -3,11 +3,11 @@ import { useLocation } from 'react-router';
import { PATHS } from '@/shared/constants/paths';
import { useNavigate } from '@/shared/lib/hooks/use-navigate';
import { useEscrowDetailMutation } from '@/entities/transaction/api/use-escrow-detail-mutation';
import { ImportantInfoWrap } from '@/entities/transaction/ui/info-wrap/important-info-wrap';
import { EscrowInfoWrap } from '@/entities/transaction/ui/info-wrap/escrow-info-wrap';
import { PaymentInfoWrap } from '@/entities/transaction/ui/info-wrap/payment-info-wrap';
import { TransactionInfoWrap } from '@/entities/transaction/ui/info-wrap/transaction-info-wrap';
import { SettlementInfoWrap } from '@/entities/transaction/ui/info-wrap/settlement-info-wrap';
import { ImportantInfoSection } from '@/entities/transaction/ui/section/important-info-section';
import { EscrowInfoSection } from '@/entities/transaction/ui/section/escrow-info-section';
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 { HeaderType } from '@/entities/common/model/types';
import {
TransactionCategory,
@@ -18,7 +18,7 @@ import {
PaymentInfo,
TransactionInfo,
SettlementInfo,
InfoWrapKeys
InfoSectionKeys
} from '@/entities/transaction/model/types';
import {
useSetOnBack,
@@ -93,23 +93,23 @@ export const EscrowDetailPage = () => {
});
};
const onClickToOpenInfo = (infoWrapKey: InfoWrapKeys) => {
if(infoWrapKey === InfoWrapKeys.Amount){
const onClickToOpenInfo = (infoSectionKey: InfoSectionKeys) => {
if(infoSectionKey === InfoSectionKeys.Amount){
setShowAmountInfo(!showAmountInfo);
}
else if(infoWrapKey === InfoWrapKeys.Important){
else if(infoSectionKey === InfoSectionKeys.Important){
setShowImportantInfo(!showImportantInfo);
}
else if(infoWrapKey === InfoWrapKeys.Escrow){
else if(infoSectionKey === InfoSectionKeys.Escrow){
setShowEscroInfo(!showEscroInfo);
}
else if(infoWrapKey === InfoWrapKeys.Payment){
else if(infoSectionKey === InfoSectionKeys.Payment){
setShowPaymentInfo(!showPaymentInfo);
}
else if(infoWrapKey === InfoWrapKeys.Transaction){
else if(infoSectionKey === InfoSectionKeys.Transaction){
setShowTransactionInfo(!showTransactionInfo);
}
else if(infoWrapKey === InfoWrapKeys.Settlement){
else if(infoSectionKey === InfoSectionKeys.Settlement){
setShowSettlementInfo(!showSettlementInfo);
}
};
@@ -121,39 +121,38 @@ export const EscrowDetailPage = () => {
<div className="tab-pane sub active">
<div className="option-list">
<div className="txn-detail">
<ImportantInfoWrap
<ImportantInfoSection
transactionCategory={ TransactionCategory.Escrow }
importantInfo={ importantInfo }
></ImportantInfoWrap>
></ImportantInfoSection>
<div className="txn-divider minus"></div>
<EscrowInfoWrap
<EscrowInfoSection
transactionCategory={ TransactionCategory.Escrow }
importantInfo={ importantInfo }
isOpen={ showEscroInfo }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></EscrowInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></EscrowInfoSection>
<div className="txn-divider minus"></div>
<PaymentInfoWrap
<PaymentInfoSection
transactionCategory={ TransactionCategory.Escrow }
paymentInfo={ paymentInfo }
isOpen={ showPaymentInfo }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></PaymentInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></PaymentInfoSection>
<div className="txn-divider"></div>
<TransactionInfoWrap
<TransactionInfoSection
transactionCategory={ TransactionCategory.Escrow }
transactionInfo={ transactionInfo }
isOpen={ showTransactionInfo }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></TransactionInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></TransactionInfoSection>
<div className="txn-divider"></div>
<SettlementInfoWrap
<SettlementInfoSection
transactionCategory={ TransactionCategory.Escrow }
settlementInfo={ settlementInfo }
isOpen={ showSettlementInfo }
onClickToOpenInfo={ (infoWrapKey) => onClickToOpenInfo(infoWrapKey) }
></SettlementInfoWrap>
onClickToOpenInfo={ (infoSectionKey) => onClickToOpenInfo(infoSectionKey) }
></SettlementInfoSection>
<div className="txn-divider"></div>
</div>
</div>

11
src/pages/transaction/escrow/list-page.tsx
View File

@@ -23,12 +23,13 @@ import {
export const EscrowListPage = () => {
const { navigate } = useNavigate();
const userInfo = useStore((state) => state.UserStore.userInfo);
const userMid = useStore.getState().UserStore.mid;
const [sortBy, setSortBy] = useState<SortByKeys>(SortByKeys.New);
const [listItems, setListItems] = useState({});
const [filterOn, setFilterOn] = useState<boolean>(false);
const [pageParam, setPageParam] = useState(DEFAULT_PAGE_PARAM);
const [mid, setMid] = useState<string>('nictest00m');
const [mid, setMid] = useState<string>(userMid);
const [searchType, setSearchType] = useState<EscrowSearchType>(EscrowSearchType.ALL);
const [searchKeyword, setSearchKeyword] = useState<string>('');
//const [startDate, setStartDate] = useState(moment().subtract(1, 'month').format('YYYY-MM-DD'));
@@ -110,12 +111,16 @@ export const EscrowListPage = () => {
};
const onClickToSort = (sort: SortByKeys) => {
setSortBy(sort);
callList({sortBy: sort});
callList({
sortBy: sort
});
};
const onClickToDeliveryStatus = (val: EscrowDeliveryStatus) => {
setDeliveryStatus(val);
callList({val: val});
callList({
val: val
});
};
useEffect(() => {