- 안드로이드 알림 설정 AppBridge 추가
- KeyIn Request 필드 수정
This commit is contained in:
@@ -8,7 +8,7 @@ import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';
|
||||
import { FilterRangeAmount } from '@/shared/ui/filter/range-amount';
|
||||
import { FilterMotionDuration, FilterMotionStyle, FilterMotionVariants } from '@/entities/common/model/constant';
|
||||
import { useStore } from '@/shared/model/store';
|
||||
import { KeyInPaymentFilterProps, KeyInPaymentPaymentStatus } from '@/entities/additional-service/model/key-in/types';
|
||||
import { KeyInPaymentFilterProps, KeyInPaymentTansactionType } from '@/entities/additional-service/model/key-in/types';
|
||||
import { keyInPaymentPaymentStatusBtnGroup } from '@/entities/additional-service/model/key-in/constant';
|
||||
|
||||
export const KeyInPaymentFilter = ({
|
||||
@@ -31,7 +31,7 @@ export const KeyInPaymentFilter = ({
|
||||
const [filterMid, setFilterMid] = useState<string>(mid);
|
||||
const [filterStartDate, setFilterStartDate] = useState<string>(startDate);
|
||||
const [filterEndDate, setFilterEndDate] = useState<string>(endDate);
|
||||
const [filterTransactionStatus, setFilterTransactionStatus] = useState<KeyInPaymentPaymentStatus>(transactionStatus);
|
||||
const [filterTransactionStatus, setFilterTransactionStatus] = useState<KeyInPaymentTansactionType>(transactionStatus);
|
||||
const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
|
||||
const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
|
||||
|
||||
|
||||
@@ -18,13 +18,13 @@ export const KeyInPaymentList = ({
|
||||
for (let i = 0; i < listItems.length; i++) {
|
||||
let items = listItems[i];
|
||||
if (!!items) {
|
||||
let paymentDate = items?.paymentDate;
|
||||
paymentDate = paymentDate?.substring(0, 8)
|
||||
if (!!paymentDate) {
|
||||
let transactionDate = items?.transactionDate;
|
||||
transactionDate = transactionDate?.substring(0, 8)
|
||||
if (!!transactionDate) {
|
||||
if (i === 0) {
|
||||
date = paymentDate;
|
||||
date = transactionDate;
|
||||
}
|
||||
if (date !== paymentDate) {
|
||||
if (date !== transactionDate) {
|
||||
if (list.length > 0) {
|
||||
rs.push(
|
||||
<ListDateGroup
|
||||
@@ -35,7 +35,7 @@ export const KeyInPaymentList = ({
|
||||
></ListDateGroup>
|
||||
);
|
||||
}
|
||||
date = paymentDate;
|
||||
date = transactionDate;
|
||||
list = [];
|
||||
}
|
||||
list.push(items);
|
||||
|
||||
@@ -38,6 +38,12 @@ export const ListDateGroup = ({
|
||||
resultStatus={ items[i]?.resultStatus }
|
||||
resultMessage={ items[i]?.resultMessage }
|
||||
applicationDate={ items[i]?.applicationDate }
|
||||
transactionTime={ items[i]?.transactionTime }
|
||||
transactionDate={ items[i]?.transactionDate }
|
||||
transactionCode={ items[i]?.transactionCode }
|
||||
transactionType={ items[i]?.transactionType }
|
||||
customerName={ items[i]?.customerName }
|
||||
statusLabel={ items[i]?.statusLabel }
|
||||
|
||||
amount={ items[i]?.amount }
|
||||
sendDate={ items[i]?.sendDate }
|
||||
|
||||
@@ -24,7 +24,6 @@ export const ListItem = ({
|
||||
accountName,
|
||||
|
||||
submallId, settlementDate, companyName,
|
||||
status: disbursementStatus, amount: disbursementAmount,
|
||||
|
||||
orderStatus, arsPaymentMethod,
|
||||
|
||||
@@ -452,7 +451,7 @@ export const ListItem = ({
|
||||
else if (additionalServiceCategory === AdditionalServiceCategory.Payout) {
|
||||
rs.push(
|
||||
<div className="transaction-details">
|
||||
<span>{getPayoutStatusText(disbursementStatus)}</span>
|
||||
<span>{getPayoutStatusText(status)}</span>
|
||||
<span className="separator">|</span>
|
||||
<span>{submallId}</span>
|
||||
</div>
|
||||
@@ -580,7 +579,7 @@ export const ListItem = ({
|
||||
className="transaction-amount"
|
||||
>
|
||||
<NumericFormat
|
||||
value={disbursementAmount}
|
||||
value={amount}
|
||||
thousandSeparator
|
||||
displayType="text"
|
||||
suffix='원'
|
||||
|
||||
Reference in New Issue
Block a user