kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-29 17:45:39 +00:00
Code Issues Projects Releases Wiki Activity

Make it more clear that QU stock = QU purchase means always a conversion factor of 1 (references #1841)

Browse Source
This commit is contained in:
Bernd Bestel 2022-04-05 00:08:27 +02:00
parent 59cd071512
commit 4d4ae9812b
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
public/viewjs/productform.js
View File

@ -91,6 +91,7 @@ $('.save-product-button').on('click', function(e)
var parentProductId = jsonData.product_id; var parentProductId = jsonData.product_id;
delete jsonData.product_id; delete jsonData.product_id;
jsonData.parent_product_id = parentProductId; jsonData.parent_product_id = parentProductId;
jsonData.qu_factor_purchase_to_stock = $("#qu_factor_purchase_to_stock").val(); // Set manually due to input could be disabled
Grocy.FrontendHelpers.BeginUiBusy("product-form"); Grocy.FrontendHelpers.BeginUiBusy("product-form");
if (jsonData.parent_product_id.toString().isEmpty()) if (jsonData.parent_product_id.toString().isEmpty())
@ -182,10 +183,8 @@ $('.input-group-qu').on('change', function(e)
} }
); );
} }
else
{ RefreshQuConversionInfo();
RefreshQuConversionInfo();
}
$("#tare_weight_qu_info").text($("#qu_id_stock option:selected").text()); $("#tare_weight_qu_info").text($("#qu_id_stock option:selected").text());
$("#quick_consume_qu_info").text($("#qu_id_stock option:selected").text()); $("#quick_consume_qu_info").text($("#qu_id_stock option:selected").text());
@ -200,7 +199,7 @@ function RefreshQuConversionInfo()
var quIdStock = $("#qu_id_stock").val(); var quIdStock = $("#qu_id_stock").val();
var factor = $('#qu_factor_purchase_to_stock').val(); var factor = $('#qu_factor_purchase_to_stock').val();
if (factor > 1 || quIdPurchase != quIdStock) if (factor > 1 && quIdPurchase != quIdStock)
{ {
$('#qu-conversion-info').text(__t('This means 1 %1$s purchased will be converted into %2$s %3$s in stock', $("#qu_id_purchase option:selected").text(), (1 * factor).toString(), __n((1 * factor).toString(), $("#qu_id_stock option:selected").text(), $("#qu_id_stock option:selected").data("plural-form"), true))); $('#qu-conversion-info').text(__t('This means 1 %1$s purchased will be converted into %2$s %3$s in stock', $("#qu_id_purchase option:selected").text(), (1 * factor).toString(), __n((1 * factor).toString(), $("#qu_id_stock option:selected").text(), $("#qu_id_stock option:selected").data("plural-form"), true)));
$('#qu-conversion-info').removeClass('d-none'); $('#qu-conversion-info').removeClass('d-none');
@ -209,6 +208,15 @@ function RefreshQuConversionInfo()
{ {
$('#qu-conversion-info').addClass('d-none'); $('#qu-conversion-info').addClass('d-none');
} }
if (quIdStock == quIdPurchase)
{
$("#qu_factor_purchase_to_stock").attr("disabled", "");
}
else
{
$("#qu_factor_purchase_to_stock").removeAttr("disabled");
}
} }
$('#product-form input').keyup(function(event) $('#product-form input').keyup(function(event)