Merge fixes

Author: daveearley

backend/app/Resources/CheckInList/AttendeeCheckInResource.php

@@ -16,7 +16,7 @@ public function toArray($request): array
             'id' => $this->getId(),
             'attendee_id' => $this->getAttendeeId(),
             'check_in_list_id' => $this->getCheckInListId(),
-            'ticket_id' => $this->getTicketId(),
+            'product_id' => $this->getProductId(),
             'event_id' => $this->getEventId(),
             'short_id' => $this->getShortId(),
             'created_at' => $this->getCreatedAt(),

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

@@ -48,8 +48,8 @@ public function handle(EditAttendeeDTO $editAttendeeDTO): AttendeeDomainObject
     private function adjustProductQuantities(AttendeeDomainObject $attendee, EditAttendeeDTO $editAttendeeDTO): void
     {
         if ($attendee->getProductPriceId() !== $editAttendeeDTO->product_price_id) {
-            $this->productQuantityService->decreaseQuantitySold($editAttendeeDTO->product_price_id);
-            $this->productQuantityService->increaseQuantitySold($attendee->getProductPriceId());
+            $this->productQuantityService->decreaseQuantitySold($attendee->getProductPriceId());
+            $this->productQuantityService->increaseQuantitySold($editAttendeeDTO->product_price_id);
         }
     }
 
@@ -60,6 +60,7 @@ private function updateAttendee(EditAttendeeDTO $editAttendeeDTO): AttendeeDomai
             'last_name' => $editAttendeeDTO->last_name,
             'email' => $editAttendeeDTO->email,
             'product_id' => $editAttendeeDTO->product_id,
+            'product_price_id' => $editAttendeeDTO->product_price_id,
             'notes' => $editAttendeeDTO->notes,
         ], [
             'event_id' => $editAttendeeDTO->event_id,
@@ -85,6 +86,13 @@ private function validateProductId(EditAttendeeDTO $editAttendeeDTO): void
             ]);
         }
 
+        $productPriceIds = $product->getProductPrices()->map(fn($productPrice) => $productPrice->getId())->toArray();
+        if (!in_array($editAttendeeDTO->product_price_id, $productPriceIds, true)) {
+            throw ValidationException::withMessages([
+                'product_price_id' => __('Product price ID is not valid'),
+            ]);
+        }
+
         $availableQuantity = $this->productRepository->getQuantityRemainingForProductPrice(
             productId: $editAttendeeDTO->product_id,
             productPriceId: $product->getType() === ProductPriceType::TIERED->name

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

@@ -65,6 +65,20 @@ export const ManageAttendeeModal = ({onClose, attendeeId}: ManageAttendeeModalPr
         }
     }, [attendee]);
 
+    useEffect(() => {
+        if (!form.values.product_id) {
+            return;
+        }
+        let productPriceId = event?.product_categories
+            ?.flatMap(category => category.products)
+            .find(product => product.id == form.values.product_id)?.prices?.[0]?.id;
+
+        form.setValues({
+            ...form.values,
+            product_price_id: String(productPriceId),
+        });
+    }, [form.values.product_id]);
+
     if (!attendee || !order || !event) {
         return <LoadingMask/>;
     }

frontend/src/locales/de.js

@@ -293,11 +293,11 @@ msgstr "Aktiv"
 msgid "Add a description for this check-in list"
 msgstr "Fügen Sie eine Beschreibung für diese Eincheckliste hinzu"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:116
+#: src/components/modals/ManageAttendeeModal/index.tsx:127
 msgid "Add any notes about the attendee. These will not be visible to the attendee."
 msgstr "Fügen Sie Anmerkungen über den Teilnehmer hinzu. Diese sind für den Teilnehmer nicht sichtbar."
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:118
+#: src/components/modals/ManageAttendeeModal/index.tsx:129
 msgid "Add any notes about the attendee..."
 msgstr "Fügen Sie Anmerkungen über den Teilnehmer hinzu..."
 
@@ -588,19 +588,19 @@ msgstr "Einmal pro Produkt fragen"
 msgid "Attendee"
 msgstr "Teilnehmer"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:132
+#: src/components/modals/ManageAttendeeModal/index.tsx:143
 msgid "Attendee Details"
 msgstr "Teilnehmerdetails"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:138
+#: src/components/modals/ManageAttendeeModal/index.tsx:149
 msgid "Attendee Notes"
 msgstr "Teilnehmernotizen"
 
 #: src/components/common/QuestionsTable/index.tsx:348
 msgid "Attendee questions"
 msgstr "Fragen der Teilnehmer"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:157
+#: src/components/modals/ManageAttendeeModal/index.tsx:168
 msgid "Attendee Ticket"
 msgstr "Teilnehmer-Ticket"
 
@@ -1356,13 +1356,17 @@ msgid "Details"
 msgstr "Einzelheiten"
 
 #: src/components/forms/CapaciyAssigmentForm/index.tsx:27
-msgid "Disable this capacity track capacity without stopping product sales"
-msgstr "Deaktivieren Sie diese Kapazität, um Kapazitäten zu verfolgen, ohne den Produktverkauf zu stoppen"
+#~ msgid "Disable this capacity track capacity without stopping product sales"
+#~ msgstr "Deaktivieren Sie diese Kapazität, um Kapazitäten zu verfolgen, ohne den Produktverkauf zu stoppen"
 
 #: src/components/forms/CapaciyAssigmentForm/index.tsx:26
 #~ msgid "Disable this capacity track capacity without stopping ticket sales"
 #~ msgstr "Deaktivieren Sie diese Kapazitätsverfolgung ohne den Ticketverkauf zu stoppen"
 
+#: src/components/forms/CapaciyAssigmentForm/index.tsx:27
+msgid "Disabling this capacity will track sales but not stop them when the limit is reached"
+msgstr "Das Deaktivieren dieser Kapazität wird Verkäufe verfolgen, aber nicht stoppen, wenn das Limit erreicht ist"
+
 #: src/components/common/PromoCodeTable/index.tsx:70
 msgid "Discount"
 msgstr "Rabatt"
@@ -1469,7 +1473,7 @@ msgid "Early bird"
 msgstr "Früher Vogel"
 
 #: src/components/common/TaxAndFeeList/index.tsx:65
-#: src/components/modals/ManageAttendeeModal/index.tsx:205
+#: src/components/modals/ManageAttendeeModal/index.tsx:216
 msgid "Edit"
 msgstr "Bearbeiten"
 
@@ -1583,7 +1587,7 @@ msgid "Email & Notification Settings"
 msgstr "E-Mail- und Benachrichtigungseinstellungen"
 
 #: src/components/modals/CreateAttendeeModal/index.tsx:132
-#: src/components/modals/ManageAttendeeModal/index.tsx:99
+#: src/components/modals/ManageAttendeeModal/index.tsx:110
 msgid "Email address"
 msgstr "E-Mail-Adresse"
 
@@ -1816,7 +1820,7 @@ msgstr "Gebühren"
 
 #: src/components/common/QuestionsTable/index.tsx:206
 #: src/components/modals/CreateAttendeeModal/index.tsx:118
-#: src/components/modals/ManageAttendeeModal/index.tsx:95
+#: src/components/modals/ManageAttendeeModal/index.tsx:106
 #: src/components/routes/product-widget/CollectInformation/index.tsx:269
 #: src/components/routes/product-widget/CollectInformation/index.tsx:328
 msgid "First name"
@@ -2071,7 +2075,7 @@ msgstr "Homepage Designer"
 msgid "Homepage Preview"
 msgstr "Homepage-Vorschau"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:95
+#: src/components/modals/ManageAttendeeModal/index.tsx:106
 msgid "Homer"
 msgstr "Homer"
 
@@ -2263,7 +2267,7 @@ msgid "Last login"
 msgstr "Letzte Anmeldung"
 
 #: src/components/modals/CreateAttendeeModal/index.tsx:125
-#: src/components/modals/ManageAttendeeModal/index.tsx:96
+#: src/components/modals/ManageAttendeeModal/index.tsx:107
 msgid "Last name"
 msgstr "Familienname, Nachname"
 
@@ -2592,7 +2596,7 @@ msgstr "Keine Bestellungen anzuzeigen"
 msgid "No Payment Required"
 msgstr "Keine Zahlung erforderlich"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:162
+#: src/components/modals/ManageAttendeeModal/index.tsx:173
 msgid "No product associated with this attendee."
 msgstr "Kein Produkt mit diesem Teilnehmer verknüpft."
 
@@ -2608,7 +2612,7 @@ msgstr "Noch keine Produkte"
 msgid "No Promo Codes to show"
 msgstr "Keine Promo-Codes anzuzeigen"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:175
+#: src/components/modals/ManageAttendeeModal/index.tsx:186
 msgid "No questions answered by this attendee."
 msgstr "Dieser Teilnehmer hat keine Fragen beantwortet."
 
@@ -2658,7 +2662,7 @@ msgstr "Nicht verfügbar"
 msgid "Not On Sale"
 msgstr "Nicht im Angebot"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:115
+#: src/components/modals/ManageAttendeeModal/index.tsx:126
 msgid "Notes"
 msgstr "Notizen"
 
@@ -2767,7 +2771,7 @@ msgstr "Bestellung abgeschlossen"
 msgid "Order Date"
 msgstr "Auftragsdatum"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:151
+#: src/components/modals/ManageAttendeeModal/index.tsx:162
 #: src/components/modals/ViewOrderModal/index.tsx:42
 #: src/components/routes/product-widget/OrderSummaryAndProducts/index.tsx:241
 msgid "Order Details"
@@ -3094,7 +3098,7 @@ msgstr "Tickets drucken"
 #~ msgstr "Produkt"
 
 #: src/components/common/AttendeeDetails/index.tsx:45
-#: src/components/modals/ManageAttendeeModal/index.tsx:104
+#: src/components/modals/ManageAttendeeModal/index.tsx:115
 #: src/components/routes/event/products.tsx:86
 msgid "Product"
 msgstr "Produkt"
@@ -3240,7 +3244,7 @@ msgstr "Fragentitel"
 msgid "Questions"
 msgstr "Fragen"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:169
+#: src/components/modals/ManageAttendeeModal/index.tsx:180
 #: src/components/modals/ViewOrderModal/index.tsx:54
 msgid "Questions & Answers"
 msgstr "Fragen & Antworten"
@@ -3415,7 +3419,7 @@ msgstr "San Francisco"
 msgid "Save"
 msgstr "Speichern"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:215
+#: src/components/modals/ManageAttendeeModal/index.tsx:226
 #: src/components/routes/event/HomepageDesigner/index.tsx:143
 msgid "Save Changes"
 msgstr "Änderungen speichern"
@@ -3514,7 +3518,7 @@ msgstr "Kategorie auswählen..."
 msgid "Select organizer"
 msgstr "Veranstalter auswählen"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:103
+#: src/components/modals/ManageAttendeeModal/index.tsx:114
 msgid "Select Product"
 msgstr "Produkt auswählen"
 
@@ -3708,7 +3712,7 @@ msgstr "Wird dem Kunden vor dem Bezahlvorgang angezeigt"
 msgid "Shows common address fields, including country"
 msgstr "Zeigt allgemeine Adressfelder an, einschließlich Land"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:96
+#: src/components/modals/ManageAttendeeModal/index.tsx:107
 msgid "Simpson"
 msgstr "Simpson"
 
@@ -3867,7 +3871,7 @@ msgstr "Frage erfolgreich erstellt"
 #~ msgid "Successfully Created Ticket"
 #~ msgstr "Ticket erfolgreich erstellt"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:81
+#: src/components/modals/ManageAttendeeModal/index.tsx:92
 msgid "Successfully updated attendee"
 msgstr "Teilnehmer erfolgreich aktualisiert"
 
@@ -4519,7 +4523,7 @@ msgstr "Umsatzsteuer"
 msgid "Venue Name"
 msgstr "Veranstaltungsort Namen"
 
-#: src/components/modals/ManageAttendeeModal/index.tsx:204
+#: src/components/modals/ManageAttendeeModal/index.tsx:215
 msgid "View"
 msgstr "Ansehen"
 
@@ -4711,7 +4715,7 @@ msgstr "Arbeiten"
 #: src/components/modals/EditProductModal/index.tsx:108
 #: src/components/modals/EditPromoCodeModal/index.tsx:84
 #: src/components/modals/EditQuestionModal/index.tsx:99
-#: src/components/modals/ManageAttendeeModal/index.tsx:215
+#: src/components/modals/ManageAttendeeModal/index.tsx:226
 #: src/components/routes/auth/Register/index.tsx:99
 #: src/components/routes/auth/ResetPassword/index.tsx:62
 msgid "Working..."