mythic-insight/calcom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Bugfix/opt in booking shown on attendee booking page (#2026)

Browse source
This commit is contained in:
Joe Au-Yeung 2022-03-04 05:04:05 -05:00 committed by GitHub
parent 6687544e66
commit b77923fc65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/web/components/booking/BookingListItem.tsx
View file

@ -170,7 +170,9 @@ function BookingListItem(booking: BookingItem) {
<td className="whitespace-nowrap py-4 text-right text-sm font-medium ltr:pr-4 rtl:pl-4"> <td className="whitespace-nowrap py-4 text-right text-sm font-medium ltr:pr-4 rtl:pl-4">
{isUpcoming && !isCancelled ? ( {isUpcoming && !isCancelled ? (
<> <>
{!booking.confirmed && !booking.rejected && <TableActions actions={pendingActions} />} {!booking.confirmed && !booking.rejected && user!.id === booking.user!.id && (
<TableActions actions={pendingActions} />
)}
{booking.confirmed && !booking.rejected && <TableActions actions={bookedActions} />} {booking.confirmed && !booking.rejected && <TableActions actions={bookedActions} />}
{!booking.confirmed && booking.rejected && ( {!booking.confirmed && booking.rejected && (
<div className="text-sm text-gray-500">{t("rejected")}</div> <div className="text-sm text-gray-500">{t("rejected")}</div>

5
apps/web/server/routers/viewer.tsx
View file

@ -386,6 +386,11 @@ const loggedInViewerRouter = createProtectedRouter()
}, },
status: true, status: true,
paid: true, paid: true,
user: {
select: {
id: true,
},
},
}, },
orderBy, orderBy,
take: take + 1, take: take + 1,