minAmount max amount 타입 변경 및 ars
This commit is contained in:
@@ -28,15 +28,15 @@ export interface PayoutFilterProps {
|
||||
fromDate: string;
|
||||
toDate: string;
|
||||
disbursementStatus: PayoutDisbursementStatus;
|
||||
minAmount?: number | string;
|
||||
maxAmount?: number | string;
|
||||
minAmount?: number;
|
||||
maxAmount?: number;
|
||||
setMid: (mid: string) => void;
|
||||
setSearchCl: (searchCl: PayoutSearchCl) => void;
|
||||
setFromDate: (fromDate: string) => void;
|
||||
setToDate: (toDate: string) => void;
|
||||
setDisbursementStatus: (disbursementStatus: PayoutDisbursementStatus) => void;
|
||||
setMinAmount: (minAmount: string | number) => void;
|
||||
setMaxAmount: (maxAmount: string | number) => void;
|
||||
setMinAmount: (minAmount?: number) => void;
|
||||
setMaxAmount: (maxAmount?: number) => void;
|
||||
};
|
||||
|
||||
export const PayoutFilter = ({
|
||||
@@ -63,8 +63,8 @@ export const PayoutFilter = ({
|
||||
const [filterFromDate, setFilterFromDate] = useState<string>(moment(fromDate).format('YYYY.MM.DD'));
|
||||
const [filterToDate, setFilterToDate] = useState<string>(moment(toDate).format('YYYY.MM.DD'));
|
||||
const [filterDisbursementStatus, setFilterDisbursementStatus] = useState<PayoutDisbursementStatus>(disbursementStatus);
|
||||
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
|
||||
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
|
||||
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
|
||||
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
|
||||
|
||||
const onClickToClose = () => {
|
||||
setFilterOn(false);
|
||||
|
||||
@@ -34,8 +34,8 @@ export const KeyInPaymentFilter = ({
|
||||
const [filterStartDate, setFilterStartDate] = useState<string>(startDate);
|
||||
const [filterEndDate, setFilterEndDate] = useState<string>(endDate);
|
||||
const [filterTransactionStatus, setFilterTransactionStatus] = useState<KeyInPaymentTransactionStatus>(transactionStatus);
|
||||
const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
|
||||
const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
|
||||
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
|
||||
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
|
||||
|
||||
const variants = {
|
||||
hidden: { x: '100%' },
|
||||
|
||||
@@ -53,7 +53,10 @@ export const ListDateGroup = ({
|
||||
receiveAccountNo={ items[i]?.receiveAccountNo }
|
||||
receiveAccountName={ items[i]?.receiveAccountName }
|
||||
status={ items[i]?.status }
|
||||
processDate={items[i]?.processDate }
|
||||
processDate={ items[i]?.processDate }
|
||||
|
||||
orderStatus={ items[i]?.orderStatus }
|
||||
arsPaymentMethod={ items[i]?.arsPaymentMethod }
|
||||
></ListItem>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -20,7 +20,9 @@ export const ListItem = ({
|
||||
|
||||
transferAmount, receiveBankName,
|
||||
receiveAccountNo, receiveAccountName,
|
||||
status, processDate
|
||||
status, processDate,
|
||||
|
||||
orderStatus, arsPaymentMethod
|
||||
}: ListItemProps) => {
|
||||
const { navigate } = useNavigate();
|
||||
const getItemClass = () => {
|
||||
@@ -171,6 +173,15 @@ export const ListItem = ({
|
||||
}
|
||||
});
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.Ars){
|
||||
navigate(PATHS.additionalService.payout.detail, {
|
||||
state: {
|
||||
additionalServiceCategory: additionalServiceCategory,
|
||||
mid: mid,
|
||||
tid: tid
|
||||
}
|
||||
});
|
||||
}
|
||||
else {
|
||||
alert('additionalServiceCategory가 존재하지 않습니다.');
|
||||
}
|
||||
@@ -196,6 +207,10 @@ export const ListItem = ({
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.FundAccountResult) {
|
||||
timeStr = moment(requestDate).format('mm:ss');
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.Ars){
|
||||
let time = paymentDate?.substring(8, 12);
|
||||
timeStr = time?.substring(0, 2) + ':' + time?.substring(2, 4);
|
||||
}
|
||||
else {
|
||||
return
|
||||
}
|
||||
@@ -208,28 +223,31 @@ export const ListItem = ({
|
||||
str = `${tid}(${amount})`;
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderAuth) {
|
||||
str = `${accountName}(${accountNo})`
|
||||
str = `${accountName}(${accountNo})`;
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.AccountHolderSearch) {
|
||||
str = `${accountNo}`
|
||||
str = `${accountNo}`;
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.LinkPaymentHistory ||
|
||||
additionalServiceCategory === AdditionalServiceCategory.LinkPaymentPending
|
||||
) {
|
||||
if (sendMethod === "SMS") {
|
||||
str = `${"buyerName"}(${"휴대폰 번호"})`
|
||||
str = `${"buyerName"}(${"휴대폰 번호"})`;
|
||||
} else {
|
||||
str = `${"buyerName"}(${"이메일"})`
|
||||
str = `${"buyerName"}(${"이메일"})`;
|
||||
}
|
||||
}
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
|
||||
str = companyName;
|
||||
}
|
||||
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountTransfer){
|
||||
str = `${receiveAccountName}(${receiveAccountNo})`
|
||||
str = `${receiveAccountName}(${receiveAccountNo})`;
|
||||
}
|
||||
else if(additionalServiceCategory === AdditionalServiceCategory.FundAccountResult){
|
||||
str = `${receiveAccountName}(${receiveAccountNo})`
|
||||
str = `${receiveAccountName}(${receiveAccountNo})`;
|
||||
}
|
||||
else if(additionalServiceCategory === AdditionalServiceCategory.Ars){
|
||||
str = '이름(' + tid + ')';
|
||||
}
|
||||
|
||||
return str;
|
||||
@@ -321,6 +339,19 @@ export const ListItem = ({
|
||||
</div>
|
||||
);
|
||||
}
|
||||
else if(additionalServiceCategory === AdditionalServiceCategory.Ars){
|
||||
rs.push(
|
||||
<div className="transaction-details">
|
||||
<span>{ getTime() }</span>
|
||||
<span className="separator">|</span>
|
||||
<span>{ paymentStatus }</span>
|
||||
<span className="separator">|</span>
|
||||
<span>{ orderStatus }</span>
|
||||
<span className="separator">|</span>
|
||||
<span>{ arsPaymentMethod }</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
return rs;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user