diff --git a/apps/admin/src/components/EnteranceTable/EnteranceTable.styles.ts b/apps/admin/src/components/EnteranceTable/EnteranceTable.styles.ts index 9c4e2bd1..aa0c2bef 100644 --- a/apps/admin/src/components/EnteranceTable/EnteranceTable.styles.ts +++ b/apps/admin/src/components/EnteranceTable/EnteranceTable.styles.ts @@ -30,7 +30,7 @@ const HeaderItem = styled.span` margin-right: 12px; } &:nth-of-type(1) { - width: 120px; + width: 130px; } &:nth-of-type(2) { width: 100px; @@ -74,7 +74,7 @@ const Item = styled.span` margin-right: 12px; } &:nth-of-type(1) { - width: 120px; + width: 130px; } &:nth-of-type(2) { width: 100px; diff --git a/apps/admin/src/components/ReservationTable/index.tsx b/apps/admin/src/components/ReservationTable/index.tsx index d9ff111a..ecdc1d22 100644 --- a/apps/admin/src/components/ReservationTable/index.tsx +++ b/apps/admin/src/components/ReservationTable/index.tsx @@ -20,25 +20,32 @@ const getColumns = (ticketStatus: TicketStatus) => [ columnHelper.accessor('csReservationId', { header: '주문 번호', }), - columnHelper.accessor('paymentInfo.payerName', { + columnHelper.accessor('paymentInfo', { header: '결제자명', + id: 'payerName', cell: (props) => { const { searchText = '' } = (props.table.options.meta ?? {}) as { searchText: string }; return ( ); }, }), - columnHelper.accessor('paymentInfo.payerPhoneNumber', { + columnHelper.accessor('paymentInfo', { header: '연락처', + id: 'payerPhoneNumber', cell: (props) => { const { searchText = '' } = (props.table.options.meta ?? {}) as { searchText: string }; return ( ); diff --git a/apps/admin/src/components/ShowDetailLayout/index.tsx b/apps/admin/src/components/ShowDetailLayout/index.tsx index f3b99cb5..804ea1c4 100644 --- a/apps/admin/src/components/ShowDetailLayout/index.tsx +++ b/apps/admin/src/components/ShowDetailLayout/index.tsx @@ -238,8 +238,8 @@ const ShowDetailLayout = ({ children }: ShowDetailLayoutProps) => { - + diff --git a/apps/admin/src/components/TicketNameFilter/index.tsx b/apps/admin/src/components/TicketNameFilter/index.tsx index 2f103a41..d3a1fbc2 100644 --- a/apps/admin/src/components/TicketNameFilter/index.tsx +++ b/apps/admin/src/components/TicketNameFilter/index.tsx @@ -64,11 +64,7 @@ const TicketFilterOptions = ({ size="regular" disabled={tempSelectedValues.length === 0} onClick={() => { - if ( - tempSelectedValues.length > 0 && - selectedValues.length === 0 && - tempSelectedValues.length !== options.length - ) { + if (tempSelectedValues.length > 0) { updateSelectValues(tempSelectedValues); } close(); diff --git a/apps/admin/src/pages/ShowReservationPage/ShowReservationPage.styles.ts b/apps/admin/src/pages/ShowReservationPage/ShowReservationPage.styles.ts index ac8a3a47..6036c3cc 100644 --- a/apps/admin/src/pages/ShowReservationPage/ShowReservationPage.styles.ts +++ b/apps/admin/src/pages/ShowReservationPage/ShowReservationPage.styles.ts @@ -37,11 +37,12 @@ const EmptyTitle = styled.p` const TicketSummaryContainer = styled.div` display: grid; - grid-template-columns: 1fr 1fr; + grid-template-columns: 1fr; grid-gap: 8px; margin-bottom: 32px; ${mq_lg} { margin-bottom: 40px; + grid-template-columns: 1fr 1fr; display: flex; } `; @@ -49,9 +50,9 @@ const TicketSummaryContainer = styled.div` const TicketSummary = styled.div<{ colorTheme: 'grey' | 'red' }>` display: flex; justify-content: space-between; - flex-direction: column; + flex-direction: row; align-items: start; - padding: 16px 20px; + padding: 12px 16px; border-radius: 8px; ${({ colorTheme, theme }) => { switch (colorTheme) { @@ -71,9 +72,9 @@ const TicketSummary = styled.div<{ colorTheme: 'grey' | 'red' }>` } }} ${mq_lg} { - flex-direction: row; - width: 260px; + flex: 1; align-items: center; + padding: 16px 20px; &:not(:last-child) { margin-right: 12px; } diff --git a/apps/admin/src/pages/ShowReservationPage/index.tsx b/apps/admin/src/pages/ShowReservationPage/index.tsx index e2dbd543..9a7754f6 100644 --- a/apps/admin/src/pages/ShowReservationPage/index.tsx +++ b/apps/admin/src/pages/ShowReservationPage/index.tsx @@ -79,7 +79,6 @@ const ShowReservationPage = () => { const { salesTicketSoldCount, totalSalesAmount, - invitationTicketSoldCount, totalSoldCount, completeCount, waitCount, @@ -100,19 +99,15 @@ const ShowReservationPage = () => { - 일반 티켓 + 결제 건수 {salesTicketSoldCount}매 - 초청 티켓 - {invitationTicketSoldCount}매 - - - 총 발권된 티켓 + 발권 티켓 {totalSoldCount}매 - 공연 수익 + 결제 금액 {totalSalesAmount.toLocaleString()}원 diff --git a/packages/api/src/queryKey.ts b/packages/api/src/queryKey.ts index 1abd407c..b2a6e994 100644 --- a/packages/api/src/queryKey.ts +++ b/packages/api/src/queryKey.ts @@ -262,7 +262,7 @@ export const adminTicketQueryKeys = createQueryKeys('adminTicket', { reservationNameOrPhoneNumber, salesTicketTypeId: salesTicketTypeId.join(','), }; - if (isUsed) { + if (typeof isUsed !== 'undefined') { searchParams.isUsed = isUsed; } return fetcher.get(`web/v1/shows/${showId}/tickets`, {