mirror of
https://github.com/grocy/grocy.git
synced 2025-04-29 17:45:39 +00:00
Display just "unlimited" on the product card for the average shelf life if it is > 200 years
This commit is contained in:
parent
765f908966
commit
4aa575e0e8
@ -6,6 +6,7 @@
|
||||
- It's now possible to accumulate min. stock amounts on parent product level (new option per product, means the sub product will never be "missing" then, only the parent product)
|
||||
- When adding a product to the shopping list from the new context/more menu from the stock overview page and if the product is already on the shopping list, the amount of that entry will be updated acccordingly instead of adding a new (double) shopping list item
|
||||
- On the purchase page there is now an option to select that the price is the total price (for the whole amount) - below the price field, defaults to "Unit price" (as it was until now), when set to "Total price", the entered price will be divided by the amount before posting
|
||||
- "Average shelf life" on the product card now displays just "Unlimited" when the resulting value would be > 200 years (for products which never expire, as they have a best before date of 2999-12-31)
|
||||
|
||||
### Recipe improvements/fixes
|
||||
- Fixed a problem regarding quantity unit conversion handling for recipe ingredients of products with no unit relations, but only a different purchase/stock quantity unit
|
||||
|
@ -1537,3 +1537,6 @@ msgstr ""
|
||||
|
||||
msgid "in %s and based on the purchase quantity unit"
|
||||
msgstr ""
|
||||
|
||||
msgid "Unlimited"
|
||||
msgstr ""
|
||||
|
@ -52,6 +52,10 @@ Grocy.Components.ProductCard.Refresh = function(productId)
|
||||
{
|
||||
$('#productcard-product-average-shelf-life').text(__t("Unknown"));
|
||||
}
|
||||
else if (parseInt(productDetails.average_shelf_life_days) > 73000) // > 200 years aka forever
|
||||
{
|
||||
$('#productcard-product-average-shelf-life').text(__t("Unlimited"));
|
||||
}
|
||||
else
|
||||
{
|
||||
$('#productcard-product-average-shelf-life').text(moment.duration(productDetails.average_shelf_life_days, "days").humanize());
|
||||
|
Loading…
x
Reference in New Issue
Block a user