github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-07 13:26:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add barcode to new product workflow update to add to product_barcodes table

Browse Source
This commit is contained in:
Kurt Riddlesperger 2020-04-28 12:40:27 -05:00
parent 982b83c87b
commit e3fd7e9d48
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
public/viewjs/productform.js
View File

@ -42,6 +42,26 @@
function(result) function(result)
{ {
Grocy.EditObjectId = result.created_object_id; Grocy.EditObjectId = result.created_object_id;
if (prefillBarcode !== undefined)
{
var jsonDataBarcode = {};
jsonDataBarcode.barcode = prefillBarcode;
jsonDataBarcode.product_id = result.created_object_id;
jsonDataBarcode.qu_factor_purchase_to_stock = jsonData.qu_factor_purchase_to_stock;
jsonDataBarcode.shopping_location_id = jsonData.shopping_location_id;
Grocy.Api.Post('objects/product_barcodes', jsonDataBarcode,
function(result)
{
},
function(xhr)
{
Grocy.FrontendHelpers.EndUiBusy("barcode-form");
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response);
}
);
}
Grocy.Components.UserfieldsForm.Save(function() Grocy.Components.UserfieldsForm.Save(function()
{ {
if (jsonData.hasOwnProperty("picture_file_name") && !Grocy.DeleteProductPictureOnSave) if (jsonData.hasOwnProperty("picture_file_name") && !Grocy.DeleteProductPictureOnSave)
@ -173,6 +193,8 @@ if (prefillName !== undefined)
$('#name').focus(); $('#name').focus();
} }
var prefillBarcode = GetUriParam('prefillbarcode');
$('.input-group-qu').on('change', function(e) $('.input-group-qu').on('change', function(e)
{ {
var quIdPurchase = $("#qu_id_purchase").val(); var quIdPurchase = $("#qu_id_purchase").val();
@ -216,7 +238,10 @@ $('#product-form input').keyup(function(event)
} }
else else
{ {
$("#barcode-add-button").removeClass("disabled"); if (prefillBarcode === undefined)
{
$("#barcode-add-button").removeClass("disabled");
}
} }
}); });
@ -230,7 +255,10 @@ $('#product-form select').change(function(event)
} }
else else
{ {
$("#barcode-add-button").removeClass("disabled"); if (prefillBarcode === undefined)
{
$("#barcode-add-button").removeClass("disabled");
}
} }
if (document.getElementById('product-form').checkValidity() === false) //There is at least one validation error if (document.getElementById('product-form').checkValidity() === false) //There is at least one validation error
{ {