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

Change public/viewjs to match API routes

Browse Source
This commit is contained in:
Christopher Forkner 2019-01-07 22:34:34 -07:00
parent 857de8481a
commit 79f49a3b17
31 changed files with 128 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/viewjs/batteries.js
View File

@ -52,7 +52,7 @@ $(document).on('click', '.battery-delete-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/batteries/' + objectId, Grocy.Api.Delete('delete-object/batteries/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/batteries'); window.location.href = U('/batteries');

2
public/viewjs/batteriesjournal.js
View File

@ -56,7 +56,7 @@ $(document).on('click', '.undo-battery-execution-button', function(e)
var element = $(e.currentTarget); var element = $(e.currentTarget);
var chargeCycleId = $(e.currentTarget).attr('data-charge-cycle-id'); var chargeCycleId = $(e.currentTarget).attr('data-charge-cycle-id');
Grocy.Api.Get('batteries/undo-charge-cycle/' + chargeCycleId.toString(), Grocy.Api.Post('batteries/' + chargeCycleId.toString() + '/undo',
function(result) function(result)
{ {
element.closest("tr").addClass("text-muted"); element.closest("tr").addClass("text-muted");

6
public/viewjs/batteriesoverview.js
View File

@ -66,10 +66,10 @@ $(document).on('click', '.track-charge-cycle-button', function(e)
var batteryName = $(e.currentTarget).attr('data-battery-name'); var batteryName = $(e.currentTarget).attr('data-battery-name');
var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss'); var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss');
Grocy.Api.Get('batteries/track-charge-cycle/' + batteryId + '?tracked_time=' + trackedTime, Grocy.Api.Post('batteries/' + batteryId + '/charged?tracked_time=' + trackedTime,
function() function()
{ {
Grocy.Api.Get('batteries/get-battery-details/' + batteryId, Grocy.Api.Get('batteries/' + batteryId,
function(result) function(result)
{ {
var batteryRow = $('#battery-' + batteryId + '-row'); var batteryRow = $('#battery-' + batteryId + '-row');
@ -128,7 +128,7 @@ $(document).on('click', '.track-charge-cycle-button', function(e)
function RefreshStatistics() function RefreshStatistics()
{ {
var nextXDays = $("#info-due-batteries").data("next-x-days"); var nextXDays = $("#info-due-batteries").data("next-x-days");
Grocy.Api.Get('batteries/get-current', Grocy.Api.Get('batteries',
function(result) function(result)
{ {
var dueCount = 0; var dueCount = 0;

6
public/viewjs/batterytracking.js
View File

@ -5,10 +5,10 @@
var jsonForm = $('#batterytracking-form').serializeJSON(); var jsonForm = $('#batterytracking-form').serializeJSON();
Grocy.FrontendHelpers.BeginUiBusy("batterytracking-form"); Grocy.FrontendHelpers.BeginUiBusy("batterytracking-form");
Grocy.Api.Get('batteries/get-battery-details/' + jsonForm.battery_id, Grocy.Api.Get('batteries/' + jsonForm.battery_id,
function (batteryDetails) function (batteryDetails)
{ {
Grocy.Api.Get('batteries/track-charge-cycle/' + jsonForm.battery_id + '?tracked_time=' + $('#tracked_time').find('input').val(), Grocy.Api.Post('batteries/' + jsonForm.battery_id + '/charge?tracked_time=' + $('#tracked_time').find('input').val(),
function(result) function(result)
{ {
Grocy.FrontendHelpers.EndUiBusy("batterytracking-form"); Grocy.FrontendHelpers.EndUiBusy("batterytracking-form");
@ -92,7 +92,7 @@ $('#tracked_time').find('input').on('keypress', function (e)
function UndoChargeCycle(chargeCycleId) function UndoChargeCycle(chargeCycleId)
{ {
Grocy.Api.Get('batteries/undo-charge-cycle/' + chargeCycleId.toString(), Grocy.Api.Post('batteries' + chargeCycleId.toString() + '/undo',
function(result) function(result)
{ {
toastr.success(L("Charge cycle successfully undone")); toastr.success(L("Charge cycle successfully undone"));

2
public/viewjs/chores.js
View File

@ -52,7 +52,7 @@ $(document).on('click', '.chore-delete-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/chores/' + objectId, Grocy.Api.Delete('delete-object/chores/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/chores'); window.location.href = U('/chores');

2
public/viewjs/choresjournal.js
View File

@ -56,7 +56,7 @@ $(document).on('click', '.undo-chore-execution-button', function(e)
var element = $(e.currentTarget); var element = $(e.currentTarget);
var executionId = $(e.currentTarget).attr('data-execution-id'); var executionId = $(e.currentTarget).attr('data-execution-id');
Grocy.Api.Get('chores/undo-chore-execution/' + executionId.toString(), Grocy.Api.Post('chores/' + executionId.toString() + '/undo',
function(result) function(result)
{ {
element.closest("tr").addClass("text-muted"); element.closest("tr").addClass("text-muted");

6
public/viewjs/choresoverview.js
View File

@ -66,10 +66,10 @@ $(document).on('click', '.track-chore-button', function(e)
var choreName = $(e.currentTarget).attr('data-chore-name'); var choreName = $(e.currentTarget).attr('data-chore-name');
var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss'); var trackedTime = moment().format('YYYY-MM-DD HH:mm:ss');
Grocy.Api.Get('chores/track-chore-execution/' + choreId + '?tracked_time=' + trackedTime, Grocy.Api.Post('chores/' + choreId + '/execute?tracked_time=' + trackedTime,
function() function()
{ {
Grocy.Api.Get('chores/get-chore-details/' + choreId, Grocy.Api.Get('chores/' + choreId,
function(result) function(result)
{ {
var choreRow = $('#chore-' + choreId + '-row'); var choreRow = $('#chore-' + choreId + '-row');
@ -128,7 +128,7 @@ $(document).on('click', '.track-chore-button', function(e)
function RefreshStatistics() function RefreshStatistics()
{ {
var nextXDays = $("#info-due-chores").data("next-x-days"); var nextXDays = $("#info-due-chores").data("next-x-days");
Grocy.Api.Get('chores/get-current', Grocy.Api.Get('chores',
function(result) function(result)
{ {
var dueCount = 0; var dueCount = 0;

6
public/viewjs/choretracking.js
View File

@ -5,10 +5,10 @@
var jsonForm = $('#choretracking-form').serializeJSON(); var jsonForm = $('#choretracking-form').serializeJSON();
Grocy.FrontendHelpers.BeginUiBusy("choretracking-form"); Grocy.FrontendHelpers.BeginUiBusy("choretracking-form");
Grocy.Api.Get('chores/get-chore-details/' + jsonForm.chore_id, Grocy.Api.Get('chores/' + jsonForm.chore_id,
function (choreDetails) function (choreDetails)
{ {
Grocy.Api.Get('chores/track-chore-execution/' + jsonForm.chore_id + '?tracked_time=' + Grocy.Components.DateTimePicker.GetValue() + "&done_by=" + Grocy.Components.UserPicker.GetValue(), Grocy.Api.Post('chores/' + jsonForm.chore_id + '/execute?tracked_time=' + Grocy.Components.DateTimePicker.GetValue() + "&done_by=" + Grocy.Components.UserPicker.GetValue(),
function(result) function(result)
{ {
Grocy.FrontendHelpers.EndUiBusy("choretracking-form"); Grocy.FrontendHelpers.EndUiBusy("choretracking-form");
@ -89,7 +89,7 @@ Grocy.Components.DateTimePicker.GetInputElement().on('keypress', function(e)
function UndoChoreExecution(executionId) function UndoChoreExecution(executionId)
{ {
Grocy.Api.Get('chores/undo-chore-execution/' + executionId.toString(), Grocy.Api.Post('chores/' + executionId.toString() + '/undo',
function(result) function(result)
{ {
toastr.success(L("Chore execution successfully undone")); toastr.success(L("Chore execution successfully undone"));

2
public/viewjs/components/batterycard.js
View File

@ -2,7 +2,7 @@ Grocy.Components.BatteryCard = { };
Grocy.Components.BatteryCard.Refresh = function(batteryId) Grocy.Components.BatteryCard.Refresh = function(batteryId)
{ {
Grocy.Api.Get('batteries/get-battery-details/' + batteryId, Grocy.Api.Get('batteries/' + batteryId,
function(batteryDetails) function(batteryDetails)
{ {
$('#batterycard-battery-name').text(batteryDetails.battery.name); $('#batterycard-battery-name').text(batteryDetails.battery.name);

2
public/viewjs/components/chorecard.js
View File

@ -2,7 +2,7 @@ Grocy.Components.ChoreCard = { };
Grocy.Components.ChoreCard.Refresh = function(choreId) Grocy.Components.ChoreCard.Refresh = function(choreId)
{ {
Grocy.Api.Get('chores/get-chore-details/' + choreId, Grocy.Api.Get('chores/' + choreId,
function(choreDetails) function(choreDetails)
{ {
$('#chorecard-chore-name').text(choreDetails.chore.name); $('#chorecard-chore-name').text(choreDetails.chore.name);

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

@ -2,7 +2,7 @@ Grocy.Components.ProductCard = { };
Grocy.Components.ProductCard.Refresh = function(productId) Grocy.Components.ProductCard.Refresh = function(productId)
{ {
Grocy.Api.Get('stock/get-product-details/' + productId, Grocy.Api.Get('stock/' + productId,
function(productDetails) function(productDetails)
{ {
var stockAmount = productDetails.stock_amount || '0'; var stockAmount = productDetails.stock_amount || '0';
@ -58,7 +58,7 @@ Grocy.Components.ProductCard.Refresh = function(productId)
} }
); );
Grocy.Api.Get('stock/get-product-price-history/' + productId, Grocy.Api.Get('stock/' + productId + '/pricehistory',
function(priceHistoryDataPoints) function(priceHistoryDataPoints)
{ {
if (priceHistoryDataPoints.length > 0) if (priceHistoryDataPoints.length > 0)

18
public/viewjs/consume.js
View File

@ -16,17 +16,17 @@
spoiled = 1; spoiled = 1;
} }
var apiUrl = 'stock/consume-product/' + jsonForm.product_id + '/' + jsonForm.amount + '?spoiled=' + spoiled; var apiUrl = 'stock/' + jsonForm.product_id + '/consume/' + jsonForm.amount + '?spoiled=' + spoiled;
if ($("#use_specific_stock_entry").is(":checked")) if ($("#use_specific_stock_entry").is(":checked"))
{ {
apiUrl += "&stock_entry_id=" + jsonForm.specific_stock_entry; apiUrl += "&stock_entry_id=" + jsonForm.specific_stock_entry;
} }
Grocy.Api.Get('stock/get-product-details/' + jsonForm.product_id, Grocy.Api.Get('stock/' + jsonForm.product_id,
function(productDetails) function(productDetails)
{ {
Grocy.Api.Get(apiUrl, Grocy.Api.Post(apiUrl,
function(result) function(result)
{ {
$("#specific_stock_entry").find("option").remove().end().append("<option></option>"); $("#specific_stock_entry").find("option").remove().end().append("<option></option>");
@ -70,17 +70,17 @@ $('#save-mark-as-open-button').on('click', function(e)
jsonForm.amount = 1; jsonForm.amount = 1;
} }
var apiUrl = 'stock/open-product/' + jsonForm.product_id + '/' + jsonForm.amount; var apiUrl = 'stock/' + jsonForm.product_id + '/open/' + jsonForm.amount;
if ($("#use_specific_stock_entry").is(":checked")) if ($("#use_specific_stock_entry").is(":checked"))
{ {
apiUrl += "&stock_entry_id=" + jsonForm.specific_stock_entry; apiUrl += "&stock_entry_id=" + jsonForm.specific_stock_entry;
} }
Grocy.Api.Get('stock/get-product-details/' + jsonForm.product_id, Grocy.Api.Get('stock/' + jsonForm.product_id,
function(productDetails) function(productDetails)
{ {
Grocy.Api.Get(apiUrl, Grocy.Api.Post(apiUrl,
function(result) function(result)
{ {
$("#specific_stock_entry").find("option").remove().end().append("<option></option>"); $("#specific_stock_entry").find("option").remove().end().append("<option></option>");
@ -126,7 +126,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{ {
Grocy.Components.ProductCard.Refresh(productId); Grocy.Components.ProductCard.Refresh(productId);
Grocy.Api.Get('stock/get-product-details/' + productId, Grocy.Api.Get('stock/' + productId,
function(productDetails) function(productDetails)
{ {
$('#amount').attr('max', productDetails.stock_amount); $('#amount').attr('max', productDetails.stock_amount);
@ -161,7 +161,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
} }
); );
Grocy.Api.Get("stock/get-product-stock-entries/" + productId, Grocy.Api.Get("stock/" + productId,
function (stockEntries) function (stockEntries)
{ {
stockEntries.forEach(stockEntry => stockEntries.forEach(stockEntry =>
@ -249,7 +249,7 @@ $("#use_specific_stock_entry").on("change", function()
function UndoStockBooking(bookingId) function UndoStockBooking(bookingId)
{ {
Grocy.Api.Get('stock/undo-booking/' + bookingId.toString(), Grocy.Api.Post('booking/' + bookingId.toString() + '/undo',
function(result) function(result)
{ {
toastr.success(L("Booking successfully undone")); toastr.success(L("Booking successfully undone"));

2
public/viewjs/equipment.js
View File

@ -98,7 +98,7 @@ $(document).on('click', '.equipment-delete-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/equipment/' + objectId, Grocy.Api.Delete('delete-object/equipment/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/equipment'); window.location.href = U('/equipment');

12
public/viewjs/inventory.js
View File

@ -5,10 +5,10 @@
var jsonForm = $('#inventory-form').serializeJSON(); var jsonForm = $('#inventory-form').serializeJSON();
Grocy.FrontendHelpers.BeginUiBusy("inventory-form"); Grocy.FrontendHelpers.BeginUiBusy("inventory-form");
Grocy.Api.Get('stock/get-product-details/' + jsonForm.product_id, Grocy.Api.Get('stock/' + jsonForm.product_id,
function (productDetails) function (productDetails)
{ {
Grocy.Api.Get('stock/inventory-product/' + jsonForm.product_id + '/' + jsonForm.new_amount + '?bestbeforedate=' + Grocy.Components.DateTimePicker.GetValue(), Grocy.Api.Post('stock/' + jsonForm.product_id + '/inventory/' + jsonForm.new_amount + '?bestbeforedate=' + Grocy.Components.DateTimePicker.GetValue(),
function(result) function(result)
{ {
var addBarcode = GetUriParam('addbarcodetoselection'); var addBarcode = GetUriParam('addbarcodetoselection');
@ -24,7 +24,7 @@
productDetails.product.barcode += ',' + addBarcode; productDetails.product.barcode += ',' + addBarcode;
} }
Grocy.Api.Get('edit-object/products/' + productDetails.product.id, productDetails.product, Grocy.Api.Post('edit-object/products/' + productDetails.product.id, productDetails.product,
function (result) { }, function (result) { },
function(xhr) function(xhr)
{ {
@ -73,7 +73,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{ {
Grocy.Components.ProductCard.Refresh(productId); Grocy.Components.ProductCard.Refresh(productId);
Grocy.Api.Get('stock/get-product-details/' + productId, Grocy.Api.Get('stock/' + productId,
function(productDetails) function(productDetails)
{ {
$('#new_amount').attr('not-equal', productDetails.stock_amount); $('#new_amount').attr('not-equal', productDetails.stock_amount);
@ -157,7 +157,7 @@ $('#new_amount').on('keyup', function(e)
if (productId) if (productId)
{ {
Grocy.Api.Get('stock/get-product-details/' + productId, Grocy.Api.Get('stock/' + productId,
function(productDetails) function(productDetails)
{ {
var productStockAmount = parseInt(productDetails.stock_amount || '0'); var productStockAmount = parseInt(productDetails.stock_amount || '0');
@ -193,7 +193,7 @@ $('#new_amount').on('keyup', function(e)
function UndoStockBooking(bookingId) function UndoStockBooking(bookingId)
{ {
Grocy.Api.Get('stock/undo-booking/' + bookingId.toString(), Grocy.Api.Get('booking/' + bookingId.toString() + '/undo',
function(result) function(result)
{ {
toastr.success(L("Booking successfully undone")); toastr.success(L("Booking successfully undone"));

2
public/viewjs/locations.js
View File

@ -52,7 +52,7 @@ $(document).on('click', '.location-delete-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/locations/' + objectId, Grocy.Api.Delete('delete-object/locations/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/locations'); window.location.href = U('/locations');

2
public/viewjs/manageapikeys.js
View File

@ -58,7 +58,7 @@ $(document).on('click', '.apikey-delete-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/api_keys/' + objectId, Grocy.Api.Delete('delete-object/api_keys/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/manageapikeys'); window.location.href = U('/manageapikeys');

2
public/viewjs/productgroups.js
View File

@ -52,7 +52,7 @@ $(document).on('click', '.product-group-delete-button', function(e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/product_groups/' + objectId, Grocy.Api.Delete('delete-object/product_groups/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/productgroups'); window.location.href = U('/productgroups');

4
public/viewjs/products.js
View File

@ -36,7 +36,7 @@ $(document).on('click', '.product-delete-button', function (e)
var objectName = $(e.currentTarget).attr('data-product-name'); var objectName = $(e.currentTarget).attr('data-product-name');
var objectId = $(e.currentTarget).attr('data-product-id'); var objectId = $(e.currentTarget).attr('data-product-id');
Grocy.Api.Get('stock/get-product-details/' + objectId, Grocy.Api.Get('stock/' + objectId,
function(productDetails) function(productDetails)
{ {
var stockAmount = productDetails.stock_amount || '0'; var stockAmount = productDetails.stock_amount || '0';
@ -59,7 +59,7 @@ $(document).on('click', '.product-delete-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/products/' + objectId, Grocy.Api.Delete('delete-object/products/' + objectId,
function (result) function (result)
{ {
window.location.href = U('/products'); window.location.href = U('/products');

8
public/viewjs/purchase.js
View File

@ -5,7 +5,7 @@
var jsonForm = $('#purchase-form').serializeJSON(); var jsonForm = $('#purchase-form').serializeJSON();
Grocy.FrontendHelpers.BeginUiBusy("purchase-form"); Grocy.FrontendHelpers.BeginUiBusy("purchase-form");
Grocy.Api.Get('stock/get-product-details/' + jsonForm.product_id, Grocy.Api.Get('stock/' + jsonForm.product_id,
function(productDetails) function(productDetails)
{ {
var amount = jsonForm.amount * productDetails.product.qu_factor_purchase_to_stock; var amount = jsonForm.amount * productDetails.product.qu_factor_purchase_to_stock;
@ -16,7 +16,7 @@
price = parseFloat(jsonForm.price).toFixed(2); price = parseFloat(jsonForm.price).toFixed(2);
} }
Grocy.Api.Get('stock/add-product/' + jsonForm.product_id + '/' + amount + '?bestbeforedate=' + Grocy.Components.DateTimePicker.GetValue() + '&price=' + price, Grocy.Api.Post('stock/' + jsonForm.product_id + '/add/' + amount + '?bestbeforedate=' + Grocy.Components.DateTimePicker.GetValue() + '&price=' + price,
function(result) function(result)
{ {
var addBarcode = GetUriParam('addbarcodetoselection'); var addBarcode = GetUriParam('addbarcodetoselection');
@ -89,7 +89,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{ {
Grocy.Components.ProductCard.Refresh(productId); Grocy.Components.ProductCard.Refresh(productId);
Grocy.Api.Get('stock/get-product-details/' + productId, Grocy.Api.Get('stock/' + productId,
function(productDetails) function(productDetails)
{ {
$('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name); $('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name);
@ -197,7 +197,7 @@ if (GetUriParam("flow") === "shoppinglistitemtostock")
function UndoStockBooking(bookingId) function UndoStockBooking(bookingId)
{ {
Grocy.Api.Get('stock/undo-booking/' + bookingId.toString(), Grocy.Api.Get('sbooking/' + bookingId.toString() + '/undo',
function(result) function(result)
{ {
toastr.success(L("Booking successfully undone")); toastr.success(L("Booking successfully undone"));

2
public/viewjs/quantityunits.js
View File

@ -52,7 +52,7 @@ $(document).on('click', '.quantityunit-delete-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/quantity_units/' + objectId, Grocy.Api.Delete('delete-object/quantity_units/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/quantityunits'); window.location.href = U('/quantityunits');

4
public/viewjs/recipeform.js
View File

@ -114,7 +114,7 @@ $(document).on('click', '.recipe-pos-delete-button', function(e)
if (result === true) if (result === true)
{ {
Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(), function() { }, function() { }); Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(), function() { }, function() { });
Grocy.Api.Get('delete-object/recipes_pos/' + objectId, Grocy.Api.Delete('delete-object/recipes_pos/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/recipe/' + Grocy.EditObjectId); window.location.href = U('/recipe/' + Grocy.EditObjectId);
@ -151,7 +151,7 @@ $(document).on('click', '.recipe-include-delete-button', function(e)
if (result === true) if (result === true)
{ {
Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(), function() { }, function() { }); Grocy.Api.Post('edit-object/recipes/' + Grocy.EditObjectId, $('#recipe-form').serializeJSON(), function() { }, function() { });
Grocy.Api.Get('delete-object/recipes_nestings/' + objectId, Grocy.Api.Delete('delete-object/recipes_nestings/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/recipe/' + Grocy.EditObjectId); window.location.href = U('/recipe/' + Grocy.EditObjectId);

2
public/viewjs/recipeposform.js
View File

@ -45,7 +45,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{ {
Grocy.Components.ProductCard.Refresh(productId); Grocy.Components.ProductCard.Refresh(productId);
Grocy.Api.Get('stock/get-product-details/' + productId, Grocy.Api.Get('stock/' + productId,
function (productDetails) function (productDetails)
{ {
if (!$("#only_check_single_unit_in_stock").is(":checked")) if (!$("#only_check_single_unit_in_stock").is(":checked"))

6
public/viewjs/recipes.js
View File

@ -63,7 +63,7 @@ $("#selectedRecipeDeleteButton").on('click', function(e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/recipes/' + objectId, Grocy.Api.Delete('delete-object/recipes/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/recipes'); window.location.href = U('/recipes');
@ -101,7 +101,7 @@ $(document).on('click', '.recipe-order-missing-button', function(e)
{ {
Grocy.FrontendHelpers.BeginUiBusy(); Grocy.FrontendHelpers.BeginUiBusy();
Grocy.Api.Get('recipes/add-not-fulfilled-products-to-shopping-list/' + objectId, Grocy.Api.Post('recipes/' + objectId + '/shoppinglist',
function(result) function(result)
{ {
window.location.href = U('/recipes'); window.location.href = U('/recipes');
@ -140,7 +140,7 @@ $("#selectedRecipeConsumeButton").on('click', function(e)
{ {
Grocy.FrontendHelpers.BeginUiBusy(); Grocy.FrontendHelpers.BeginUiBusy();
Grocy.Api.Get('recipes/consume-recipe/' + objectId, Grocy.Api.Get('recipes/' + objectId + '/consume',
function(result) function(result)
{ {
Grocy.FrontendHelpers.EndUiBusy(); Grocy.FrontendHelpers.EndUiBusy();

6
public/viewjs/shoppinglist.js
View File

@ -64,7 +64,7 @@ $(document).on('click', '.shoppinglist-delete-button', function (e)
var shoppingListItemId = $(e.currentTarget).attr('data-shoppinglist-id'); var shoppingListItemId = $(e.currentTarget).attr('data-shoppinglist-id');
Grocy.FrontendHelpers.BeginUiBusy(); Grocy.FrontendHelpers.BeginUiBusy();
Grocy.Api.Get('delete-object/shopping_list/' + shoppingListItemId, Grocy.Api.Delete('delete-object/shopping_list/' + shoppingListItemId,
function(result) function(result)
{ {
$('#shoppinglistitem-' + shoppingListItemId + '-row').fadeOut(500, function() $('#shoppinglistitem-' + shoppingListItemId + '-row').fadeOut(500, function()
@ -84,7 +84,7 @@ $(document).on('click', '.shoppinglist-delete-button', function (e)
$(document).on('click', '#add-products-below-min-stock-amount', function(e) $(document).on('click', '#add-products-below-min-stock-amount', function(e)
{ {
Grocy.Api.Get('stock/add-missing-products-to-shoppinglist', Grocy.Api.Post('stock/shoppinglist',
function(result) function(result)
{ {
window.location.href = U('/shoppinglist'); window.location.href = U('/shoppinglist');
@ -116,7 +116,7 @@ $(document).on('click', '#clear-shopping-list', function(e)
{ {
Grocy.FrontendHelpers.BeginUiBusy(); Grocy.FrontendHelpers.BeginUiBusy();
Grocy.Api.Get('stock/clear-shopping-list', Grocy.Api.Post('stock/clearshoppinglist',
function(result) function(result)
{ {
$('#shoppinglist-table tbody tr').fadeOut(500, function() $('#shoppinglist-table tbody tr').fadeOut(500, function()

2
public/viewjs/shoppinglistform.js
View File

@ -43,7 +43,7 @@ Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{ {
Grocy.Components.ProductCard.Refresh(productId); Grocy.Components.ProductCard.Refresh(productId);
Grocy.Api.Get('stock/get-product-details/' + productId, Grocy.Api.Get('stock/' + productId,
function (productDetails) function (productDetails)
{ {
$('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name); $('#amount_qu_unit').text(productDetails.quantity_unit_purchase.name);

2
public/viewjs/stockjournal.js
View File

@ -56,7 +56,7 @@ $(document).on('click', '.undo-stock-booking-button', function(e)
var element = $(e.currentTarget); var element = $(e.currentTarget);
var bookingId = $(e.currentTarget).attr('data-booking-id'); var bookingId = $(e.currentTarget).attr('data-booking-id');
Grocy.Api.Get('stock/undo-booking/' + bookingId.toString(), Grocy.Api.Get('booking/' + bookingId.toString() + '/undo',
function(result) function(result)
{ {
element.closest("tr").addClass("text-muted"); element.closest("tr").addClass("text-muted");

12
public/viewjs/stockoverview.js
View File

@ -92,10 +92,10 @@ $(document).on('click', '.product-consume-button', function(e)
var productQuName = $(e.currentTarget).attr('data-product-qu-name'); var productQuName = $(e.currentTarget).attr('data-product-qu-name');
var consumeAmount = $(e.currentTarget).attr('data-consume-amount'); var consumeAmount = $(e.currentTarget).attr('data-consume-amount');
Grocy.Api.Get('stock/consume-product/' + productId + '/' + consumeAmount, Grocy.Api.Post('stock/' + productId + '/consume/' + consumeAmount,
function() function()
{ {
Grocy.Api.Get('stock/get-product-details/' + productId, Grocy.Api.Get('stock/' + productId,
function(result) function(result)
{ {
var productRow = $('#product-' + productId + '-row'); var productRow = $('#product-' + productId + '-row');
@ -189,10 +189,10 @@ $(document).on('click', '.product-open-button', function(e)
var productQuName = $(e.currentTarget).attr('data-product-qu-name'); var productQuName = $(e.currentTarget).attr('data-product-qu-name');
var button = $(e.currentTarget); var button = $(e.currentTarget);
Grocy.Api.Get('stock/open-product/' + productId + '/1', Grocy.Api.Get('stock/' + productId + 'open/1',
function() function()
{ {
Grocy.Api.Get('stock/get-product-details/' + productId, Grocy.Api.Get('stock/' + productId,
function(result) function(result)
{ {
var productRow = $('#product-' + productId + '-row'); var productRow = $('#product-' + productId + '-row');
@ -257,7 +257,7 @@ $(document).on("click", ".product-name-cell", function(e)
function RefreshStatistics() function RefreshStatistics()
{ {
Grocy.Api.Get('stock/get-current-stock', Grocy.Api.Get('stock',
function(result) function(result)
{ {
var amountSum = 0; var amountSum = 0;
@ -273,7 +273,7 @@ function RefreshStatistics()
); );
var nextXDays = $("#info-expiring-products").data("next-x-days"); var nextXDays = $("#info-expiring-products").data("next-x-days");
Grocy.Api.Get('stock/get-current-volatil-stock?expiring_days=' + nextXDays, Grocy.Api.Get('stock/volatil?expiring_days=' + nextXDays,
function(result) function(result)
{ {
$("#info-expiring-products").text(Pluralize(result.expiring_products.length, L('#1 product expires within the next #2 days', result.expiring_products.length, nextXDays), L('#1 products expiring within the next #2 days', result.expiring_products.length, nextXDays))); $("#info-expiring-products").text(Pluralize(result.expiring_products.length, L('#1 product expires within the next #2 days', result.expiring_products.length, nextXDays), L('#1 products expiring within the next #2 days', result.expiring_products.length, nextXDays)));

2
public/viewjs/taskcategories.js
View File

@ -52,7 +52,7 @@ $(document).on('click', '.task-category-delete-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/task_categories/' + objectId, Grocy.Api.Delete('delete-object/task_categories/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/taskcategories'); window.location.href = U('/taskcategories');

6
public/viewjs/tasks.js
View File

@ -70,7 +70,7 @@ $(document).on('click', '.do-task-button', function(e)
var taskName = $(e.currentTarget).attr('data-task-name'); var taskName = $(e.currentTarget).attr('data-task-name');
var doneTime = moment().format('YYYY-MM-DD HH:mm:ss'); var doneTime = moment().format('YYYY-MM-DD HH:mm:ss');
Grocy.Api.Get('tasks/mark-task-as-completed/' + taskId + '?done_time=' + doneTime, Grocy.Api.Get('tasks/' + taskId + '/complete?done_time=' + doneTime,
function() function()
{ {
if (!$("#show-done-tasks").is(":checked")) if (!$("#show-done-tasks").is(":checked"))
@ -123,7 +123,7 @@ $(document).on('click', '.delete-task-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('delete-object/tasks/' + objectId, Grocy.Api.Delete('delete-object/tasks/' + objectId,
function(result) function(result)
{ {
$('#task-' + objectId + '-row').fadeOut(500, function () $('#task-' + objectId + '-row').fadeOut(500, function ()
@ -161,7 +161,7 @@ if (GetUriParam('include_done'))
function RefreshStatistics() function RefreshStatistics()
{ {
var nextXDays = $("#info-due-tasks").data("next-x-days"); var nextXDays = $("#info-due-tasks").data("next-x-days");
Grocy.Api.Get('tasks/get-current', Grocy.Api.Get('tasks',
function(result) function(result)
{ {
var dueCount = 0; var dueCount = 0;

2
public/viewjs/users.js
View File

@ -52,7 +52,7 @@ $(document).on('click', '.user-delete-button', function (e)
{ {
if (result === true) if (result === true)
{ {
Grocy.Api.Get('users/delete/' + objectId, Grocy.Api.Delete('users/delete/' + objectId,
function(result) function(result)
{ {
window.location.href = U('/users'); window.location.href = U('/users');

2
routes.php
View File

@ -102,7 +102,7 @@ $app->group('/api', function()
$this->get('/users/get', '\Grocy\Controllers\UsersApiController:GetUsers'); $this->get('/users/get', '\Grocy\Controllers\UsersApiController:GetUsers');
$this->post('/users/create', '\Grocy\Controllers\UsersApiController:CreateUser'); $this->post('/users/create', '\Grocy\Controllers\UsersApiController:CreateUser');
$this->post('/users/edit/{userId}', '\Grocy\Controllers\UsersApiController:EditUser'); $this->post('/users/edit/{userId}', '\Grocy\Controllers\UsersApiController:EditUser');
$this->get('/users/delete/{userId}', '\Grocy\Controllers\UsersApiController:DeleteUser'); $this->delete('/users/delete/{userId}', '\Grocy\Controllers\UsersApiController:DeleteUser');
// User // User
$this->get('/user/settings/{settingKey}', '\Grocy\Controllers\UsersApiController:GetUserSetting'); $this->get('/user/settings/{settingKey}', '\Grocy\Controllers\UsersApiController:GetUserSetting');