필터 수정

2025-11-20 10:50:17 +09:00
parent 5c03f7f021
commit cce6808bd8
12 changed files with 30 additions and 2 deletions
--- a/src/entities/transaction/model/types.ts
+++ b/src/entities/transaction/model/types.ts
@@ -155,6 +155,7 @@ export interface AllTransactionListProps {
  transactionCategory: TransactionCategory;
  listItems: Array<ListItemProps>;
  setDetailData: (detailData: DetailData) => void;
+  filterUsed: boolean;
  onClickToOpenFilter?: () => void;
  onClickToOpenDownloadBottomSheet?: () => void;
 };
@@ -162,6 +163,7 @@ export interface CashReceiptListProps {
  transactionCategory: TransactionCategory;
  listItems: Array<ListItemProps>;
  setDetailData: (detailData: DetailData) => void;
+  filterUsed: boolean;
  onClickToOpenFilter?: () => void;
  onClickToOpenDownloadBottomSheet?: () => void;
 };
@@ -169,6 +171,7 @@ export interface EscrowListProps {
  transactionCategory: TransactionCategory;
  listItems: Array<ListItemProps>;
  setDetailData: (detailData: DetailData) => void;
+  filterUsed: boolean;
  onClickToOpenFilter?: () => void;
  onClickToOpenDownloadBottomSheet?: () => void;
 };
@@ -176,6 +179,7 @@ export interface BillingListProps {
  transactionCategory: TransactionCategory;
  listItems: Array<ListItemProps>;
  setDetailData: (detailData: DetailData) => void;
+  filterUsed: boolean;
  onClickToOpenFilter?: () => void;
  onClickToOpenDownloadBottomSheet?: () => void;
 };
--- a/src/entities/transaction/ui/all-transaction-list.tsx
+++ b/src/entities/transaction/ui/all-transaction-list.tsx
@@ -8,6 +8,7 @@ export const AllTransactionList = ({
  transactionCategory,
  listItems,
  setDetailData,
+  filterUsed,
  onClickToOpenFilter,
  onClickToOpenDownloadBottomSheet
 }: AllTransactionListProps) => {
@@ -94,6 +95,9 @@ export const AllTransactionList = ({
              alt={t('transaction.searchOptions')}
              onClick={ onClickToOpenFilter }
            />
+            { filterUsed &&
+              <span className="notification-badge2"></span>
+            }
          </button>
          <button className="download-btn">
            <img
--- a/src/entities/transaction/ui/billing-list.tsx
+++ b/src/entities/transaction/ui/billing-list.tsx
@@ -8,6 +8,7 @@ export const BillingList = ({
  transactionCategory,
  listItems,
  setDetailData,
+  filterUsed,
  onClickToOpenFilter,
  onClickToOpenDownloadBottomSheet
 }: BillingListProps) => {
@@ -94,6 +95,9 @@ export const BillingList = ({
              alt={t('transaction.searchOptions')}
              onClick={ onClickToOpenFilter }
            />
+            { filterUsed &&
+              <span className="notification-badge2"></span>
+            }
          </button>
          <button className="download-btn">
            <img
--- a/src/entities/transaction/ui/cash-receipt-list.tsx
+++ b/src/entities/transaction/ui/cash-receipt-list.tsx
@@ -8,6 +8,7 @@ export const CashReceiptList = ({
  transactionCategory,
  listItems,
  setDetailData,
+  filterUsed,
  onClickToOpenFilter,
  onClickToOpenDownloadBottomSheet
 }: CashReceiptListProps) => {
@@ -93,6 +94,9 @@ export const CashReceiptList = ({
                alt={t('transaction.searchOptions')}
                onClick={ onClickToOpenFilter }
              />
+              { filterUsed &&
+                <span className="notification-badge2"></span>
+              }
            </button>
            <button className="download-btn">
              <img
--- a/src/entities/transaction/ui/escrow-list.tsx
+++ b/src/entities/transaction/ui/escrow-list.tsx
@@ -8,6 +8,7 @@ export const EscrowList = ({
  transactionCategory,
  listItems,
  setDetailData,
+  filterUsed,
  onClickToOpenFilter,
  onClickToOpenDownloadBottomSheet
 }: EscrowListProps) => {
@@ -93,6 +94,9 @@ export const EscrowList = ({
              alt={t('transaction.searchOptions')}
              onClick={ onClickToOpenFilter }
            />
+            { filterUsed &&
+              <span className="notification-badge2"></span>
+            }
          </button>
          <button className="download-btn">
            <img
--- a/src/entities/transaction/ui/section/transaction-info-section.tsx
+++ b/src/entities/transaction/ui/section/transaction-info-section.tsx
@@ -76,7 +76,7 @@ export const TransactionInfoSection = ({
              <span className="k">·&nbsp;&nbsp;{ subItems[k]?.name }</span>
              <span className="v">
              { (checkValue(newTransactionInfo[k]) && subItems[k]?.type === 'string') &&
-                newTransactionInfo[k] 
+                (k === 'partialCancel')? ((newTransactionInfo[k] === '1')? t('transaction.possible'): t('transaction.impossible')): newTransactionInfo[k] 
              }
              { (checkValue(newTransactionInfo[k]) && subItems[k]?.type === 'number') &&
                t('home.money', { value: new Intl.NumberFormat('en-US').format(newTransactionInfo[k] || 0) })
@@ -138,7 +138,7 @@ export const TransactionInfoSection = ({
              </li>
              <li className="kv-row">
                <span className="k">·&nbsp;&nbsp;{t('transaction.fields.partialCancel')}</span>
-                <span className="v">{ transactionInfo?.partialCancel }</span>
+                <span className="v">{ (transactionInfo?.partialCancel === '1')? t('transaction.possible'): t('transaction.impossible') }</span>
              </li>
              { (serviceCode === '02' || serviceCode === '03') &&
              <li className="kv-row">
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -497,6 +497,8 @@
        "cancelTitle": "Cancel Transaction",
        "fullCancel": "Full Cancel",
        "partialCancel": "Partial Cancel",
+        "possible": "possible",
+        "impossible": "impossible",
        "submit": "Submit",
        "apply": "Apply",
        "searchAmount": "Search Amount",
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -497,6 +497,8 @@
        "cancelTitle": "거래 취소",
        "fullCancel": "전체 취소",
        "partialCancel": "부분 취소",
+        "possible": "가능",
+        "impossible": "불가능",
        "submit": "신청",
        "apply": "적용",
        "searchAmount": "조회금액",
--- a/src/pages/transaction/all-transaction/list-page.tsx
+++ b/src/pages/transaction/all-transaction/list-page.tsx
@@ -406,6 +406,7 @@ export const AllTransactionListPage = () => {
              listItems={ listItems }
              transactionCategory={ TransactionCategory.AllTransaction }
              setDetailData={ setDetailData }
+              filterUsed={ filterUsed }
              onClickToOpenFilter={ onClickToOpenFilter }
              onClickToOpenDownloadBottomSheet={ onClickToOpenDownloadBottomSheet }
            ></AllTransactionList>
--- a/src/pages/transaction/billing/list-page.tsx
+++ b/src/pages/transaction/billing/list-page.tsx
@@ -311,6 +311,7 @@ export const BillingListPage = () => {
 							listItems={ listItems }
 							transactionCategory={ TransactionCategory.Billing }
 							setDetailData={ setDetailData }
+							filterUsed={ filterUsed }
 							onClickToOpenFilter={ onClickToOpenFilter }
              onClickToOpenDownloadBottomSheet={ onClickToOpenDownloadBottomSheet }
 						></BillingList>
--- a/src/pages/transaction/cash-receipt/list-page.tsx
+++ b/src/pages/transaction/cash-receipt/list-page.tsx
@@ -357,6 +357,7 @@ export const CashReceiptListPage = () => {
 							listItems={ listItems }
 							transactionCategory={ TransactionCategory.CashReceipt }
 							setDetailData={ setDetailData }
+							filterUsed={ filterUsed }
 							onClickToOpenFilter={ onClickToOpenFilter }
              onClickToOpenDownloadBottomSheet={ onClickToOpenDownloadBottomSheet }
 						></CashReceiptList>
--- a/src/pages/transaction/escrow/list-page.tsx
+++ b/src/pages/transaction/escrow/list-page.tsx
@@ -303,6 +303,7 @@ export const EscrowListPage = () => {
 							listItems={ listItems }
 							transactionCategory={ TransactionCategory.Escrow }
 							setDetailData={ setDetailData }
+							filterUsed={ filterUsed }
 							onClickToOpenFilter={ onClickToOpenFilter }
              onClickToOpenDownloadBottomSheet={ onClickToOpenDownloadBottomSheet }
 						></EscrowList>