diff --git a/GrocyDbMigrator.php b/GrocyDbMigrator.php index ea3142a2..6fe1d517 100644 --- a/GrocyDbMigrator.php +++ b/GrocyDbMigrator.php @@ -81,7 +81,7 @@ class GrocyDbMigrator ON p.id = s.product_id WHERE p.min_stock_amount != 0 GROUP BY p.id - HAVING SUM(s.amount) < p.min_stock_amount;" + HAVING IFNULL(SUM(s.amount), 0) < p.min_stock_amount;" ); self::ExecuteMigrationWhenNeeded($pdo, 8, " @@ -92,6 +92,16 @@ class GrocyDbMigrator GROUP BY product_id ORDER BY MIN(best_before_date) ASC;" ); + + self::ExecuteMigrationWhenNeeded($pdo, 9, " + CREATE TABLE shopping_list ( + id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE, + product_id INTEGER NOT NULL UNIQUE, + amount INTEGER NOT NULL DEFAULT 0, + amount_autoadded INTEGER NOT NULL DEFAULT 0, + row_created_timestamp DATETIME DEFAULT (datetime('now', 'localtime')) + )" + ); } private static function ExecuteMigrationWhenNeeded(PDO $pdo, int $migrationId, string $sql) diff --git a/GrocyLogicStock.php b/GrocyLogicStock.php index 76fe93ba..4a00f3e0 100644 --- a/GrocyLogicStock.php +++ b/GrocyLogicStock.php @@ -160,4 +160,32 @@ class GrocyLogicStock return true; } + + public static function AddMissingProductsToShoppingList() + { + $db = Grocy::GetDbConnection(); + + $missingProducts = self::GetMissingProducts(); + foreach ($missingProducts as $missingProduct) + { + $product = $db->products()->where('id', $missingProduct->id)->fetch(); + $amount = ceil($missingProduct->amount_missing / $product->qu_factor_purchase_to_stock); + + $alreadyExistingEntry = $db->shopping_list()->where('product_id', $missingProduct->id)->fetch(); + if ($alreadyExistingEntry) //Update + { + $alreadyExistingEntry->update(array( + 'amount_autoadded' => $amount + )); + } + else //Insert + { + $shoppinglistRow = $db->shopping_list()->createRow(array( + 'product_id' => $missingProduct->id, + 'amount_autoadded' => $amount + )); + $shoppinglistRow->save(); + } + } + } } diff --git a/grocy.phpproj b/grocy.phpproj index 89063966..931beaa3 100644 --- a/grocy.phpproj +++ b/grocy.phpproj @@ -25,6 +25,8 @@ + + @@ -51,6 +53,8 @@ + + diff --git a/index.php b/index.php index 1eaba6b0..5275d027 100644 --- a/index.php +++ b/index.php @@ -37,7 +37,7 @@ $db = Grocy::GetDbConnection(); $app->get('/', function(Request $request, Response $response) use($db) { $db = Grocy::GetDbConnection(true); //For database schema migration - + return $this->renderer->render($response, '/layout.php', [ 'title' => 'Dashboard', 'contentPage' => 'dashboard.php', @@ -74,6 +74,18 @@ $app->get('/inventory', function(Request $request, Response $response) use($db) ]); }); +$app->get('/shoppinglist', function(Request $request, Response $response) use($db) +{ + return $this->renderer->render($response, '/layout.php', [ + 'title' => 'Shopping list', + 'contentPage' => 'shoppinglist.php', + 'listItems' => $db->shopping_list(), + 'products' => $db->products(), + 'quantityunits' => $db->quantity_units(), + 'missingProducts' => GrocyLogicStock::GetMissingProducts() + ]); +}); + $app->get('/products', function(Request $request, Response $response) use($db) { return $this->renderer->render($response, '/layout.php', [ @@ -170,6 +182,29 @@ $app->get('/quantityunit/{quantityunitId}', function(Request $request, Response } }); +$app->get('/shoppinglist/{itemId}', function(Request $request, Response $response, $args) use($db) +{ + if ($args['itemId'] == 'new') + { + return $this->renderer->render($response, '/layout.php', [ + 'title' => 'Add shopping list item', + 'contentPage' => 'shoppinglistform.php', + 'products' => $db->products(), + 'mode' => 'create' + ]); + } + else + { + return $this->renderer->render($response, '/layout.php', [ + 'title' => 'Edit shopping list item', + 'contentPage' => 'shoppinglistform.php', + 'listItem' => $db->shopping_list($args['itemId']), + 'products' => $db->products(), + 'mode' => 'edit' + ]); + } +}); + $app->group('/api', function() use($db) { $this->get('/get-objects/{entity}', function(Request $request, Response $response, $args) use($db) @@ -260,6 +295,12 @@ $app->group('/api', function() use($db) { echo json_encode(GrocyLogicStock::GetCurrentStock()); }); + + $this->get('/stock/add-missing-products-to-shoppinglist', function(Request $request, Response $response) + { + GrocyLogicStock::AddMissingProductsToShoppingList(); + echo json_encode(array('success' => true)); + }); })->add(function($request, $response, $next) { $response = $next($request, $response); diff --git a/views/consumption.php b/views/consumption.php index e5147f73..0953c638 100644 --- a/views/consumption.php +++ b/views/consumption.php @@ -6,7 +6,7 @@
- diff --git a/views/layout.php b/views/layout.php index fb482c7e..889c0759 100644 --- a/views/layout.php +++ b/views/layout.php @@ -52,6 +52,9 @@
  •  Inventory
    • +
  • +  Shopping list +
      • diff --git a/views/shoppinglist.js b/views/shoppinglist.js new file mode 100644 index 00000000..198d17c7 --- /dev/null +++ b/views/shoppinglist.js @@ -0,0 +1,38 @@ +$(document).on('click', '.shoppinglist-delete-button', function(e) +{ + Grocy.FetchJson('/api/delete-object/shopping_list/' + $(e.target).attr('data-shoppinglist-id'), + function(result) + { + window.location.href = '/shoppinglist'; + }, + function(xhr) + { + console.error(xhr); + } + ); +}); + +$(document).on('click', '#add-products-below-min-stock-amount', function(e) +{ + Grocy.FetchJson('/api/stock/add-missing-products-to-shoppinglist', + function(result) + { + window.location.href = '/shoppinglist'; + }, + function(xhr) + { + console.error(xhr); + } + ); +}); + +$(function() +{ + $('#shoppinglist-table').DataTable({ + 'pageLength': 50, + 'order': [[1, 'asc']], + 'columnDefs': [ + { 'orderable': false, 'targets': 0 } + ] + }); +}); diff --git a/views/shoppinglist.php b/views/shoppinglist.php new file mode 100644 index 00000000..0767c40a --- /dev/null +++ b/views/shoppinglist.php @@ -0,0 +1,45 @@ +
      + +

      + Shopping List + +  Add + + +  Add products that are below defined min. stock amount + +

      + +
      + + + + + + + + + + + + + + + + + +
      #ProductAmount
      + + + + + + + + product_id)->name; ?> + + amount + $listItem->amount_autoadded . ' ' . GrocyPhpHelper::FindObjectInArrayByPropertyValue($quantityunits, 'id', GrocyPhpHelper::FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name; ?> +
      +
      + +
      diff --git a/views/shoppinglistform.js b/views/shoppinglistform.js new file mode 100644 index 00000000..0e662952 --- /dev/null +++ b/views/shoppinglistform.js @@ -0,0 +1,87 @@ +$('#save-shoppinglist-button').on('click', function(e) +{ + e.preventDefault(); + + if (Grocy.EditMode === 'create') + { + Grocy.PostJson('/api/add-object/shopping_list', $('#shoppinglist-form').serializeJSON(), + function(result) + { + window.location.href = '/shoppinglist'; + }, + function(xhr) + { + console.error(xhr); + } + ); + } + else + { + Grocy.PostJson('/api/edit-object/shopping_list/' + Grocy.EditObjectId, $('#shoppinglist-form').serializeJSON(), + function(result) + { + window.location.href = '/shoppinglist'; + }, + function(xhr) + { + console.error(xhr); + } + ); + } +}); + +$(function() +{ + $('.combobox').combobox({ + appendId: '_text_input' + }); + + $('#product_id_text_input').on('change', function(e) + { + var input = $('#product_id_text_input').val().toString(); + var possibleOptionElement = $("#product_id option[data-additional-searchdata*='" + input + "']").first(); + + if (possibleOptionElement.length > 0) + { + $('#product_id').val(possibleOptionElement.val()); + $('#product_id').data('combobox').refresh(); + $('#product_id').trigger('change'); + } + }); + + if (Grocy.EditMode === 'create') + { + $('#product_id').val(''); + $('#product_id_text_input').focus(); + $('#product_id_text_input').val(''); + $('#product_id_text_input').trigger('change'); + } + else + { + $('#product_id').data('combobox').refresh(); + $('#product_id').trigger('change'); + } + + $('#shoppinglist-form').validator(); + $('#shoppinglist-form').validator('validate'); + + $('#amount').on('focus', function(e) + { + if ($('#product_id_text_input').val().length === 0) + { + $('#product_id_text_input').focus(); + } + }); + + $('#shoppinglist-form input').keydown(function(event) + { + if (event.keyCode === 13) //Enter + { + if ($('#shoppinglist-form').validator('validate').has('.has-error').length !== 0) //There is at least one validation error + { + event.preventDefault(); + return false; + } + } + }); +}); diff --git a/views/shoppinglistform.php b/views/shoppinglistform.php new file mode 100644 index 00000000..43995f36 --- /dev/null +++ b/views/shoppinglistform.php @@ -0,0 +1,34 @@ +
      + +

      + + + + + + + +
      + +
      + + +
      +
      + +
      + + +
      +
      + + + +
      + +