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
Fix quantity logic for tiered tickets
Dave Earleycf8b76802d30
diff --git a/backend/app/DomainObjects/TicketDomainObject.php b/backend/app/DomainObjects/TicketDomainObject.phpindex 1be1bab35..1d51237c2 100644--- a/backend/app/DomainObjects/TicketDomainObject.php+++ b/backend/app/DomainObjects/TicketDomainObject.php@@ -76,7 +76,7 @@ class TicketDomainObject extends Generated\TicketDomainObjectAbstract implementspublic function isSoldOut(): bool{if (!$this->getTicketPrices() || $this->getTicketPrices()->isEmpty()) {- throw new LogicException('You cannot check if a ticket is sold out without prices.');+ return true;}return $this->getTicketPrices()->every(fn(TicketPriceDomainObject $price) => $price->isSoldOut());@@ -85,7 +85,7 @@ class TicketDomainObject extends Generated\TicketDomainObjectAbstract implementspublic function getQuantityAvailable(): int{if (!$this->getTicketPrices() || $this->getTicketPrices()->isEmpty()) {- throw new LogicException('You cannot get the quantity available for a ticket without prices.');+ return 0;}return $this->getTicketPrices()->sum(fn(TicketPriceDomainObject $price) => $price->getQuantityAvailable());diff --git a/backend/app/Repository/Eloquent/EventRepository.php b/backend/app/Repository/Eloquent/EventRepository.phpindex 6f81d07fb..66f6e63ca 100644--- a/backend/app/Repository/Eloquent/EventRepository.php+++ b/backend/app/Repository/Eloquent/EventRepository.php@@ -71,6 +71,7 @@ class EventRepository extends BaseRepository implements EventRepositoryInterfaceWHERE orders.event_id = $eventIdAND orders.status = '$reserved'AND orders.reserved_until > NOW()+ AND orders.deleted_at IS NULLGROUP BY order_items.ticket_id, order_items.ticket_price_id) AS reserved_quantitiesON ticket_prices.id = reserved_quantities.ticket_price_idWHERE tickets.event_id = $eventIddiff --git a/backend/app/Resources/Ticket/TicketResourcePublic.php b/backend/app/Resources/Ticket/TicketResourcePublic.phpindex 500f4611c..c61eda51a 100644--- a/backend/app/Resources/Ticket/TicketResourcePublic.php+++ b/backend/app/Resources/Ticket/TicketResourcePublic.php@@ -26,6 +26,9 @@ class TicketResourcePublic extends JsonResource'event_id' => $this->getEventId(),'is_before_sale_start_date' => $this->isBeforeSaleStartDate(),'is_after_sale_end_date' => $this->isAfterSaleEndDate(),+ $this->mergeWhen($this->getShowQuantityRemaining(), fn () => [+ 'quantity_available' => $this->getQuantityAvailable(),+ ]),'price' => $this->when($this->getTicketPrices() && !$this->isTieredType(),fn() => $this->getPrice(),diff --git a/backend/app/Services/Domain/Order/OrderCreateRequestValidationService.php b/backend/app/Services/Domain/Order/OrderCreateRequestValidationService.phpindex b17e57bf8..c0833551a 100644--- a/backend/app/Services/Domain/Order/OrderCreateRequestValidationService.php+++ b/backend/app/Services/Domain/Order/OrderCreateRequestValidationService.php@@ -168,21 +168,14 @@ readonly class OrderCreateRequestValidationServiceprivate function validateTicketQuantity(int $ticketIndex, array $ticketAndQuantities, TicketDomainObject $ticket): void{$totalQuantity = collect($ticketAndQuantities['quantities'])->sum('quantity');- $maxPerOrder = (int)$ticket->getMaxPerOrder() ?: 100; // Placeholder for config value+ $maxPerOrder = (int)$ticket->getMaxPerOrder() ?: 100;$minPerOrder = (int)$ticket->getMinPerOrder() ?: 1;- $ticketQuantityAvailable = $this->ticketRepository->getQuantityRemainingForTicketPrice(- ticketId: $ticket->getId(),- ticketPriceId: $ticketAndQuantities['quantities'][0]['price_id']- );- if ($totalQuantity > $ticketQuantityAvailable) {- throw ValidationException::withMessages([- "tickets.$ticketIndex" => __("The maximum number of tickets available for :ticket is :max", [- 'max' => $ticketQuantityAvailable,- 'ticket' => $ticket->getTitle(),- ]),- ]);- }+ $this->validateTicketPricesQuantity(+ quantities: $ticketAndQuantities['quantities'],+ ticket: $ticket,+ ticketIndex: $ticketIndex+ );if ($totalQuantity > $maxPerOrder) {throw ValidationException::withMessages([@@ -274,4 +267,40 @@ readonly class OrderCreateRequestValidationServicethrow ValidationException::withMessages($errors);}}++ /**+ * @throws ValidationException+ */+ private function validateTicketPricesQuantity(array $quantities, TicketDomainObject $ticket, int $ticketIndex): void+ {+ foreach ($quantities as $ticketQuantity) {+ $numberAvailable = $this->ticketRepository->getQuantityRemainingForTicketPrice(+ ticketId: $ticket->getId(),+ ticketPriceId: $ticketQuantity['price_id']+ );++ $numberAvailable = max(0, $numberAvailable);++ /** @var TicketPriceDomainObject $ticketPrice */+ $ticketPrice = $ticket->getTicketPrices()+ ?->first(fn(TicketPriceDomainObject $price) => $price->getId() === $ticketQuantity['price_id']);++ if ($ticketQuantity['quantity'] > $numberAvailable) {+ if ($numberAvailable === 0) {+ throw ValidationException::withMessages([+ "tickets.$ticketIndex" => __("The ticket :ticket is sold out", [+ 'ticket' => $ticket->getTitle() . ($ticketPrice->getLabel() ? ' - ' . $ticketPrice->getLabel() : ''),+ ]),+ ]);+ }++ throw ValidationException::withMessages([+ "tickets.$ticketIndex" => __("The maximum number of tickets available for :ticket is :max", [+ 'max' => $numberAvailable,+ 'ticket' => $ticket->getTitle() . ($ticketPrice->getLabel() ? ' - ' . $ticketPrice->getLabel() : ''),+ ]),+ ]);+ }+ }+ }}diff --git a/frontend/src/components/forms/TicketForm/index.tsx b/frontend/src/components/forms/TicketForm/index.tsxindex 1c43e957b..29cc76718 100644--- a/frontend/src/components/forms/TicketForm/index.tsx+++ b/frontend/src/components/forms/TicketForm/index.tsx@@ -296,10 +296,10 @@ export const TicketForm = ({form, ticket}: TicketFormProps) => {)}<InputGroup>- <NumberInput {...form.getInputProps('max_per_order')} label={t`Maximum Per Order`}- placeholder="5"/><NumberInput {...form.getInputProps('min_per_order')} label={t`Minimum Per Order`}placeholder="5"/>+ <NumberInput {...form.getInputProps('max_per_order')} label={t`Maximum Per Order`}+ placeholder="5"/></InputGroup><InputGroup>diff --git a/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx b/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsxindex 43c8df9af..a95e6c00f 100644--- a/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx+++ b/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx@@ -276,7 +276,6 @@ const SelectTickets = (props: SelectTicketsProps) => {.map((n) => n.toString());quantityRange.unshift("0");-return (<div key={ticket.id} className={'hi-ticket-row'}><div className={'hi-title-row'}>@@ -284,6 +283,12 @@ const SelectTickets = (props: SelectTicketsProps) => {<h3>{ticket.title}</h3></div><div className={'hi-ticket-availability'}>+ {(ticket.is_available && !!ticket.quantity_available) && (+ <>+ <Trans>{ticket?.quantity_available} available</Trans>+ </>+ )}+{(!ticket.is_available && ticket.type === 'TIERED') && (<TicketAvailabilityMessage ticket={ticket} event={event}/>)}diff --git a/frontend/src/styles/widget/default.scss b/frontend/src/styles/widget/default.scssindex bbe04db25..89a6cd2e0 100644--- a/frontend/src/styles/widget/default.scss+++ b/frontend/src/styles/widget/default.scss@@ -43,8 +43,8 @@}.hi-ticket-availability {- color: #909090;text-align: right;+ color: var(--widget-primary-text-color);}}diff --git a/frontend/src/types.ts b/frontend/src/types.tsindex 021078621..ef9e03872 100644--- a/frontend/src/types.ts+++ b/frontend/src/types.ts@@ -201,7 +201,6 @@ export interface Organizer {events?: Event[];}-export interface SortDirectionLabel {asc: string;desc: string;@@ -283,6 +282,7 @@ export interface Ticket {hide_after_sale_end_date?: boolean;hide_when_sold_out?: boolean;show_quantity_remaining?: boolean;+ quantity_available?: number;status?: TicketStatus;is_sold_out?: boolean;is_available?: boolean;