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

Optimized product picker barcode clear handling (fixes #2745)

Browse Source
This commit is contained in:
Bernd Bestel
2025-05-26 20:20:40 +02:00
parent d6f3595684
commit 8560becb83
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/81_UNRELEASED_xxxx-xx-xx.md
View File

@@ -10,7 +10,7 @@
### Stock ### Stock
- xxx - Fixed that when using/scanning a barcode on the purchase page with a note attached (which prefills the note field) and when manually selecting another product afterwards, the note of the previously used barcode was incorrectly prefilled again
### Shopping list ### Shopping list

1
public/viewjs/components/productpicker.js
View File

@@ -32,6 +32,7 @@ Grocy.Components.ProductPicker.Clear = function()
{ {
Grocy.Components.ProductPicker.SetValue(''); Grocy.Components.ProductPicker.SetValue('');
Grocy.Components.ProductPicker.SetId(null); Grocy.Components.ProductPicker.SetId(null);
$('#product_id').attr("barcode", "null");
} }
Grocy.Components.ProductPicker.InProductAddWorkflow = function() Grocy.Components.ProductPicker.InProductAddWorkflow = function()

2
public/viewjs/inventory.js
View File

@@ -155,7 +155,7 @@ $('#save-inventory-button').on('click', function(e)
$('#note').val(''); $('#note').val('');
$('#price-hint').text(""); $('#price-hint').text("");
Grocy.Components.DateTimePicker.Clear(); Grocy.Components.DateTimePicker.Clear();
Grocy.Components.ProductPicker.SetValue(''); Grocy.Components.ProductPicker.Clear();
if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
{ {
Grocy.Components.ShoppingLocationPicker.SetValue(''); Grocy.Components.ShoppingLocationPicker.SetValue('');

2
public/viewjs/purchase.js
View File

@@ -202,6 +202,7 @@ $('#save-purchase-button').on('click', function(e)
} }
Grocy.Components.ProductAmountPicker.Reset(); Grocy.Components.ProductAmountPicker.Reset();
Grocy.Components.ProductPicker.Clear();
$("#purchase-form").removeAttr("data-used-barcode"); $("#purchase-form").removeAttr("data-used-barcode");
$("#display_amount").attr("min", Grocy.DefaultMinAmount); $("#display_amount").attr("min", Grocy.DefaultMinAmount);
$('#display_amount').val(Grocy.UserSettings.stock_default_purchase_amount); $('#display_amount').val(Grocy.UserSettings.stock_default_purchase_amount);
@@ -216,7 +217,6 @@ $('#save-purchase-button').on('click', function(e)
{ {
Grocy.Components.DateTimePicker.Clear(); Grocy.Components.DateTimePicker.Clear();
} }
Grocy.Components.ProductPicker.SetValue('');
if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING) if (Grocy.FeatureFlags.GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
{ {
Grocy.Components.ShoppingLocationPicker.SetValue(''); Grocy.Components.ShoppingLocationPicker.SetValue('');