Fix tiered ticketing quality check + SSR token fix

Dockerfile.all-in-one

@@ -37,7 +37,7 @@ COPY ./docker/all-in-one/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY ./docker/all-in-one/supervisor/supervisord.conf /etc/supervisord.conf
 
 COPY ./docker/all-in-one/scripts/startup.sh /startup.sh
-RUN chmod +x /startup.sh
+RUN dos2unix /startup.sh && chmod +x /startup.sh
 
 EXPOSE 80
 

README.md

@@ -99,7 +99,7 @@ a quick start, follow these steps:
 
 3. **Start the Docker Containers:**
    ```bash
-   docker-compose up -d
+   docker compose up -d
    ```
 4. **Create an account:**
    ```bash

backend/app/DomainObjects/TicketDomainObject.php

@@ -76,7 +76,7 @@ public function getFees(): ?Collection
     public function isSoldOut(): bool
     {
         if (!$this->getTicketPrices() || $this->getTicketPrices()->isEmpty()) {
-            throw new LogicException('You cannot check if a ticket is sold out without prices.');
+            return true;
         }
 
         return $this->getTicketPrices()->every(fn(TicketPriceDomainObject $price) => $price->isSoldOut());
@@ -85,7 +85,7 @@ public function isSoldOut(): bool
     public function getQuantityAvailable(): int
     {
         if (!$this->getTicketPrices() || $this->getTicketPrices()->isEmpty()) {
-            throw new LogicException('You cannot get the quantity available for a ticket without prices.');
+            return 0;
         }
 
         return $this->getTicketPrices()->sum(fn(TicketPriceDomainObject $price) => $price->getQuantityAvailable());

backend/app/Repository/Eloquent/EventRepository.php

@@ -71,6 +71,7 @@ public function getAvailableTicketQuantities(int $eventId): Collection
                   WHERE orders.event_id = $eventId
                     AND orders.status = '$reserved'
                     AND orders.reserved_until > NOW()
+                    AND orders.deleted_at IS NULL
                   GROUP BY order_items.ticket_id, order_items.ticket_price_id) AS reserved_quantities
                  ON ticket_prices.id = reserved_quantities.ticket_price_id
             WHERE tickets.event_id = $eventId

backend/app/Resources/Ticket/TicketResourcePublic.php

@@ -26,6 +26,9 @@ public function toArray(Request $request): array
             'event_id' => $this->getEventId(),
             'is_before_sale_start_date' => $this->isBeforeSaleStartDate(),
             'is_after_sale_end_date' => $this->isAfterSaleEndDate(),
+            $this->mergeWhen($this->getShowQuantityRemaining(), fn () => [
+                'quantity_available' => $this->getQuantityAvailable(),
+            ]),
             'price' => $this->when(
                 $this->getTicketPrices() && !$this->isTieredType(),
                 fn() => $this->getPrice(),

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

@@ -168,21 +168,14 @@ private function validateSingleTicketDetails(EventDomainObject $event, int $tick
     private function validateTicketQuantity(int $ticketIndex, array $ticketAndQuantities, TicketDomainObject $ticket): void
     {
         $totalQuantity = collect($ticketAndQuantities['quantities'])->sum('quantity');
-        $maxPerOrder = (int)$ticket->getMaxPerOrder() ?: 100; // Placeholder for config value
+        $maxPerOrder = (int)$ticket->getMaxPerOrder() ?: 100;
         $minPerOrder = (int)$ticket->getMinPerOrder() ?: 1;
-        $ticketQuantityAvailable = $this->ticketRepository->getQuantityRemainingForTicketPrice(
-            ticketId: $ticket->getId(),
-            ticketPriceId: $ticketAndQuantities['quantities'][0]['price_id']
-        );
 
-        if ($totalQuantity > $ticketQuantityAvailable) {
-            throw ValidationException::withMessages([
-                "tickets.$ticketIndex" => __("The maximum number of tickets available for :ticket is :max", [
-                    'max' => $ticketQuantityAvailable,
-                    'ticket' => $ticket->getTitle(),
-                ]),
-            ]);
-        }
+        $this->validateTicketPricesQuantity(
+            quantities: $ticketAndQuantities['quantities'],
+            ticket: $ticket,
+            ticketIndex: $ticketIndex
+        );
 
         if ($totalQuantity > $maxPerOrder) {
             throw ValidationException::withMessages([
@@ -274,4 +267,40 @@ private function validatePriceIdAndQuantity(int $ticketIndex, array $ticketAndQu
             throw ValidationException::withMessages($errors);
         }
     }
+
+    /**
+     * @throws ValidationException
+     */
+    private function validateTicketPricesQuantity(array $quantities, TicketDomainObject $ticket, int $ticketIndex): void
+    {
+        foreach ($quantities as $ticketQuantity) {
+            $numberAvailable = $this->ticketRepository->getQuantityRemainingForTicketPrice(
+                ticketId: $ticket->getId(),
+                ticketPriceId: $ticketQuantity['price_id']
+            );
+
+            $numberAvailable = max(0, $numberAvailable);
+
+            /** @var TicketPriceDomainObject $ticketPrice */
+            $ticketPrice = $ticket->getTicketPrices()
+                ?->first(fn(TicketPriceDomainObject $price) => $price->getId() === $ticketQuantity['price_id']);
+
+            if ($ticketQuantity['quantity'] > $numberAvailable) {
+                if ($numberAvailable === 0) {
+                    throw ValidationException::withMessages([
+                        "tickets.$ticketIndex" => __("The ticket :ticket is sold out", [
+                            'ticket' => $ticket->getTitle() . ($ticketPrice->getLabel() ? ' - ' . $ticketPrice->getLabel() : ''),
+                        ]),
+                    ]);
+                }
+
+                throw ValidationException::withMessages([
+                    "tickets.$ticketIndex" => __("The maximum number of tickets available for :ticket is :max", [
+                        'max' => $numberAvailable,
+                        'ticket' => $ticket->getTitle() . ($ticketPrice->getLabel() ? ' - ' . $ticketPrice->getLabel() : ''),
+                    ]),
+                ]);
+            }
+        }
+    }
 }

backend/app/Services/Handlers/Order/CreateOrderHandler.php

@@ -65,7 +65,12 @@ public function handle(
                 sessionId: $sessionId
             );
 
-            $orderItems = $this->orderItemProcessingService->process($order, $createOrderPublicDTO->tickets, $event, $promoCode);
+            $orderItems = $this->orderItemProcessingService->process(
+                order: $order,
+                ticketsOrderDetails: $createOrderPublicDTO->tickets,
+                event: $event,
+                promoCode: $promoCode,
+            );
 
             return $this->orderManagementService->updateOrderTotals($order, $orderItems);
         });

docker/all-in-one/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   all-in-one:
     build:

docker/backend/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   hi-events-backend:
     build:

docker/development/docker-compose.dev.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
     backend:
         build:

docker/frontend/docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   hi-events-frontend:
     build:

frontend/server.js

@@ -94,11 +94,16 @@ app.use("*", async (req, res) => {
         res.setHeader("Content-Type", "text/html");
         return res.status(200).end(html);
     } catch (error) {
-        if (!isProduction) {
-            vite.ssrFixStacktrace(error);
+        if (error instanceof Response) {
+            if (error.status >= 300 && error.status < 400) {
+                return res.redirect(error.status, error.headers.get("Location") || "/");
+            } else {
+                return res.status(error.status).send(await error.text());
+            }
         }
-        console.log(error.stack);
-        res.status(500).end(error.stack);
+
+        console.error(error);
+        res.status(500).send("Internal Server Error");
     }
 });
 

frontend/src/App.tsx

@@ -24,7 +24,6 @@ import {messages as fr} from "./locales/fr.po";
 import {messages as pt} from "./locales/pt.po";
 // @ts-ignore
 import {messages as es} from "./locales/es.po";
-import {setAuthToken} from "./utilites/apiClient.ts";
 import {isSsr} from "./utilites/helpers.ts";
 
 declare global {
@@ -63,7 +62,6 @@ export const App: FC<
     PropsWithChildren<{
         queryClient: QueryClient;
         helmetContext?: any;
-        token?: string;
     }>
 > = (props) => {
     const [isLoadedOnBrowser, setIsLoadedOnBrowser] = React.useState(false);
@@ -74,10 +72,6 @@ export const App: FC<
         dynamicActivate(getSupportedLocale());
     }
 
-    if (props.token) {
-        setAuthToken(props.token);
-    }
-
     useEffect(() => {
         setIsLoadedOnBrowser(!isSsr());
     }, [])

frontend/src/api/client.ts

@@ -26,12 +26,6 @@ export const api = axios.create({
     withCredentials: true,
 });
 
-
-const existingToken = typeof window !== "undefined" ? window.localStorage.getItem('token') : undefined;
-if (existingToken) {
-    setAuthToken(existingToken);
-}
-
 api.interceptors.response.use(
     (response) => {
         // Securely update the token on each response

frontend/src/components/common/QuestionsTable/QuestionsTable.module.scss

@@ -77,8 +77,17 @@
     .questions {
       margin-bottom: 20px;
 
+      h3 {
+        margin-bottom: 8px;
+      }
+
       .noQuestionsAlert {
+        display: flex;
+        align-items: center;
 
+        svg {
+          margin-right: 5px;
+        }
       }
 
       .questionCard {

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

@@ -1,4 +1,4 @@
-import {Alert, Button, Group, Menu, Switch, TextInput, Tooltip} from '@mantine/core';
+import {Button, Group, Menu, Switch, TextInput, Tooltip} from '@mantine/core';
 import {IdParam, Question} from "../../../types.ts";
 import {
     IconDotsVertical,
@@ -297,9 +297,9 @@ export const QuestionsTable = ({questions}: QuestionsTableProp) => {
                         {orderQuestions
                             .filter(question => showHiddenQuestions || !question.is_hidden)
                             .length === 0 && (
-                            <Alert icon={<IconInfoCircle/>} color={'gray'} className={classes.noQuestionsAlert}>
-                                {t`You have no order questions.`}
-                            </Alert>
+                            <Card className={classes.noQuestionsAlert}>
+                                <IconInfoCircle/> {t`You have no order questions.`}
+                            </Card>
                         )}
                     </div>
                     <div className={classes.questions}>
@@ -312,9 +312,9 @@ export const QuestionsTable = ({questions}: QuestionsTableProp) => {
                         {ticketQuestions
                             .filter(question => showHiddenQuestions || !question.is_hidden)
                             .length === 0 && (
-                            <Alert icon={<IconInfoCircle/>} color={'gray'} className={classes.noQuestionsAlert}>
-                                {t`You have no attendee questions.`}
-                            </Alert>
+                            <Card className={classes.noQuestionsAlert}>
+                                <IconInfoCircle/> {t`You have no attendee questions.`}
+                            </Card>
                         )}
                     </div>
                 </div>

frontend/src/components/common/WidgetEditor/WidgetEditor.module.scss

@@ -40,10 +40,11 @@
 
 .browserChrome {
   width: 100%;
-  background: #f0f0f0;
+  background: #fff;
   border-radius: 5px 5px 0 0;
   height: 40px;
   display: flex;
+  border-bottom: 1px solid #dbdbdb;
 }
 
 .browserActionButtons {
@@ -57,7 +58,7 @@
     width: 15px;
     height: 15px;
     border-radius: 50px;
-    background-color: #fff;
+    background-color: #eee;
     display: inline-block;
     margin-right: 4px;
   }
@@ -68,7 +69,7 @@
   align-self: center;
 
   div {
-    background-color: #ffffff63;
+    background-color: #f8f8f8;
     border-radius: 5px;
     margin-right: 20%;
     font-size: 0.9em;

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

@@ -1,12 +1,13 @@
 import {UseFormReturnType} from "@mantine/form";
 import {Alert, MultiSelect, NumberInput, Select, TextInput} from "@mantine/core";
-import {IconAlertCircle, IconCurrencyDollar, IconPercentage} from "@tabler/icons-react";
+import {IconAlertCircle, IconPercentage} from "@tabler/icons-react";
 import {PromoCode, PromoCodeDiscountType} from "../../../types.ts";
 import {useGetEvent} from "../../../queries/useGetEvent.ts";
 import {useParams} from "react-router-dom";
 import {LoadingMask} from "../../common/LoadingMask";
 import {t} from "@lingui/macro";
 import {InputGroup} from "../../common/InputGroup";
+import {getCurrencySymbol} from "../../../utilites/currency.ts";
 
 interface PromoCodeFormProps {
     form: UseFormReturnType<PromoCode>,
@@ -20,7 +21,7 @@ export const PromoCodeForm = ({form}: PromoCodeFormProps) => {
         if (form.values.discount_type === 'PERCENTAGE') {
             return <IconPercentage/>;
         }
-        return <IconCurrencyDollar/>
+        return getCurrencySymbol(event?.currency as string);
     };
 
     if (!event || !tickets) {
@@ -55,7 +56,9 @@ export const PromoCodeForm = ({form}: PromoCodeFormProps) => {
                     ]}/>
                 <NumberInput
                     disabled={form.values.discount_type === PromoCodeDiscountType.None}
-                    decimalScale={2} min={0} rightSection={<DiscountIcon/>} {...form.getInputProps('discount')}
+                    decimalScale={2} min={0}
+                    leftSection={<DiscountIcon/>}
+                    {...form.getInputProps('discount')}
                     label={(form.values.discount_type === 'PERCENTAGE' ? t`Discount %` : t`Discount in ${event.currency}`)}
                     placeholder="0.00"/>
             </InputGroup>

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

@@ -296,10 +296,10 @@ export const TicketForm = ({form, ticket}: TicketFormProps) => {
                     )}
 
                     <InputGroup>
-                        <NumberInput {...form.getInputProps('max_per_order')} label={t`Maximum Per Order`}
-                                     placeholder="5"/>
                         <NumberInput {...form.getInputProps('min_per_order')} label={t`Minimum Per Order`}
                                      placeholder="5"/>
+                        <NumberInput {...form.getInputProps('max_per_order')} label={t`Maximum Per Order`}
+                                     placeholder="5"/>
                     </InputGroup>
 
                     <InputGroup>

frontend/src/components/routes/event/Settings/Sections/EventDetailsForm/index.tsx

@@ -99,6 +99,7 @@ export const EventDetailsForm = () => {
                             {...form.getInputProps('currency')}
                             label={t`Currency`}
                             placeholder={t`EUR`}
+                            disabled
                         />
 
                         <Select

frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx

@@ -276,14 +276,19 @@ const SelectTickets = (props: SelectTicketsProps) => {
                                 .map((n) => n.toString());
                             quantityRange.unshift("0");
 
-
                             return (
                                 <div key={ticket.id} className={'hi-ticket-row'}>
                                     <div className={'hi-title-row'}>
                                         <div className={'hi-ticket-title'}>
                                             <h3>{ticket.title}</h3>
                                         </div>
                                         <div className={'hi-ticket-availability'}>
+                                            {(ticket.is_available && !!ticket.quantity_available) && (
+                                                <>
+                                                    <Trans>{ticket?.quantity_available} available</Trans>
+                                                </>
+                                            )}
+
                                             {(!ticket.is_available && ticket.type === 'TIERED') && (
                                                 <TicketAvailabilityMessage ticket={ticket} event={event}/>
                                             )}