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

Reuse existing shopping list items when adding products from the stock overview page (closes #375)

Browse Source
This commit is contained in:
Bernd Bestel
2019-09-24 18:27:50 +02:00
parent b0c7958891
commit 5351828e79
8 changed files with 63 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
public/viewjs/shoppinglistitemform.js
View File

@@ -5,6 +5,41 @@
var jsonData = $('#shoppinglist-form').serializeJSON();
Grocy.FrontendHelpers.BeginUiBusy("shoppinglist-form");
if (GetUriParam("updateexistingproduct") !== undefined)
{
jsonData.product_amount = jsonData.amount;
delete jsonData.amount;
Grocy.Api.Post('stock/shoppinglist/add-product', jsonData,
function(result)
{
if (GetUriParam("embedded") !== undefined)
{
Grocy.Api.Get('stock/products/' + jsonData.product_id,
function (productDetails)
{
window.parent.postMessage(WindowMessageBag("ShowSuccessMessage", __t("Added %1$s of %2$s to the shopping list \"%3$s\"", jsonData.product_amount + " " + __n(jsonData.product_amount, productDetails.quantity_unit_purchase.name, productDetails.quantity_unit_purchase.name_plural), productDetails.product.name, $("#shopping_list_id option:selected").text())), Grocy.BaseUrl);
window.parent.postMessage(WindowMessageBag("CloseAllModals"), Grocy.BaseUrl);
},
function (xhr)
{
console.error(xhr);
}
);
}
else
{
window.location.href = U('/shoppinglist?list=' + $("#shopping_list_id").val().toString());
}
},
function(xhr)
{
Grocy.FrontendHelpers.EndUiBusy("shoppinglist-form");
console.error(xhr);
}
);
}
if (Grocy.EditMode === 'create')
{
Grocy.Api.Post('objects/shopping_list', jsonData,

2
public/viewjs/stockoverview.js
View File

@@ -288,7 +288,7 @@ $(document).on("click", ".product-add-to-shopping-list-button", function(e)
var productId = $(e.currentTarget).attr("data-product-id");
bootbox.dialog({
message: '<iframe height="650px" class="embed-responsive" src="' + U("/shoppinglistitem/new?embedded&product=") + productId.toString() + '"></iframe>',
message: '<iframe height="650px" class="embed-responsive" src="' + U("/shoppinglistitem/new?embedded&updateexistingproduct&product=") + productId.toString() + '"></iframe>',
size: 'large',
backdrop: true,
closeButton: false,