Skip to content

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 ⭐️

ISSUE 215 - Adjust "tickets remaining" display logic for tiered tickets

Dave Earley1cd3ce65ab1b
diff --git a/backend/app/DomainObjects/TicketDomainObject.php b/backend/app/DomainObjects/TicketDomainObject.php
index 78c6e33d0..b0965f1be 100644
--- a/backend/app/DomainObjects/TicketDomainObject.php
+++ b/backend/app/DomainObjects/TicketDomainObject.php
@@ -17,6 +17,8 @@ class TicketDomainObject extends Generated\TicketDomainObjectAbstract implements
private ?string $offSaleReason = null;
+ private ?int $quantityAvailable = null;
+
public static function getDefaultSort(): string
{
return self::ORDER;
@@ -86,11 +88,24 @@ class TicketDomainObject extends Generated\TicketDomainObjectAbstract implements
public function getQuantityAvailable(): int
{
+ $availableCount = $this->getTicketPrices()->sum(fn(TicketPriceDomainObject $price) => $price->getQuantityAvailable());
+
+ if ($this->quantityAvailable !== null) {
+ return min($availableCount, $this->quantityAvailable);
+ }
+
if (!$this->getTicketPrices() || $this->getTicketPrices()->isEmpty()) {
return 0;
}
- return $this->getTicketPrices()->sum(fn(TicketPriceDomainObject $price) => $price->getQuantityAvailable());
+ return $availableCount;
+ }
+
+ public function setQuantityAvailable(int $quantityAvailable): TicketDomainObject
+ {
+ $this->quantityAvailable = $quantityAvailable;
+
+ return $this;
}
public function isBeforeSaleStartDate(): bool
diff --git a/backend/app/Resources/BaseResource.php b/backend/app/Resources/BaseResource.php
index 00c36f6da..a5df7336e 100644
--- a/backend/app/Resources/BaseResource.php
+++ b/backend/app/Resources/BaseResource.php
@@ -6,5 +6,17 @@ use Illuminate\Http\Resources\Json\JsonResource;
abstract class BaseResource extends JsonResource
{
+ protected static array $additionalData = [];
+ public static function collectionWithAdditionalData($resource, $data): JsonResource
+ {
+ static::$additionalData = $data;
+
+ return static::collection($resource);
+ }
+
+ public function getAdditionalDataByKey(string $key)
+ {
+ return static::$additionalData[$key] ?? null;
+ }
}
diff --git a/backend/app/Resources/Ticket/TicketPriceResourcePublic.php b/backend/app/Resources/Ticket/TicketPriceResourcePublic.php
index 46df118d2..1b20b1289 100644
--- a/backend/app/Resources/Ticket/TicketPriceResourcePublic.php
+++ b/backend/app/Resources/Ticket/TicketPriceResourcePublic.php
@@ -11,6 +11,8 @@ use Illuminate\Http\Request;
*/
class TicketPriceResourcePublic extends BaseResource
{
+ public const SHOW_QUANTITY_AVAILABLE = 'show_quantity_available';
+
public function toArray(Request $request): array
{
return [
@@ -28,7 +30,9 @@ class TicketPriceResourcePublic extends BaseResource
'is_after_sale_end_date' => $this->isAfterSaleEndDate(),
'is_available' => $this->isAvailable(),
'is_sold_out' => $this->isSoldOut(),
- 'quantity_remaining' => $this->getQuantityAvailable(),
+ $this->mergeWhen($this->getAdditionalDataByKey(self::SHOW_QUANTITY_AVAILABLE), fn() => [
+ 'quantity_remaining' => $this->getQuantityAvailable(),
+ ]),
];
}
}
diff --git a/backend/app/Resources/Ticket/TicketResourcePublic.php b/backend/app/Resources/Ticket/TicketResourcePublic.php
index decf05050..2bc93cbac 100644
--- a/backend/app/Resources/Ticket/TicketResourcePublic.php
+++ b/backend/app/Resources/Ticket/TicketResourcePublic.php
@@ -26,7 +26,7 @@ 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 () => [
+ $this->mergeWhen($this->getShowQuantityRemaining(), fn() => [
'quantity_available' => $this->getQuantityAvailable(),
]),
'price' => $this->when(
@@ -35,7 +35,9 @@ class TicketResourcePublic extends JsonResource
),
'prices' => $this->when(
(bool)$this->getTicketPrices(),
- fn() => TicketPriceResourcePublic::collection($this->getTicketPrices()),
+ fn() => TicketPriceResourcePublic::collectionWithAdditionalData($this->getTicketPrices(), [
+ TicketPriceResourcePublic::SHOW_QUANTITY_AVAILABLE => $this->getShowQuantityRemaining(),
+ ]),
),
'taxes' => $this->when(
(bool)$this->getTaxAndFees(),
diff --git a/backend/app/Services/Domain/Ticket/DTO/AvailableTicketQuantitiesDTO.php b/backend/app/Services/Domain/Ticket/DTO/AvailableTicketQuantitiesDTO.php
index 2a677e48c..72c032b6b 100644
--- a/backend/app/Services/Domain/Ticket/DTO/AvailableTicketQuantitiesDTO.php
+++ b/backend/app/Services/Domain/Ticket/DTO/AvailableTicketQuantitiesDTO.php
@@ -3,6 +3,7 @@
namespace HiEvents\Services\Domain\Ticket\DTO;
use HiEvents\DataTransferObjects\BaseDTO;
+use HiEvents\DomainObjects\CapacityAssignmentDomainObject;
use Illuminate\Support\Collection;
class AvailableTicketQuantitiesDTO extends BaseDTO
@@ -15,6 +16,7 @@ class AvailableTicketQuantitiesDTO extends BaseDTO
public int $quantity_available,
public int $quantity_reserved,
public ?int $initial_quantity_available,
+ /** @var Collection<CapacityAssignmentDomainObject> */
public ?Collection $capacities = null,
)
{
diff --git a/backend/app/Services/Domain/Ticket/TicketFilterService.php b/backend/app/Services/Domain/Ticket/TicketFilterService.php
index f18ed90b5..1715d11b8 100644
--- a/backend/app/Services/Domain/Ticket/TicketFilterService.php
+++ b/backend/app/Services/Domain/Ticket/TicketFilterService.php
@@ -3,6 +3,7 @@
namespace HiEvents\Services\Domain\Ticket;
use HiEvents\Constants;
+use HiEvents\DomainObjects\CapacityAssignmentDomainObject;
use HiEvents\DomainObjects\PromoCodeDomainObject;
use HiEvents\DomainObjects\TicketDomainObject;
use HiEvents\DomainObjects\TicketPriceDomainObject;
@@ -37,7 +38,8 @@ class TicketFilterService
return $tickets;
}
- $ticketQuantities = $this->fetchAvailableTicketQuantitiesService
+ $ticketQuantities = $this
+ ->fetchAvailableTicketQuantitiesService
->getAvailableTicketQuantities($tickets->first()->getEventId());
return $tickets
@@ -84,6 +86,7 @@ class TicketFilterService
});
}
+
$ticket->getTicketPrices()?->map(function (TicketPriceDomainObject $price) use ($ticketQuantities) {
$availableQuantity = $ticketQuantities->where('price_id', $price->getId())->first()?->quantity_available;
$availableQuantity = $availableQuantity === Constants::INFINITE ? null : $availableQuantity;
@@ -92,6 +95,14 @@ class TicketFilterService
);
});
+ $ticketQuantities->each(function (AvailableTicketQuantitiesDTO $quantity) use ($ticket) {
+ if ($quantity->capacities !== null && $quantity->capacities->isNotEmpty() && $quantity->ticket_id === $ticket->getId()) {
+ $ticket->setQuantityAvailable(
+ $quantity->capacities->min(fn(CapacityAssignmentDomainObject $capacity) => $capacity->getAvailableCapacity())
+ );
+ }
+ });
+
return $ticket;
}
diff --git a/frontend/src/components/routes/ticket-widget/SelectTickets/Prices/Tiered/index.tsx b/frontend/src/components/routes/ticket-widget/SelectTickets/Prices/Tiered/index.tsx
index 60a4ce469..fbb56b2f9 100644
--- a/frontend/src/components/routes/ticket-widget/SelectTickets/Prices/Tiered/index.tsx
+++ b/frontend/src/components/routes/ticket-widget/SelectTickets/Prices/Tiered/index.tsx
@@ -59,8 +59,8 @@ export const TieredPricing = ({ticket, event, form, ticketIndex}: TieredPricingP
<>
<NumberSelector
className={'hi-ticket-quantity-selector'}
- min={(ticket.type !== TicketType.Tiered ? ticket.min_per_order : 0) || 0}
- max={(ticket.type !== TicketType.Tiered ? ticket.max_per_order : 100) || 100}
+ min={ticket.min_per_order ?? 0}
+ max={(Math.min(price.quantity_remaining ?? 50, ticket.max_per_order ?? 50))}
fieldName={`tickets.${ticketIndex}.quantities.${index}.quantity`}
formInstance={form}
/>
@@ -91,4 +91,4 @@ export const TieredPricing = ({ticket, event, form, ticketIndex}: TieredPricingP
})}
</>
);
-}
\ No newline at end of file
+}
diff --git a/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx b/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx
index a41f01142..4019b2ea5 100644
--- a/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx
+++ b/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx
@@ -315,7 +315,7 @@ const SelectTickets = (props: SelectTicketsProps) => {
{ticket.max_per_order && form.values.tickets && isObjectEmpty(form.errors) && (form.values.tickets[ticketIndex]?.quantities.reduce((acc, {quantity}) => acc + Number(quantity), 0) > ticket.max_per_order) && (
<div className={'hi-ticket-quantity-error'}>
- <Trans>The maximum numbers number of tickets for Generals
+ <Trans>The maximum numbers number of tickets for {ticket.title}
is {ticket.max_per_order}</Trans>
</div>
)}
diff --git a/frontend/src/types.ts b/frontend/src/types.ts
index 5648650bf..58abddaa8 100644
--- a/frontend/src/types.ts
+++ b/frontend/src/types.ts
@@ -286,6 +286,7 @@ export interface TicketPrice {
initial_quantity_available?: number;
quantity_sold?: number;
is_hidden?: boolean;
+ quantity_remaining?: number;
}
export interface Ticket {