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

버그 픽스 및 정산 조회

Browse Source
This commit is contained in:
focp212@naver.com
2025-10-24 13:55:37 +09:00
parent b2568ea8ff
commit 7f891b85b1
13 changed files with 89 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/entities/settlement/model/types.ts
View File

@@ -93,6 +93,11 @@ export interface AmountInfo {
holdAmount?: number; holdAmount?: number;
releaseAmount?: number; releaseAmount?: number;
offsetAmount?: number; offsetAmount?: number;
transactionAmount?: number;
settlementAmount?: number;
preSettlementCancelOffset?: number;
finalSettlementAmount?: number;
}; };
export interface TransactionInfo { export interface TransactionInfo {
orderNumber: string; orderNumber: string;

102
src/entities/settlement/ui/info-wrap/amount-info-wrap.tsx
View File

@@ -19,67 +19,55 @@ export const AmountInfoWrap = ({
<li className="kv-row"> <li className="kv-row">
<span className="k">거래금액 합계</span> <span className="k">거래금액 합계</span>
<span className="v"> <span className="v">
<span> <NumericFormat
<NumericFormat value={ amountInfo?.totalTransactionAmount }
value={ amountInfo?.totalTransactionAmount } thousandSeparator
thousandSeparator displayType="text"
displayType="text" suffix='원'
suffix='원' ></NumericFormat>
></NumericFormat> <NumericFormat
</span> value={ amountInfo?.totalTransactionCount }
<span> thousandSeparator
<NumericFormat displayType="text"
value={ amountInfo?.totalTransactionCount } prefix=' ('
thousandSeparator suffix='건)'
displayType="text" ></NumericFormat>
prefix=' ('
suffix='건)'
></NumericFormat>
</span>
</span> </span>
<ul className="txn-amount-detail"> <ul className="txn-amount-detail">
<li> <li>
<span>·&nbsp;&nbsp;신용카드</span> <span>·&nbsp;&nbsp;신용카드</span>
<span> <span className="unset-child-span">
<span> <NumericFormat
<NumericFormat value={ amountInfo?.creditCardAmount }
value={ amountInfo?.creditCardAmount } thousandSeparator
thousandSeparator displayType="text"
displayType="text" suffix='원'
suffix='원' ></NumericFormat>
></NumericFormat> <NumericFormat
</span> value={ amountInfo?.creditCardCount }
<span> thousandSeparator
<NumericFormat displayType="text"
value={ amountInfo?.creditCardCount } prefix=' ('
thousandSeparator suffix='건)'
displayType="text" ></NumericFormat>
prefix=' ('
suffix='건)'
></NumericFormat>
</span>
</span> </span>
</li> </li>
<li> <li>
<span>·&nbsp;&nbsp;계좌이체</span> <span>·&nbsp;&nbsp;계좌이체</span>
<span> <span className="unset-child-span">
<span> <NumericFormat
<NumericFormat value={ amountInfo?.accountTransferAmount }
value={ amountInfo?.accountTransferAmount } thousandSeparator
thousandSeparator displayType="text"
displayType="text" suffix='원'
suffix='원' ></NumericFormat>
></NumericFormat> <NumericFormat
</span> value={ amountInfo?.accountTransferCount }
<span> thousandSeparator
<NumericFormat displayType="text"
value={ amountInfo?.accountTransferCount } prefix=' ('
thousandSeparator suffix='건)'
displayType="text" ></NumericFormat>
prefix=' ('
suffix='건)'
></NumericFormat>
</span>
</span> </span>
</li> </li>
</ul> </ul>
@@ -178,7 +166,7 @@ export const AmountInfoWrap = ({
<span className="k">거래금액</span> <span className="k">거래금액</span>
<span className="v"> <span className="v">
<NumericFormat <NumericFormat
value={ amountInfo?.totalTransactionAmount } value={ amountInfo?.transactionAmount }
thousandSeparator thousandSeparator
displayType="text" displayType="text"
suffix='원' suffix='원'
@@ -233,7 +221,7 @@ export const AmountInfoWrap = ({
<span className="k">정산예정금액</span> <span className="k">정산예정금액</span>
<span className="v"> <span className="v">
<NumericFormat <NumericFormat
value={ amountInfo?.offsetAmount } value={ amountInfo?.settlementAmount }
thousandSeparator thousandSeparator
displayType="text" displayType="text"
suffix='원' suffix='원'
@@ -244,7 +232,7 @@ export const AmountInfoWrap = ({
<span className="k">정산전 취소상계</span> <span className="k">정산전 취소상계</span>
<span className="v"> <span className="v">
<NumericFormat <NumericFormat
value={ amountInfo?.offsetAmount } value={ amountInfo?.preSettlementCancelOffset }
thousandSeparator thousandSeparator
displayType="text" displayType="text"
suffix='원' suffix='원'
@@ -255,7 +243,7 @@ export const AmountInfoWrap = ({
<span className="k">정산금액</span> <span className="k">정산금액</span>
<span className="v"> <span className="v">
<NumericFormat <NumericFormat
value={ amountInfo?.offsetAmount } value={ amountInfo?.finalSettlementAmount }
thousandSeparator thousandSeparator
displayType="text" displayType="text"
suffix='원' suffix='원'

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

@@ -182,16 +182,6 @@ export const ListWrap = ({
} }
} }
}; };
useEffect(() => {
setTransactionIds([
'TXN_20250608_001',
'TXN_20250608_002'
]);
}, []);
useEffect(() => {
callList();
}, [periodType]);
const getSettlementDateListDateGroup = () => { const getSettlementDateListDateGroup = () => {
let rs = []; let rs = [];
@@ -209,7 +199,6 @@ export const ListWrap = ({
date = settlementDate; date = settlementDate;
} }
if(date !== settlementDate){ if(date !== settlementDate){
date = settlementDate;
if(list.length > 0){ if(list.length > 0){
rs.push( rs.push(
<ListDateGroup <ListDateGroup
@@ -220,6 +209,7 @@ export const ListWrap = ({
></ListDateGroup> ></ListDateGroup>
); );
} }
date = settlementDate;
list = []; list = [];
} }
list.push(listItem); list.push(listItem);
@@ -255,7 +245,6 @@ export const ListWrap = ({
date = settlementDate; date = settlementDate;
} }
if(date !== settlementDate){ if(date !== settlementDate){
date = settlementDate;
if(list.length > 0){ if(list.length > 0){
rs.push( rs.push(
<ListDateGroup <ListDateGroup
@@ -266,6 +255,7 @@ export const ListWrap = ({
></ListDateGroup> ></ListDateGroup>
); );
} }
date = settlementDate;
list = []; list = [];
} }
list.push(listItem); list.push(listItem);
@@ -304,6 +294,22 @@ export const ListWrap = ({
*/ */
}; };
useEffect(() => {
setTransactionIds([
'TXN_20250608_001',
'TXN_20250608_002'
]);
}, []);
useEffect(() => {
callList();
}, [
mid, periodType,
startDate, endDate,
paymentMethod
]);
return ( return (
<> <>
<div className="summary-section pt-30"> <div className="summary-section pt-30">

2
src/entities/transaction/ui/all-transaction-list.tsx
View File

@@ -19,7 +19,6 @@ export const AllTransactionList = ({
date = transactionDate; date = transactionDate;
} }
if(date !== transactionDate){ if(date !== transactionDate){
date = transactionDate;
if(list.length > 0){ if(list.length > 0){
rs.push( rs.push(
<ListDateGroup <ListDateGroup
@@ -30,6 +29,7 @@ export const AllTransactionList = ({
></ListDateGroup> ></ListDateGroup>
); );
} }
date = transactionDate;
list = []; list = [];
} }
list.push(item); list.push(item);

2
src/entities/transaction/ui/billing-list.tsx
View File

@@ -22,7 +22,6 @@ export const BillingList = ({
date = transactionDate; date = transactionDate;
} }
if(date !== transactionDate){ if(date !== transactionDate){
date = transactionDate;
if(list.length > 0){ if(list.length > 0){
rs.push( rs.push(
<ListDateGroup <ListDateGroup
@@ -33,6 +32,7 @@ export const BillingList = ({
></ListDateGroup> ></ListDateGroup>
); );
} }
date = transactionDate;
list = []; list = [];
} }
list.push(item); list.push(item);

2
src/entities/transaction/ui/cash-receipt-list.tsx
View File

@@ -22,7 +22,6 @@ export const CashReceiptList = ({
date = transactionDate; date = transactionDate;
} }
if(date !== transactionDate){ if(date !== transactionDate){
date = transactionDate;
if(list.length > 0){ if(list.length > 0){
rs.push( rs.push(
<ListDateGroup <ListDateGroup
@@ -33,6 +32,7 @@ export const CashReceiptList = ({
></ListDateGroup> ></ListDateGroup>
); );
} }
date = transactionDate;
list = []; list = [];
} }
list.push(item); list.push(item);

2
src/entities/transaction/ui/escrow-list.tsx
View File

@@ -19,7 +19,6 @@ export const EscrowList = ({
date = transactionDate; date = transactionDate;
} }
if(date !== transactionDate){ if(date !== transactionDate){
date = transactionDate;
if(list.length > 0){ if(list.length > 0){
rs.push( rs.push(
<ListDateGroup <ListDateGroup
@@ -30,6 +29,7 @@ export const EscrowList = ({
></ListDateGroup> ></ListDateGroup>
); );
} }
date = transactionDate;
list = []; list = [];
} }
list.push(item); list.push(item);

2
src/entities/vat-return/ui/list-date-group.tsx
View File

@@ -9,7 +9,7 @@ export const ListDateGroup = ({
}: ListDateGroupProps) => { }: ListDateGroupProps) => {
moment.locale('ko'); moment.locale('ko');
const getStateDate = () => { const getStateDate = () => {
let stateDate = moment(date).format('YY.MM'); let stateDate = moment(date).format('YYYY.MM');
return stateDate; return stateDate;
}; };

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

@@ -1,5 +1,4 @@
import moment from 'moment'; import moment from 'moment';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import { IMAGE_ROOT } from '@/shared/constants/common'; import { IMAGE_ROOT } from '@/shared/constants/common';
import { ListFilter } from './filter/list-filter'; import { ListFilter } from './filter/list-filter';
@@ -91,7 +90,6 @@ export const ListWrap = () => {
date = issueDate; date = issueDate;
} }
if(date !== issueDate){ if(date !== issueDate){
date = issueDate;
if(list.length > 0){ if(list.length > 0){
rs.push( rs.push(
<ListDateGroup <ListDateGroup
@@ -101,6 +99,7 @@ export const ListWrap = () => {
></ListDateGroup> ></ListDateGroup>
); );
} }
date = issueDate;
list = []; list = [];
} }
list.push(item); list.push(item);

2
src/entities/vat-return/ui/section/amount-section.tsx
View File

@@ -27,7 +27,7 @@ export const AmountSection = ({
}; };
const onClickToOpenDownloadBottomSheet = () => { const onClickToOpenDownloadBottomSheet = () => {
setDownloadBottomSheetOn(true);
}; };
return ( return (

2
src/pages/vat-return/detail-page.tsx
View File

@@ -89,7 +89,7 @@ export const DetailPage = () => {
<button <button
className="btn-50 btn-blue flex-1" className="btn-50 btn-blue flex-1"
onClick={ onClickToOpenBottomSheet } onClick={ onClickToOpenBottomSheet }
>거래 취소</button> >세부내역 조회</button>
</div> </div>
</div> </div>
</div> </div>

7
src/shared/ui/assets/css/style-fix.css
View File

@@ -379,3 +379,10 @@ main.home-main{
.scrollbar-hide::-webkit-scrollbar { .scrollbar-hide::-webkit-scrollbar {
display: none; /* Chrome, Safari, Opera */ display: none; /* Chrome, Safari, Opera */
} }
.unset-child-span > span {
color: unset !important;
font-size: unset !important;
font-weight: unset !important;
width: unset !important;
text-align: unset !important;
}

12
src/shared/ui/filter/calendar-month.tsx
View File

@@ -28,20 +28,20 @@ export const FilterCalendarMonth = ({
const setFilterMonth = (monthOptions: FilterMonthOptions) => { const setFilterMonth = (monthOptions: FilterMonthOptions) => {
if(monthOptions === FilterMonthOptions.Month1){ if(monthOptions === FilterMonthOptions.Month1){
setStartMonth(moment().format('YYYY.MM')); setStartMonth(moment().format('YYYYMM'));
setEndMonth(moment().format('YYYY.MM')); setEndMonth(moment().format('YYYYMM'));
setMonthReadyOnly(true); setMonthReadyOnly(true);
setFilterMonthOptionsBtn(FilterMonthOptions.Month1); setFilterMonthOptionsBtn(FilterMonthOptions.Month1);
} }
else if(monthOptions === FilterMonthOptions.Month2){ else if(monthOptions === FilterMonthOptions.Month2){
setStartMonth(moment().subtract(1, 'month').format('YYYY.MM')); setStartMonth(moment().subtract(1, 'month').format('YYYYMM'));
setEndMonth(moment().format('YYYY.MM')); setEndMonth(moment().format('YYYYMM'));
setMonthReadyOnly(true); setMonthReadyOnly(true);
setFilterMonthOptionsBtn(FilterMonthOptions.Month2); setFilterMonthOptionsBtn(FilterMonthOptions.Month2);
} }
else if(monthOptions === FilterMonthOptions.Month3){ else if(monthOptions === FilterMonthOptions.Month3){
setStartMonth(moment().subtract(2, 'month').format('YYYY.MM')); setStartMonth(moment().subtract(2, 'month').format('YYYYMM'));
setEndMonth(moment().format('YYYY.MM')); setEndMonth(moment().format('YYYYMM'));
setMonthReadyOnly(true); setMonthReadyOnly(true);
setFilterMonthOptionsBtn(FilterMonthOptions.Month3); setFilterMonthOptionsBtn(FilterMonthOptions.Month3);
} }