diff --git a/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue b/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue index 3fb0b11af..d32dc927e 100644 --- a/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue +++ b/frontend/components/Domain/Household/GroupMealPlanDayContextMenu.vue @@ -91,7 +91,7 @@ const state = reactive({ shoppingListDialog: false, menuItems: [ { - title: i18n.t("recipe.add-to-list"), + title: i18n.t("meal-plan.add-day-to-list"), icon: $globals.icons.cartCheck, color: undefined, event: "shoppingList", @@ -123,8 +123,8 @@ async function getShoppingLists() { // eslint-disable-next-line @typescript-eslint/no-invalid-void-type const eventHandlers: { [key: string]: () => void | Promise } = { - shoppingList: () => { - getShoppingLists(); + shoppingList: async () => { + await getShoppingLists(); state.shoppingListDialog = true; }, }; diff --git a/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue b/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue index b76fd0def..ccd43e7ae 100644 --- a/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue +++ b/frontend/components/Domain/Recipe/RecipeDialogAddToShoppingList.vue @@ -227,7 +227,7 @@ const currentHouseholdSlug = ref(""); const filteredShoppingLists = ref([]); const state = reactive({ - shoppingListDialog: true, + shoppingListDialog: false, shoppingListIngredientDialog: false, shoppingListShowAllToggled: false, }); @@ -249,6 +249,7 @@ watch([dialog, () => preferences.value.viewAllLists], () => { openShoppingListIngredientDialog(selectedShoppingList.value); } else { + state.shoppingListDialog = true; ready.value = true; } } @@ -371,7 +372,7 @@ async function consolidateRecipesIntoSections(recipes: RecipeWithScale[]) { } function initState() { - state.shoppingListDialog = true; + state.shoppingListDialog = false; state.shoppingListIngredientDialog = false; state.shoppingListShowAllToggled = false; recipeIngredientSections.value = []; diff --git a/frontend/lang/messages/en-US.json b/frontend/lang/messages/en-US.json index 43d3b82e0..f1e5d0453 100644 --- a/frontend/lang/messages/en-US.json +++ b/frontend/lang/messages/en-US.json @@ -369,7 +369,9 @@ "recipe-rules": "Recipe Rules", "applies-to-all-days": "Applies to all days", "applies-on-days": "Applies on {0}s", - "meal-plan-settings": "Meal Plan Settings" + "meal-plan-settings": "Meal Plan Settings", + "add-all-to-list": "Add All to List", + "add-day-to-list": "Add Day to List" }, "migration": { "migration-data-removed": "Migration data removed", diff --git a/frontend/pages/household/mealplan/planner.vue b/frontend/pages/household/mealplan/planner.vue index 58d91bbc1..b38bb11ab 100644 --- a/frontend/pages/household/mealplan/planner.vue +++ b/frontend/pages/household/mealplan/planner.vue @@ -1,5 +1,11 @@