Merge branch 'main' of https://gitea.bpsoft.co.kr/nicepayments/nice-app-web

2025-09-15 13:55:22 +09:00
parent b743ed3a13 020731dba5
commit 868864487c
8 changed files with 271 additions and 21 deletions
--- a/src/entities/additional-service/model/types.ts
+++ b/src/entities/additional-service/model/types.ts
@@ -28,6 +28,12 @@ export enum ProcessResult {
  SUCCESS = 'SUCCESS',
  FAILURE = 'FAILURE'
 };
+export enum KeyInPaymentTransactionStatus {
+  ALL = 'ALL',
+  APPROVE = 'APPROVE',
+  BF_CANCEL = 'BF_CANCEL',
+  AF_CANCEL = 'AF_CANCEL'
+}
 export enum AccountHolderSearchType {
  ALL = 'ALL',
  ACCOUNT_HOLDER = 'ACCOUNT_HOLDER',
@@ -353,6 +359,20 @@ export interface FilterProps {
  filterOn: boolean;
  setFilterOn: (filterOn: boolean) => void;
 };
+export interface KeyInPaymentFilterProps extends FilterProps {
+  mid: string,
+  startDate: string;
+  endDate: string;
+  transactionStatus: KeyInPaymentTransactionStatus;
+  minAmount?: number | string;
+  maxAmount?: number | string;
+  setMid: (mid: string) => void;
+  setStartDate: (startDate: string) => void;
+  setEndDate: (endDate: string) => void;
+  setTransactionStatus: (transactionStatus: KeyInPaymentTransactionStatus) => void;
+  setMinAmount: (minAmount: string | number) => void;
+  setMaxAmount: (maxAmount: string | number) => void;
+}
 // 계좌성명 조회 필터
 export interface AccountHolderSearchFilterProps extends FilterProps {
  mid: string;
--- a/src/entities/additional-service/ui/account-holder-search/account-holder-search-filter.tsx
+++ b/src/entities/additional-service/ui/account-holder-search/account-holder-search-filter.tsx
@@ -11,7 +11,7 @@ import {
 import { FilterSelect } from '@/shared/ui/filter/select';
 import { FilterSelectInput } from '@/shared/ui/filter/select-input';
 import { FilterDateOptions } from '@/entities/common/model/types';
-import { FilterCalendar } from '@/shared/ui/filter/filter-calendar';
+import { FilterCalendar } from '@/shared/ui/filter/calendar';
 import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';

 export const AccountHolderSearchFilter = ({
--- a/src/entities/additional-service/ui/key-in-payment/key-in-payment-filter.tsx
+++ b/src/entities/additional-service/ui/key-in-payment/key-in-payment-filter.tsx
@@ -0,0 +1,145 @@
+import moment from 'moment';
+import { useEffect } from 'react';
+import { useState } from 'react';
+import { motion } from 'framer-motion';
+import { IMAGE_ROOT } from '@/shared/constants/common';
+import { FilterSelect } from '@/shared/ui/filter/select';
+import { FilterSelectInput } from '@/shared/ui/filter/select-input';
+import { FilterCalendar } from '@/shared/ui/filter/calendar';
+import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';
+import { FilterRangeAmount } from '@/shared/ui/filter/range-amount';
+import {
+    KeyInPaymentFilterProps,
+    KeyInPaymentTransactionStatus
+} from '../../model/types';
+
+export const KeyInPaymentFilter = ({
+    filterOn,
+    setFilterOn,
+    mid,
+    startDate,
+    endDate,
+    transactionStatus,
+    minAmount,
+    maxAmount,
+    setMid,
+    setStartDate,
+    setEndDate,
+    setTransactionStatus,
+    setMinAmount,
+    setMaxAmount
+}: KeyInPaymentFilterProps) => {
+
+    const [filterMid, setFilterMid] = useState<string>(mid);
+    const [filterStartDate, setFilterStartDate] = useState<string>(startDate);
+    const [filterEndDate, setFilterEndDate] = useState<string>(endDate);
+    const [filterTransactionStatus, setFilterTransactionStatus] = useState<KeyInPaymentTransactionStatus>(transactionStatus);
+    const [filterMinAmount, setFilterMinAmount] = useState<number | string>(minAmount || '');
+    const [filterMaxAmount, setFilterMaxAmount] = useState<number | string>(maxAmount || '');
+
+    const variants = {
+        hidden: { x: '100%' },
+        visible: { x: '0%' },
+    };
+
+    const onClickToClose = () => {
+        setFilterOn(false);
+    };
+
+    const setNewDate = (newDate: any) => {
+        console.log(newDate)
+    };
+
+    const onClickToSetFilter = () => {
+        setMid(filterMid);
+        setStartDate(filterStartDate);
+        setEndDate(filterEndDate);
+        setTransactionStatus(filterTransactionStatus);
+        setMinAmount(filterMinAmount);
+        setMaxAmount(filterMaxAmount);
+        onClickToClose();
+    };
+    let MidOptions = [
+        { name: 'nictest001m', value: 'nictest001m' }
+    ];
+
+    let transactionStatusOption = [
+        { name: '전체', value: KeyInPaymentTransactionStatus.ALL },
+        { name: '승인', value: KeyInPaymentTransactionStatus.APPROVE },
+        { name: '전취소', value: KeyInPaymentTransactionStatus.BF_CANCEL },
+        { name: '후취소', value: KeyInPaymentTransactionStatus.AF_CANCEL },
+    ]
+
+    return (
+        <>
+            <motion.div
+                id="fullMenuModal"
+                className="full-menu-modal"
+                initial="hidden"
+                animate={(filterOn) ? 'visible' : 'hidden'}
+                variants={variants}
+                transition={{ duration: 0.3 }}
+                style={{
+                    width: '100%',
+                    height: '100%',
+                }}
+            >
+                <div className="full-menu-container">
+                    <div className="full-menu-header">
+                        <div className="full-menu-title center">필터</div>
+                        <div className="full-menu-actions">
+                            <button
+                                id="closeFullMenu"
+                                className="full-menu-close"
+                            >
+                                <img
+                                    src={IMAGE_ROOT + '/ico_close.svg'}
+                                    alt="닫기"
+                                    onClick={() => onClickToClose()}
+                                />
+                            </button>
+                        </div>
+                    </div>
+
+                    <div className="option-list pt-16">
+                        <FilterSelect
+                            title='가맹점'
+                            selectValue={filterMid}
+                            selectSetter={setFilterMid}
+                            selectOptions={MidOptions}
+                        ></FilterSelect>
+                        <FilterCalendar
+                            title='조회기간'
+                            startDate={filterStartDate}
+                            endDate={filterEndDate}
+                            setStartDate={setFilterStartDate}
+                            setEndDate={setFilterEndDate}
+                        ></FilterCalendar>
+
+                        <FilterButtonGroups
+                            title='거래상태'
+                            activeValue={filterTransactionStatus}
+                            btnGroups={transactionStatusOption}
+                            setter={setFilterTransactionStatus}
+                        ></FilterButtonGroups>
+
+                        <FilterRangeAmount
+                            title='상품가격'
+                            minAmount={filterMinAmount}
+                            maxAmount={filterMaxAmount}
+                            setMinAmount={setFilterMinAmount}
+                            setMaxAmount={setFilterMaxAmount}
+                        ></FilterRangeAmount>
+
+                    </div>
+                    <div className="apply-row">
+                        <button
+                            className="btn-50 btn-blue flex-1"
+                            onClick={() => onClickToSetFilter()}
+                        >적용</button>
+                    </div>
+                </div>
+            </motion.div>
+        </>
+    );
+};
--- a/src/entities/additional-service/ui/link-payment/filter/link-payment-pending-send-filter.tsx
+++ b/src/entities/additional-service/ui/link-payment/filter/link-payment-pending-send-filter.tsx
@@ -12,7 +12,7 @@ import {
 import { FilterSelect } from '@/shared/ui/filter/select';
 import { FilterSelectInput } from '@/shared/ui/filter/select-input';
 import { FilterDateOptions } from '@/entities/common/model/types';
-import { FilterCalendar } from '@/shared/ui/filter/filter-calendar';
+import { FilterCalendar } from '@/shared/ui/filter/calendar';
 import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';

 export const LinkPaymentPendingSendFilter = ({
--- a/src/entities/additional-service/ui/link-payment/filter/link-payment-shipping-history-filter.tsx
+++ b/src/entities/additional-service/ui/link-payment/filter/link-payment-shipping-history-filter.tsx
@@ -13,7 +13,7 @@ import {
 import { FilterSelect } from '@/shared/ui/filter/select';
 import { FilterSelectInput } from '@/shared/ui/filter/select-input';
 import { FilterDateOptions } from '@/entities/common/model/types';
-import { FilterCalendar } from '@/shared/ui/filter/filter-calendar';
+import { FilterCalendar } from '@/shared/ui/filter/calendar';
 import { FilterButtonGroups } from '@/shared/ui/filter/button-groups';

 export const LinkPaymentShippingHistoryFilter = ({
--- a/src/entities/transaction/ui/filter/billing-filter.tsx
+++ b/src/entities/transaction/ui/filter/billing-filter.tsx
@@ -73,6 +73,8 @@ export const BillingFilter = ({
    setRequestStatus(filterRequestStatus);
    setProcessResult(filterProcessResult);
    setPaymentMethod(filterPaymentMethod);
+    setMinAmount(filterMinAmount);
+    setMaxAmount(filterMaxAmount);
    onClickToClose();
 	};
  let MidOptions = [
@@ -140,16 +142,16 @@ export const BillingFilter = ({
            <FilterSelect
              title='가맹점'
              selectValue={ filterMid }
-              selectSetter={ setMid }
+              selectSetter={ setFilterMid }
              selectOptions={ MidOptions }
            ></FilterSelect>
            <FilterSelectInput
              title='주문번호/ID'
              selectValue={ filterSearchType }
-              selectSetter={ setSearchType }
+              selectSetter={ setFilterSearchType }
              selectOptions={ SearchTypeOptions }
              inputValue={ searchKeyword }
-              inputSetter={ setSearchKeyword }
+              inputSetter={ setFilterSearchKeyword }
            ></FilterSelectInput>
            <FilterCalendar
              title='조회기간'