Skip to content

Commit 7313619

Browse files
authored
Merge pull request #114 from HiEventsDev/develop
main <- develop
2 parents f6fa71a + 1d0d30c commit 7313619

File tree

26 files changed

+263
-163
lines changed

26 files changed

+263
-163
lines changed

README.de.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Hi.Events ist darauf ausgelegt, Ihnen zu helfen, Events jeder Größe zu erstell
6565
-**Unterstützung für vollständige und teilweise Rückerstattungen:** Einfache Verwaltung von vollständigen und teilweisen Rückerstattungen.
6666
- 📧 **E-Mail-Benachrichtigungen:** Halten Sie Teilnehmer mit automatischen E-Mail-Benachrichtigungen auf dem Laufenden.
6767
- 📱 **Mobile-Responsive:** Nahtloses Erlebnis auf jedem Gerät.
68-
- 🌐 **Mehrsprachige Unterstützung:** Unterstützung für mehrere Sprachen - `Bald verfügbar!`
68+
- 🌐 **Mehrsprachige Unterstützung:** Unterstützung für mehrere Sprachen.
6969
- 🎉 **Und vieles mehr!**
7070

7171
## 🚀 Schnellstart
@@ -128,4 +128,4 @@ Haben Sie Fragen? Unsere [Dokumentation](https://hi.events/docs) hat Antworten.
128128

129129
Hi.Events ist unter den Bedingungen der [AGPL-3.0](https://github.com/HiEventsDev/hi.events/blob/main/LICENCE) lizenziert.
130130

131-
Für weitere Lizenzinformationen, einschließlich kommerzieller Lizenzoptionen, besuchen Sie bitte unsere Lizenzseite [hier](https://hi.events/licensing).
131+
Für weitere Lizenzinformationen, einschließlich kommerzieller Lizenzoptionen, besuchen Sie bitte unsere Lizenzseite [hier](https://hi.events/licensing).

README.es.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
-**Soporte para Reembolsos Completos y Parciales:** Gestione fácilmente reembolsos completos y parciales.
6565
- 📧 **Notificaciones por Correo Electrónico:** Mantenga informados a los asistentes con notificaciones automáticas por correo electrónico.
6666
- 📱 **Adaptable a Móviles:** Disfrute de una experiencia sin interrupciones en cualquier dispositivo.
67-
- 🌐 **Soporte Multilingüe:** Soporte para varios idiomas - `Próximamente!`
67+
- 🌐 **Soporte Multilingüe:** Soporte para varios idiomas.
6868
- 🎉 **Y mucho más!**
6969

7070
## 🚀 Primeros Pasos
@@ -126,4 +126,4 @@ contactarnos en [[email protected]](mailto:[email protected]).
126126

127127
Hi.Events está licenciado bajo los términos de la [AGPL-3.0](https://github.com/HiEventsDev/hi.events/blob/main/LICENCE).
128128

129-
Para obtener más información sobre la licencia, incluidas las opciones de licencia comercial, visite nuestra página de licencias [aquí](https://hi.events/licensing).
129+
Para obtener más información sobre la licencia, incluidas las opciones de licencia comercial, visite nuestra página de licencias [aquí](https://hi.events/licensing).

README.fr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
-**Support pour Remboursements Complets et Partiels :** Gérez facilement les remboursements complets et partiels.
6565
- 📧 **Notifications par E-mail :** Tenez les participants informés avec des notifications automatiques par e-mail.
6666
- 📱 **Adapté aux Mobiles :** Profitez d'une expérience sans faille sur tous les appareils.
67-
- 🌐 **Support Multilingue :** Support pour plusieurs langues - `Bientôt disponible !`
67+
- 🌐 **Support Multilingue :** Support pour plusieurs langues.
6868
- 🎉 **Et bien plus encore !**
6969

7070
## 🚀 Démarrage Rapide
@@ -127,4 +127,4 @@ nous contacter à [[email protected]](mailto:[email protected]).
127127

128128
Hi.Events est licencié sous les termes de la licence [AGPL-3.0](https://github.com/HiEventsDev/hi.events/blob/main/LICENCE).
129129

130-
Pour plus d'informations sur les licences, y compris les options de licences commerciales, veuillez visiter notre page de licences [ici](https://hi.events/licensing).
130+
Pour plus d'informations sur les licences, y compris les options de licences commerciales, veuillez visiter notre page de licences [ici](https://hi.events/licensing).

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ Hi.Events is designed to help you create, manage, and sell tickets for events of
7676
- 📧 **Email Notifications:** Keep attendees informed with automated email notifications.
7777
- 📱 **Mobile-Responsive:** Enjoy a seamless experience on any device.
7878
- 🌐 **Multi-Language Support:** Support for multiple languages (English, Português, Español, 中文 (Zhōngwén), Deutsch, Français)
79+
- 🔋 **Advanced Capacity Management:** Set capacity limits across multiple ticket types. - `Coming Soon`
7980
- 🎉 **And much more!**
8081

8182
## 🚀 Getting Started

README.pt.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
-**Suporte a Reembolsos Totais e Parciais:** Gerencie facilmente reembolsos totais e parciais.
6565
- 📧 **Notificações por E-mail:** Mantenha os participantes informados com notificações automáticas por e-mail.
6666
- 📱 **Adaptável a Dispositivos Móveis:** Desfrute de uma experiência contínua em qualquer dispositivo.
67-
- 🌐 **Suporte Multilíngue:** Suporte para vários idiomas - `Em Breve!`
67+
- 🌐 **Suporte Multilíngue:** Suporte para vários idiomas.
6868
- 🎉 **E muito mais!**
6969

7070
## 🚀 Primeiros Passos
@@ -128,4 +128,4 @@ nos contatar em [[email protected]](mailto:[email protected]).
128128

129129
Hi.Events está licenciado sob os termos da [AGPL-3.0](https://github.com/HiEventsDev/hi.events/blob/main/LICENCE).
130130

131-
Para mais informações sobre licenças, incluindo opções de licenciamento comercial, visite nossa página de licenças [aqui](https://hi.events/licensing).
131+
Para mais informações sobre licenças, incluindo opções de licenciamento comercial, visite nossa página de licenças [aqui](https://hi.events/licensing).

README.zh-cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Hi.Events 旨在帮助您创建、管理和销售各种规模的活动门票。
6565
-**全额和部分退款支持:** 轻松管理全额和部分退款。
6666
- 📧 **邮件通知:** 使用自动邮件通知让与会者知情。
6767
- 📱 **移动响应:** 在任何设备上享受无缝体验。
68-
- 🌐 **多语言支持:** 支持多种语言 - `即将推出!`
68+
- 🌐 **多语言支持:** 支持多种语言.
6969
- 🎉 **以及更多!**
7070

7171
## 🚀 快速开始
@@ -124,4 +124,4 @@ Hi.Events 旨在帮助您创建、管理和销售各种规模的活动门票。
124124

125125
Hi.Events 根据 [AGPL-3.0](https://github.com/HiEventsDev/hi.events/blob/main/LICENCE) 许可证条款进行许可。
126126

127-
有关更多许可信息,包括商业许可选项,请访问我们的许可页面 [此处](https://hi.events/licensing)
127+
有关更多许可信息,包括商业许可选项,请访问我们的许可页面 [此处](https://hi.events/licensing)

backend/app/DomainObjects/Enums/QuestionTypeEnum.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,5 @@ enum QuestionTypeEnum
1515
case RADIO;
1616
case DROPDOWN;
1717
case MULTI_SELECT_DROPDOWN;
18+
case DATE;
1819
}

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import countries from "../../../../data/countries.json";
66
import {InputGroup} from "../InputGroup";
77
import classes from "./CheckoutQuestion.module.scss";
88
import {UserGeneratedContent} from "../UserGeneratedContent";
9+
import {DatePicker} from "@mantine/dates";
910

1011
interface CheckoutQuestionProps {
1112
questions: Question[],
@@ -62,6 +63,18 @@ const MultiLineTextInput = ({question, name, form}: QuestionInputProps) => {
6263
);
6364
}
6465

66+
const DateInput = ({question, name, form}: QuestionInputProps) => {
67+
return (
68+
<>
69+
<TextInput withAsterisk={question.required}
70+
type="date"
71+
{...form.getInputProps(`${name}.answer`)}
72+
label={question.title}
73+
/>
74+
</>
75+
);
76+
}
77+
6578
const SingleLineTextInput = ({question, name, form}: QuestionInputProps) => {
6679
return (
6780
<>
@@ -181,6 +194,9 @@ export const QuestionInput = ({question, name, form}: QuestionInputProps) => {
181194
case QuestionType.SINGLE_LINE_TEXT:
182195
input = <SingleLineTextInput question={question} name={name} form={form}/>;
183196
break;
197+
case QuestionType.DATE:
198+
input = <DateInput question={question} name={name} form={form}/>;
199+
break;
184200
}
185201

186202
return (

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {QuestionBelongsToType, QuestionType, Ticket} from "../../../types.ts";
44
import {Button, Group, MultiSelect, Switch, TextInput} from "@mantine/core";
55
import {
66
IconAlignBoxLeftTop,
7+
IconCalendar,
78
IconCircleCheck,
89
IconForms,
910
IconMapPin,
@@ -129,6 +130,12 @@ export const QuestionForm = ({form, tickets}: QuestionFormProps) => {
129130
value: QuestionType.ADDRESS,
130131
description: t`Shows common address fields, including country`,
131132
},
133+
{
134+
icon: <IconCalendar/>,
135+
label: t`Date`,
136+
value: QuestionType.DATE,
137+
description: t`A date input. Perfect for asking for a date of birth etc.`,
138+
}
132139
];
133140
const multiAnswerQuestionTypes = [
134141
QuestionType.CHECKBOX.toString(),
@@ -151,6 +158,7 @@ export const QuestionForm = ({form, tickets}: QuestionFormProps) => {
151158
mt={20}
152159
label={t`What tickets should this question be apply to?`}
153160
multiple
161+
placeholder={t`Select tickets`}
154162
data={tickets?.map(ticket => {
155163
return {
156164
value: String(ticket.id),
@@ -194,6 +202,7 @@ export const QuestionForm = ({form, tickets}: QuestionFormProps) => {
194202
variant="transparent"
195203
ml={0}
196204
pl={0}
205+
mb={10}
197206
onClick={() => setShowDescription(true)}
198207
>
199208
{t`Add description`}
@@ -217,4 +226,4 @@ export const QuestionForm = ({form, tickets}: QuestionFormProps) => {
217226
/>
218227
</>
219228
)
220-
}
229+
}

frontend/src/locales/de.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)