kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-17 11:06:36 +00:00
Code Issues Projects Releases Wiki Activity

Added a new product option "Disable own stock" (closes #564)

Browse Source
This commit is contained in:
Bernd Bestel
2022-04-01 18:49:17 +02:00
parent b53d1a076f
commit ccc59dfc8b
10 changed files with 132 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/viewjs/components/productcard.js
View File

@@ -110,7 +110,16 @@ Grocy.Components.ProductCard.Refresh = function(productId)
$("#productcard-product-picture").addClass("d-none");
}
$("#productcard-product-stock-amount-wrapper").removeClass("d-none");
$("#productcard-aggregated-amounts").addClass("pl-2");
if (productDetails.product.no_own_stock == 1)
{
$("#productcard-product-stock-amount-wrapper").addClass("d-none");
$("#productcard-aggregated-amounts").removeClass("pl-2");
}
RefreshContextualTimeago(".productcard");
RefreshLocaleNumberDisplay(".productcard");
},
function(xhr)
{

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

@@ -122,11 +122,19 @@ if (!prefillProductId2.isEmpty())
if (typeof prefillProductId !== "undefined")
{
$('#product_id').val(prefillProductId);
$('#product_id').data('combobox').refresh();
$('#product_id').trigger('change');
var nextInputElement = $(Grocy.Components.ProductPicker.GetPicker().parent().data('next-input-selector').toString());
nextInputElement.focus();
if ($('#product_id').val() != null)
{
$('#product_id').data('combobox').refresh();
$('#product_id').trigger('change');
var nextInputElement = $(Grocy.Components.ProductPicker.GetPicker().parent().data('next-input-selector').toString());
nextInputElement.focus();
}
else
{
Grocy.Components.ProductPicker.GetInputElement().focus();
}
}
if (GetUriParam("flow") === "InplaceAddBarcodeToExistingProduct")