Merge pull request #13 from HiEventsDev/develop

Fix quantity validation bug + i18n
HiEventsDev · Jun 6, 2024 · 96f5fac · 96f5fac
2 parents f61896f + fbbc6e9
commit 96f5fac
Show file tree

Hide file tree

Showing 33 changed files with 1,078 additions and 953 deletions.
diff --git a/README.md b/README.md
@@ -20,6 +20,10 @@
 
 </div>
 
+<div align="center">
+ 🌟 A star would be much appreciated! 🌟
+</div>
+
 <hr/>
 
 ## Table of Contents
@@ -93,7 +97,7 @@ a quick start, follow these steps:
    cd hi.events/docker/all-in-one
    ```
 
-3. **Run the set-up script:**
+3. **Start the Docker Containers:**
    ```bash
    docker-compose up -d
    ```

diff --git a/backend/app/Http/Request/User/CreateUserRequest.php b/backend/app/Http/Request/User/CreateUserRequest.php
@@ -13,8 +13,8 @@ class CreateUserRequest extends BaseRequest
     public function rules(): array
     {
         return [
-            'first_name' => 'required|min:2',
-            'last_name' => 'required|min:2',
+            'first_name' => 'required|min:1',
+            'last_name' => 'required|min:1',
             'role' => Rule::in(Role::valuesArray()),
             'email' => [
                 'required',

diff --git a/backend/app/Http/Request/User/UpdateMeRequest.php b/backend/app/Http/Request/User/UpdateMeRequest.php
@@ -14,8 +14,8 @@ class UpdateMeRequest extends BaseRequest
     public function rules(): array
     {
         return [
-            'first_name' => 'required_without_all:current_password,password,password_confirmation|min:2',
-            'last_name' => 'required_without_all:current_password,password,password_confirmation|min:2',
+            'first_name' => 'required_without_all:current_password,password,password_confirmation|min:1',
+            'last_name' => 'required_without_all:current_password,password,password_confirmation|min:1',
             'email' => 'required_without_all:current_password,password,password_confirmation|email',
             'timezone' => 'required_without_all:current_password,password,password_confirmation|timezone',
 

diff --git a/backend/app/Repository/Eloquent/TicketRepository.php b/backend/app/Repository/Eloquent/TicketRepository.php
@@ -59,6 +59,8 @@ public function getQuantityRemainingForTicketPrice(int $ticketId, int $ticketPri
                     WHERE order_items.ticket_price_id = :ticketPriceId
                     AND orders.status in ('RESERVED')
                     AND current_timestamp < orders.reserved_until
+                    AND orders.deleted_at IS NULL
+                    AND order_items.deleted_at IS NULL
                 ), 0)
             ) AS quantity_remaining,
             ticket_prices.initial_quantity_available IS NULL AS unlimited_tickets_available

diff --git a/backend/app/Resources/Account/AccountResource.php b/backend/app/Resources/Account/AccountResource.php
@@ -16,7 +16,6 @@ public function toArray(Request $request): array
         return [
             'id' => $this->getId(),
             'name' => $this->getName(),
-            'email' => $this->getEmail(),
             'currency_code' => $this->getCurrencyCode(),
             'timezone' => $this->getTimezone(),
             'updated_at' => $this->getUpdatedAt(),

diff --git a/backend/app/Resources/Ticket/TicketResourcePublic.php b/backend/app/Resources/Ticket/TicketResourcePublic.php
@@ -27,7 +27,7 @@ public function toArray(Request $request): array
             'is_before_sale_start_date' => $this->isBeforeSaleStartDate(),
             'is_after_sale_end_date' => $this->isAfterSaleEndDate(),
             'price' => $this->when(
-                (bool)$this->getTicketPrices() && !$this->isTieredType(),
+                $this->getTicketPrices() && !$this->isTieredType(),
                 fn() => $this->getPrice(),
             ),
             'prices' => $this->when(
@@ -40,6 +40,7 @@ public function toArray(Request $request): array
             ),
             $this->mergeWhen((bool)$this->getTicketPrices(), fn() => [
                 'is_available' => $this->isAvailable(),
+                'is_sold_out' => $this->isSoldOut(),
             ]),
         ];
     }

diff --git a/backend/app/Services/Domain/Order/OrderCreateRequestValidationService.php b/backend/app/Services/Domain/Order/OrderCreateRequestValidationService.php
@@ -170,10 +170,23 @@ private function validateTicketQuantity(int $ticketIndex, array $ticketAndQuanti
         $totalQuantity = collect($ticketAndQuantities['quantities'])->sum('quantity');
         $maxPerOrder = (int)$ticket->getMaxPerOrder() ?: 100; // Placeholder for config value
         $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(),
+                ]),
+            ]);
+        }
 
         if ($totalQuantity > $maxPerOrder) {
             throw ValidationException::withMessages([
-                "tickets.$ticketIndex" => __("The maximum numbers number of tickets for :tickets is :max", [
+                "tickets.$ticketIndex" => __("The maximum number of tickets available for :tickets is :max", [
                     'max' => $maxPerOrder,
                     'ticket' => $ticket->getTitle(),
                 ]),

diff --git a/backend/resources/views/emails/auth/reset-password-success.blade.php b/backend/resources/views/emails/auth/reset-password-success.blade.php
@@ -3,7 +3,7 @@
 
 Your password has been reset for your account on {{ config('app.name') }}.
 
-If you did not request a password reset, please let us know.
+If you did not request a password reset, please immediately contact reset your password.
 
 Thank you
 </x-mail::message>
diff --git a/docker/development/docker-compose.dev.yml b/docker/development/docker-compose.dev.yml
@@ -43,7 +43,7 @@ services:
         build:
             context: ./../../frontend
             dockerfile: Dockerfile.ssr.dev
-        container_name: frontend-ssr
+        container_name: frontend
         ports:
             - "5678:5678"
             - "24678:24678"

diff --git a/docker/development/start-dev.sh b/docker/development/start-dev.sh
@@ -75,11 +75,11 @@ done
 
 echo -e "\n${GREEN}Database is ready. Proceeding with migrations...${NC}"
 
-if [ ! -f ./../backend/.env ]; then
+if [ ! -f ./../../backend/.env ]; then
     $COMPOSE_CMD exec backend cp .env.example .env
 fi
 
-if [ ! -f ./../frontend/.env ]; then
+if [ ! -f ./../../frontend/.env ]; then
     $COMPOSE_CMD exec frontend cp .env.example .env
 fi
 

diff --git a/frontend/src/components/forms/QuestionForm/index.tsx b/frontend/src/components/forms/QuestionForm/index.tsx
@@ -111,7 +111,7 @@ export const QuestionForm = ({form, tickets}: QuestionFormProps) => {
             icon: <IconCircleCheck/>,
             label: t`Radio Option`,
             value: QuestionType.RADIO,
-            description: t`A Radio option allows has multiple options but only one can be selected.`,
+            description: t`A Radio option has multiple options but only one can be selected.`,
         },
         {
             icon: <IconSelector/>,

diff --git a/frontend/src/components/routes/account/ManageAccount/sections/AccountSettings/index.tsx b/frontend/src/components/routes/account/ManageAccount/sections/AccountSettings/index.tsx
@@ -21,7 +21,6 @@ const AccountSettings = () => {
             name: '',
             currency_code: '',
             timezone: '',
-            email: '',
         }
     });
     const accountQuery = useGetAccount();
@@ -57,20 +56,13 @@ const AccountSettings = () => {
             <Card className={classes.tabContent}>
                 <LoadingMask/>
                 <fieldset disabled={updateMutation.isLoading || accountQuery.isLoading || !isUserAdmin}>
-                    <form onSubmit={form.onSubmit(handleSubmit)}>
+                    <form onSubmit={form.onSubmit(handleSubmit as any)}>
                         <TextInput
                             {...form.getInputProps('name')}
                             label={t`Account Name`}
                             placeholder={t`Name`}
                             description={t`Your account name is used on event pages and in emails.`}
                         />
-                        <TextInput
-                            type={'email'}
-                            {...form.getInputProps('email')}
-                            label={t`Account Email`}
-                            placeholder={t`Email`}
-                            description={t`Your account email in outgoing emails.`}
-                        />
                         <Select
                             searchable
                             data={Object.entries(currencies).map(([key, value]) => ({

diff --git a/frontend/src/components/routes/account/ManageAccount/sections/PaymentSettings/index.tsx b/frontend/src/components/routes/account/ManageAccount/sections/PaymentSettings/index.tsx
@@ -8,11 +8,19 @@ import {Anchor, Button, Group} from "@mantine/core";
 import {StripeConnectDetails} from "../../../../../../types.ts";
 import paymentClasses from "./PaymentSettings.module.scss"
 import classes from "../../ManageAccount.module.scss"
+import {useEffect, useState} from "react";
 
 const ConnectStatus = (props: { stripeDetails: StripeConnectDetails }) => {
-    const isReturn = window?.location.search.includes('is_return');
-    const isRefresh = window?.location.search.includes('is_refresh');
-    const isReturningFromStripe = isReturn || isRefresh;
+    const [isReturningFromStripe, setIsReturningFromStripe] = useState(false);
+
+    useEffect(() => {
+        if (typeof window === 'undefined') {
+            return;
+        }
+        setIsReturningFromStripe(
+            window.location.search.includes('is_return') || window.location.search.includes('is_refresh')
+        );
+    }, []);
 
     return (
         <div className={paymentClasses.stripeInfo}>

diff --git a/frontend/src/components/routes/auth/ResetPassword/ResetPassword.module.scss b/frontend/src/components/routes/auth/ResetPassword/ResetPassword.module.scss
@@ -0,0 +1,12 @@
+.header {
+  text-align: center;
+  margin-bottom: 30px;
+
+  h2 {
+    margin: 0;
+  }
+
+  p {
+    margin-top: -0;
+  }
+}
diff --git a/frontend/src/components/routes/auth/ResetPassword/index.tsx b/frontend/src/components/routes/auth/ResetPassword/index.tsx
@@ -9,6 +9,7 @@ import {ResetPasswordRequest} from "../../../../types.ts";
 import {useFormErrorResponseHandler} from "../../../../hooks/useFormErrorResponseHandler.tsx";
 import {t} from "@lingui/macro";
 import {Card} from "../../../common/Card";
+import classes from "./ResetPassword.module.scss";
 
 export const ResetPassword = () => {
     const form = useForm({
@@ -48,18 +49,25 @@ export const ResetPassword = () => {
     });
 
     return (
-        <Card>
-            <form onSubmit={form.onSubmit(handleSubmit)}>
-                <PasswordInput {...form.getInputProps('password')} label={t`New Password`} required/>
-                <PasswordInput {...form.getInputProps('password_confirmation')} label={t`Confirm Password`} required/>
-                <Button type="submit" fullWidth disabled={mutate.isLoading}>
-                    {mutate.isLoading ? t`Working...` : t`Reset password`}
-                </Button>
-            </form>
-            <footer>
-                <NavLink to={'/auth/login'}>{t`Back to login`}</NavLink>
-            </footer>
-        </Card>
+        <>
+            <header className={classes.header}>
+                <h2>{t`Reset Password`}</h2>
+                <p>{t`Please enter your new password`}</p>
+            </header>
+            <Card>
+                <form onSubmit={form.onSubmit(handleSubmit)}>
+                    <PasswordInput {...form.getInputProps('password')} label={t`New Password`} required/>
+                    <PasswordInput {...form.getInputProps('password_confirmation')} label={t`Confirm Password`} required/>
+                    <Button type="submit" fullWidth disabled={mutate.isLoading}>
+                        {mutate.isLoading ? t`Working...` : t`Reset password`}
+                    </Button>
+                </form>
+                <footer>
+                    <NavLink to={'/auth/login'}>{t`Back to login`}</NavLink>
+                </footer>
+            </Card>
+        </>
+
     )
 }
 

diff --git a/frontend/src/components/routes/profile/ManageProfile/index.tsx b/frontend/src/components/routes/profile/ManageProfile/index.tsx
@@ -52,10 +52,10 @@ export const ManageProfile = () => {
             userData: formValues,
         }, {
             onSuccess: () => {
+                form.reset();
                 showSuccess(t`Profile updated successfully`);
             },
             onError: (error: any) => {
-                showError(t`Something went wrong. Please try again.`);
                 errorHandler(form, error);
             }
         })

diff --git a/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx b/frontend/src/components/routes/ticket-widget/SelectTickets/index.tsx
@@ -214,6 +214,12 @@ const SelectTickets = (props: SelectTicketsProps) => {
         }
     }
 
+    const isButtonDisabled = ticketMutation.isLoading
+        || !ticketAreAvailable
+        || selectedTicketQuantitySum === 0
+        || props.widgetMode === 'preview'
+        || tickets?.every(ticket => ticket.is_sold_out);
+
     return (
         <div className={'hi-ticket-widget-container'}
              ref={resizeRef}
@@ -326,7 +332,7 @@ const SelectTickets = (props: SelectTicketsProps) => {
                                 __html: event.settings.ticket_page_message.replace(/\n/g, '<br/>')
                             }} className={'hi-ticket-page-message'}/>
                         )}
-                        <Button disabled={props.widgetMode === 'preview'} fullWidth className={'hi-continue-button'}
+                        <Button disabled={isButtonDisabled} fullWidth className={'hi-continue-button'}
                                 type={"submit"}
                                 loading={ticketMutation.isLoading}>
                             {props.continueButtonText || event?.settings?.continue_button_text || t`Continue`}

diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.js