aiolabs/webapp
9
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix(events): stop subtracting sold from amount_tickets' (#174) from fix/my-events-availability-arithmetic into dev

Browse source 
Reviewed-on: #174
This commit is contained in:
padreug 2026-09-27 21:09:34 +00:00
commit 9ad8d42e58
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/modules/events/components/CreateEventDialog.vue
View file

@ -146,7 +146,11 @@ const formSchema = toTypedSchema(
.array(z.enum(['lightning', 'fiat'])) .array(z.enum(['lightning', 'fiat']))
.min(1, 'Enable at least one payment method'), .min(1, 'Enable at least one payment method'),
fiat_currency: z.string().default("USD"), fiat_currency: z.string().default("USD"),
amount_tickets: z.number().min(0).max(100000).default(0), // Required, and at least 1. A capacity of 0 used to mean
// "unlimited", but the backend reads `amount_tickets < 1` as sold
// out everywhere (aiolabs/events#34), so a 0 produced an event that
// advertised unlimited tickets and refused every purchase.
amount_tickets: z.number().min(1, 'Set how many tickets are on sale').max(100000),
price_per_ticket: z.number().min(0).default(0), price_per_ticket: z.number().min(0).default(0),
email_notifications: z.boolean().default(false), email_notifications: z.boolean().default(false),
nostr_notifications: z.boolean().default(false), nostr_notifications: z.boolean().default(false),
@ -195,7 +199,7 @@ const form = useForm({
currency: 'sat', currency: 'sat',
payment_methods: ['lightning'], payment_methods: ['lightning'],
fiat_currency: 'USD', fiat_currency: 'USD',
amount_tickets: 0, amount_tickets: undefined,
price_per_ticket: 0, price_per_ticket: 0,
email_notifications: false, email_notifications: false,
nostr_notifications: false, nostr_notifications: false,
@ -306,7 +310,9 @@ async function populateFromEvent(event: TicketedEvent) {
currency: event.currency ?? 'sat', currency: event.currency ?? 'sat',
payment_methods: paymentMethodsOf(event), payment_methods: paymentMethodsOf(event),
fiat_currency: event.fiat_currency ?? 'USD', fiat_currency: event.fiat_currency ?? 'USD',
amount_tickets: event.amount_tickets ?? 0, // 0 is no longer a valid capacity, so an existing zero-capacity event
// opens with the field empty and the organiser has to set a real one.
amount_tickets: event.amount_tickets || undefined,
price_per_ticket: event.price_per_ticket ?? 0, price_per_ticket: event.price_per_ticket ?? 0,
email_notifications: event.extra?.email_notifications ?? false, email_notifications: event.extra?.email_notifications ?? false,
nostr_notifications: event.extra?.nostr_notifications ?? false, nostr_notifications: event.extra?.nostr_notifications ?? false,
@ -429,7 +435,8 @@ const onSubmit = form.handleSubmit(async (formValues) => {
if (acceptsFiat && formValues.fiat_currency) { if (acceptsFiat && formValues.fiat_currency) {
eventData.fiat_currency = formValues.fiat_currency eventData.fiat_currency = formValues.fiat_currency
} }
if (formValues.amount_tickets) eventData.amount_tickets = formValues.amount_tickets if (formValues.amount_tickets !== undefined)
eventData.amount_tickets = formValues.amount_tickets
if (formValues.price_per_ticket) eventData.price_per_ticket = formValues.price_per_ticket if (formValues.price_per_ticket) eventData.price_per_ticket = formValues.price_per_ticket
if (selectedCategories.value.length > 0) eventData.categories = selectedCategories.value if (selectedCategories.value.length > 0) eventData.categories = selectedCategories.value
@ -693,9 +700,9 @@ const handleOpenChange = (open: boolean) => {
<FormItem class="min-w-0"> <FormItem class="min-w-0">
<FormLabel>Tickets</FormLabel> <FormLabel>Tickets</FormLabel>
<FormControl> <FormControl>
<Input type="number" min="0" max="100000" placeholder="0" v-bind="componentField" /> <Input type="number" min="1" max="100000" placeholder="50" v-bind="componentField" />
</FormControl> </FormControl>
<FormDescription class="text-xs">0 = unlimited</FormDescription> <FormDescription class="text-xs">Total on sale</FormDescription>
<FormMessage /> <FormMessage />
</FormItem> </FormItem>
</FormField> </FormField>

4
src/modules/events/views/MyEventsPage.vue
View file

@ -173,7 +173,7 @@ function handleEventChanged() {
</div> </div>
<div class="flex justify-between"> <div class="flex justify-between">
<span class="text-muted-foreground">Tickets Available:</span> <span class="text-muted-foreground">Tickets Available:</span>
<span class="text-foreground">{{ event.amount_tickets - event.sold }}</span> <span class="text-foreground">{{ event.amount_tickets }}</span>
</div> </div>
<div class="flex justify-between"> <div class="flex justify-between">
<span class="text-muted-foreground">Price:</span> <span class="text-muted-foreground">Price:</span>
@ -187,7 +187,7 @@ function handleEventChanged() {
variant="default" variant="default"
:disabled=" :disabled="
event.status !== 'approved' || event.status !== 'approved' ||
event.amount_tickets <= event.sold || event.amount_tickets < 1 ||
!isAuthenticated !isAuthenticated
" "
@click="handlePurchaseClick(event)" @click="handlePurchaseClick(event)"