test

src/entities/transaction/ui/all-transaction-list.tsx

@@ -8,15 +8,26 @@ export const AllTransactionList = ({
   
   const getListDateGroup = () => {
     let rs = [];
-    for (const [key, value] of Object.entries(listItems)) {
-      rs.push(
-        <ListDateGroup
-          transactionCategory={ transactionCategory }
-          key={ key }
-          date={ key }
-          items={ value }
-        ></ListDateGroup>
-      );  
+    let date = '';
+    let list = [];
+    for(let i=0;i<listItems.length;i++){
+      let transactionDateTime = listItems[i].transactionDateTime;
+      let transactionDate = transactionDateTime.substr(0, 8);
+      if(date !== transactionDate){
+        date = transactionDate;
+        if(list.length > 0){
+          rs.push(
+            <ListDateGroup
+              transactionCategory={ transactionCategory }
+              key={ date }
+              date={ date }
+              items={ list }
+            ></ListDateGroup>
+          )
+        }
+        list = [];
+      }
+      list.push(listItems[i]);
     }
     return rs;
   };

src/entities/transaction/ui/filter/all-transaction-filter.tsx

@@ -9,14 +9,14 @@ import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';
 import { FilterRangeAmount } from '@/shared/ui/filter/range-amount';
 import { 
   AllTransactionMoidTidOptionsGroup,
-  AllTransactionStateCodeBtnGroup,
+  AllTransactionStatusCodeBtnGroup,
   AllTransactionServiceCodeOptionsGroup,
   AllTransactionCardBankCodeOptionsGroup,
 } from '@/entities/transaction/model/contant';
 import { 
   AllTransactionFilterProps,
   AllTransactionSearchCl,
-  AllTransactionStateCode,
+  AllTransactionStatusCode,
   AllTransactionServiceCode,
   AllTransactionMoidTid
 } from '../../model/types';
@@ -33,7 +33,7 @@ export const AllTransactionFilter = ({
   mid,
   fromDate,
   toDate,
-  stateCode,
+  statusCode,
   serviceCode,
   minAmount,
   maxAmount,
@@ -46,7 +46,7 @@ export const AllTransactionFilter = ({
   setTid,
   setFromDate,
   setToDate,
-  setStateCode,
+  setStatusCode,
   setServiceCode,
   setMinAmount,
   setMaxAmount,
@@ -54,6 +54,7 @@ export const AllTransactionFilter = ({
   setBankCode,
   setSearchCl,
   setSearchValue,
+  serviceCodeOptions
 }: AllTransactionFilterProps) => {
 
   const [filterMid, setFilterMid] = useState<string>(mid);
@@ -61,8 +62,8 @@ export const AllTransactionFilter = ({
   const [filterMoidTidValue, setFilterMoidTidValue] = useState<string>('');
   const [filterFromDate, setFilterFromDate] = useState<string>(fromDate);
   const [filterToDate, setFilterToDate] = useState<string>(toDate);
-  const [filterStateCode, setFilterStateCode] = useState<AllTransactionStateCode>(stateCode);
-  const [filterServiceCode, setFilterServiceCode] = useState<AllTransactionServiceCode>(serviceCode);
+  const [filterStatusCode, setFilterStatusCode] = useState<string>(statusCode);
+  const [filterServiceCode, setFilterServiceCode] = useState<string>(serviceCode);
   const [filterMinAmount, setFilterMinAmount] = useState<number | undefined>(minAmount);
   const [filterMaxAmount, setFilterMaxAmount] = useState<number | undefined>(maxAmount);
   
@@ -78,6 +79,8 @@ export const AllTransactionFilter = ({
 
   const midOptions = useStore.getState().UserStore.selectOptionsMids;
 
+  console.log(serviceCodeOptions)
+
   const onClickToClose = () => {
     setFilterOn(false);
   };
@@ -98,7 +101,7 @@ export const AllTransactionFilter = ({
     }
     setFromDate(filterFromDate);
     setToDate(filterToDate);
-    setStateCode(filterStateCode);
+    setStatusCode(filterStatusCode);
 
     setServiceCode(filterServiceCode);
     setMinAmount(filterMinAmount);
@@ -110,9 +113,11 @@ export const AllTransactionFilter = ({
     onClickToClose();
   };
   
-  let setSearchClOptions = (value: AllTransactionServiceCode) => {
+  let setSearchClOptions = (value: string) => {
     let options = [];
     setFilterServiceCode(value);
+
+    /*
     if(value === AllTransactionServiceCode.ALL){
 
     }
@@ -146,6 +151,7 @@ export const AllTransactionFilter = ({
       options.push({name: '티머니번호', value: AllTransactionSearchCl.TMONEY_CARD_NO}); 
     }
     setSearchClOptionsGroup(options);
+    */
   };
 
   /*
@@ -206,16 +212,19 @@ export const AllTransactionFilter = ({
             
             <FilterButtonGroups
               title='거래상태'
-              activeValue={ filterStateCode }
-              btnGroups={ AllTransactionStateCodeBtnGroup }
-              setter={ setFilterStateCode }
+              activeValue={ filterStatusCode }
+              btnGroups={ AllTransactionStatusCodeBtnGroup }
+              setter={ setFilterStatusCode }
             ></FilterButtonGroups>
+
+            { serviceCodeOptions && 
             <FilterSelect
               title='결제수단'
               selectValue={ filterServiceCode }
               selectSetter={ setSearchClOptions }
-              selectOptions={ AllTransactionServiceCodeOptionsGroup }
+              selectOptions={ serviceCodeOptions }
             ></FilterSelect>
+            }
             
             <FilterRangeAmount
               title='거래금액'