diff --git a/src/entities/settlement/model/constant.ts b/src/entities/settlement/model/constant.ts index d6d44f3..3700bf4 100644 --- a/src/entities/settlement/model/constant.ts +++ b/src/entities/settlement/model/constant.ts @@ -17,4 +17,31 @@ export const getSettlementPaymentMethodOptionsGroup = (t: TFunction) => [ {name: t('transaction.constants.ssgBank'), value: SettlementPaymentMethod.SSG_BANK_ACCOUNT}, {name: t('transaction.constants.cultureLand'), value: SettlementPaymentMethod.CULTURE_VOUCHER}, {name: t('transaction.constants.tmoneyPay'), value: SettlementPaymentMethod.TMONEY_PAY}, -]; \ No newline at end of file +]; + +export const getPaymentMethodName = (t: TFunction, paymentMethod?: string): string => { + if (!paymentMethod) return ''; + + const methodMap: Record = { + '신용카드': t('transaction.constants.creditCard'), + '가상계좌': t('transaction.constants.virtualAccount'), + '계좌이체': t('transaction.constants.accountTransfer'), + '간편계좌이체': t('transaction.constants.accountSimpleTransfer'), + '휴대폰': t('transaction.constants.mobilePayment'), + 'SSG머니': t('transaction.constants.ssgMoney'), + 'SSG은행계좌': t('transaction.constants.ssgBank'), + '문화상품권': t('transaction.constants.cultureLand'), + '티머니페이': t('transaction.constants.tmoneyPay'), + 'Credit Card': t('transaction.constants.creditCard'), + 'Virtual Account': t('transaction.constants.virtualAccount'), + 'Account Transfer': t('transaction.constants.accountTransfer'), + 'Simple Account Transfer': t('transaction.constants.accountSimpleTransfer'), + 'Mobile Payment': t('transaction.constants.mobilePayment'), + 'SSG Money': t('transaction.constants.ssgMoney'), + 'SSG Bank Account': t('transaction.constants.ssgBank'), + 'Culture Voucher': t('transaction.constants.cultureLand'), + 'Tmoney Pay': t('transaction.constants.tmoneyPay'), + }; + + return methodMap[paymentMethod] || paymentMethod; +}; \ No newline at end of file diff --git a/src/entities/settlement/ui/info-wrap/transaction-info-wrap.tsx b/src/entities/settlement/ui/info-wrap/transaction-info-wrap.tsx index 00057f2..ebbe1c9 100644 --- a/src/entities/settlement/ui/info-wrap/transaction-info-wrap.tsx +++ b/src/entities/settlement/ui/info-wrap/transaction-info-wrap.tsx @@ -7,6 +7,7 @@ import { InfoWrapKeys, TransactionInfoWrapProps, } from '@/entities/settlement/model/types'; +import { getPaymentMethodName } from '@/entities/settlement/model/constant'; export const TransactionInfoWrap = ({ transactionInfo, @@ -51,7 +52,7 @@ export const TransactionInfoWrap = ({
  • {t('transaction.fields.paymentMethod')} - { transactionInfo?.paymentMethod } + { getPaymentMethodName(t, transactionInfo?.paymentMethod) }
  • {t('additionalService.settlementAgency.settlementDate')} diff --git a/src/entities/transaction/model/contant.ts b/src/entities/transaction/model/contant.ts index 69d994a..0978104 100644 --- a/src/entities/transaction/model/contant.ts +++ b/src/entities/transaction/model/contant.ts @@ -210,3 +210,30 @@ export const getBillingPaymentMethodBtnGroup = (t: TFunction) => [ {name: t('transaction.constants.virtualAccount'), value: BillingPaymentMethod.VIRTUAL_ACCOUNT}, {name: t('transaction.constants.mobilePayment'), value: BillingPaymentMethod.MOBILE_PAYMENT}, ]; + +export const getPaymentMethodName = (t: TFunction, paymentMethod?: string): string => { + if (!paymentMethod) return ''; + + const methodMap: Record = { + '신용카드': t('transaction.constants.creditCard'), + '가상계좌': t('transaction.constants.virtualAccount'), + '계좌이체': t('transaction.constants.accountTransfer'), + '간편계좌이체': t('transaction.constants.accountSimpleTransfer'), + '휴대폰': t('transaction.constants.mobilePayment'), + 'SSG머니': t('transaction.constants.ssgMoney'), + 'SSG은행계좌': t('transaction.constants.ssgBank'), + '문화상품권': t('transaction.constants.cultureLand'), + '티머니페이': t('transaction.constants.tmoneyPay'), + 'Credit Card': t('transaction.constants.creditCard'), + 'Virtual Account': t('transaction.constants.virtualAccount'), + 'Account Transfer': t('transaction.constants.accountTransfer'), + 'Simple Account Transfer': t('transaction.constants.accountSimpleTransfer'), + 'Mobile Payment': t('transaction.constants.mobilePayment'), + 'SSG Money': t('transaction.constants.ssgMoney'), + 'SSG Bank Account': t('transaction.constants.ssgBank'), + 'Culture Voucher': t('transaction.constants.cultureLand'), + 'Tmoney Pay': t('transaction.constants.tmoneyPay'), + }; + + return methodMap[paymentMethod] || paymentMethod; +}; diff --git a/src/entities/transaction/ui/filter/all-transaction-filter.tsx b/src/entities/transaction/ui/filter/all-transaction-filter.tsx index 70ec692..7d2c9e1 100644 --- a/src/entities/transaction/ui/filter/all-transaction-filter.tsx +++ b/src/entities/transaction/ui/filter/all-transaction-filter.tsx @@ -83,6 +83,34 @@ export const AllTransactionFilter = ({ const moidTidOptionsGroup = getAllTransactionMoidTidOptionsGroup(t); const allTransactionStatusCode = getAllTransactionStatusCode(t); + const getLocalizedServiceCodeName = (name?: string): string => { + if (!name) return ''; + + const nameMap: Record = { + '전체': t('transaction.constants.all'), + '신용카드': t('transaction.constants.creditCard'), + '계좌이체': t('transaction.constants.accountTransfer'), + '가상계좌': t('transaction.constants.virtualAccount'), + '휴대폰': t('transaction.constants.mobilePayment'), + '문화상품권': t('transaction.constants.cultureLand'), + '(구)SSG머니': t('transaction.constants.ssgMoney'), + 'SSG은행계좌결제': t('transaction.constants.ssgBank'), + '계좌간편결제': t('transaction.constants.accountSimpleTransfer'), + '티머니페이': t('transaction.constants.tmoneyPay'), + }; + + return nameMap[name] || name; + }; + + const getLocalizedServiceCodeOptions = () => { + if (!serviceCodeOptions) return []; + + return serviceCodeOptions.map(option => ({ + ...option, + name: getLocalizedServiceCodeName(option.name) + })); + }; + const onClickToClose = () => { setFilterOn(false); }; @@ -238,7 +266,7 @@ export const AllTransactionFilter = ({ title={t('filter.paymentMethod')} selectValue={ filterServiceCode } selectSetter={ onChangeServiceCode } - selectOptions={ serviceCodeOptions } + selectOptions={ getLocalizedServiceCodeOptions() } > } diff --git a/src/entities/transaction/ui/list-item.tsx b/src/entities/transaction/ui/list-item.tsx index 15edc04..387761b 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 { getAllTransactionStatusCode } from '../model/contant'; +import { getAllTransactionStatusCode, getPaymentMethodName } from '../model/contant'; import { useTranslation } from 'react-i18next'; export const ListItem = ({ @@ -179,7 +179,7 @@ export const ListItem = ({ | { transactionType } | - { paymentMethod } + { getPaymentMethodName(t, paymentMethod) } | { processResult } @@ -212,7 +212,7 @@ export const ListItem = ({ | { processResult } | - { paymentMethod } + { getPaymentMethodName(t, paymentMethod) } ); } @@ -233,12 +233,7 @@ export const ListItem = ({ { getDetail() }
    - + {t('home.money', { value: new Intl.NumberFormat('en-US').format(goodsAmount || amount || transactionAmount || 0) })}
    diff --git a/src/locales/en.json b/src/locales/en.json index 5faf48b..bd0284a 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -93,7 +93,7 @@ "periods": { "today": "Today", "week": "1 Week", - "currentMonth": "Current Month", + "currentMonth": "Current", "1month": "1 Month", "2months": "2 Months", "3months": "3 Months", diff --git a/src/pages/transaction/all-transaction/list-page.tsx b/src/pages/transaction/all-transaction/list-page.tsx index 20318fa..03c6e02 100644 --- a/src/pages/transaction/all-transaction/list-page.tsx +++ b/src/pages/transaction/all-transaction/list-page.tsx @@ -197,16 +197,37 @@ export const AllTransactionListPage = () => { let rs = []; if(!!serviceCodeOptions && serviceCodeOptions.length > 0) for(let i=0;i{ serviceCodeOptions[i]?.name } + value={option?.value} + >{ localizedName } ) } return rs; }; + const getLocalizedServiceCodeName = (name?: string): string => { + if (!name) return ''; + + const nameMap: Record = { + '전체': t('transaction.constants.all'), + '신용카드': t('transaction.constants.creditCard'), + '계좌이체': t('transaction.constants.accountTransfer'), + '가상계좌': t('transaction.constants.virtualAccount'), + '휴대폰': t('transaction.constants.mobilePayment'), + '문화상품권': t('transaction.constants.cultureLand'), + '(구)SSG머니': t('transaction.constants.ssgMoney'), + 'SSG은행계좌결제': t('transaction.constants.ssgBank'), + '계좌간편결제': t('transaction.constants.accountSimpleTransfer'), + '티머니페이': t('transaction.constants.tmoneyPay'), + }; + + return nameMap[name] || name; + }; + useEffect(() => { callServiceCodeOptions(); }, []);