mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-08 07:38:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge of uncreated food entries

Browse Source
This commit is contained in:
vabene1111
2021-02-03 20:15:42 +01:00
parent 69674e2648
commit 966a107414
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cookbook/templates/shopping_list.html
View File

@@ -570,7 +570,7 @@
findMergeEntry: function (categories, entry) { findMergeEntry: function (categories, entry) {
for (let [i, e] of Object.entries(categories)) { for (let [i, e] of Object.entries(categories)) {
let found_entry = e.entries.find(item => { let found_entry = e.entries.find(item => {
if (entry.food.id === item.food.id) { if (entry.food.id === item.food.id && entry.food.name === item.food.name) {
if (entry.unit === null && item.unit === null) { if (entry.unit === null && item.unit === null) {
return true return true
} else if (entry.unit !== null && item.unit !== null && entry.unit.id === item.unit.id) { } else if (entry.unit !== null && item.unit !== null && entry.unit.id === item.unit.id) {
@@ -780,10 +780,16 @@
this.$http.post('{% url 'api_ingredient_from_string' %}', {text: this.simple_entry}, {emulateJSON: true}).then((response) => { this.$http.post('{% url 'api_ingredient_from_string' %}', {text: this.simple_entry}, {emulateJSON: true}).then((response) => {
console.log(response) console.log(response)
let unit = null
if (response.body.unit !== '') {
unit = {'name': response.body.unit}
}
this.shopping_list.entries.push({ this.shopping_list.entries.push({
'list_recipe': null, 'list_recipe': null,
'food': {'name': response.body.food, supermarket_category: null}, 'food': {'name': response.body.food, supermarket_category: null},
'unit': {'name': response.body.unit}, 'unit': unit,
'amount': response.body.amount, 'amount': response.body.amount,
'order': 0, 'order': 0,
'checked': false, 'checked': false,