Merge pull request #326 from HiEventsDev/develop

main <- develop

Author: daveearley

backend/app/Services/Domain/Order/OrderCancelService.php

@@ -35,8 +35,8 @@ public function __construct(
     public function cancelOrder(OrderDomainObject $order): void
     {
         $this->databaseManager->transaction(function () use ($order) {
-            $this->cancelAttendees($order);
             $this->adjustTicketQuantities($order);
+            $this->cancelAttendees($order);
             $this->updateOrderStatus($order);
 
             $event = $this->eventRepository

frontend/src/components/common/AttendeeList/index.tsx

@@ -11,7 +11,7 @@ export const AttendeeList = ({order, tickets}: { order: Order, tickets: Ticket[]
     return (
         <div className={classes.attendeeList}>
             {order.attendees?.map(attendee => (
-                <div className={classes.attendee}>
+                <div className={classes.attendee} key={`${attendee.id}`}>
                     <Avatar size={40}>
                         {getInitials(attendee.first_name + ' ' + attendee.last_name)}
                     </Avatar>
@@ -35,4 +35,4 @@ export const AttendeeList = ({order, tickets}: { order: Order, tickets: Ticket[]
             ))}
         </div>
     )
-}
+}

frontend/src/components/forms/CapaciyAssigmentForm/index.tsx

@@ -1,17 +1,17 @@
 import {InputGroup} from "../../common/InputGroup";
-import {MultiSelect, NumberInput, Switch, TextInput} from "@mantine/core";
+import {MultiSelect, NumberInput, TextInput} from "@mantine/core";
 import {t} from "@lingui/macro";
 import {UseFormReturnType} from "@mantine/form";
 import {CapacityAssignmentRequest, Ticket} from "../../../types.ts";
 import {CustomSelect, ItemProps} from "../../common/CustomSelect";
 import {IconCheck, IconTicket, IconX} from "@tabler/icons-react";
 
-interface CapaciyAssigmentFormProps {
+interface CapacityAssigmentFormProps {
     form: UseFormReturnType<CapacityAssignmentRequest>;
     tickets: Ticket[],
 }
 
-export const CapaciyAssigmentForm = ({form, tickets}: CapaciyAssigmentFormProps) => {
+export const CapacityAssigmentForm = ({form, tickets}: CapacityAssigmentFormProps) => {
     const statusOptions: ItemProps[] = [
         {
             icon: <IconCheck/>,
@@ -23,7 +23,7 @@ export const CapaciyAssigmentForm = ({form, tickets}: CapaciyAssigmentFormProps)
             icon: <IconX/>,
             label: t`Inactive`,
             value: 'INACTIVE',
-            description: t`Disable this capacity track capacity without stopping ticket sales`,
+            description: t`Disabling this capacity will track sales but not stop them when the limit is reached`,
         },
     ];
 

frontend/src/components/modals/CreateCapacityAssignmentModal/index.tsx

@@ -1,7 +1,7 @@
 import {CapacityAssignmentRequest, GenericModalProps, Ticket} from "../../../types.ts";
 import {Modal} from "../../common/Modal";
 import {t} from "@lingui/macro";
-import {CapaciyAssigmentForm} from "../../forms/CapaciyAssigmentForm";
+import {CapacityAssigmentForm} from "../../forms/CapaciyAssigmentForm";
 import {useForm} from "@mantine/form";
 import {Button} from "@mantine/core";
 import {useCreateCapacityAssignment} from "../../../mutations/useCreateCapacityAssignment.ts";
@@ -69,7 +69,7 @@ export const CreateCapacityAssignmentModal = ({onClose}: GenericModalProps) => {
             {!eventHasTickets && <NoTickets/>}
             {eventHasTickets && (
                 <form onSubmit={form.onSubmit(handleSubmit)}>
-                    {event && <CapaciyAssigmentForm form={form} tickets={event.tickets as Ticket[]}/>}
+                    {event && <CapacityAssigmentForm form={form} tickets={event.tickets as Ticket[]}/>}
                     <Button
                         type={'submit'}
                         fullWidth

frontend/src/components/modals/EditCapacityAssignmentModal/index.tsx

@@ -1,7 +1,7 @@
 import {CapacityAssignmentRequest, GenericModalProps, IdParam, Ticket} from "../../../types.ts";
 import {Modal} from "../../common/Modal";
 import {t} from "@lingui/macro";
-import {CapaciyAssigmentForm} from "../../forms/CapaciyAssigmentForm";
+import {CapacityAssigmentForm} from "../../forms/CapaciyAssigmentForm";
 import {useForm} from "@mantine/form";
 import {Button} from "@mantine/core";
 import {showSuccess} from "../../../utilites/notifications.tsx";
@@ -65,7 +65,7 @@ export const EditCapacityAssignmentModal = ({
     return (
         <Modal opened onClose={onClose} heading={t`Edit Capacity Assignment`}>
             <form onSubmit={form.onSubmit(handleSubmit)}>
-                {event && <CapaciyAssigmentForm form={form} tickets={event.tickets as Ticket[]}/>}
+                {event && <CapacityAssigmentForm form={form} tickets={event.tickets as Ticket[]}/>}
                 <Button
                     type={'submit'}
                     fullWidth