From d15e3f011f0dc859b1771fcb9e5d71e9f67166a7 Mon Sep 17 00:00:00 2001 From: Minsu Kim Date: Sat, 23 Nov 2024 20:26:37 +0900 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=EA=B2=B0=EC=A0=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=20=EC=AA=BD=20=EA=B3=A0=EC=B9=A0=20=EC=88=98=20?= =?UTF-8?q?=EC=9E=87=EB=8A=94=20=EA=B2=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ShowReservationPage/ShowReservationPage.styles.ts | 11 ++++++----- apps/admin/src/pages/ShowReservationPage/index.tsx | 11 +++-------- 2 files changed, 9 insertions(+), 13 deletions(-) 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()}원 From 5282cbaf4b46c1dfc6e18575a88d3287271e0485 Mon Sep 17 00:00:00 2001 From: Minsu Kim Date: Sat, 23 Nov 2024 20:27:59 +0900 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=ED=97=A4=EB=8D=94=20=ED=83=AD=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/src/components/ShowDetailLayout/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) => { - + From d2c4340b2ff2cb691df84c2e0dd792f1f599e62a Mon Sep 17 00:00:00 2001 From: Minsu Kim Date: Sat, 23 Nov 2024 20:29:55 +0900 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=EB=B0=A9=EB=AC=B8=EC=9E=90=20?= =?UTF-8?q?=EA=B4=80=EB=A6=AC=20API=20=EC=9A=94=EC=B2=AD=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/api/src/queryKey.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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`, { From 64556a07856de7242b40d8edff4e1835138574e0 Mon Sep 17 00:00:00 2001 From: Minsu Kim Date: Sat, 23 Nov 2024 20:34:20 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=EC=84=A0=ED=83=9D=ED=95=9C=20?= =?UTF-8?q?=ED=95=84=ED=84=B0=20=EB=B3=80=EA=B2=BD=20=EC=95=88=EB=90=98?= =?UTF-8?q?=EB=8A=94=20=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/EnteranceTable/EnteranceTable.styles.ts | 4 ++-- apps/admin/src/components/TicketNameFilter/index.tsx | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) 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/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(); From c2c402a33a03ae850afa5f4e197da56d543c80ae Mon Sep 17 00:00:00 2001 From: Minsu Kim Date: Sat, 23 Nov 2024 20:57:55 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20paymentInfo=20=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EA=B2=83=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/ReservationTable/index.tsx | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) 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 ( );