diff --git a/src/entities/transaction/ui/section/amount-info-section.tsx b/src/entities/transaction/ui/section/amount-info-section.tsx index ec28319..184c858 100644 --- a/src/entities/transaction/ui/section/amount-info-section.tsx +++ b/src/entities/transaction/ui/section/amount-info-section.tsx @@ -278,11 +278,6 @@ export const AmountInfoSection = ({ tid: tid }; cashReceiptReceiptDownload(params).then((rs: CashReceiptReceiptDownloadResponse) => { - /* - if(rs?.merchantInfo){ - rs.merchantInfo.merchantName = '나이스페이먼츠'; - } - */ setReceiptIssueInfo(rs?.issueInfo); setReceiptMerchantInfo(rs?.merchantInfo); setReceiptTransactionInfo(rs?.transactionInfo); diff --git a/src/shared/ui/filter/calendar.tsx b/src/shared/ui/filter/calendar.tsx index cecddc7..249933a 100644 --- a/src/shared/ui/filter/calendar.tsx +++ b/src/shared/ui/filter/calendar.tsx @@ -64,6 +64,9 @@ export const FilterCalendar = ({ }; const onClickToOpenCalendar = (calendarType: CalendarType) => { + setCalendarOpen(true); + setCalendarType(calendarType); + /* if(!dateReadOnly){ setCalendarOpen(true); setCalendarType(calendarType); @@ -72,6 +75,7 @@ export const FilterCalendar = ({ setCalendarOpen(false); } + */ }; const setNewDate = (date: string, calendarType: CalendarType) => { @@ -83,6 +87,7 @@ export const FilterCalendar = ({ setEndDate(moment(date, 'YYYY.MM.DD').format('YYYYMMDD')); setNewEndDate(moment(date, 'YYYY.MM.DD').format('YYYY.MM.DD')); } + setFilterDateOptionsBtn(FilterDateOptions.Input); setCalendarOpen(false); }; @@ -141,7 +146,6 @@ export const FilterCalendar = ({ placeholder={t('filter.selectDate')} value={ newStartDate } onChange={ (e: ChangeEvent) => {} } - readOnly={ dateReadOnly } />