Add ability to add notes to attendees

Author: daveearley

backend/app/DomainObjects/Generated/AttendeeDomainObjectAbstract.php

@@ -28,6 +28,7 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
     final public const UPDATED_AT = 'updated_at';
     final public const DELETED_AT = 'deleted_at';
     final public const LOCALE = 'locale';
+    final public const NOTES = 'notes';
 
     protected int $id;
     protected int $order_id;
@@ -47,6 +48,7 @@ abstract class AttendeeDomainObjectAbstract extends \HiEvents\DomainObjects\Abst
     protected string $updated_at;
     protected ?string $deleted_at = null;
     protected string $locale = 'en';
+    protected ?string $notes = null;
 
     public function toArray(): array
     {
@@ -69,6 +71,7 @@ public function toArray(): array
                     'updated_at' => $this->updated_at ?? null,
                     'deleted_at' => $this->deleted_at ?? null,
                     'locale' => $this->locale ?? null,
+                    'notes' => $this->notes ?? null,
                 ];
     }
 
@@ -269,4 +272,15 @@ public function getLocale(): string
     {
         return $this->locale;
     }
+
+    public function setNotes(?string $notes): self
+    {
+        $this->notes = $notes;
+        return $this;
+    }
+
+    public function getNotes(): ?string
+    {
+        return $this->notes;
+    }
 }

backend/app/Http/Actions/Attendees/EditAttendeeAction.php

@@ -37,6 +37,7 @@ public function __invoke(EditAttendeeRequest $request, int $eventId, int $attend
                 'product_price_id' => $request->input('product_price_id'),
                 'event_id' => $eventId,
                 'attendee_id' => $attendeeId,
+                'notes' => $request->input('notes'),
             ]));
         } catch (NoTicketsAvailableException $exception) {
             throw ValidationException::withMessages([

backend/app/Http/Request/Attendee/EditAttendeeRequest.php

@@ -15,6 +15,7 @@ public function rules(): array
             'last_name' => RulesHelper::REQUIRED_STRING,
             'product_id' => RulesHelper::REQUIRED_NUMERIC,
             'product_price_id' => RulesHelper::REQUIRED_NUMERIC,
+            'notes' => RulesHelper::OPTIONAL_TEXT_MEDIUM_LENGTH,
         ];
     }
 
@@ -29,6 +30,7 @@ public function messages(): array
             'product_price_id.required' => __('Product price is required'),
             'product_id.numeric' => '',
             'product_price_id.numeric' => '',
+            'notes.max' => __('Notes must be less than 2000 characters'),
         ];
     }
 }

backend/app/Http/Request/ProductCategory/UpsertProductCategoryRequest.php

@@ -12,7 +12,7 @@ public function rules(): array
             'name' => ['string', 'required', 'max:50'],
             'description' => ['string', 'max:255', 'nullable'],
             'is_hidden' => ['boolean', 'required'],
-            'no_products_message' => ['string', 'max:255', 'required'],
+            'no_products_message' => ['string', 'max:255', 'nullable'],
         ];
     }
 }

backend/app/Resources/Attendee/AttendeeResource.php

@@ -30,6 +30,7 @@ public function toArray(Request $request): array
             'public_id' => $this->getPublicId(),
             'short_id' => $this->getShortId(),
             'locale' => $this->getLocale(),
+            'notes' => $this->getNotes(),
             'product' => $this->when(
                 !is_null($this->getProduct()),
                 fn() => new ProductResource($this->getProduct()),

backend/app/Services/Application/Handlers/Attendee/DTO/EditAttendeeDTO.php

@@ -7,13 +7,14 @@
 class EditAttendeeDTO extends BaseDTO
 {
     public function __construct(
-        public string $first_name,
-        public string $last_name,
-        public string $email,
-        public int    $product_id,
-        public int    $product_price_id,
-        public int    $event_id,
-        public int    $attendee_id,
+        public string  $first_name,
+        public string  $last_name,
+        public string  $email,
+        public int     $product_id,
+        public int     $product_price_id,
+        public int     $event_id,
+        public int     $attendee_id,
+        public ?string $notes = null,
     )
     {
     }

backend/app/Services/Application/Handlers/Attendee/EditAttendeeHandler.php

@@ -6,6 +6,7 @@
 use HiEvents\DomainObjects\Enums\ProductPriceType;
 use HiEvents\DomainObjects\Generated\AttendeeDomainObjectAbstract;
 use HiEvents\DomainObjects\Generated\ProductDomainObjectAbstract;
+use HiEvents\DomainObjects\ProductDomainObject;
 use HiEvents\DomainObjects\ProductPriceDomainObject;
 use HiEvents\Exceptions\NoTicketsAvailableException;
 use HiEvents\Repository\Interfaces\AttendeeRepositoryInterface;
@@ -59,6 +60,7 @@ private function updateAttendee(EditAttendeeDTO $editAttendeeDTO): AttendeeDomai
             'last_name' => $editAttendeeDTO->last_name,
             'email' => $editAttendeeDTO->email,
             'product_id' => $editAttendeeDTO->product_id,
+            'notes' => $editAttendeeDTO->notes,
         ], [
             'event_id' => $editAttendeeDTO->event_id,
         ]);
@@ -70,6 +72,7 @@ private function updateAttendee(EditAttendeeDTO $editAttendeeDTO): AttendeeDomai
      */
     private function validateProductId(EditAttendeeDTO $editAttendeeDTO): void
     {
+        /** @var ProductDomainObject $product */
         $product = $this->productRepository
             ->loadRelation(ProductPriceDomainObject::class)
             ->findFirstWhere([

backend/app/Services/Application/Handlers/ProductCategory/CreateProductCategoryHandler.php

@@ -21,7 +21,7 @@ public function handle(UpsertProductCategoryDTO $dto): ProductCategoryDomainObje
             isHidden: $dto->is_hidden,
             eventId: $dto->event_id,
             description: $dto->description,
-            noProductsMessage: $dto->no_products_message,
+            noProductsMessage: $dto->no_products_message ?? __('There are no products available in this category'),
         );
     }
 }

backend/app/Services/Application/Handlers/ProductCategory/EditProductCategoryHandler.php

@@ -21,7 +21,7 @@ public function handle(UpsertProductCategoryDTO $dto): ProductCategoryDomainObje
                 'name' => $dto->name,
                 'is_hidden' => $dto->is_hidden,
                 'description' => $dto->description,
-                'no_products_message' => $dto->no_products_message,
+                'no_products_message' => $dto->no_products_message ?? __('There are no products available in this category'),
             ],
             where: [
                 'id' => $dto->product_category_id,

backend/app/Validators/Rules/RulesHelper.php

@@ -16,4 +16,5 @@ class RulesHelper
 
     public const REQUIRED_EMAIL = ['email' , 'required', 'max:100'];
 
+    public const OPTIONAL_TEXT_MEDIUM_LENGTH = ['string', 'max:2000', 'nullable'];
 }

backend/database/migrations/2024_12_09_234323_add_notes_to_attendees_table.php

@@ -0,0 +1,21 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('attendees', static function (Blueprint $table) {
+            $table->text('notes')->nullable();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('attendees', static function (Blueprint $table) {
+            $table->dropColumn('notes');
+        });
+    }
+};

frontend/src/api/attendee.client.ts

@@ -8,6 +8,7 @@ export interface EditAttendeeRequest {
     first_name: string;
     last_name: string;
     email: string;
+    notes?: string;
     product_id?: IdParam;
     product_price_id?: IdParam;
     status?: string;

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

@@ -7,7 +7,7 @@ import {getLocaleName, SupportedLocales} from "../../../locales.ts";
 
 export const AttendeeDetails = ({attendee}: { attendee: Attendee }) => {
     return (
-        <div className={classes.orderDetails} variant={'lightGray'}>
+        <div className={classes.orderDetails}>
             <div className={classes.block}>
                 <div className={classes.title}>
                     {t`Name`}
@@ -29,7 +29,7 @@ export const AttendeeDetails = ({attendee}: { attendee: Attendee }) => {
                     {t`Status`}
                 </div>
                 <div className={classes.amount}>
-                    {attendee.status}
+                    {attendee.status === 'ACTIVE' ? <span style={{color: '#0d7553'}}>{t`Active`}</span> : <span style={{color: '#EF4444'}}>{t`Canceled`}</span>}
                 </div>
             </div>
             <div className={classes.block}>

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

@@ -1,14 +1,13 @@
 import {Anchor, Avatar, Badge, Button, Table as MantineTable,} from '@mantine/core';
 import {Attendee, MessageType} from "../../../types.ts";
-import {IconEye, IconMailForward, IconPencil, IconPlus, IconSend, IconTrash} from "@tabler/icons-react";
+import {IconMailForward, IconPlus, IconSend, IconTrash, IconUserCog} from "@tabler/icons-react";
 import {getInitials, getProductFromEvent} from "../../../utilites/helpers.ts";
 import {Table, TableHead} from "../Table";
 import {useDisclosure} from "@mantine/hooks";
 import {SendMessageModal} from "../../modals/SendMessageModal";
 import {useState} from "react";
 import {NoResultsSplash} from "../NoResultsSplash";
 import {useParams} from "react-router-dom";
-import {EditAttendeeModal} from "../../modals/EditAttendeeModal";
 import {useGetEvent} from "../../../queries/useGetEvent.ts";
 import Truncate from "../Truncate";
 import {notifications} from "@mantine/notifications";
@@ -17,7 +16,7 @@ import {showError, showSuccess} from "../../../utilites/notifications.tsx";
 import {t, Trans} from "@lingui/macro";
 import {confirmationDialog} from "../../../utilites/confirmationDialog.tsx";
 import {useResendAttendeeTicket} from "../../../mutations/useResendAttendeeTicket.ts";
-import {ViewAttendeeModal} from "../../modals/ViewAttendeeModal";
+import {ManageAttendeeModal} from "../../modals/ManageAttendeeModal";
 import {ActionMenu} from '../ActionMenu';
 
 interface AttendeeTableProps {
@@ -28,7 +27,6 @@ interface AttendeeTableProps {
 export const AttendeeTable = ({attendees, openCreateModal}: AttendeeTableProps) => {
     const {eventId} = useParams();
     const [isMessageModalOpen, messageModal] = useDisclosure(false);
-    const [isEditModalOpen, editModal] = useDisclosure(false);
     const [isViewModalOpem, viewModalOpen] = useDisclosure(false);
     const [selectedAttendee, setSelectedAttendee] = useState<Attendee>();
     const {data: event} = useGetEvent(eventId);
@@ -161,20 +159,15 @@ export const AttendeeTable = ({attendees, openCreateModal}: AttendeeTableProps)
                                             label: t`Actions`,
                                             items: [
                                                 {
-                                                    label: t`View attendee`,
-                                                    icon: <IconEye size={14}/>,
+                                                    label: t`Manage attendee`,
+                                                    icon: <IconUserCog size={14}/>,
                                                     onClick: () => handleModalClick(attendee, viewModalOpen),
                                                 },
                                                 {
                                                     label: t`Message attendee`,
                                                     icon: <IconSend size={14}/>,
                                                     onClick: () => handleModalClick(attendee, messageModal),
                                                 },
-                                                {
-                                                    label: t`Edit attendee`,
-                                                    icon: <IconPencil size={14}/>,
-                                                    onClick: () => handleModalClick(attendee, editModal),
-                                                },
                                                 {
                                                     label: t`Resend ticket email`,
                                                     icon: <IconMailForward size={14}/>,
@@ -207,12 +200,7 @@ export const AttendeeTable = ({attendees, openCreateModal}: AttendeeTableProps)
                 attendeeId={selectedAttendee.id}
                 messageType={MessageType.Attendee}
             />}
-            {(selectedAttendee?.id && isEditModalOpen) && <EditAttendeeModal
-                attendeeId={selectedAttendee.id}
-                onClose={editModal.close}
-            />}
-
-            {(selectedAttendee?.id && isViewModalOpem) && <ViewAttendeeModal
+            {(selectedAttendee?.id && isViewModalOpem) && <ManageAttendeeModal
                 attendeeId={selectedAttendee.id}
                 onClose={viewModalOpen.close}
             />}

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

@@ -21,7 +21,6 @@ export const ProductCategoryForm = ({form}: ProductCategoryFormProps) => {
             <TextInput
                 label={"No products message"}
                 description={"A message to display when there are no products in this category."}
-                required
                 {...form.getInputProps("no_products_message")}
             />