kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-18 19:37:12 +00:00
Code Issues Projects Releases Wiki Activity

Split user setting stock_decimal_places_prices into separate settings for input/display (closes #1893)

Browse Source
This commit is contained in:
Bernd Bestel
2022-06-04 14:09:35 +02:00
parent 337ca7d4ba
commit 27582611c1
16 changed files with 59 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/viewjs/purchase.js
View File

@@ -43,10 +43,10 @@ $('#save-purchase-button').on('click', function(e)
amount -= parseFloat(productDetails.product.tare_weight);
}
var price = parseFloat(jsonForm.price * $("#qu_id option:selected").attr("data-qu-factor")).toFixed(Grocy.UserSettings.stock_decimal_places_prices);
var price = parseFloat(jsonForm.price * $("#qu_id option:selected").attr("data-qu-factor")).toFixed(Grocy.UserSettings.stock_decimal_places_prices_input);
if ($("input[name='price-type']:checked").val() == "total-price")
{
price = parseFloat(price / amount).toFixed(Grocy.UserSettings.stock_decimal_places_prices);
price = parseFloat(price / amount).toFixed(Grocy.UserSettings.stock_decimal_places_prices_input);
}
jsonData.price = price;
@@ -595,13 +595,13 @@ function refreshPriceHint()
amount -= parseFloat(CurrentProductDetails.product.tare_weight);
}
var price = parseFloat($('#price').val() * $("#qu_id option:selected").attr("data-qu-factor")).toFixed(Grocy.UserSettings.stock_decimal_places_prices);
var price = parseFloat($('#price').val() * $("#qu_id option:selected").attr("data-qu-factor")).toFixed(Grocy.UserSettings.stock_decimal_places_prices_input);
if ($("input[name='price-type']:checked").val() == "total-price")
{
price = parseFloat(price / amount).toFixed(Grocy.UserSettings.stock_decimal_places_prices);
price = parseFloat(price / amount).toFixed(Grocy.UserSettings.stock_decimal_places_prices_input);
}
$('#price-hint').text(__t('means %1$s per %2$s', price.toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices }), $("#qu_id").attr("data-destination-qu-name")));
$('#price-hint').text(__t('means %1$s per %2$s', price.toLocaleString(undefined, { style: "currency", currency: Grocy.Currency, minimumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices_display, maximumFractionDigits: Grocy.UserSettings.stock_decimal_places_prices_display }), $("#qu_id").attr("data-destination-qu-name")));
}
else
{