diff --git a/config/services.yaml b/config/services.yaml index 537036ebc..af84cbfee 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -47,11 +47,10 @@ parameters: app.secret: '%env(APP_SECRET)%' mealz.lock_toggle_participation_at: '-1 day 16:00' - mealz.meal.price: 3.60 + mealz.meal.price: 4.13 mealz.meal.search_timestamp: '2000-01-01' mealz.meal.new_flag_counter: 2 - mealz.meal.combined.price: 5.60 - + mealz.meal.combined.price: 6.13 # PDO Session Handler options # Define table and column names to store session data app.session.handler.pdo.options: diff --git a/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishVariations.php b/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishVariations.php index 6921ea485..bea3eddc6 100644 --- a/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishVariations.php +++ b/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishVariations.php @@ -74,7 +74,7 @@ private function getDishVariation(Dish $dish): DishVariation $dishVariation->setTitleDe($dish->getTitleDe() . $dummyPrefix); $dishVariation->setTitleEn($dish->getTitleEn() . $dummyPrefix); $dishVariation->setParent($dish); - $dishVariation->setPrice(3.60); + $dishVariation->setPrice(4.13); $variations = $dish->getVariations(); $variations->add($dishVariation); diff --git a/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishes.php b/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishes.php index bd772e3f8..5f2a5ca05 100644 --- a/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishes.php +++ b/src/Mealz/MealBundle/DataFixtures/ORM/LoadDishes.php @@ -72,7 +72,7 @@ public function getOrder(): int protected function addDish(string $titleEN, string $titleDE, string $descEN = null, string $descDE = null, bool $oneSize = false): void { $dish = new Dish(); - $dish->setPrice(3.60); + $dish->setPrice(4.13); $dish->setTitleEn($titleEN); $dish->setTitleDe($titleDE); $dish->setDescriptionEn('Description - ' . $titleEN); diff --git a/src/Resources/src/api/getEventInvitionData.ts b/src/Resources/src/api/getEventInvitionData.ts index 7600e31f2..5d640589d 100644 --- a/src/Resources/src/api/getEventInvitionData.ts +++ b/src/Resources/src/api/getEventInvitionData.ts @@ -1,9 +1,10 @@ import { IMessage } from "@/interfaces/IMessage"; import useApi from "./api"; +import { DateTime } from "./getDashboardData"; export interface EventInvitationData { - date: string, - lockDate: string, + date: DateTime, + lockDate: DateTime, event: string } diff --git a/src/Resources/src/locales/de.json b/src/Resources/src/locales/de.json index fb9761571..327d2c785 100644 --- a/src/Resources/src/locales/de.json +++ b/src/Resources/src/locales/de.json @@ -232,8 +232,8 @@ "description": "Als Gast in unserem Haus laden wir Sie gerne zu einem Mittagessen in der AOE Eatery ein. Für Ihre Bestellung tragen Sie sich bitte bis spätestens einen Tag vorher mit Ihren Daten ein und wählen das gewünschte Gericht aus, das dann an unsere Köche weitergeleitet wird.\n\nGuten Appetit wünscht Ihnen,\nAOE", "event": { "submit": "An Event teilnehmen", - "title": "Event bei AOE", - "description": "Hiermit laden wir Sie zu dem Event \"%EventTitle%\" bei uns ein." + "title": "Veranstaltung bei AOE", + "description": "Hiermit laden wir Sie zu der Veranstaltung \"%EventTitle%\" bei uns ein. Damit wir rechtzeitig mit Ihnen planen können tragen Sie sich bitte bis spätestens %lockDate% Uhr für das Event ein.\n\nWir freuen uns auf Sie!" } }, "header": { diff --git a/src/Resources/src/locales/en.json b/src/Resources/src/locales/en.json index 5765ca23f..dea70eecf 100644 --- a/src/Resources/src/locales/en.json +++ b/src/Resources/src/locales/en.json @@ -231,9 +231,9 @@ "title": "Lunch at AOE", "description": "As our guest, we would like to invite you to lunch in the AOE Eatery. To order a meal, register no later than one day before your visit to AOE with your personal information and choose the desired dish. Your order will be forwarded to our cooks.\n\nWe hope that you enjoy your lunch\nAOE", "event": { - "submit": "An Event teilnehmen", - "title": "Event bei AOE", - "description": "Hiermit laden wir Sie zu dem Event \"%EventTitle%\" bei uns ein." + "submit": "Participate", + "title": "Event at AOE", + "description": "We would like to invite you to join us at the Event \"%EventTitle%\". To ensure we can plan ahead with you, please register for the event by %lockDate% at the latest.\n\nWe look forward to having you!" } }, "header": { diff --git a/src/Resources/src/views/GuestEvent.vue b/src/Resources/src/views/GuestEvent.vue index fb069e92b..8efc5389b 100644 --- a/src/Resources/src/views/GuestEvent.vue +++ b/src/Resources/src/views/GuestEvent.vue @@ -1,44 +1,54 @@ \ No newline at end of file