diff --git a/src/entities/transaction/model/contant.ts b/src/entities/transaction/model/contant.ts index 7890050..69d994a 100644 --- a/src/entities/transaction/model/contant.ts +++ b/src/entities/transaction/model/contant.ts @@ -1,4 +1,5 @@ -import { +import { TFunction } from 'i18next'; +import { AllTransactionMoidTid, AllTransactionSearchCl, AllTransactionServiceCode, @@ -6,7 +7,7 @@ import { CashReceiptPurposeType, CashReceiptTransactionType, CashReceiptProcessResult, - BillingPaymentMethod, + BillingPaymentMethod, BillingProcessResult, BillingRequestStatus, BillingSearchType, @@ -15,121 +16,121 @@ import { EscrowSettlementStatus } from '@/entities/transaction/model/types'; -export const AllTransactionMoidTidOptionsGroup = [ - {name: '주문번호', value: AllTransactionMoidTid.MOID}, - {name: 'TID', value: AllTransactionMoidTid.TID}, +export const getAllTransactionMoidTidOptionsGroup = (t: TFunction) => [ + {name: t('transaction.constants.orderNumber'), value: AllTransactionMoidTid.MOID}, + {name: t('transaction.constants.tid'), value: AllTransactionMoidTid.TID}, ]; -export const AllTransactionStatusCodeBtnGroup = [ - {name: '전체', value: AllTransactionStatusCode.ALL}, - {name: '승인/입금완료', value: AllTransactionStatusCode.APPROVAL}, - {name: '전취소/취소', value: AllTransactionStatusCode.CANCEL}, - {name: '후취소/환불', value: AllTransactionStatusCode.REFUND} -]; -export const AllTransactionServiceCodeOptionsGroup = [ - {name: '전체', value: AllTransactionServiceCode.ALL}, - {name: '신용카드', value: AllTransactionServiceCode.CREDIT_CARD}, - {name: '가상계좌', value: AllTransactionServiceCode.VIRTUAL_ACCOUNT}, - {name: '계좌이체', value: AllTransactionServiceCode.ACCOUNT_TRANSFER}, - {name: '계좌간편결제', value: AllTransactionServiceCode.ACCOUNT_SIMPLE_TRANSFER}, - {name: '휴대폰', value: AllTransactionServiceCode.MOBILE_PAYMENT}, - {name: 'SSG 머니', value: AllTransactionServiceCode.SSGMONEY}, - {name: 'SSG 은행계좌', value: AllTransactionServiceCode.SSGBANK}, - {name: '문화상품권', value: AllTransactionServiceCode.CULT}, - {name: '티머니페이', value: AllTransactionServiceCode.TMONEY}, - +export const getAllTransactionStatusCodeBtnGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: AllTransactionStatusCode.ALL}, + {name: t('transaction.constants.approvalComplete'), value: AllTransactionStatusCode.APPROVAL}, + {name: t('transaction.constants.totalCancel'), value: AllTransactionStatusCode.CANCEL}, + {name: t('transaction.constants.refund'), value: AllTransactionStatusCode.REFUND} ]; -export const AllTracsactionStatusCode = [ +export const getAllTransactionServiceCodeOptionsGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: AllTransactionServiceCode.ALL}, + {name: t('transaction.constants.creditCard'), value: AllTransactionServiceCode.CREDIT_CARD}, + {name: t('transaction.constants.virtualAccount'), value: AllTransactionServiceCode.VIRTUAL_ACCOUNT}, + {name: t('transaction.constants.accountTransfer'), value: AllTransactionServiceCode.ACCOUNT_TRANSFER}, + {name: t('transaction.constants.accountSimpleTransfer'), value: AllTransactionServiceCode.ACCOUNT_SIMPLE_TRANSFER}, + {name: t('transaction.constants.mobilePayment'), value: AllTransactionServiceCode.MOBILE_PAYMENT}, + {name: t('transaction.constants.ssgMoney'), value: AllTransactionServiceCode.SSGMONEY}, + {name: t('transaction.constants.ssgBank'), value: AllTransactionServiceCode.SSGBANK}, + {name: t('transaction.constants.cultureLand'), value: AllTransactionServiceCode.CULT}, + {name: t('transaction.constants.tmoneyPay'), value: AllTransactionServiceCode.TMONEY}, +]; + +export const getAllTransactionStatusCode = (t: TFunction) => [ { - serviceCode: '', + serviceCode: '', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '승인/입금완료', en: 'Approval'}, - {code: '1', ko: '전취소/취소', en: 'Total Cancellation'}, - {code: '2', ko: '후취소/환불', en: 'Cancellation'} + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.approvalComplete')}, + {code: '1', name: t('transaction.constants.totalCancel')}, + {code: '2', name: t('transaction.constants.refund')} ] }, { - serviceCode: '01', + serviceCode: '01', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '승인', en: 'Approval'}, - {code: '1', ko: '전취소', en: 'Total Cancellation'}, - {code: '2', ko: '후취소', en: 'Cancellation'} + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.approval')}, + {code: '1', name: t('transaction.constants.totalCancelShort')}, + {code: '2', name: t('transaction.constants.cancelShort')} ] }, { serviceCode: '02', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '승인', en: 'Approval'}, - {code: '1', ko: '취소', en: 'Cancellation'}, - {code: '2', ko: '환불', en: 'Refund'}, + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.approval')}, + {code: '1', name: t('transaction.constants.cancel')}, + {code: '2', name: t('transaction.constants.refund')}, ] }, { serviceCode: '03', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '입금', en: 'Payment Complete'}, - {code: '2', ko: '환불', en: 'Refund'}, - {code: '3', ko: '입금대기', en: 'Waiting Payment'}, - {code: '4', ko: '채번취소', en: 'Cancellation Issue'}, + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.deposit')}, + {code: '2', name: t('transaction.constants.refund')}, + {code: '3', name: t('transaction.constants.waitingDeposit')}, + {code: '4', name: t('transaction.constants.issueCancel')}, ] }, { serviceCode: '05', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '승인', en: 'Approval'}, - {code: '1', ko: '취소', en: 'Cancellation'}, - {code: '2', ko: '환불', en: 'Refund'}, + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.approval')}, + {code: '1', name: t('transaction.constants.cancel')}, + {code: '2', name: t('transaction.constants.refund')}, ] }, { serviceCode: '14', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '승인', en: 'Approval'}, - {code: '1', ko: '취소', en: 'Cancellation'}, - {code: '2', ko: '환불', en: 'Refund'}, + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.approval')}, + {code: '1', name: t('transaction.constants.cancel')}, + {code: '2', name: t('transaction.constants.refund')}, ] }, { serviceCode: '21', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '승인', en: 'Approval'}, - {code: '1', ko: '취소', en: 'Cancellation'}, - {code: '2', ko: '환불', en: 'Refund'}, + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.approval')}, + {code: '1', name: t('transaction.constants.cancel')}, + {code: '2', name: t('transaction.constants.refund')}, ] }, { serviceCode: '24', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '승인', en: 'Approval'}, - {code: '1', ko: '취소', en: 'Cancellation'}, - {code: '2', ko: '환불', en: 'Refund'}, + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.approval')}, + {code: '1', name: t('transaction.constants.cancel')}, + {code: '2', name: t('transaction.constants.refund')}, ] }, { serviceCode: '26', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '승인', en: 'Approval'}, - {code: '1', ko: '취소', en: 'Cancellation'}, - {code: '2', ko: '환불', en: 'Refund'}, + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.approval')}, + {code: '1', name: t('transaction.constants.cancel')}, + {code: '2', name: t('transaction.constants.refund')}, ] }, { serviceCode: '31', list: [ - {code: '', ko: '전체', en: 'All'}, - {code: '0', ko: '승인', en: 'Approval'}, - {code: '1', ko: '전취소', en: 'Total Cancellation'}, - {code: '2', ko: '후취소', en: 'Cancellation'}, + {code: '', name: t('transaction.constants.all')}, + {code: '0', name: t('transaction.constants.approval')}, + {code: '1', name: t('transaction.constants.totalCancelShort')}, + {code: '2', name: t('transaction.constants.cancelShort')}, ] }, ]; @@ -140,63 +141,72 @@ export const AllTransactionCardBankCodeOptionsGroup = { -export const CashReceiptPurposeTypeBtnGroup = [ - {name: '전체', value: CashReceiptPurposeType.ALL}, - {name: '소득공제', value: CashReceiptPurposeType.INCOME_DEDUCTION}, - {name: '지출증빙', value: CashReceiptPurposeType.EXPENSE_PROOF}, +export const getCashReceiptPurposeTypeBtnGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: CashReceiptPurposeType.ALL}, + {name: t('transaction.handWrittenIssuance.incomeDeduction'), value: CashReceiptPurposeType.INCOME_DEDUCTION}, + {name: t('transaction.handWrittenIssuance.expenseProof'), value: CashReceiptPurposeType.EXPENSE_PROOF}, ]; -export const CashReceiptTransactionTypeBtnGroup = [ - {name: '전체', value: CashReceiptTransactionType.ALL}, - {name: '승인', value: CashReceiptTransactionType.APPROVAL}, - {name: '취소', value: CashReceiptTransactionType.CANCEL}, + +export const getCashReceiptTransactionTypeBtnGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: CashReceiptTransactionType.ALL}, + {name: t('transaction.constants.approval'), value: CashReceiptTransactionType.APPROVAL}, + {name: t('transaction.constants.cancel'), value: CashReceiptTransactionType.CANCEL}, ]; -export const CashReceiptProcessResultBtnGroup = [ - {name: '전체', value: CashReceiptProcessResult.ALL}, - {name: '요청', value: CashReceiptProcessResult.REQUEST}, - {name: '요청취소', value: CashReceiptProcessResult.REQUEST_CANCEL}, - {name: '요청완료', value: CashReceiptProcessResult.REQUEST_COMPLETE}, - {name: '발급완료', value: CashReceiptProcessResult.ISSUE_COMPLETE}, - {name: '요청실패', value: CashReceiptProcessResult.REQUEST_FAIL}, - {name: '발급실패', value: CashReceiptProcessResult.ISSUE_FAIL}, + +export const getCashReceiptProcessResultBtnGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: CashReceiptProcessResult.ALL}, + {name: t('transaction.constants.request'), value: CashReceiptProcessResult.REQUEST}, + {name: t('transaction.constants.requestCancel'), value: CashReceiptProcessResult.REQUEST_CANCEL}, + {name: t('transaction.constants.requestComplete'), value: CashReceiptProcessResult.REQUEST_COMPLETE}, + {name: t('transaction.constants.issueComplete'), value: CashReceiptProcessResult.ISSUE_COMPLETE}, + {name: t('transaction.constants.requestFail'), value: CashReceiptProcessResult.REQUEST_FAIL}, + {name: t('transaction.constants.issueFail'), value: CashReceiptProcessResult.ISSUE_FAIL}, ]; -export const EscrowSearchTypeOptionsGroup = [ - {name: '주문번호', value: EscrowSearchType.ORDER_NUMBER }, - {name: 'TID', value: EscrowSearchType.TID } + +export const getEscrowSearchTypeOptionsGroup = (t: TFunction) => [ + {name: t('transaction.constants.orderNumber'), value: EscrowSearchType.ORDER_NUMBER }, + {name: t('transaction.constants.tid'), value: EscrowSearchType.TID } ]; -export const EscrowDeliveryStatusBtnGroup = [ - {name: '전체', value: EscrowDeliveryStatus.ALL}, - {name: '결제완료', value: EscrowDeliveryStatus.PAY_COMPLETE}, - {name: '배송등록', value: EscrowDeliveryStatus.DELIVERY_INSERT}, - {name: '배송완료', value: EscrowDeliveryStatus.DELIVERY_COMPLETE}, - {name: '구매확인', value: EscrowDeliveryStatus.PURCHASE_CONFIRM}, - {name: '구매거절', value: EscrowDeliveryStatus.PURCHASE_REJECT}, - {name: '환불처리', value: EscrowDeliveryStatus.RETURN_PROCESSING}, - {name: '지급완료', value: EscrowDeliveryStatus.DEPOSIT_COMPLETE}, + +export const getEscrowDeliveryStatusBtnGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: EscrowDeliveryStatus.ALL}, + {name: t('transaction.constants.paymentComplete'), value: EscrowDeliveryStatus.PAY_COMPLETE}, + {name: t('transaction.constants.deliveryRegistration'), value: EscrowDeliveryStatus.DELIVERY_INSERT}, + {name: t('transaction.constants.deliveryComplete'), value: EscrowDeliveryStatus.DELIVERY_COMPLETE}, + {name: t('transaction.constants.purchaseConfirm'), value: EscrowDeliveryStatus.PURCHASE_CONFIRM}, + {name: t('transaction.constants.purchaseReject'), value: EscrowDeliveryStatus.PURCHASE_REJECT}, + {name: t('transaction.constants.refundProcessing'), value: EscrowDeliveryStatus.RETURN_PROCESSING}, + {name: t('transaction.constants.depositComplete'), value: EscrowDeliveryStatus.DEPOSIT_COMPLETE}, ]; -export const EscrowSettlementStatusBtnGroup = [ - {name: '전체', value: EscrowSettlementStatus.ALL}, - {name: '신용카드', value: EscrowSettlementStatus.CREDIT_CARD}, - {name: '가상계좌', value: EscrowSettlementStatus.REAL_ACCOUNT}, - {name: '계좌이체', value: EscrowSettlementStatus.ACCOUNT_TRANSFER}, + +export const getEscrowSettlementStatusBtnGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: EscrowSettlementStatus.ALL}, + {name: t('transaction.constants.creditCard'), value: EscrowSettlementStatus.CREDIT_CARD}, + {name: t('transaction.constants.virtualAccount'), value: EscrowSettlementStatus.REAL_ACCOUNT}, + {name: t('transaction.constants.accountTransfer'), value: EscrowSettlementStatus.ACCOUNT_TRANSFER}, ]; -export const BillingSearchTypeOptionsGroup = [ - {name: '주문번호', value: BillingSearchType.ORDER_NUMBER }, - {name: 'TID', value: BillingSearchType.TID } + +export const getBillingSearchTypeOptionsGroup = (t: TFunction) => [ + {name: t('transaction.constants.orderNumber'), value: BillingSearchType.ORDER_NUMBER }, + {name: t('transaction.constants.tid'), value: BillingSearchType.TID } ]; -export const BillingRequestStatusBtnGroup = [ - {name: '전체', value: BillingRequestStatus.ALL}, - {name: '진행중', value: BillingRequestStatus.IN_PROGRESS}, - {name: '성공', value: BillingRequestStatus.SUCCESS}, - {name: '요청취소', value: BillingRequestStatus.REQUEST_CANCEL}, + +export const getBillingRequestStatusBtnGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: BillingRequestStatus.ALL}, + {name: t('transaction.constants.inProgress'), value: BillingRequestStatus.IN_PROGRESS}, + {name: t('transaction.constants.success'), value: BillingRequestStatus.SUCCESS}, + {name: t('transaction.constants.requestCancel'), value: BillingRequestStatus.REQUEST_CANCEL}, ]; -export const BillingProcessResultBtnGroup = [ - {name: '전체', value: BillingProcessResult.ALL}, - {name: '성공', value: BillingProcessResult.SUCCESS}, - {name: '실패', value: BillingProcessResult.FAILURE}, + +export const getBillingProcessResultBtnGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: BillingProcessResult.ALL}, + {name: t('transaction.constants.success'), value: BillingProcessResult.SUCCESS}, + {name: t('transaction.constants.failure'), value: BillingProcessResult.FAILURE}, ]; -export const BillingPaymentMethodBtnGroup = [ - {name: '전체', value: BillingPaymentMethod.ALL}, - {name: '신용카드', value: BillingPaymentMethod.CREDIT_CARD}, - {name: '가상계좌', value: BillingPaymentMethod.VIRTUAL_ACCOUNT}, - {name: '휴대폰', value: BillingPaymentMethod.MOBILE_PAYMENT}, + +export const getBillingPaymentMethodBtnGroup = (t: TFunction) => [ + {name: t('transaction.constants.all'), value: BillingPaymentMethod.ALL}, + {name: t('transaction.constants.creditCard'), value: BillingPaymentMethod.CREDIT_CARD}, + {name: t('transaction.constants.virtualAccount'), value: BillingPaymentMethod.VIRTUAL_ACCOUNT}, + {name: t('transaction.constants.mobilePayment'), value: BillingPaymentMethod.MOBILE_PAYMENT}, ]; diff --git a/src/entities/transaction/ui/filter/all-transaction-filter.tsx b/src/entities/transaction/ui/filter/all-transaction-filter.tsx index bd055a1..70ec692 100644 --- a/src/entities/transaction/ui/filter/all-transaction-filter.tsx +++ b/src/entities/transaction/ui/filter/all-transaction-filter.tsx @@ -9,8 +9,8 @@ import { FilterCalendar } from '@/shared/ui/filter/calendar'; import { FilterButtonGroups } from '@/shared/ui/filter/button-groups'; import { FilterRangeAmount } from '@/shared/ui/filter/range-amount'; import { - AllTransactionMoidTidOptionsGroup, - AllTracsactionStatusCode, + getAllTransactionMoidTidOptionsGroup, + getAllTransactionStatusCode, } from '@/entities/transaction/model/contant'; import { AllTransactionFilterProps, @@ -80,6 +80,9 @@ export const AllTransactionFilter = ({ const [statusCodeBtns, setStatusCodeBtns] = useState>>(); + const moidTidOptionsGroup = getAllTransactionMoidTidOptionsGroup(t); + const allTransactionStatusCode = getAllTransactionStatusCode(t); + const onClickToClose = () => { setFilterOn(false); }; @@ -155,12 +158,12 @@ export const AllTransactionFilter = ({ }; const onChangeServiceCode = (val: string) => { - let list = AllTracsactionStatusCode.filter((value, index) => { + let list = allTransactionStatusCode.filter((value, index) => { return val === value.serviceCode; })[0]?.list; let btns = list?.map((value, index) => { return { - name: value.ko, + name: value.name, value: value.code } }); @@ -211,7 +214,7 @@ export const AllTransactionFilter = ({ title={t('filter.orderNumberTid')} selectValue={ filterMoidTidType } selectSetter={ setFilterMoidTidType } - selectOptions={ AllTransactionMoidTidOptionsGroup } + selectOptions={ moidTidOptionsGroup } inputValue={ filterMoidTidValue } inputSetter={ setFilterMoidTidValue } > diff --git a/src/entities/transaction/ui/filter/billing-filter.tsx b/src/entities/transaction/ui/filter/billing-filter.tsx index 8c8f3bc..db0205b 100644 --- a/src/entities/transaction/ui/filter/billing-filter.tsx +++ b/src/entities/transaction/ui/filter/billing-filter.tsx @@ -9,10 +9,10 @@ import { FilterCalendar } from '@/shared/ui/filter/calendar'; import { FilterButtonGroups } from '@/shared/ui/filter/button-groups'; import { FilterRangeAmount } from '@/shared/ui/filter/range-amount'; import { - BillingSearchTypeOptionsGroup, - BillingRequestStatusBtnGroup, - BillingProcessResultBtnGroup, - BillingPaymentMethodBtnGroup + getBillingSearchTypeOptionsGroup, + getBillingRequestStatusBtnGroup, + getBillingProcessResultBtnGroup, + getBillingPaymentMethodBtnGroup } from '@/entities/transaction/model/contant'; import { BillingFilterProps, @@ -68,6 +68,11 @@ export const BillingFilter = ({ const midOptions = useStore.getState().UserStore.selectOptionsMids; + const searchTypeOptionsGroup = getBillingSearchTypeOptionsGroup(t); + const requestStatusBtnGroup = getBillingRequestStatusBtnGroup(t); + const processResultBtnGroup = getBillingProcessResultBtnGroup(t); + const paymentMethodBtnGroup = getBillingPaymentMethodBtnGroup(t); + const onClickToClose = () => { setFilterOn(false); }; @@ -131,7 +136,7 @@ export const BillingFilter = ({ title={t('filter.orderNumberTid')} selectValue={ filterSearchType } selectSetter={ setFilterSearchType } - selectOptions={ BillingSearchTypeOptionsGroup } + selectOptions={ searchTypeOptionsGroup } inputValue={ searchKeyword } inputSetter={ setFilterSearchKeyword } > @@ -146,19 +151,19 @@ export const BillingFilter = ({ diff --git a/src/entities/transaction/ui/filter/cash-receipt-filter.tsx b/src/entities/transaction/ui/filter/cash-receipt-filter.tsx index f651e32..111d897 100644 --- a/src/entities/transaction/ui/filter/cash-receipt-filter.tsx +++ b/src/entities/transaction/ui/filter/cash-receipt-filter.tsx @@ -8,9 +8,9 @@ import { FilterSelectInput } from '@/shared/ui/filter/select-input'; import { FilterCalendar } from '@/shared/ui/filter/calendar'; import { FilterButtonGroups } from '@/shared/ui/filter/button-groups'; import { - CashReceiptPurposeTypeBtnGroup, - CashReceiptTransactionTypeBtnGroup, - CashReceiptProcessResultBtnGroup + getCashReceiptPurposeTypeBtnGroup, + getCashReceiptTransactionTypeBtnGroup, + getCashReceiptProcessResultBtnGroup } from '@/entities/transaction/model/contant'; import { CashReceiptFilterProps, @@ -64,6 +64,10 @@ export const CashReceiptFilter = ({ const midOptions = useStore.getState().UserStore.selectOptionsMids; + const purposeTypeBtnGroup = getCashReceiptPurposeTypeBtnGroup(t); + const transactionTypeBtnGroup = getCashReceiptTransactionTypeBtnGroup(t); + const processResultBtnGroup = getCashReceiptProcessResultBtnGroup(t); + const onClickToClose = () => { setFilterOn(false); }; @@ -130,19 +134,19 @@ export const CashReceiptFilter = ({ (maxAmount); const midOptions = useStore.getState().UserStore.selectOptionsMids; - + + const searchTypeOptionsGroup = getEscrowSearchTypeOptionsGroup(t); + const deliveryStatusBtnGroup = getEscrowDeliveryStatusBtnGroup(t); + const settlementStatusBtnGroup = getEscrowSettlementStatusBtnGroup(t); + const onClickToClose = () => { setFilterOn(false); }; @@ -125,7 +129,7 @@ export const EscrowFilter = ({ title={t('filter.orderNumberTid')} selectValue={ filterSearchType } selectSetter={ setSearchType } - selectOptions={ EscrowSearchTypeOptionsGroup } + selectOptions={ searchTypeOptionsGroup } inputValue={ searchKeyword } inputSetter={ setSearchKeyword } > @@ -140,13 +144,13 @@ export const EscrowFilter = ({ diff --git a/src/entities/transaction/ui/list-item.tsx b/src/entities/transaction/ui/list-item.tsx index 1211681..8c79767 100644 --- a/src/entities/transaction/ui/list-item.tsx +++ b/src/entities/transaction/ui/list-item.tsx @@ -4,7 +4,7 @@ import { useNavigate } from '@/shared/lib/hooks/use-navigate'; import { ListItemProps, TransactionCategory } from '../model/types'; import moment from 'moment'; import { useStore } from '@/shared/model/store'; -import { AllTracsactionStatusCode } from '../model/contant'; +import { getAllTransactionStatusCode } from '../model/contant'; import { useTranslation } from 'react-i18next'; export const ListItem = ({ @@ -129,15 +129,16 @@ export const ListItem = ({ const getStatusName = () => { let str; if(transactionCategory === TransactionCategory.AllTransaction){ - Loop1: - for(let i=0;i { let str; if(transactionCategory === TransactionCategory.AllTransaction){ - Loop1: - for(let i=0;i {
{ - BillingRequestStatusBtnGroup.map((value, index) => ( - ( + onClickToRequestStatus(value.value) } diff --git a/src/pages/transaction/cash-receipt/list-page.tsx b/src/pages/transaction/cash-receipt/list-page.tsx index 71dd5d9..1d88067 100644 --- a/src/pages/transaction/cash-receipt/list-page.tsx +++ b/src/pages/transaction/cash-receipt/list-page.tsx @@ -30,7 +30,7 @@ import { useSetHeaderType, useSetFooterMode } from '@/widgets/sub-layout/use-sub-layout'; -import { CashReceiptTransactionTypeBtnGroup } from '@/entities/transaction/model/contant'; +import { getCashReceiptTransactionTypeBtnGroup } from '@/entities/transaction/model/contant'; import { useStore } from '@/shared/model/store'; import { useCashReceiptSummaryMutation } from '@/entities/transaction/api/use-cash-receipt-summary-mutation'; import { EmailBottomSheet } from '@/entities/common/ui/email-bottom-sheet'; @@ -256,7 +256,7 @@ export const CashReceiptListPage = () => {
{ - CashReceiptTransactionTypeBtnGroup.map((value, index) => ( + getCashReceiptTransactionTypeBtnGroup(t).map((value: any, index: number) => ( {
{ - EscrowDeliveryStatusBtnGroup.map((value, index) => ( - ( + onClickToDeliveryStatus(value.value) }