From bbdc372dcf26a23c5add540f09097d1d113f7b30 Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Tue, 17 Nov 2020 22:06:52 +0100 Subject: [PATCH] Use total price for product_barcodes.last_price (references #1131) --- public/viewjs/purchase.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/viewjs/purchase.js b/public/viewjs/purchase.js index b3538482..29a28c0c 100644 --- a/public/viewjs/purchase.js +++ b/public/viewjs/purchase.js @@ -57,7 +57,7 @@ $('#save-purchase-button').on('click', function(e) { if ($("#purchase-form").hasAttr("data-used-barcode")) { - Grocy.Api.Put('objects/product_barcodes/' + $("#purchase-form").attr("data-used-barcode"), { last_price: $("#price").val() / $("#display_amount").val() }, + Grocy.Api.Put('objects/product_barcodes/' + $("#purchase-form").attr("data-used-barcode"), { last_price: $("#price").val() }, function(result) { }, function(xhr) @@ -220,7 +220,6 @@ if (Grocy.Components.ProductPicker !== undefined) else { $('#price').val(parseFloat(productDetails.last_price / $("#qu_id option:selected").attr("data-qu-factor"))); - RefreshLocaleNumberInput(); } var priceTypeUnitPrice = $("#price-type-unit-price"); @@ -270,7 +269,6 @@ if (Grocy.Components.ProductPicker !== undefined) if (BoolVal(Grocy.UserSettings.scan_mode_purchase_enabled)) { $("#display_amount").val(1); - RefreshLocaleNumberInput(); $(".input-group-productamountpicker").trigger("change"); Grocy.FrontendHelpers.ValidateForm("purchase-form"); @@ -285,6 +283,8 @@ if (Grocy.Components.ProductPicker !== undefined) } } + RefreshLocaleNumberInput(); + if (document.getElementById("product_id").getAttribute("barcode") != "null") { Grocy.Api.Get('objects/product_barcodes?query[]=barcode=' + document.getElementById("product_id").getAttribute("barcode"), @@ -321,6 +321,7 @@ if (Grocy.Components.ProductPicker !== undefined) $(".input-group-productamountpicker").trigger("change"); Grocy.FrontendHelpers.ValidateForm('purchase-form'); + RefreshLocaleNumberInput(); } } },