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

Fix inability to edit tickets

Dave Earley76434a99ead5
diff --git a/backend/app/Http/Request/Ticket/UpsertTicketRequest.php b/backend/app/Http/Request/Ticket/UpsertTicketRequest.php
index c77a2bf11..e7c98c456 100644
--- a/backend/app/Http/Request/Ticket/UpsertTicketRequest.php
+++ b/backend/app/Http/Request/Ticket/UpsertTicketRequest.php
@@ -4,10 +4,10 @@ declare(strict_types=1);
namespace HiEvents\Http\Request\Ticket;
-use Illuminate\Validation\Rule;
use HiEvents\DomainObjects\Enums\TicketType;
use HiEvents\Http\Request\BaseRequest;
use HiEvents\Validators\Rules\RulesHelper;
+use Illuminate\Validation\Rule;
class UpsertTicketRequest extends BaseRequest
{
@@ -20,16 +20,12 @@ class UpsertTicketRequest extends BaseRequest
'sale_start_date' => 'date|nullable',
'sale_end_date' => 'date|nullable|after:sale_start_date',
'max_per_order' => 'integer|nullable',
- 'price' => array_merge(RulesHelper::MONEY, [
- 'required_without:prices',
- Rule::requiredIf($this->input('type') !== TicketType::TIERED->name),
- ]),
- 'prices' => 'required_without:price|array|required_if:type,' . TicketType::TIERED->name,
- 'prices.*.price' => RulesHelper::MONEY,
- 'prices.*.label' => ['nullable', ...RulesHelper::STRING],
+ 'prices' => ['required', 'array'],
+ 'prices.*.price' => [...RulesHelper::MONEY, 'required'],
+ 'prices.*.label' => ['nullable', ...RulesHelper::STRING, 'required_if:type,' . TicketType::TIERED->name],
'prices.*.sale_start_date' => ['date', 'nullable', 'after:sale_start_date'],
'prices.*.sale_end_date' => 'date|nullable|after:prices.*.sale_start_date',
- 'prices.*.initial_quantity_available' => 'integer|nullable',
+ 'prices.*.initial_quantity_available' => ['integer', 'nullable', 'min:0'],
'prices.*.is_hidden' => ['boolean'],
'description' => 'string|nullable',
'min_per_order' => 'integer|nullable',
diff --git a/backend/app/Services/Domain/Ticket/TicketPriceUpdateService.php b/backend/app/Services/Domain/Ticket/TicketPriceUpdateService.php
index 3ab063ae8..f2bef504e 100644
--- a/backend/app/Services/Domain/Ticket/TicketPriceUpdateService.php
+++ b/backend/app/Services/Domain/Ticket/TicketPriceUpdateService.php
@@ -13,10 +13,10 @@ use HiEvents\Services\Domain\Ticket\DTO\TicketPriceDTO;
use HiEvents\Services\Handlers\Ticket\DTO\UpsertTicketDTO;
use Illuminate\Support\Collection;
-readonly class TicketPriceUpdateService
+class TicketPriceUpdateService
{
public function __construct(
- private TicketPriceRepository $ticketPriceRepository,
+ private readonly TicketPriceRepository $ticketPriceRepository,
)
{
}
@@ -34,11 +34,11 @@ readonly class TicketPriceUpdateService
{
if ($ticketsData->type !== TicketType::TIERED) {
$prices = new Collection([new TicketPriceDTO(
- price: $ticketsData->type === TicketType::FREE ? 0.00 : $ticketsData->price,
+ price: $ticketsData->type === TicketType::FREE ? 0.00 : $ticketsData->prices->first()->price,
label: null,
sale_start_date: null,
sale_end_date: null,
- initial_quantity_available: $ticketsData->initial_quantity_available,
+ initial_quantity_available: $ticketsData->prices->first()->initial_quantity_available,
id: $existingPrices->first()->getId(),
)]);
} else {
@@ -86,9 +86,12 @@ readonly class TicketPriceUpdateService
$this->deletePrices($prices, $existingPrices);
}
+ /**
+ * @throws CannotDeleteEntityException
+ */
private function deletePrices(?Collection $prices, Collection $existingPrices): void
{
- $pricesIds = $prices->map(fn($price) => $price->id)->toArray();
+ $pricesIds = $prices?->map(fn($price) => $price->id)->toArray();
$existingPrices->each(function (TicketPriceDomainObject $price) use ($pricesIds) {
if (in_array($price->getId(), $pricesIds)) {
diff --git a/backend/app/Services/Handlers/Ticket/EditTicketHandler.php b/backend/app/Services/Handlers/Ticket/EditTicketHandler.php
index d6203a6eb..e33d17cf2 100644
--- a/backend/app/Services/Handlers/Ticket/EditTicketHandler.php
+++ b/backend/app/Services/Handlers/Ticket/EditTicketHandler.php
@@ -20,15 +20,18 @@ use HTMLPurifier;
use Illuminate\Database\DatabaseManager;
use Throwable;
-readonly class EditTicketHandler
+/**
+ * @todo - Move logic into a domain service
+ */
+class EditTicketHandler
{
public function __construct(
- private TicketRepositoryInterface $ticketRepository,
- private TaxAndTicketAssociationService $taxAndTicketAssociationService,
- private DatabaseManager $databaseManager,
- private TicketPriceUpdateService $priceUpdateService,
- private HTMLPurifier $purifier,
- private EventRepositoryInterface $eventRepository,
+ private readonly TicketRepositoryInterface $ticketRepository,
+ private readonly TaxAndTicketAssociationService $taxAndTicketAssociationService,
+ private readonly DatabaseManager $databaseManager,
+ private readonly TicketPriceUpdateService $priceUpdateService,
+ private readonly HTMLPurifier $purifier,
+ private readonly EventRepositoryInterface $eventRepository,
)
{
}
@@ -75,10 +78,10 @@ readonly class EditTicketHandler
'title' => $ticketsData->title,
'type' => $ticketsData->type->name,
'order' => $ticketsData->order,
- 'sale_start_date' => !!$ticketsData->sale_start_date
+ 'sale_start_date' => $ticketsData->sale_start_date
? DateHelper::convertToUTC($ticketsData->sale_start_date, $event->getTimezone())
: null,
- 'sale_end_date' => !!$ticketsData->sale_end_date
+ 'sale_end_date' => $ticketsData->sale_end_date
? DateHelper::convertToUTC($ticketsData->sale_end_date, $event->getTimezone())
: null,
'max_per_order' => $ticketsData->max_per_order,
diff --git a/frontend/src/components/forms/TicketForm/index.tsx b/frontend/src/components/forms/TicketForm/index.tsx
index 045b817b5..ad946a300 100644
--- a/frontend/src/components/forms/TicketForm/index.tsx
+++ b/frontend/src/components/forms/TicketForm/index.tsx
@@ -225,12 +225,12 @@ export const TicketForm = ({form, ticket}: TicketFormProps) => {
fixedDecimalScale
disabled={isFreeTicket}
leftSection={event?.currency ? getCurrencySymbol(event.currency) : ''}
- {...form.getInputProps('price')}
+ {...form.getInputProps('prices.0.price')}
label={isDonationTicket ? t`Minimum Price` : t`Price`}
placeholder="19.99"/>
<NumberInput min={0}
placeholder={t`Unlimited`}
- {...form.getInputProps('initial_quantity_available')}
+ {...form.getInputProps('prices.0.initial_quantity_available')}
label={t`Quantity Available`}/>
</InputGroup>
)}
diff --git a/frontend/src/components/modals/CreateTicketModal/index.tsx b/frontend/src/components/modals/CreateTicketModal/index.tsx
index cf6a7cc78..05f3a817b 100644
--- a/frontend/src/components/modals/CreateTicketModal/index.tsx
+++ b/frontend/src/components/modals/CreateTicketModal/index.tsx
@@ -20,12 +20,10 @@ export const CreateTicketModal = ({onClose}: GenericModalProps) => {
initialValues: {
title: '',
description: '',
- price: 0,
max_per_order: 100,
min_per_order: 1,
sale_start_date: '',
sale_end_date: '',
- initial_quantity_available: undefined,
hide_before_sale_start_date: false,
hide_after_sale_end_date: false,
show_quantity_remaining: false,
diff --git a/frontend/src/components/modals/EditTicketModal/index.tsx b/frontend/src/components/modals/EditTicketModal/index.tsx
index b6008f0b8..0a19c0a56 100644
--- a/frontend/src/components/modals/EditTicketModal/index.tsx
+++ b/frontend/src/components/modals/EditTicketModal/index.tsx
@@ -23,12 +23,10 @@ export const EditTicketModal = ({onClose, ticketId}: GenericModalProps & { ticke
initialValues: {
title: '',
description: '',
- price: 0,
max_per_order: 100,
min_per_order: 1,
sale_start_date: undefined,
sale_end_date: undefined,
- initial_quantity_available: undefined,
hide_before_sale_start_date: undefined,
hide_after_sale_end_date: undefined,
show_quantity_remaining: undefined,
@@ -51,12 +49,10 @@ export const EditTicketModal = ({onClose, ticketId}: GenericModalProps & { ticke
id: ticket.id,
title: ticket.title,
description: ticket.description,
- price: ticket.price ?? 0.00,
max_per_order: ticket.max_per_order ?? 0,
min_per_order: ticket.min_per_order ?? 0,
sale_start_date: utcToTz(ticket.sale_start_date, event.timezone),
sale_end_date: utcToTz(ticket.sale_end_date, event.timezone),
- initial_quantity_available: ticket.initial_quantity_available ?? undefined,
hide_before_sale_start_date: ticket.hide_before_sale_start_date,
hide_after_sale_end_date: ticket.hide_after_sale_end_date,
show_quantity_remaining: ticket.show_quantity_remaining,
@@ -66,11 +62,11 @@ export const EditTicketModal = ({onClose, ticketId}: GenericModalProps & { ticke
tax_and_fee_ids: ticket.taxes_and_fees?.map(t => String(t.id)) ?? [],
is_hidden: ticket.is_hidden,
prices: ticket.prices?.map(p => ({
- price: p.price,
+ price: p.price ?? 0,
label: p.label,
sale_start_date: utcToTz(p.sale_start_date, event.timezone),
sale_end_date: utcToTz(p.sale_end_date, event.timezone),
- initial_quantity_available: p.initial_quantity_available,
+ initial_quantity_available: p.initial_quantity_available ?? undefined,
id: p.id,
is_hidden: p.is_hidden,
})) ?? [],