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 promo code modal
Dave Earley992214a1d7c2
diff --git a/backend/app/Services/Domain/Event/DTO/EventSettingsDTO.php b/backend/app/Services/Domain/Event/DTO/EventSettingsDTO.phpdeleted file mode 100644index b794fa19b..000000000--- a/backend/app/Services/Domain/Event/DTO/EventSettingsDTO.php+++ /dev/null@@ -1,10 +0,0 @@-<?php--namespace HiEvents\Services\Domain\Event\DTO;--use HiEvents\Services\Handlers\EventSettings\DTO\UpdateEventSettingsDTO;--class EventSettingsDTO extends UpdateEventSettingsDTO-{--}diff --git a/backend/app/Services/Handlers/Event/DTO/CreateEventDTO.php b/backend/app/Services/Handlers/Event/DTO/CreateEventDTO.phpindex bda05d1a3..773a91d59 100644--- a/backend/app/Services/Handlers/Event/DTO/CreateEventDTO.php+++ b/backend/app/Services/Handlers/Event/DTO/CreateEventDTO.php@@ -7,7 +7,7 @@ use HiEvents\DataTransferObjects\Attributes\CollectionOf;use HiEvents\DataTransferObjects\AttributesDTO;use HiEvents\DataTransferObjects\BaseDTO;use HiEvents\DomainObjects\Status\EventStatus;-use HiEvents\Services\Domain\Event\DTO\EventSettingsDTO;+use HiEvents\Services\Handlers\EventSettings\DTO\UpdateEventSettingsDTO;use Illuminate\Support\Collection;class CreateEventDTO extends BaseDTO@@ -28,7 +28,7 @@ class CreateEventDTO extends BaseDTOpublic readonly ?AddressDTO $location_details = null,public readonly ?string $status = EventStatus::DRAFT->name,- public ?EventSettingsDTO $event_settings = null+ public ?UpdateEventSettingsDTO $event_settings = null){}diff --git a/frontend/src/components/modals/EditPromoCodeModal/index.tsx b/frontend/src/components/modals/EditPromoCodeModal/index.tsxindex c341782e6..52bd54fc2 100644--- a/frontend/src/components/modals/EditPromoCodeModal/index.tsx+++ b/frontend/src/components/modals/EditPromoCodeModal/index.tsx@@ -23,6 +23,8 @@ export const EditPromoCodeModal = ({onClose, promoCodeId}: EditPromoCodeModalProconst errorHandler = useFormErrorResponseHandler();const promoCodeQuery = useGetPromoCode(eventId, promoCodeId);const {data: event} = useGetEvent(eventId);+ const {data: promoCode} = promoCodeQuery;+const form = useForm<PromoCode>({initialValues: {code: '',@@ -56,21 +58,19 @@ export const EditPromoCodeModal = ({onClose, promoCodeId}: EditPromoCodeModalPro}useEffect(() => {- const {data} = promoCodeQuery;- if (!data || !event) {+ if (!promoCode || !event) {return;}form.setValues({- code: data.code,- discount: data.discount,- applicable_ticket_ids: data.applicable_ticket_ids,- expiry_date: utcToTz(data.expiry_date, event.timezone),- discount_type: data.discount_type,- max_allowed_usages: data.max_allowed_usages || undefined,+ code: promoCode.code,+ discount: promoCode.discount,+ applicable_ticket_ids: promoCode.applicable_ticket_ids ? promoCode.applicable_ticket_ids.map((id) => id.toString()) : [],+ expiry_date: utcToTz(promoCode.expiry_date, event.timezone),+ discount_type: promoCode.discount_type,+ max_allowed_usages: promoCode.max_allowed_usages || undefined,});-- }, [promoCodeQuery.isFetched, event]);+ }, [promoCode, event]);return (<Modaldiff --git a/frontend/src/types.ts b/frontend/src/types.tsindex 0a0d525c3..0e399a9cf 100644--- a/frontend/src/types.ts+++ b/frontend/src/types.ts@@ -490,7 +490,7 @@ export interface PromoCode {id?: number;code: string;discount?: number;- applicable_ticket_ids?: number[];+ applicable_ticket_ids?: number[] | string[];expiry_date?: string;event_id?: number;discount_type?: PromoCodeDiscountType | null;