Skip to content

main <- develop #994

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daveearley merged 2 commits into from
Jan 8, 2026
Merged

main <- develop #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a85180c
Fix: Trusted and Premium tiers bypass eligibility checks
daveearley Jan 8, 2026
0bcaed7
Update broken links
daveearley Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,17 +164,6 @@ managed option with zero setup, automatic updates, and managed infrastructure.

<br>

## Documentation

| Resource | Link |
|:----------------|:----------------------------------------------------------------------------------------------|
| Getting Started | [hi.events/docs/getting-started](https://hi.events/docs/getting-started?utm_source=gh-readme) |
| Configuration | [hi.events/docs/configuration](https://hi.events/docs/configuration?utm_source=gh-readme) |
| API Reference | [hi.events/docs/api](https://hi.events/docs/api?utm_source=gh-readme) |
| Webhooks | [hi.events/docs/webhooks](https://hi.events/docs/webhooks?utm_source=gh-readme) |

<br>

## Contributing

We welcome contributions. See the [contributing guide](CONTRIBUTING.md) for details.
Expand Down
15 changes: 11 additions & 4 deletions backend/app/Services/Domain/Message/MessagingEligibilityService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,19 @@ public function __construct(

public function checkEligibility(int $accountId, int $eventId): ?MessagingEligibilityFailureDTO
{
$failures = [];

$account = $this->accountRepository
->loadRelation(AccountStripePlatformDomainObject::class)
->findById($accountId);

$tier = $this->getAccountMessagingTier($account->getAccountMessagingTierId());

// Trusted and Premium tiers bypass eligibility checks
if ($tier->getName() !== self::UNTRUSTED_TIER_NAME) {
return null;
}

$failures = [];

if (!$account->isStripeSetupComplete()) {
$failures[] = MessagingEligibilityFailureEnum::STRIPE_NOT_CONNECTED;
}
Expand Down Expand Up @@ -69,11 +76,11 @@ public function checkTierLimits(int $accountId, int $recipientCount, string $mes

$messagesInLast24h = $this->messageRepository->countMessagesInLast24Hours($accountId);
if ($messagesInLast24h >= $tier->getMaxMessagesPer24h()) {
// $violations[] = MessagingTierViolationEnum::MESSAGE_LIMIT_EXCEEDED;
$violations[] = MessagingTierViolationEnum::MESSAGE_LIMIT_EXCEEDED;
}

if ($recipientCount > $tier->getMaxRecipientsPerMessage()) {
// $violations[] = MessagingTierViolationEnum::RECIPIENT_LIMIT_EXCEEDED;
$violations[] = MessagingTierViolationEnum::RECIPIENT_LIMIT_EXCEEDED;
}

if (!$tier->getLinksAllowed() && $this->containsLinks($messageContent)) {
Expand Down
13 changes: 0 additions & 13 deletions frontend/src/components/common/AdminEventsTable/AdminEventsTable.module.scss
View file
Open in desktop

This file was deleted.

221 changes: 113 additions & 108 deletions frontend/src/components/common/AdminEventsTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {t} from "@lingui/macro";
import {AdminEvent} from "../../../api/admin.client";
import {IconChevronDown, IconChevronUp, IconEye, IconUserCheck} from "@tabler/icons-react";
import {IdParam} from "../../../types";
import classes from "./AdminEventsTable.module.scss";
import tableStyles from "../../../styles/admin-table.module.scss";

interface AdminEventsTableProps {
events: AdminEvent[];
Expand All @@ -18,7 +18,7 @@ interface AdminEventsTableProps {
const AdminEventsTable = ({events, onSort, sortBy, sortDirection, onViewEvent, onImpersonate, isImpersonating}: AdminEventsTableProps) => {
if (!events || events.length === 0) {
return (
<div className={classes.emptyState}>
<div className={tableStyles.emptyState}>
<Text size="lg" c="dimmed">{t`No events found`}</Text>
</div>
);
Expand Down Expand Up @@ -68,113 +68,118 @@ const AdminEventsTable = ({events, onSort, sortBy, sortDirection, onViewEvent, o
};

return (
<div className={classes.tableContainer}>
<Table striped highlightOnHover>
<Table.Thead>
<Table.Tr>
<Table.Th>
<Button
variant="subtle"
size="compact-sm"
onClick={() => handleSort('title')}
rightSection={<SortIcon column="title" />}
>
{t`Event Title`}
</Button>
</Table.Th>
<Table.Th>{t`Organizer`}</Table.Th>
<Table.Th>
<Button
variant="subtle"
size="compact-sm"
onClick={() => handleSort('start_date')}
rightSection={<SortIcon column="start_date" />}
>
{t`Start Date`}
</Button>
</Table.Th>
<Table.Th>
<Button
variant="subtle"
size="compact-sm"
onClick={() => handleSort('end_date')}
rightSection={<SortIcon column="end_date" />}
>
{t`End Date`}
</Button>
</Table.Th>
<Table.Th>{t`Statistics`}</Table.Th>
<Table.Th>{t`Status`}</Table.Th>
<Table.Th>{t`Actions`}</Table.Th>
</Table.Tr>
</Table.Thead>
<Table.Tbody>
{events.map((event) => (
<Table.Tr key={event.id}>
<Table.Td>
<Text fw={500}>{event.title}</Text>
</Table.Td>
<Table.Td>
<Text size="sm">{event.organizer_name}</Text>
</Table.Td>
<Table.Td>
<Text size="sm">{formatDate(event.start_date)}</Text>
</Table.Td>
<Table.Td>
<Text size="sm">{formatDate(event.end_date)}</Text>
</Table.Td>
<Table.Td>
{event.statistics ? (
<Stack gap={4}>
<Group gap={6}>
<Text size="xs" c="dimmed">{t`Sales:`}</Text>
<Text size="xs" fw={600}>{formatCurrency(event.statistics.total_gross_sales)}</Text>
</Group>
<Group gap={6}>
<Text size="xs" c="dimmed">{t`Attendees:`}</Text>
<Text size="xs" fw={500}>{formatNumber(event.statistics.attendees_registered)}</Text>
</Group>
<Group gap={6}>
<Text size="xs" c="dimmed">{t`Orders:`}</Text>
<Text size="xs" fw={500}>{formatNumber(event.statistics.orders_created)}</Text>
</Group>
</Stack>
) : (
<Text size="sm" c="dimmed">-</Text>
)}
</Table.Td>
<Table.Td>
<Badge color={getStatusBadgeColor(event.status)}>
{event.status}
</Badge>
</Table.Td>
<Table.Td>
<Group gap="xs">
<Tooltip label={t`View Event`}>
<ActionIcon
variant="subtle"
color="blue"
onClick={() => onViewEvent?.(event)}
>
<IconEye size={18} />
</ActionIcon>
</Tooltip>
<Tooltip label={t`Impersonate User`}>
<ActionIcon
variant="subtle"
color="grape"
onClick={() => onImpersonate?.(event.user_id, event.account_id)}
disabled={isImpersonating}
>
<IconUserCheck size={18} />
</ActionIcon>
</Tooltip>
</Group>
</Table.Td>
<div className={tableStyles.tableWrapper}>
<div className={tableStyles.tableScroll}>
<Table className={tableStyles.table} highlightOnHover>
<Table.Thead>
<Table.Tr>
<Table.Th>
<Button
variant="subtle"
size="compact-sm"
onClick={() => handleSort('title')}
rightSection={<SortIcon column="title" />}
className={tableStyles.sortButton}
>
{t`Event Title`}
</Button>
</Table.Th>
<Table.Th>{t`Organizer`}</Table.Th>
<Table.Th>
<Button
variant="subtle"
size="compact-sm"
onClick={() => handleSort('start_date')}
rightSection={<SortIcon column="start_date" />}
className={tableStyles.sortButton}
>
{t`Start Date`}
</Button>
</Table.Th>
<Table.Th>
<Button
variant="subtle"
size="compact-sm"
onClick={() => handleSort('end_date')}
rightSection={<SortIcon column="end_date" />}
className={tableStyles.sortButton}
>
{t`End Date`}
</Button>
</Table.Th>
<Table.Th>{t`Statistics`}</Table.Th>
<Table.Th>{t`Status`}</Table.Th>
<Table.Th>{t`Actions`}</Table.Th>
</Table.Tr>
))}
</Table.Tbody>
</Table>
</Table.Thead>
<Table.Tbody>
{events.map((event) => (
<Table.Tr key={event.id}>
<Table.Td>
<Text fw={500}>{event.title}</Text>
</Table.Td>
<Table.Td>
<Text size="sm">{event.organizer_name}</Text>
</Table.Td>
<Table.Td>
<Text size="sm">{formatDate(event.start_date)}</Text>
</Table.Td>
<Table.Td>
<Text size="sm">{formatDate(event.end_date)}</Text>
</Table.Td>
<Table.Td>
{event.statistics ? (
<Stack gap={4}>
<Group gap={6}>
<Text size="xs" c="dimmed">{t`Sales:`}</Text>
<Text size="xs" fw={600}>{formatCurrency(event.statistics.total_gross_sales)}</Text>
</Group>
<Group gap={6}>
<Text size="xs" c="dimmed">{t`Attendees:`}</Text>
<Text size="xs" fw={500}>{formatNumber(event.statistics.attendees_registered)}</Text>
</Group>
<Group gap={6}>
<Text size="xs" c="dimmed">{t`Orders:`}</Text>
<Text size="xs" fw={500}>{formatNumber(event.statistics.orders_created)}</Text>
</Group>
</Stack>
) : (
<Text size="sm" c="dimmed">-</Text>
)}
</Table.Td>
<Table.Td>
<Badge color={getStatusBadgeColor(event.status)} variant="light">
{event.status}
</Badge>
</Table.Td>
<Table.Td>
<Group gap="xs">
<Tooltip label={t`View Event`}>
<ActionIcon
variant="subtle"
color="blue"
onClick={() => onViewEvent?.(event)}
>
<IconEye size={18} />
</ActionIcon>
</Tooltip>
<Tooltip label={t`Impersonate User`}>
<ActionIcon
variant="subtle"
color="grape"
onClick={() => onImpersonate?.(event.user_id, event.account_id)}
disabled={isImpersonating}
>
<IconUserCheck size={18} />
</ActionIcon>
</Tooltip>
</Group>
</Table.Td>
</Table.Tr>
))}
</Table.Tbody>
</Table>
</div>
</div>
);
};
Expand Down
13 changes: 0 additions & 13 deletions frontend/src/components/common/AdminOrdersTable/AdminOrdersTable.module.scss
View file
Open in desktop

This file was deleted.

Loading
Loading