mirror of
https://github.com/grocy/grocy.git
synced 2025-04-29 17:45:39 +00:00
* Puchase add qu_factor_to_stock * qu_factor_purchase_to_stock for stock edit * product barcodes with QU and Stores * remove product barcode tags * migrations/0103 add value and factor_puchase_amount to stock_current and stock_current_location_content * Remove unused method * StockService#GetProductDetails: include stock_value * productcard: include stock_value * Add Purchase Factor to Stock Overview * update demo data with stock qu_factor_purchase_to_stock * recipes_pos_resolved update * avg_price and oldest_price in product details * add average price to product card * hint for recipe costs not included if not in stock * Round value and factor_purchas_amount. Include currency for stock value * Add factor_purchase_amount to product card stock amount * Allow editing qu_factor_purchase_to_stock for stock entries * fix update qu_factor_purchase_to_stock for Transfers * Add barcode to existing product update to add to product_barcodes table * Add barcode to new product workflow update to add to product_barcodes table * *** Price now saved as 1 QU to stock in stock tables *** * remove column product barcode and use product_barcodes * Allow products to be deactivated instead of deleted * Embedded barcode and qu-conversion with page reload on change * Save current product barcode into new product_barcodes table * Embedded popup for product group add/edit * barcode scanner added to product barcodes input * Edit product qu_stock is unavailable after first purchase * StockOverview: Filters break when columns are reordered so for now just disable colReorder * view stockoverview.blade: display product_group column * Review Co-authored-by: Bernd Bestel <bernd@berrnd.de>
175 lines
5.2 KiB
JavaScript
175 lines
5.2 KiB
JavaScript
$('#save-quconversion-button').on('click', function(e)
|
|
{
|
|
e.preventDefault();
|
|
|
|
var jsonData = $('#quconversion-form').serializeJSON();
|
|
jsonData.from_qu_id = $("#from_qu_id").val();
|
|
Grocy.FrontendHelpers.BeginUiBusy("quconversion-form");
|
|
if ($("#create_inverse").is(":checked"))
|
|
{
|
|
var inverse_to_qu_id = $("#from_qu_id").val();
|
|
var inverse_from_qu_id = $("#to_qu_id").val();
|
|
}
|
|
|
|
if (Grocy.EditMode === 'create')
|
|
{
|
|
Grocy.Api.Post('objects/quantity_unit_conversions', jsonData,
|
|
function(result)
|
|
{
|
|
Grocy.EditObjectId = result.created_object_id;
|
|
Grocy.Components.UserfieldsForm.Save(function()
|
|
{
|
|
if (typeof GetUriParam("qu-unit") !== "undefined")
|
|
{
|
|
window.location.href = U("/quantityunit/" + GetUriParam("qu-unit"));
|
|
}
|
|
else
|
|
{
|
|
window.parent.postMessage(WindowMessageBag("ProductQUConversionChanged"), U("/product/" + GetUriParam("product")));
|
|
window.parent.postMessage(WindowMessageBag("CloseAllModals"), U("/product/" + GetUriParam("product")));
|
|
}
|
|
});
|
|
},
|
|
function(xhr)
|
|
{
|
|
Grocy.FrontendHelpers.EndUiBusy("quconversion-form");
|
|
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
|
|
}
|
|
);
|
|
if ($("#create_inverse").is(":checked"))
|
|
{
|
|
jsonData.to_qu_id = inverse_to_qu_id;
|
|
jsonData.from_qu_id = inverse_from_qu_id;
|
|
jsonData.factor = 1 / jsonData.factor;
|
|
|
|
//Create Inverse
|
|
Grocy.Api.Post('objects/quantity_unit_conversions', jsonData,
|
|
function(result)
|
|
{
|
|
Grocy.EditObjectId = result.created_object_id;
|
|
Grocy.Components.UserfieldsForm.Save(function()
|
|
{
|
|
if (typeof GetUriParam("qu-unit") !== "undefined")
|
|
{
|
|
window.location.href = U("/quantityunit/" + GetUriParam("qu-unit"));
|
|
}
|
|
else
|
|
{
|
|
window.parent.postMessage(WindowMessageBag("ProductQUConversionChanged"), U("/product/" + GetUriParam("product")));
|
|
window.parent.postMessage(WindowMessageBag("CloseAllModals"), U("/product/" + GetUriParam("product")));
|
|
}
|
|
});
|
|
},
|
|
function(xhr)
|
|
{
|
|
Grocy.FrontendHelpers.EndUiBusy("quconversion-form");
|
|
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
|
|
}
|
|
);
|
|
}
|
|
}
|
|
else
|
|
{
|
|
Grocy.Api.Put('objects/quantity_unit_conversions/' + Grocy.EditObjectId, jsonData,
|
|
function(result)
|
|
{
|
|
Grocy.Components.UserfieldsForm.Save(function()
|
|
{
|
|
if (typeof GetUriParam("qu-unit") !== "undefined")
|
|
{
|
|
window.location.href = U("/quantityunit/" + GetUriParam("qu-unit"));
|
|
}
|
|
else
|
|
{
|
|
window.parent.postMessage(WindowMessageBag("ProductQUConversionChanged"), U("/product/" + GetUriParam("product")));
|
|
window.parent.postMessage(WindowMessageBag("CloseAllModals"), U("/product/" + GetUriParam("product")));
|
|
}
|
|
});
|
|
},
|
|
function(xhr)
|
|
{
|
|
Grocy.FrontendHelpers.EndUiBusy("quconversion-form");
|
|
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response)
|
|
}
|
|
);
|
|
}
|
|
});
|
|
|
|
$('#quconversion-form input').keyup(function(event)
|
|
{
|
|
$('.input-group-qu').trigger('change');
|
|
Grocy.FrontendHelpers.ValidateForm('quconversion-form');
|
|
});
|
|
|
|
$('#quconversion-form input').keydown(function(event)
|
|
{
|
|
if (event.keyCode === 13) //Enter
|
|
{
|
|
event.preventDefault();
|
|
|
|
if (document.getElementById('quconversion-form').checkValidity() === false) //There is at least one validation error
|
|
{
|
|
return false;
|
|
}
|
|
else
|
|
{
|
|
$('#save-quconversion-button').click();
|
|
}
|
|
}
|
|
});
|
|
|
|
$("#create_inverse").on("change", function()
|
|
{
|
|
var value = $(this).is(":checked");
|
|
|
|
if (value)
|
|
{
|
|
$('#qu-conversion-inverse-info').removeClass('d-none');
|
|
}
|
|
else
|
|
{
|
|
$('#qu-conversion-inverse-info').addClass('d-none');
|
|
}
|
|
});
|
|
|
|
$('.input-group-qu').on('change', function(e)
|
|
{
|
|
var fromQuId = $("#from_qu_id").val();
|
|
var toQuId = $("#to_qu_id").val();
|
|
var factor = $('#factor').val();
|
|
|
|
if (fromQuId == toQuId)
|
|
{
|
|
$("#to_qu_id").parent().find(".invalid-feedback").text(__t('This cannot be equal to %s', $("#from_qu_id option:selected").text()));
|
|
$("#to_qu_id")[0].setCustomValidity("error");
|
|
}
|
|
else
|
|
{
|
|
$("#to_qu_id")[0].setCustomValidity("");
|
|
}
|
|
|
|
if (fromQuId && toQuId)
|
|
{
|
|
$('#qu-conversion-info').text(__t('This means 1 %1$s is the same as %2$s %3$s', $("#from_qu_id option:selected").text(), (1 * factor).toString(), __n((1 * factor).toString(), $("#to_qu_id option:selected").text(), $("#to_qu_id option:selected").data("plural-form"))));
|
|
$('#qu-conversion-info').removeClass('d-none');
|
|
|
|
if (Grocy.EditMode === 'create')
|
|
{
|
|
$('#qu-conversion-inverse-info').text('(' + __t('This means 1 %1$s is the same as %2$s %3$s', $("#to_qu_id option:selected").text(), (1 / factor).toString(), __n((1 / factor).toString(), $("#from_qu_id option:selected").text(), $("#from_qu_id option:selected").data("plural-form"))) + ')');
|
|
$('#qu-conversion-inverse-info').removeClass('d-none');
|
|
}
|
|
}
|
|
else
|
|
{
|
|
$('#qu-conversion-info').addClass('d-none');
|
|
$('#qu-conversion-inverse-info').addClass('d-none');
|
|
}
|
|
|
|
Grocy.FrontendHelpers.ValidateForm('quconversion-form');
|
|
});
|
|
|
|
Grocy.Components.UserfieldsForm.Load();
|
|
$('.input-group-qu').trigger('change');
|
|
$('#from_qu_id').focus();
|
|
Grocy.FrontendHelpers.ValidateForm('quconversion-form');
|