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
Add ability to collapse tickets, and a setting to collapse a given ticket on page load
Graham Blair9e91dd2b84e7
diff --git a/backend/app/DomainObjects/Generated/TicketDomainObjectAbstract.php b/backend/app/DomainObjects/Generated/TicketDomainObjectAbstract.phpindex 88e1f07b6..8c4beeabb 100644--- a/backend/app/DomainObjects/Generated/TicketDomainObjectAbstract.php+++ b/backend/app/DomainObjects/Generated/TicketDomainObjectAbstract.php@@ -70,6 +70,7 @@ abstract class TicketDomainObjectAbstract extends \HiEvents\DomainObjects\Abstra'hide_before_sale_start_date' => $this->hide_before_sale_start_date ?? null,'hide_after_sale_end_date' => $this->hide_after_sale_end_date ?? null,'hide_when_sold_out' => $this->hide_when_sold_out ?? null,+ 'start_collapsed' => $this->start_collapsed ?? null,'show_quantity_remaining' => $this->show_quantity_remaining ?? null,'is_hidden_without_promo_code' => $this->is_hidden_without_promo_code ?? null,'order' => $this->order ?? null,@@ -136,6 +137,17 @@ abstract class TicketDomainObjectAbstract extends \HiEvents\DomainObjects\Abstrareturn $this->sale_end_date;}+ public function setStartCollapsed(?bool $start_collapsed): self+ {+ $this->start_collapsed = $start_collapsed;+ return $this;+ }++ public function getStartCollapsed(): ?bool+ {+ return $this->start_collapsed;+ }+public function setMaxPerOrder(?int $max_per_order): self{$this->max_per_order = $max_per_order;diff --git a/backend/app/Http/Request/Ticket/UpsertTicketRequest.php b/backend/app/Http/Request/Ticket/UpsertTicketRequest.phpindex e7c98c456..4eff2df35 100644--- a/backend/app/Http/Request/Ticket/UpsertTicketRequest.php+++ b/backend/app/Http/Request/Ticket/UpsertTicketRequest.php@@ -33,6 +33,7 @@ class UpsertTicketRequest extends BaseRequest'hide_before_sale_start_date' => 'boolean','hide_after_sale_end_date' => 'boolean','hide_when_sold_out' => 'boolean',+ 'start_collapsed' => 'boolean','show_quantity_remaining' => 'boolean','is_hidden_without_promo_code' => 'boolean','type' => ['required', Rule::in(TicketType::valuesArray())],diff --git a/backend/app/Resources/Ticket/TicketResource.php b/backend/app/Resources/Ticket/TicketResource.phpindex b547d3b56..9080bde29 100644--- a/backend/app/Resources/Ticket/TicketResource.php+++ b/backend/app/Resources/Ticket/TicketResource.php@@ -38,6 +38,7 @@ class TicketResource extends JsonResource'initial_quantity_available' => $this->getInitialQuantityAvailable(),'hide_before_sale_start_date' => $this->getHideBeforeSaleStartDate(),'hide_after_sale_end_date' => $this->getHideAfterSaleEndDate(),+ 'start_collapsed' => $this->getStartCollapsed(),'show_quantity_remaining' => $this->getShowQuantityRemaining(),'hide_when_sold_out' => $this->getHideWhenSoldOut(),'is_hidden_without_promo_code' => $this->getIsHiddenWithoutPromoCode(),diff --git a/backend/app/Resources/Ticket/TicketResourcePublic.php b/backend/app/Resources/Ticket/TicketResourcePublic.phpindex 2bc93cbac..788ed23cb 100644--- a/backend/app/Resources/Ticket/TicketResourcePublic.php+++ b/backend/app/Resources/Ticket/TicketResourcePublic.php@@ -26,6 +26,7 @@ class TicketResourcePublic extends JsonResource'event_id' => $this->getEventId(),'is_before_sale_start_date' => $this->isBeforeSaleStartDate(),'is_after_sale_end_date' => $this->isAfterSaleEndDate(),+ 'start_collapsed' => $this->getStartCollapsed(),$this->mergeWhen($this->getShowQuantityRemaining(), fn() => ['quantity_available' => $this->getQuantityAvailable(),]),diff --git a/backend/app/Services/Domain/Ticket/CreateTicketService.php b/backend/app/Services/Domain/Ticket/CreateTicketService.phpindex 065e9b781..dc6764807 100644--- a/backend/app/Services/Domain/Ticket/CreateTicketService.php+++ b/backend/app/Services/Domain/Ticket/CreateTicketService.php@@ -68,6 +68,7 @@ class CreateTicketService'hide_before_sale_start_date' => $ticketsData->getHideBeforeSaleStartDate(),'hide_after_sale_end_date' => $ticketsData->getHideAfterSaleEndDate(),'hide_when_sold_out' => $ticketsData->getHideWhenSoldOut(),+ 'start_collapsed' => $ticketsData->getStartCollapsed(),'show_quantity_remaining' => $ticketsData->getShowQuantityRemaining(),'is_hidden_without_promo_code' => $ticketsData->getIsHiddenWithoutPromoCode(),'event_id' => $ticketsData->getEventId(),diff --git a/backend/app/Services/Handlers/Ticket/CreateTicketHandler.php b/backend/app/Services/Handlers/Ticket/CreateTicketHandler.phpindex d8edb7e32..c055e65b2 100644--- a/backend/app/Services/Handlers/Ticket/CreateTicketHandler.php+++ b/backend/app/Services/Handlers/Ticket/CreateTicketHandler.php@@ -49,6 +49,7 @@ class CreateTicketHandler->setHideBeforeSaleStartDate($ticketsData->hide_before_sale_start_date)->setHideAfterSaleEndDate($ticketsData->hide_after_sale_end_date)->setHideWhenSoldOut($ticketsData->hide_when_sold_out)+ ->setStartCollapsed($ticketsData->start_collapsed)->setShowQuantityRemaining($ticketsData->show_quantity_remaining)->setIsHiddenWithoutPromoCode($ticketsData->is_hidden_without_promo_code)->setTicketPrices($ticketPrices)diff --git a/backend/app/Services/Handlers/Ticket/DTO/UpsertTicketDTO.php b/backend/app/Services/Handlers/Ticket/DTO/UpsertTicketDTO.phpindex 8563bf63a..b19e4d979 100644--- a/backend/app/Services/Handlers/Ticket/DTO/UpsertTicketDTO.php+++ b/backend/app/Services/Handlers/Ticket/DTO/UpsertTicketDTO.php@@ -30,6 +30,7 @@ class UpsertTicketDTO extends BaseDTOpublic readonly ?bool $hide_before_sale_start_date = false,public readonly ?bool $hide_after_sale_end_date = false,public readonly ?bool $hide_when_sold_out = false,+ public readonly ?bool $start_collapsed = false,public readonly ?bool $show_quantity_remaining = false,public readonly ?bool $is_hidden_without_promo_code = false,public readonly ?array $tax_and_fee_ids = [],diff --git a/backend/app/Services/Handlers/Ticket/EditTicketHandler.php b/backend/app/Services/Handlers/Ticket/EditTicketHandler.phpindex e33d17cf2..fb0e82439 100644--- a/backend/app/Services/Handlers/Ticket/EditTicketHandler.php+++ b/backend/app/Services/Handlers/Ticket/EditTicketHandler.php@@ -91,6 +91,7 @@ class EditTicketHandler'hide_before_sale_start_date' => $ticketsData->hide_before_sale_start_date,'hide_after_sale_end_date' => $ticketsData->hide_after_sale_end_date,'hide_when_sold_out' => $ticketsData->hide_when_sold_out,+ 'start_collapsed' => $ticketsData->start_collapsed,'show_quantity_remaining' => $ticketsData->show_quantity_remaining,'is_hidden_without_promo_code' => $ticketsData->is_hidden_without_promo_code,],diff --git a/backend/database/migrations/2024_10_14_232118_add_start_collapsed_to_tickets.php b/backend/database/migrations/2024_10_14_232118_add_start_collapsed_to_tickets.phpnew file mode 100644index 000000000..a453959c9--- /dev/null+++ b/backend/database/migrations/2024_10_14_232118_add_start_collapsed_to_tickets.php@@ -0,0 +1,23 @@+<?php++use Illuminate\Database\Migrations\Migration;+use Illuminate\Database\Schema\Blueprint;+use Illuminate\Support\Facades\DB;+use Illuminate\Support\Facades\Schema;++return new class extends Migration+{+ public function up(): void+ {+ Schema::table('tickets', static function (Blueprint $table) {+ $table->boolean('start_collapsed')->default(false);+ });+ }++ public function down(): void+ {+ Schema::table('tickets', static function (Blueprint $table) {+ $table->dropColumn('start_collapsed');+ });+ }+};diff --git a/backend/database/migrations/schema.sql b/backend/database/migrations/schema.sqlindex 4b20e570d..bb359414a 100644--- a/backend/database/migrations/schema.sql+++ b/backend/database/migrations/schema.sql@@ -276,6 +276,7 @@ create table if not exists ticketsdeleted_at timestamp,type varchar(20) default 'PAID'::character varying not null,is_hidden boolean default false,+ start_collapsed boolean default false,primary key (id),constraint fk_tickets_event_idforeign key (event_id) references eventsdiff --git a/frontend/src/components/forms/TicketForm/index.tsx b/frontend/src/components/forms/TicketForm/index.tsxindex 56f5a1a19..8b147d563 100644--- a/frontend/src/components/forms/TicketForm/index.tsx+++ b/frontend/src/components/forms/TicketForm/index.tsx@@ -342,6 +342,8 @@ export const TicketForm = ({form, ticket}: TicketFormProps) => {label={t`Hide ticket before sale start date`}/><Switch mt={20} {...form.getInputProps('hide_after_sale_end_date', {type: 'checkbox'})}label={t`Hide ticket after sale end date`}/>+ <Switch mt={20} {...form.getInputProps('start_collapsed', {type: 'checkbox'})}+ label={t`Collapse this ticket when the event page is initially loaded`}/><Switch mt={20} {...form.getInputProps('show_quantity_remaining', {type: 'checkbox'})}label={t`Show available ticket quantity`}/><Switch mt={20} {...form.getInputProps('hide_when_sold_out', {type: 'checkbox'})}diff --git a/frontend/src/components/modals/CreateTicketModal/index.tsx b/frontend/src/components/modals/CreateTicketModal/index.tsxindex b12e36e0c..06d36fe92 100644--- a/frontend/src/components/modals/CreateTicketModal/index.tsx+++ b/frontend/src/components/modals/CreateTicketModal/index.tsx@@ -26,6 +26,7 @@ export const CreateTicketModal = ({onClose}: GenericModalProps) => {sale_end_date: '',hide_before_sale_start_date: false,hide_after_sale_end_date: false,+ start_collapsed: false,show_quantity_remaining: false,hide_when_sold_out: false,is_hidden_without_promo_code: false,diff --git a/frontend/src/components/modals/EditTicketModal/index.tsx b/frontend/src/components/modals/EditTicketModal/index.tsxindex 72b45a112..c32f5912a 100644--- a/frontend/src/components/modals/EditTicketModal/index.tsx+++ b/frontend/src/components/modals/EditTicketModal/index.tsx@@ -29,6 +29,7 @@ export const EditTicketModal = ({onClose, ticketId}: GenericModalProps & { tickesale_end_date: undefined,hide_before_sale_start_date: undefined,hide_after_sale_end_date: undefined,+ start_collapsed: undefined,show_quantity_remaining: undefined,hide_when_sold_out: undefined,is_hidden_without_promo_code: undefined,@@ -55,6 +56,7 @@ export const EditTicketModal = ({onClose, ticketId}: GenericModalProps & { tickesale_end_date: utcToTz(ticket.sale_end_date, event.timezone),hide_before_sale_start_date: ticket.hide_before_sale_start_date,hide_after_sale_end_date: ticket.hide_after_sale_end_date,+ start_collapsed: ticket.start_collapsed,show_quantity_remaining: ticket.show_quantity_remaining,hide_when_sold_out: ticket.hide_when_sold_out,is_hidden_without_promo_code: ticket.is_hidden_without_promo_code,diff --git a/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx b/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsxindex 4019b2ea5..8e26c2c01 100644--- a/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx+++ b/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx@@ -1,5 +1,5 @@import {t, Trans} from "@lingui/macro";-import {ActionIcon, Anchor, Button, Group, Input, Modal, Spoiler, TextInput} from "@mantine/core";+import {ActionIcon, Anchor, Button, Collapse, Group, Input, Modal, Spoiler, TextInput} from "@mantine/core";import {useNavigate, useParams} from "react-router-dom";import {useMutation, useQueryClient} from "@tanstack/react-query";import {notifications} from "@mantine/notifications";@@ -10,7 +10,7 @@ import {TicketPriceQuantityFormValue} from "../../../../api/order.client.ts";import {useForm} from "@mantine/form";-import {range, useInputState, useResizeObserver} from "@mantine/hooks";+import {range, useDisclosure, useInputState, useResizeObserver} from "@mantine/hooks";import React, {useEffect, useMemo, useRef, useState} from "react";import {showError, showInfo, showSuccess} from "../../../../utilites/notifications.tsx";import {addQueryStringToUrl, isObjectEmpty, removeQueryStringFromUrl} from "../../../../utilites/helpers.ts";@@ -286,11 +286,19 @@ const SelectTickets = (props: SelectTicketsProps) => {.map((n) => n.toString());quantityRange.unshift("0");+ const [opened, {toggle}] = useDisclosure(!ticket.start_collapsed);+return (<div key={ticket.id} className={'hi-ticket-row'}><div className={'hi-title-row'}><div className={'hi-ticket-title'}>- <h3>{ticket.title}</h3>+ <h3>+ <Anchor display={'flex'} underline={'false'} onClick={toggle}>+ {ticket.title}++ <div className={'hi-ticket-collapse-arrow'}>{opened ? t`▼` : t`▲`}</div>+ </Anchor>+ </h3></div><div className={'hi-ticket-availability'}>{(ticket.is_available && !!ticket.quantity_available) && (@@ -304,38 +312,41 @@ const SelectTickets = (props: SelectTicketsProps) => {)}</div></div>- <div className={'hi-price-tiers-rows'}>- <TieredPricing- ticketIndex={ticketIndex}- event={event}- ticket={ticket}- form={form}- />- </div>- {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 {ticket.title}- is {ticket.max_per_order}</Trans>+ <Collapse in={opened} mt={20}>+ <div className={'hi-price-tiers-rows'}>+ <TieredPricing+ ticketIndex={ticketIndex}+ event={event}+ ticket={ticket}+ form={form}+ /></div>- )}- {form.errors[`tickets.${ticketIndex}`] && (- <div className={'hi-ticket-quantity-error'}>- {form.errors[`tickets.${ticketIndex}`]}- </div>- )}-- {ticket.description && (- <div- className={'hi-ticket-description-row'}>- <Spoiler maxHeight={87} showLabel={t`Show more`} hideLabel={t`Hide`}>- <div dangerouslySetInnerHTML={{- __html: ticket.description- }}/>- </Spoiler>- </div>- )}+ {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 {ticket.title}+ is {ticket.max_per_order}</Trans>+ </div>+ )}++ {form.errors[`tickets.${ticketIndex}`] && (+ <div className={'hi-ticket-quantity-error'}>+ {form.errors[`tickets.${ticketIndex}`]}+ </div>+ )}++ {ticket.description && (+ <div+ className={'hi-ticket-description-row'}>+ <Spoiler maxHeight={87} showLabel={t`Show more`} hideLabel={t`Hide`}>+ <div dangerouslySetInnerHTML={{+ __html: ticket.description+ }}/>+ </Spoiler>+ </div>+ )}+ </Collapse></div>)})}diff --git a/frontend/src/styles/widget/default.scss b/frontend/src/styles/widget/default.scssindex 3d2aa27b2..1b5ce6e8b 100644--- a/frontend/src/styles/widget/default.scss+++ b/frontend/src/styles/widget/default.scss@@ -22,7 +22,7 @@display: flex;flex-flow: column;border: 3px solid var(--widget-primary-color, var(--tk-secondary));- padding: 10px 20px 20px;+ padding: 10px 20px;border-radius: 5px;.hi-ticket-description-row {@@ -41,6 +41,11 @@h3 {margin: 10px 0;}++ .hi-ticket-collapse-arrow {+ margin-left: auto;+ color: var(--widget-secondary-color, var(--tk-primary));+ }}.hi-ticket-availability {diff --git a/frontend/src/types.ts b/frontend/src/types.tsindex 4e2ec4033..771fe42ba 100644--- a/frontend/src/types.ts+++ b/frontend/src/types.ts@@ -309,6 +309,7 @@ export interface Ticket {hide_before_sale_start_date?: boolean;hide_after_sale_end_date?: boolean;hide_when_sold_out?: boolean;+ start_collapsed?: boolean;show_quantity_remaining?: boolean;quantity_available?: number;status?: TicketStatus;