jacob/munch-ease-frontend
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Show purchase date

Browse source
This commit is contained in:
jableader 2024-10-14 16:11:00 +11:00
parent f375787590
commit e251cbde5c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/shopping/ShoppingListItem.vue
View file

@ -126,8 +126,8 @@ export default {
return calculateTotals(this.productGrouping.purchased.map(r => r.ingredient)); return calculateTotals(this.productGrouping.purchased.map(r => r.ingredient));
}, },
lastPurchased() { lastPurchased() {
return this.productGrouping.purchased.reduce((latest, purchase) => { return this.productGrouping.purchased.reduce((latest, source) => {
return latest > purchase.date ? latest : purchase.date; return (source.shop.created_date && latest > source.shop.created_date) ? latest : source.shop.created_date;
}, new Date(0)); }, new Date(0));
} }
}, },

2
src/components/shopping/shopping.js
View file

@ -68,7 +68,7 @@ function getOutstandingGroupedByMeal(currentShoppingList) {
.filter(source => source.ingredient.product.id in shopResults); .filter(source => source.ingredient.product.id in shopResults);
for (const source of purchasedSources) { for (const source of purchasedSources) {
requestedMeals[source.meal.id].purchased.push(source); requestedMeals[source.meal.id].purchased.push({ shop, ...source });
requestedMeals[source.meal.id].required = requestedMeals[source.meal.id].required.filter(required => required.ingredient.product.id !== source.ingredient.product.id); requestedMeals[source.meal.id].required = requestedMeals[source.meal.id].required.filter(required => required.ingredient.product.id !== source.ingredient.product.id);
} }
} }