- 정산조회_정산내역_ 거래기준 조회 Request Enum Value 오류 수정
This commit is contained in:
@@ -3,7 +3,7 @@ import { SettlementPaymentMethod, SettlementPeriodType } from './types';
|
|||||||
|
|
||||||
export const getSettlementPeriodTypeBtnGroup = (t: TFunction) => [
|
export const getSettlementPeriodTypeBtnGroup = (t: TFunction) => [
|
||||||
{name: t('settlement.periodType.settlementDate'), value: SettlementPeriodType.SETTLEMENT_DATE },
|
{name: t('settlement.periodType.settlementDate'), value: SettlementPeriodType.SETTLEMENT_DATE },
|
||||||
{name: t('settlement.periodType.transactionDate'), value: SettlementPeriodType.TRANSACTION_DATE }
|
{name: t('settlement.periodType.transactionDate'), value: SettlementPeriodType.DEPOSIT_DATE }
|
||||||
];
|
];
|
||||||
|
|
||||||
export const getSettlementPaymentMethodOptionsGroup = (t: TFunction) => [
|
export const getSettlementPaymentMethodOptionsGroup = (t: TFunction) => [
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ export interface SettlementTabProps {
|
|||||||
};
|
};
|
||||||
export enum SettlementPeriodType {
|
export enum SettlementPeriodType {
|
||||||
SETTLEMENT_DATE = 'SETTLEMENT_DATE',
|
SETTLEMENT_DATE = 'SETTLEMENT_DATE',
|
||||||
TRANSACTION_DATE = 'TRANSACTION_DATE',
|
DEPOSIT_DATE = 'DEPOSIT_DATE',
|
||||||
};
|
};
|
||||||
export enum SettlementPaymentMethod {
|
export enum SettlementPaymentMethod {
|
||||||
ALL = 'ALL',
|
ALL = 'ALL',
|
||||||
|
|||||||
@@ -118,7 +118,7 @@ export const SettlementDetail = ({
|
|||||||
if(periodType === SettlementPeriodType.SETTLEMENT_DATE && settlementId){
|
if(periodType === SettlementPeriodType.SETTLEMENT_DATE && settlementId){
|
||||||
callSettlementDetail();
|
callSettlementDetail();
|
||||||
}
|
}
|
||||||
else if(periodType === SettlementPeriodType.TRANSACTION_DATE && tid){
|
else if(periodType === SettlementPeriodType.DEPOSIT_DATE && tid){
|
||||||
callTransactionDetail();
|
callTransactionDetail();
|
||||||
}
|
}
|
||||||
}, [periodType, settlementId, tid]);
|
}, [periodType, settlementId, tid]);
|
||||||
@@ -157,7 +157,7 @@ export const SettlementDetail = ({
|
|||||||
<div className="txn-date">{ moment(settlementDate).format('YYYY.MM.DD') }</div>
|
<div className="txn-date">{ moment(settlementDate).format('YYYY.MM.DD') }</div>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
{ (periodType === SettlementPeriodType.TRANSACTION_DATE) &&
|
{ (periodType === SettlementPeriodType.DEPOSIT_DATE) &&
|
||||||
<div className="txn-num-group">
|
<div className="txn-num-group">
|
||||||
<div className="txn-amount">
|
<div className="txn-amount">
|
||||||
<div className="value">
|
<div className="value">
|
||||||
@@ -184,7 +184,7 @@ export const SettlementDetail = ({
|
|||||||
onClickToShowInfo={ (infoWrapKey) => onClickToShowInfo(infoWrapKey) }
|
onClickToShowInfo={ (infoWrapKey) => onClickToShowInfo(infoWrapKey) }
|
||||||
></SettlementInfoWrap>
|
></SettlementInfoWrap>
|
||||||
}
|
}
|
||||||
{ (periodType === SettlementPeriodType.TRANSACTION_DATE) &&
|
{ (periodType === SettlementPeriodType.DEPOSIT_DATE) &&
|
||||||
<TransactionInfoWrap
|
<TransactionInfoWrap
|
||||||
transactionInfo={ transactionInfo }
|
transactionInfo={ transactionInfo }
|
||||||
isOpen={ showTransaction }
|
isOpen={ showTransaction }
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ export const AmountInfoWrap = ({
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
}
|
}
|
||||||
{ (periodType === SettlementPeriodType.TRANSACTION_DATE) &&
|
{ (periodType === SettlementPeriodType.DEPOSIT_DATE) &&
|
||||||
<ul className="kv-list">
|
<ul className="kv-list">
|
||||||
<li className="kv-row">
|
<li className="kv-row">
|
||||||
<span className="k">{t('settlement.transactionAmount')}</span>
|
<span className="k">{t('settlement.transactionAmount')}</span>
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export const ListItem = ({
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if(periodType === SettlementPeriodType.TRANSACTION_DATE){
|
else if(periodType === SettlementPeriodType.DEPOSIT_DATE){
|
||||||
if(setDetailData && tid){
|
if(setDetailData && tid){
|
||||||
setDetailData({
|
setDetailData({
|
||||||
tid: tid,
|
tid: tid,
|
||||||
@@ -44,7 +44,7 @@ export const ListItem = ({
|
|||||||
if(periodType === SettlementPeriodType.SETTLEMENT_DATE && settlementAmount){
|
if(periodType === SettlementPeriodType.SETTLEMENT_DATE && settlementAmount){
|
||||||
if(settlementAmount > 0) rs = 'blue';
|
if(settlementAmount > 0) rs = 'blue';
|
||||||
}
|
}
|
||||||
else if(periodType === SettlementPeriodType.TRANSACTION_DATE && transactionAmount){
|
else if(periodType === SettlementPeriodType.DEPOSIT_DATE && transactionAmount){
|
||||||
if(transactionAmount > 0) rs = 'blue';
|
if(transactionAmount > 0) rs = 'blue';
|
||||||
}
|
}
|
||||||
return rs;
|
return rs;
|
||||||
@@ -63,7 +63,7 @@ export const ListItem = ({
|
|||||||
{ (periodType === SettlementPeriodType.SETTLEMENT_DATE) &&
|
{ (periodType === SettlementPeriodType.SETTLEMENT_DATE) &&
|
||||||
<div className="transaction-title">{ `${merchantName}(${mid})` }</div>
|
<div className="transaction-title">{ `${merchantName}(${mid})` }</div>
|
||||||
}
|
}
|
||||||
{ (periodType === SettlementPeriodType.TRANSACTION_DATE) &&
|
{ (periodType === SettlementPeriodType.DEPOSIT_DATE) &&
|
||||||
<>
|
<>
|
||||||
<div className="transaction-title">{ `${approvalNumber || 'NO_NUMBER'}(${mid})` }</div>
|
<div className="transaction-title">{ `${approvalNumber || 'NO_NUMBER'}(${mid})` }</div>
|
||||||
<div className="transaction-details">
|
<div className="transaction-details">
|
||||||
|
|||||||
@@ -98,7 +98,7 @@ export const ListWrap = ({
|
|||||||
if(periodType === SettlementPeriodType.SETTLEMENT_DATE){
|
if(periodType === SettlementPeriodType.SETTLEMENT_DATE){
|
||||||
callSettlementList(type);
|
callSettlementList(type);
|
||||||
}
|
}
|
||||||
else if(periodType === SettlementPeriodType.TRANSACTION_DATE){
|
else if(periodType === SettlementPeriodType.DEPOSIT_DATE){
|
||||||
callTransactionList(type);
|
callTransactionList(type);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -486,7 +486,7 @@ export const ListWrap = ({
|
|||||||
}
|
}
|
||||||
</SlideDown>
|
</SlideDown>
|
||||||
}
|
}
|
||||||
{ (periodType === SettlementPeriodType.TRANSACTION_DATE) &&
|
{ (periodType === SettlementPeriodType.DEPOSIT_DATE) &&
|
||||||
<SlideDown className={'my-dropdown-slidedown'}>
|
<SlideDown className={'my-dropdown-slidedown'}>
|
||||||
{ isOpenSummary &&
|
{ isOpenSummary &&
|
||||||
<ListSummaryExtendTransaction
|
<ListSummaryExtendTransaction
|
||||||
@@ -515,8 +515,8 @@ export const ListWrap = ({
|
|||||||
onClick={ () => changePeriodType(SettlementPeriodType.SETTLEMENT_DATE) }
|
onClick={ () => changePeriodType(SettlementPeriodType.SETTLEMENT_DATE) }
|
||||||
>{t('settlement.merchantBasis')}</span>
|
>{t('settlement.merchantBasis')}</span>
|
||||||
<span
|
<span
|
||||||
className={ `keyword-tag ${(periodType === SettlementPeriodType.TRANSACTION_DATE)? 'active': ''}` }
|
className={ `keyword-tag ${(periodType === SettlementPeriodType.DEPOSIT_DATE)? 'active': ''}` }
|
||||||
onClick={ () => changePeriodType(SettlementPeriodType.TRANSACTION_DATE) }
|
onClick={ () => changePeriodType(SettlementPeriodType.DEPOSIT_DATE) }
|
||||||
>{t('settlement.transactionBasis')}</span>
|
>{t('settlement.transactionBasis')}</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -526,7 +526,7 @@ export const ListWrap = ({
|
|||||||
getSettlementDateListDateGroup()
|
getSettlementDateListDateGroup()
|
||||||
}
|
}
|
||||||
|
|
||||||
{ (periodType === SettlementPeriodType.TRANSACTION_DATE) &&
|
{ (periodType === SettlementPeriodType.DEPOSIT_DATE) &&
|
||||||
getTransactionDateListDateGroup()
|
getTransactionDateListDateGroup()
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user