Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️
PHP attendize-alternativedoor-managementevent-check-inevent-managementevent-registrationevent-ticketingeventbrite-alternativeeventslaravelopen-sourcephpreactself-hostedsell-ticketssell-tickets-onlineticket-sellingticketing-systemtickettailor-alternativetito-alternative
Feature: Order table UI/UX improvements (#904)
Dave Earleye7dfc50921cc
diff --git a/backend/app/Http/Actions/Orders/Public/CompleteOrderActionPublic.php b/backend/app/Http/Actions/Orders/Public/CompleteOrderActionPublic.phpindex 68c46439c..a1be5515d 100644--- a/backend/app/Http/Actions/Orders/Public/CompleteOrderActionPublic.php+++ b/backend/app/Http/Actions/Orders/Public/CompleteOrderActionPublic.php@@ -34,6 +34,7 @@ class CompleteOrderActionPublic extends BaseAction: null,]),'products' => $request->input('products'),+ 'event_id' => $eventId,]));} catch (ResourceConflictException $e) {return $this->errorResponse($e->getMessage(), Response::HTTP_CONFLICT);diff --git a/backend/app/Services/Application/Handlers/Order/CompleteOrderHandler.php b/backend/app/Services/Application/Handlers/Order/CompleteOrderHandler.phpindex b588cffb1..468ba5df9 100644--- a/backend/app/Services/Application/Handlers/Order/CompleteOrderHandler.php+++ b/backend/app/Services/Application/Handlers/Order/CompleteOrderHandler.php@@ -8,6 +8,7 @@ use Carbon\Carbon;use Exception;use HiEvents\DomainObjects\AttendeeDomainObject;use HiEvents\DomainObjects\Enums\ProductType;+use HiEvents\DomainObjects\EventSettingDomainObject;use HiEvents\DomainObjects\Generated\AttendeeDomainObjectAbstract;use HiEvents\DomainObjects\Generated\OrderDomainObjectAbstract;use HiEvents\DomainObjects\Generated\ProductPriceDomainObjectAbstract;@@ -24,6 +25,7 @@ use HiEvents\Helper\IdHelper;use HiEvents\Repository\Eloquent\Value\Relationship;use HiEvents\Repository\Interfaces\AffiliateRepositoryInterface;use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;+use HiEvents\Repository\Interfaces\EventSettingsRepositoryInterface;use HiEvents\Repository\Interfaces\OrderRepositoryInterface;use HiEvents\Repository\Interfaces\ProductPriceRepositoryInterface;use HiEvents\Repository\Interfaces\QuestionAnswerRepositoryInterface;@@ -55,6 +57,7 @@ class CompleteOrderHandlerprivate readonly ProductQuantityUpdateService $productQuantityUpdateService,private readonly ProductPriceRepositoryInterface $productPriceRepository,private readonly DomainEventDispatcherService $domainEventDispatcherService,+ private readonly EventSettingsRepositoryInterface $eventSettingsRepository,){}@@ -90,7 +93,16 @@ class CompleteOrderHandlerreturn $updatedOrder;});- OrderStatusChangedEvent::dispatch($updatedOrder);+ /** @var EventSettingDomainObject $eventSettings */+ $eventSettings = $this->eventSettingsRepository->findFirstWhere([+ 'event_id' => $orderData->event_id,+ ]);++ event(new OrderStatusChangedEvent(+ order: $updatedOrder,+ sendEmails: true,+ createInvoice: $eventSettings->getEnableInvoicing(),+ ));if ($updatedOrder->isOrderCompleted()) {$this->domainEventDispatcherService->dispatch(diff --git a/backend/app/Services/Application/Handlers/Order/DTO/CompleteOrderDTO.php b/backend/app/Services/Application/Handlers/Order/DTO/CompleteOrderDTO.phpindex 44247d245..0532294c2 100644--- a/backend/app/Services/Application/Handlers/Order/DTO/CompleteOrderDTO.php+++ b/backend/app/Services/Application/Handlers/Order/DTO/CompleteOrderDTO.php@@ -11,11 +11,13 @@ class CompleteOrderDTO extends BaseDTO/*** @param CompleteOrderOrderDTO $order* @param Collection<CompleteOrderProductDataDTO> $products+ * @param int $event_id*/public function __construct(public CompleteOrderOrderDTO $order,#[CollectionOf(CompleteOrderProductDataDTO::class)]- public Collection $products+ public Collection $products,+ public int $event_id,){}diff --git a/backend/tests/Unit/Services/Application/Handlers/Order/CompleteOrderHandlerTest.php b/backend/tests/Unit/Services/Application/Handlers/Order/CompleteOrderHandlerTest.phpindex 3f0a56d5c..b331f4c74 100644--- a/backend/tests/Unit/Services/Application/Handlers/Order/CompleteOrderHandlerTest.php+++ b/backend/tests/Unit/Services/Application/Handlers/Order/CompleteOrderHandlerTest.php@@ -5,6 +5,7 @@ namespace Tests\Unit\Services\Application\Handlers\Order;use Carbon\Carbon;use Exception;use HiEvents\DomainObjects\AttendeeDomainObject;+use HiEvents\DomainObjects\EventSettingDomainObject;use HiEvents\DomainObjects\OrderDomainObject;use HiEvents\DomainObjects\OrderItemDomainObject;use HiEvents\DomainObjects\ProductPriceDomainObject;@@ -12,6 +13,7 @@ use HiEvents\DomainObjects\Status\OrderStatus;use HiEvents\Exceptions\ResourceConflictException;use HiEvents\Repository\Interfaces\AffiliateRepositoryInterface;use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;+use HiEvents\Repository\Interfaces\EventSettingsRepositoryInterface;use HiEvents\Repository\Interfaces\OrderRepositoryInterface;use HiEvents\Repository\Interfaces\ProductPriceRepositoryInterface;use HiEvents\Repository\Interfaces\QuestionAnswerRepositoryInterface;@@ -44,6 +46,7 @@ class CompleteOrderHandlerTest extends TestCaseprivate CompleteOrderHandler $completeOrderHandler;private DomainEventDispatcherService $domainEventDispatcherService;private AffiliateRepositoryInterface|MockInterface $affiliateRepository;+ private EventSettingsRepositoryInterface $eventSettingsRepository;protected function setUp(): void{@@ -60,6 +63,7 @@ class CompleteOrderHandlerTest extends TestCase$this->productPriceRepository = Mockery::mock(ProductPriceRepositoryInterface::class);$this->domainEventDispatcherService = Mockery::mock(DomainEventDispatcherService::class);$this->affiliateRepository = Mockery::mock(AffiliateRepositoryInterface::class);+ $this->eventSettingsRepository = Mockery::mock(EventSettingsRepositoryInterface::class);$this->completeOrderHandler = new CompleteOrderHandler($this->orderRepository,@@ -68,7 +72,8 @@ class CompleteOrderHandlerTest extends TestCase$this->questionAnswersRepository,$this->productQuantityUpdateService,$this->productPriceRepository,- $this->domainEventDispatcherService+ $this->domainEventDispatcherService,+ $this->eventSettingsRepository,);}@@ -97,6 +102,8 @@ class CompleteOrderHandlerTest extends TestCase$this->productQuantityUpdateService->shouldReceive('updateQuantitiesFromOrder');+ $this->eventSettingsRepository->shouldReceive('findFirstWhere')->andReturn($this->createMockEventSetting());+$this->completeOrderHandler->handle($orderShortId, $orderData);$this->assertTrue(true);@@ -169,6 +176,8 @@ class CompleteOrderHandlerTest extends TestCase$this->productQuantityUpdateService->shouldReceive('updateQuantitiesFromOrder')->once();+ $this->eventSettingsRepository->shouldReceive('findFirstWhere')->andReturn($this->createMockEventSetting());+$this->domainEventDispatcherService->shouldReceive('dispatch')->withArgs(function (OrderEvent $event) use ($order) {return $event->type === DomainEventType::ORDER_CREATED@@ -201,6 +210,8 @@ class CompleteOrderHandlerTest extends TestCase$this->productQuantityUpdateService->shouldNotReceive('updateQuantitiesFromOrder');+ $this->eventSettingsRepository->shouldReceive('findFirstWhere')->andReturn($this->createMockEventSetting());+$this->completeOrderHandler->handle($orderShortId, $orderData);$this->expectNotToPerformAssertions();@@ -269,6 +280,7 @@ class CompleteOrderHandlerTest extends TestCasereturn new CompleteOrderDTO(order: $orderDTO,products: new Collection([$attendeeDTO])+ ,event_id: 1);}@@ -313,4 +325,11 @@ class CompleteOrderHandlerTest extends TestCase$attendee->shouldReceive('getProductId')->andReturn(1);return $attendee;}++ private function createMockEventSetting(): EventSettingDomainObject+ {+ return (new EventSettingDomainObject())+ ->setId(1)+ ->setEventId(1);+ }}diff --git a/frontend/src/components/common/OrdersTable/OrdersTable.module.scss b/frontend/src/components/common/OrdersTable/OrdersTable.module.scssindex e4dc7e9da..086a36041 100644--- a/frontend/src/components/common/OrdersTable/OrdersTable.module.scss+++ b/frontend/src/components/common/OrdersTable/OrdersTable.module.scss@@ -1,10 +1,228 @@@use "../../../styles/mixins.scss";+// Customer Section (Sticky Left)+.customerDetails {+ display: flex;+ flex-direction: column;+ gap: 6px;+ min-width: 0;+ flex: 1;+}++.nameRow {+ display: flex;+ align-items: center;+ gap: 8px;+ flex-wrap: wrap;+}++.customerName {+ font-size: 15px;+ font-weight: 600;+ line-height: 1.3;+ text-decoration: none;+ color: var(--mantine-color-text);++ &:hover {+ text-decoration: underline;+ }+}++.companyName {+ font-size: 12px;+ color: var(--mantine-color-dimmed);+ line-height: 1.3;+}++.customerEmail {+ font-size: 13px;+ line-height: 1.3;+ color: var(--mantine-color-dimmed);+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+ max-width: 280px;+}++// Order Details Section+.orderDetails {+ display: flex;+ flex-direction: column;+ gap: 6px;+}++.orderId {+ font-size: 14px;+ font-weight: 500;+ color: var(--mantine-color-text);+ font-family: 'Courier New', monospace;+ line-height: 1.3;+ text-decoration: none;++ &:hover {+ text-decoration: underline;+ }+}++.orderMeta {+ display: flex;+ flex-direction: column;+ gap: 4px;+ font-size: 12px;+}++.createdDate {+ font-size: 12px;+ color: var(--mantine-color-dimmed);+ line-height: 1.3;+}++.invoiceLink {+ display: inline-flex;+ align-items: center;+ gap: 4px;+ font-size: 12px;+ color: var(--mantine-color-primary-filled);+ text-decoration: none;+ font-weight: 500;+ line-height: 1.3;++ &:hover {+ text-decoration: underline;+ }+}++.noInvoice {+ display: inline-flex;+ align-items: center;+ gap: 4px;+ font-size: 12px;+ color: var(--mantine-color-dimmed);+ line-height: 1.3;+}++.reservedUntil {+ display: inline-flex;+ align-items: center;+ gap: 4px;+ font-size: 12px;+ color: var(--mantine-color-yellow-9);+ line-height: 1.3;+}++// Items Section+.itemsBadge {+ display: inline-flex;+ align-items: center;+ gap: 4px;+ padding: 4px 8px;+ background: var(--mantine-color-gray-1);+ border-radius: 4px;+ font-size: 12px;+ color: var(--mantine-color-gray-7);+ font-weight: 500;+}++// Amount Section+.amountDetails {+ display: flex;+ flex-direction: column;+ gap: 4px;+}++.amountGross {+ font-size: 16px;+ font-weight: 600;+ color: var(--mantine-color-text);+ line-height: 1.3;+}++.amountBreakdown {+ font-size: 11px;+ color: var(--mantine-color-dimmed);+ line-height: 1.3;+}++.refundedAmount {+ display: inline-flex;+ align-items: center;+ gap: 4px;+ font-size: 11px;+ color: var(--mantine-color-red-9);+ line-height: 1.3;+}++// Payment Section.paymentStatus {- text-transform: capitalize;- color: #777777;+ display: inline-flex;+ align-items: center;+ gap: 6px;+ font-size: 13px;+ color: var(--mantine-color-dimmed);+}++// Status Section+.statusBadge {+ display: inline-flex;+ align-items: center;+ gap: 4px;+ padding: 6px 12px;+ border-radius: 6px;+ font-size: 12px;+ font-weight: 600;+ white-space: nowrap;++ &[data-status="COMPLETED"] {+ background: var(--mantine-color-green-1);+ color: var(--mantine-color-green-9);+ }++ &[data-status="RESERVED"] {+ background: var(--mantine-color-blue-1);+ color: var(--mantine-color-blue-9);+ }++ &[data-status="AWAITING_OFFLINE_PAYMENT"] {+ background: var(--mantine-color-yellow-1);+ color: var(--mantine-color-yellow-9);+ }++ &[data-status="CANCELLED"] {+ background: var(--mantine-color-red-1);+ color: var(--mantine-color-red-9);+ }++ &[data-status="ABANDONED"] {+ background: var(--mantine-color-gray-1);+ color: var(--mantine-color-gray-9);+ }+}++// Actions Section+.actionsMenu {+ display: flex;+ align-items: center;+ justify-content: flex-end;+}++// Action menu helpers (for mobile/desktop)+.action {+ .desktopAction {+ display: block;+ @include mixins.respond-below(md) {+ display: none;+ }+ }++ .mobileAction {+ display: none;+ @include mixins.respond-below(md) {+ display: block;+ }+ }}+// Mobile Card Layout (preserve existing mobile view).orderCard {display: flex;flex-direction: row;@@ -53,6 +271,13 @@.amount {margin-bottom: 10px;+ font-weight: 600;+ font-size: 1.2em;+ }++ .name {+ font-weight: 600;+ margin-bottom: 5px;}}@@ -70,20 +295,6 @@.actionButton {display: flex;- .desktopAction {- display: none;- @include mixins.respond-below(md) {- display: none;- }- }-- .mobileAction {- display: none;- @include mixins.respond-below(md) {- display: block;- }- }-@include mixins.respond-above(md) {place-content: flex-end;}diff --git a/frontend/src/components/common/OrdersTable/index.tsx b/frontend/src/components/common/OrdersTable/index.tsxindex 837994060..640b6ae20 100644--- a/frontend/src/components/common/OrdersTable/index.tsx+++ b/frontend/src/components/common/OrdersTable/index.tsx@@ -1,34 +1,39 @@import {t} from "@lingui/macro";-import {Anchor, Badge, Button, Group, Menu, Table as MantineTable, Tooltip} from '@mantine/core';+import {Anchor, Button, Group, Menu, Popover, Text} from '@mantine/core';import {Event, IdParam, Invoice, MessageType, Order} from "../../../types.ts";import {+ IconAlertCircle,IconBasketCog,+ IconCash,IconCheck,+ IconClock,+ IconClockPause,+ IconCopy,+ IconCreditCard,+ IconCurrencyDollar,IconDotsVertical,- IconInfoCircle,+ IconFileInvoice,+ IconFileOff,+ IconHelp,IconReceipt2,IconReceiptDollar,IconReceiptRefund,IconRepeat,IconSend,- IconTrash+ IconTicket,+ IconTrash,+ IconX} from "@tabler/icons-react";-import {prettyDate, relativeDate} from "../../../utilites/dates.ts";+import {relativeDate} from "../../../utilites/dates.ts";import {ManageOrderModal} from "../../modals/ManageOrderModal";-import {useDisclosure} from "@mantine/hooks";-import {useState} from "react";+import {useClipboard, useDisclosure} from "@mantine/hooks";+import {useMemo, useState} from "react";import {CancelOrderModal} from "../../modals/CancelOrderModal";import {SendMessageModal} from "../../modals/SendMessageModal";-import {notifications} from "@mantine/notifications";import {NoResultsSplash} from "../NoResultsSplash";-import {OrderAmountPopover} from "../OrderAmountPopover";import {RefundOrderModal} from "../../modals/RefundOrderModal";import classes from "./OrdersTable.module.scss";-import {Card} from "../Card";-import {Table, TableHead} from "../Table";-import {ShowForDesktop, ShowForMobile} from "../Responsive/ShowHideComponents.tsx";import {useResendOrderConfirmation} from "../../../mutations/useResendOrderConfirmation.ts";-import {OrderStatusBadge} from "../OrderStatusBadge";import {formatNumber} from "../../../utilites/helpers.ts";import {useUrlHash} from "../../../hooks/useUrlHash.ts";import {useMarkOrderAsPaid} from "../../../mutations/useMarkOrderAsPaid.ts";@@ -36,6 +41,10 @@ import {orderClient} from "../../../api/order.client.ts";import {downloadBinary} from "../../../utilites/download.ts";import {withLoadingNotification} from "../../../utilites/withLoadingNotification.tsx";import {showError, showSuccess} from "../../../utilites/notifications.tsx";+import {TanStackTable, TanStackTableColumn} from "../TanStackTable";+import {ColumnVisibilityToggle} from "../ColumnVisibilityToggle";+import {CellContext} from "@tanstack/react-table";+import {formatCurrency} from "../../../utilites/currency.ts";interface OrdersTableProps {event: Event,@@ -48,8 +57,10 @@ export const OrdersTable = ({orders, event}: OrdersTableProps) => {const [isMessageModalOpen, messageModal] = useDisclosure(false);const [isRefundModalOpen, refundModal] = useDisclosure(false);const [orderId, setOrderId] = useState<IdParam>();+ const [emailPopoverId, setEmailPopoverId] = useState<IdParam | null>(null);const resendConfirmationMutation = useResendOrderConfirmation();const markAsPaidMutation = useMarkOrderAsPaid();+ const clipboard = useClipboard({timeout: 2000});useUrlHash(/^#order-(\d+)$/, (matches => {const orderId = matches![1];@@ -83,20 +94,8 @@ export const OrdersTable = ({orders, event}: OrdersTableProps) => {const handleResendConfirmation = (eventId: IdParam, orderId: IdParam) => {resendConfirmationMutation.mutate({eventId, orderId}, {- onSuccess: () => {- notifications.show({- message: t`Your message has been sent`,- icon: <IconCheck/>,- position: 'top-center',- })- },- onError: () => {- notifications.show({- message: t`There was an error sending your message`,- icon: <IconCheck/>,- position: 'top-center',- })- }+ onSuccess: () => showSuccess(t`Your message has been sent`),+ onError: () => showError(t`There was an error sending your message`)});}@@ -123,184 +122,346 @@ export const OrdersTable = ({orders, event}: OrdersTableProps) => {);};+ const handleCopyEmail = (email: string) => {+ clipboard.copy(email);+ showSuccess(t`Email address copied to clipboard`);+ setEmailPopoverId(null);+ };++ const handleMessageFromEmail = (order: Order) => {+ setEmailPopoverId(null);+ handleModalClick(order.id, messageModal);+ };++ const formatTime = (dateString: string): string => {+ const date = new Date(dateString);+ return date.toLocaleTimeString('en-US', {+ hour: 'numeric',+ minute: '2-digit',+ hour12: true,+ });+ };+const ActionMenu = ({order}: { order: Order }) => {const isRefundable = !order.is_free_order&& order.status !== 'AWAITING_OFFLINE_PAYMENT'&& order.payment_provider === 'STRIPE'&& order.refund_status !== 'REFUNDED';- return <Group wrap={'nowrap'} gap={0} justify={'flex-end'}>- <Menu shadow="md" width={200}>- <Menu.Target>- <div className={classes.action}>- <div className={classes.mobileAction}>- <ShowForMobile>- <Button size={"xs"} variant={"light"}>- {t`Manage`}- </Button>- </ShowForMobile>- </div>- <div className={classes.desktopAction}>- <ShowForDesktop>- <Button size={"xs"} variant={"transparent"}>- <IconDotsVertical/>- </Button>- </ShowForDesktop>+ return (+ <Group wrap={'nowrap'} gap={0} justify={'flex-end'}>+ <Menu shadow="md" width={200}>+ <Menu.Target>+ <div className={classes.action}>+ <Button size={"xs"} variant={"transparent"}>+ <IconDotsVertical/>+ </Button></div>- </div>- </Menu.Target>+ </Menu.Target>- <Menu.Dropdown>- <Menu.Label>{t`Manage`}</Menu.Label>- <Menu.Item onClick={() => handleModalClick(order.id, viewModal)}- leftSection={<IconBasketCog size={14}/>}>{t`Manage order`}</Menu.Item>- <Menu.Item onClick={() => handleModalClick(order.id, messageModal)}- leftSection={<IconSend size={14}/>}>{t`Message buyer`}</Menu.Item>+ <Menu.Dropdown>+ <Menu.Label>{t`Manage`}</Menu.Label>+ <Menu.Item onClick={() => handleModalClick(order.id, viewModal)}+ leftSection={<IconBasketCog size={14}/>}>{t`Manage order`}</Menu.Item>+ <Menu.Item onClick={() => handleModalClick(order.id, messageModal)}+ leftSection={<IconSend size={14}/>}>{t`Message buyer`}</Menu.Item>- {order.latest_invoice && (- <Menu.Item onClick={() => handleInvoiceDownload(order.latest_invoice as Invoice)}- leftSection={<IconReceipt2 size={14}/>}>{t`Download invoice`}</Menu.Item>- )}+ {order.latest_invoice && (+ <Menu.Item onClick={() => handleInvoiceDownload(order.latest_invoice as Invoice)}+ leftSection={<IconReceipt2 size={14}/>}>{t`Download invoice`}</Menu.Item>+ )}- {order.status === 'AWAITING_OFFLINE_PAYMENT' && (- <Menu.Item onClick={() => handleMarkAsPaid(event.id, order.id)}- leftSection={<IconReceiptDollar size={14}/>}>{t`Mark as paid`}</Menu.Item>- )}+ {order.status === 'AWAITING_OFFLINE_PAYMENT' && (+ <Menu.Item onClick={() => handleMarkAsPaid(event.id, order.id)}+ leftSection={<IconReceiptDollar size={14}/>}>{t`Mark as paid`}</Menu.Item>+ )}- {isRefundable && (- <Menu.Item onClick={() => handleModalClick(order.id, refundModal)}- leftSection={<IconReceiptRefund size={14}/>}>{t`Refund order`}</Menu.Item>- )}+ {isRefundable && (+ <Menu.Item onClick={() => handleModalClick(order.id, refundModal)}+ leftSection={<IconReceiptRefund size={14}/>}>{t`Refund order`}</Menu.Item>+ )}- {order.status === 'COMPLETED' && (- <Menu.Item- onClick={() => handleResendConfirmation(event.id, order.id)}- leftSection={<IconRepeat size={14}/>}>- {t`Resend order email`}- </Menu.Item>- )}-- {order.status !== 'CANCELLED' && (- <>- <Menu.Divider/>- <Menu.Label>{t`Danger zone`}</Menu.Label>- <Menu.Item color="red"- onClick={() => handleModalClick(order.id, cancelModal)}- leftSection={<IconTrash size={14}/>}>- {t`Cancel order`}+ {order.status === 'COMPLETED' && (+ <Menu.Item+ onClick={() => handleResendConfirmation(event.id, order.id)}+ leftSection={<IconRepeat size={14}/>}>+ {t`Resend order email`}</Menu.Item>- </>- )}- </Menu.Dropdown>- </Menu>- </Group>;+ )}++ {order.status !== 'CANCELLED' && (+ <>+ <Menu.Divider/>+ <Menu.Label>{t`Danger zone`}</Menu.Label>+ <Menu.Item color="red"+ onClick={() => handleModalClick(order.id, cancelModal)}+ leftSection={<IconTrash size={14}/>}>+ {t`Cancel order`}+ </Menu.Item>+ </>+ )}+ </Menu.Dropdown>+ </Menu>+ </Group>+ );}- const OrderTableDesktop = () => (- <ShowForDesktop>- <Table>- <TableHead>- <MantineTable.Tr>- <MantineTable.Th miw={120}>{t`Reference`}</MantineTable.Th>- <MantineTable.Th>{t`Customer`}</MantineTable.Th>- <MantineTable.Th>{t`Attendees`}</MantineTable.Th>- <MantineTable.Th miw={140}>{t`Amount`}</MantineTable.Th>- <MantineTable.Th>{t`Created`}</MantineTable.Th>- <MantineTable.Th miw={120}>{t`Status`}</MantineTable.Th>- <MantineTable.Th></MantineTable.Th>- </MantineTable.Tr>- </TableHead>- <MantineTable.Tbody>- {orders.map((order) => {- return (- <MantineTable.Tr key={order.id}>- <MantineTable.Td>- <Anchor onClick={() => handleModalClick(order.id, viewModal)}>- <Badge variant={'outline'}>{order.public_id}</Badge>+ const columns = useMemo<TanStackTableColumn<Order>[]>(+ () => [+ {+ id: 'customer',+ header: t`Customer`,+ enableHiding: false,+ cell: (info: CellContext<Order, unknown>) => {+ const order = info.row.original;+ return (+ <div className={classes.customerDetails}>+ <div className={classes.nameRow}>+ <Anchor+ onClick={() => handleModalClick(order.id, viewModal)}+ className={classes.customerName}+ style={{cursor: 'pointer'}}+ >+ {order.first_name} {order.last_name}+ </Anchor>+ {order.company_name && (+ <Text className={classes.companyName}>+ {order.company_name}+ </Text>+ )}+ </div>+ <Popover+ opened={emailPopoverId === order.id}+ onChange={(opened) => {+ if (!opened) setEmailPopoverId(null);+ }}+ width={200}+ position="bottom"+ withArrow+ shadow="md"+ >+ <Popover.Target>+ <Anchor+ onClick={() => setEmailPopoverId(order.id)}+ className={classes.customerEmail}+ style={{cursor: 'pointer'}}+ >+ {order.email}</Anchor>- </MantineTable.Td>- <MantineTable.Td>- <div>- <b>{order.first_name + ' ' + order.last_name}</b>- </div>- <Anchor target={'_blank'} href={`mailto:${order.email}`}>{order.email}</Anchor>- </MantineTable.Td>- <MantineTable.Td>- <Anchor onClick={() => handleModalClick(order.id, viewModal)}>- {formatNumber(order.attendees?.length as number)}+ </Popover.Target>+ <Popover.Dropdown>+ <Group gap="xs" style={{flexDirection: 'column', width: '100%'}}>+ <Button+ fullWidth+ variant="light"+ leftSection={<IconSend size={16}/>}+ onClick={() => handleMessageFromEmail(order)}+ >+ {t`Message`}+ </Button>+ <Button+ fullWidth+ variant="light"+ color="gray"+ leftSection={<IconCopy size={16}/>}+ onClick={() => handleCopyEmail(order.email)}+ >+ {t`Copy Email`}+ </Button>+ </Group>+ </Popover.Dropdown>+ </Popover>+ </div>+ );+ },+ meta: {+ headerStyle: {minWidth: 280},+ },+ },+ {+ id: 'orderDetails',+ header: t`Order Details`,+ enableHiding: true,+ cell: (info: CellContext<Order, unknown>) => {+ const order = info.row.original;+ return (+ <div className={classes.orderDetails}>+ <Anchor+ onClick={() => handleModalClick(order.id, viewModal)}+ className={classes.orderId}+ style={{cursor: 'pointer'}}+ >+ {order.public_id}+ </Anchor>+ <div className={classes.orderMeta}>+ <Text className={classes.createdDate}>+ {relativeDate(order.created_at)}+ </Text>+ {order.latest_invoice ? (+ <Anchor+ onClick={() => handleInvoiceDownload(order.latest_invoice as Invoice)}+ className={classes.invoiceLink}+ style={{cursor: 'pointer'}}+ >+ <IconFileInvoice size={14}/>+ {t`Invoice`} #{order.latest_invoice.invoice_number}</Anchor>- </MantineTable.Td>- <MantineTable.Td>- <OrderAmountPopover event={event} order={order}/>- </MantineTable.Td>- <MantineTable.Td>- <Tooltip.Floating label={prettyDate(order.created_at, event.timezone)}>- <span>- {relativeDate(order.created_at)}- </span>- </Tooltip.Floating>- </MantineTable.Td>- <MantineTable.Td>- <OrderStatusBadge order={order}/>- </MantineTable.Td>- <MantineTable.Td>- <ActionMenu order={order}/>- </MantineTable.Td>- </MantineTable.Tr>- );- })}- </MantineTable.Tbody>- </Table>- </ShowForDesktop>- );-- const OrderTableMobile = () => (- <ShowForMobile>- {orders.map((order) => {- return (- <Card className={classes.orderCard} key={order.id}>- <div className={classes.colDetails}>-- <div className={classes.amount}>- <OrderAmountPopover event={event} order={order}/>- </div>- <div className={classes.name}>- {order.first_name + ' ' + order.last_name}+ ) : (+ <Text className={classes.noInvoice}>+ <IconFileOff size={14}/>+ {t`No invoice`}+ </Text>+ )}+ {order.status === 'RESERVED' && order.reserved_until && (+ <Text className={classes.reservedUntil}>+ <IconClock size={14}/>+ {t`Reserved until`} {formatTime(order.reserved_until)}+ </Text>+ )}</div>- <Anchor className={classes.email} target={'_blank'}- href={`mailto:${order.email}`}>{order.email}</Anchor>-- <span className={classes.reference}>- {t`Reference`}: <b>{order.public_id}</b>- <Anchor onClick={() => handleModalClick(order.id, viewModal)}>- <IconInfoCircle size={13}/>- </Anchor>- </span>- <Tooltip.Floating label={prettyDate(order.created_at, event.timezone)}>- <span className={classes.createdDate}>- {t`Created`}: <b>{relativeDate(order.created_at)}</b>- </span>- </Tooltip.Floating>-</div>- <div className={classes.colActions}>- <div className={classes.status}>- <OrderStatusBadge order={order}/>- </div>- <div className={classes.actionButton}>- <ActionMenu order={order}/>- </div>+ );+ },+ },+ {+ id: 'items',+ header: t`Items`,+ enableHiding: true,+ cell: (info: CellContext<Order, unknown>) => {+ const order = info.row.original;+ const itemCount = order.order_items?.length || order.attendees?.length || 0;+ return (+ <div className={classes.itemsBadge}>+ <IconTicket size={14}/>+ {formatNumber(itemCount)} {t`item(s)`}+ </div>+ );+ },+ },+ {+ id: 'amount',+ header: t`Amount`,+ enableHiding: true,+ cell: (info: CellContext<Order, unknown>) => {+ const order = info.row.original;+ return (+ <div className={classes.amountDetails}>+ <Text className={classes.amountGross}>+ {formatCurrency(order.total_gross, order.currency)}+ </Text>+ <Text className={classes.amountBreakdown}>+ {t`Tax`}: {formatCurrency(order.total_tax, order.currency)} •+ {' '}{t`Fees`}: {formatCurrency(order.total_fee, order.currency)}+ </Text>+ {order.total_refunded > 0 && (+ <Text className={classes.refundedAmount}>+ <IconCurrencyDollar size={12}/>+ {t`Refunded`}: {formatCurrency(order.total_refunded, order.currency)}+ </Text>+ )}+ </div>+ );+ },+ },+ {+ id: 'payment',+ header: t`Payment`,+ enableHiding: true,+ cell: (info: CellContext<Order, unknown>) => {+ const order = info.row.original;+ return (+ <div className={classes.paymentStatus}>+ {order.payment_provider === 'STRIPE' ? (+ <>+ <IconCreditCard size={16}/>+ <Text>{t`Stripe`}</Text>+ </>+ ) : order.payment_provider === 'OFFLINE' ? (+ <>+ <IconCash size={16}/>+ <Text>{t`Offline`}</Text>+ </>+ ) : (+ <>+ <IconHelp size={16}/>+ <Text>{t`Other`}</Text>+ </>+ )}</div>- </Card>- );- })}- </ShowForMobile>+ );+ },+ },+ {+ id: 'status',+ header: t`Status`,+ enableHiding: true,+ cell: (info: CellContext<Order, unknown>) => {+ const order = info.row.original;+ return (+ <div className={classes.statusBadge} data-status={order.status}>+ {order.status === 'COMPLETED' && (+ <>+ <IconCheck size={14}/>+ {t`Completed`}+ </>+ )}+ {order.status === 'RESERVED' && (+ <>+ <IconClock size={14}/>+ {t`Reserved`}+ </>+ )}+ {order.status === 'AWAITING_OFFLINE_PAYMENT' && (+ <>+ <IconClockPause size={14}/>+ {t`Awaiting Payment`}+ </>+ )}+ {order.status === 'CANCELLED' && (+ <>+ <IconX size={14}/>+ {t`Cancelled`}+ </>+ )}+ {order.status === 'ABANDONED' && (+ <>+ <IconAlertCircle size={14}/>+ {t`Abandoned`}+ </>+ )}+ </div>+ );+ },+ },+ {+ id: 'actions',+ header: t`Actions`,+ enableHiding: false,+ cell: (info: CellContext<Order, unknown>) => {+ const order = info.row.original;+ return (+ <div className={classes.actionsMenu}>+ <ActionMenu order={order}/>+ </div>+ );+ },+ meta: {+ sticky: 'right',+ },+ },+ ],+ [event.id, emailPopoverId]);return (<>- <OrderTableDesktop/>- <OrderTableMobile/>+ <TanStackTable+ data={orders}+ columns={columns}+ storageKey="orders-table"+ enableColumnVisibility={true}+ renderColumnVisibilityToggle={(table) => <ColumnVisibilityToggle table={table}/>}+ />{orderId && (<>{isRefundModalOpen && <RefundOrderModal onClose={refundModal.close} orderId={orderId}/>}diff --git a/frontend/src/components/common/TanStackTable/TanStackTable.module.scss b/frontend/src/components/common/TanStackTable/TanStackTable.module.scssindex 154729a1f..e8ce8ffda 100644--- a/frontend/src/components/common/TanStackTable/TanStackTable.module.scss+++ b/frontend/src/components/common/TanStackTable/TanStackTable.module.scss@@ -19,7 +19,7 @@th {background-color: #f2f0f5;color: var(--hi-secondary-text) !important;- padding: 0.75rem 0.625rem !important;+ padding: 20px !important;}}@@ -30,6 +30,10 @@:global(.mantine-ScrollArea-viewport) {padding-bottom: 0;}++ :global(.mantine-ScrollArea-scrollbar) {+ z-index: 20 !important;+ }}.table {@@ -83,7 +87,7 @@.stickyRight {position: sticky;right: 0;- z-index: 10;+ z-index: 9;background: var(--mantine-color-body);&::before {diff --git a/frontend/src/components/common/TanStackTable/index.tsx b/frontend/src/components/common/TanStackTable/index.tsxindex 07d3e617e..74596d9cc 100644--- a/frontend/src/components/common/TanStackTable/index.tsx+++ b/frontend/src/components/common/TanStackTable/index.tsx@@ -1,10 +1,4 @@-import {- ColumnDef,- flexRender,- getCoreRowModel,- useReactTable,- VisibilityState,-} from '@tanstack/react-table';+import {ColumnDef, flexRender, getCoreRowModel, useReactTable, VisibilityState,} from '@tanstack/react-table';import {Table as MantineTable} from '@mantine/core';import React, {useEffect, useState} from 'react';import {Card} from '../Card';@@ -29,12 +23,12 @@ interface TanStackTableProps<TData> {}export function TanStackTable<TData>({- data,- columns,- storageKey,- enableColumnVisibility = false,- renderColumnVisibilityToggle,-}: TanStackTableProps<TData>) {+ data,+ columns,+ storageKey,+ enableColumnVisibility = false,+ renderColumnVisibilityToggle,+ }: TanStackTableProps<TData>) {const [columnVisibility, setColumnVisibility] = useState<VisibilityState>(() => {if (storageKey && enableColumnVisibility) {const stored = localStorage.getItem(`${storageKey}-column-visibility`);@@ -74,7 +68,9 @@ export function TanStackTable<TData>({</div>)}<Card className={classes.card}>- <MantineTable.ScrollContainer minWidth={200}>+ <MantineTable.ScrollContainer minWidth={200} scrollAreaProps={{+ type: 'hover',+ }}><MantineTable className={classes.table}><MantineTable.Thead className={classes.tableHead}>{table.getHeaderGroups().map((headerGroup) => (@@ -84,8 +80,8 @@ export function TanStackTable<TData>({const stickyClass = columnMeta?.sticky === 'left'? classes.stickyLeft: columnMeta?.sticky === 'right'- ? classes.stickyRight- : '';+ ? classes.stickyRight+ : '';return (<MantineTable.Th@@ -115,8 +111,8 @@ export function TanStackTable<TData>({const stickyClass = columnMeta?.sticky === 'left'? classes.stickyLeft: columnMeta?.sticky === 'right'- ? classes.stickyRight- : '';+ ? classes.stickyRight+ : '';return (<MantineTable.Td