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

Some refinements for #501

Browse Source
This commit is contained in:
Bernd Bestel 2020-01-21 20:45:34 +01:00
parent 3a36bdaf45
commit 0816359867
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
9 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
localization/en/stock_transaction_types.po
View File

@ -35,3 +35,6 @@ msgstr "Stock entry edited (old values)"
msgid "stock-edit-new"
msgstr "Stock entry edited (new values)"
msgid "self-production"
msgstr "Self-production"

3
localization/stock_transaction_types.pot
View File

@ -35,3 +35,6 @@ msgstr ""
msgid "stock-edit-new"
msgstr ""
msgid "self-production"
msgstr ""

9
localization/strings.pot
View File

@ -1618,3 +1618,12 @@ msgstr ""
msgid "A purchased date is required"
msgstr ""
msgid "When a product is selected, one unit (per serving in purchase quantity unit) will be added to stock on consuming this recipe"
msgstr ""
msgid "Produces product"
msgstr ""
msgid "This booking cannot be undone"
msgstr ""

32
migrations/0095.sql
View File

@ -20,6 +20,22 @@ ADD correlation_id TEXT;
ALTER TABLE stock_log
ADD transaction_id TEXT;
ALTER TABLE stock_log
ADD stock_row_id INTEGER;
DROP VIEW stock_current_locations;
CREATE VIEW stock_current_locations
AS
SELECT
1 AS id, -- Dummy, LessQL needs an id column
s.product_id,
s.location_id AS location_id,
l.name AS location_name
FROM stock s
JOIN locations l
ON s.location_id = l.id
GROUP BY s.product_id, s.location_id, l.name;
ALTER TABLE recipes
ADD product_id INTEGER;
@ -38,19 +54,3 @@ FROM recipes r
LEFT JOIN recipes_pos_resolved rpr
ON r.id = rpr.recipe_id
GROUP BY r.id;
ALTER TABLE stock_log
ADD stock_row_id INTEGER;
DROP VIEW stock_current_locations;
CREATE VIEW stock_current_locations
AS
SELECT
1 AS id, -- Dummy, LessQL needs an id column
s.product_id,
s.location_id AS location_id,
l.name AS location_name
FROM stock s
JOIN locations l
ON s.location_id = l.id
GROUP BY s.product_id, s.location_id, l.name;

17
public/viewjs/recipeform.js
View File

@ -1,8 +1,4 @@
$(document).ready(function() {
Grocy.Components.ProductPicker.GetPicker().trigger('change');
} );
$('#save-recipe-button').on('click', function(e)
$('#save-recipe-button').on('click', function(e)
{
e.preventDefault();
@ -351,15 +347,4 @@ $(window).on("message", function(e)
{
window.location.href = U('/recipe/' + Grocy.EditObjectId);
}
});
Grocy.Components.ProductPicker.GetPicker().on('change', function(e)
{
var productId = $(e.target).val();
if (productId)
{
Grocy.Components.ProductCard.Refresh(productId);
}
});

16
services/RecipesService.php
View File

@ -67,15 +67,6 @@ class RecipesService extends BaseService
throw new \Exception('Recipe does not exist');
}
$recipeRow = $this->Database->recipes()->where('id = :1', $recipeId)->fetch();
if ($recipeRow->product_id != null)
{
$recipeResolvedRow = $this->Database->recipes_resolved()->where('recipe_id = :1', $recipeId)->fetch();
$price = number_format($recipeResolvedRow->costs, 2);
$bookingAmount = floatval($recipeRow->desired_servings);
$this->StockService->AddProduct($recipeRow->product_id, $bookingAmount, null, StockService::TRANSACTION_TYPE_PURCHASE, date('Y-m-d'), $price);
}
$recipePositions = $this->Database->recipes_pos_resolved()->where('recipe_id', $recipeId)->fetchAll();
foreach ($recipePositions as $recipePosition)
{
@ -84,6 +75,13 @@ class RecipesService extends BaseService
$this->StockService->ConsumeProduct($recipePosition->product_id, $recipePosition->recipe_amount, false, StockService::TRANSACTION_TYPE_CONSUME, 'default', $recipeId);
}
}
$recipeRow = $this->Database->recipes()->where('id = :1', $recipeId)->fetch();
if (!empty($recipeRow->product_id))
{
$recipeResolvedRow = $this->Database->recipes_resolved()->where('recipe_id = :1', $recipeId)->fetch();
$this->StockService->AddProduct($recipeRow->product_id, floatval($recipeRow->desired_servings), null, StockService::TRANSACTION_TYPE_SELF_PRODUCTION, date('Y-m-d'), floatval($recipeResolvedRow->costs));
}
}
private function RecipeExists($recipeId)

3
services/StockService.php
View File

@ -12,6 +12,7 @@ class StockService extends BaseService
const TRANSACTION_TYPE_STOCK_EDIT_NEW = 'stock-edit-new';
const TRANSACTION_TYPE_STOCK_EDIT_OLD = 'stock-edit-old';
const TRANSACTION_TYPE_PRODUCT_OPENED = 'product-opened';
const TRANSACTION_TYPE_SELF_PRODUCTION = 'self-production';
public function GetCurrentStock($includeNotInStockButMissingProducts = false)
{
@ -242,7 +243,7 @@ class StockService extends BaseService
}
}
if ($transactionType === self::TRANSACTION_TYPE_PURCHASE || $transactionType === self::TRANSACTION_TYPE_INVENTORY_CORRECTION)
if ($transactionType === self::TRANSACTION_TYPE_PURCHASE || $transactionType === self::TRANSACTION_TYPE_INVENTORY_CORRECTION || $transactionType == self::TRANSACTION_TYPE_SELF_PRODUCTION)
{
if ($transactionId === null)
{

22
views/recipeform.blade.php
View File

@ -61,13 +61,7 @@
'value' => $value,
'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
'hint' => $__t('The ingredients listed here result in this amount of servings')
))
@include('components.productpicker', array(
'products' => $products,
'isRequired' => false,
'label' => 'Creates Product'
))
))
<div class="form-group">
<div class="form-check">
@ -89,6 +83,15 @@
</div>
</div>
@include('components.productpicker', array(
'products' => $products,
'isRequired' => false,
'label' => 'Produces product',
'prefillById' => $recipe->product_id,
'disallowAllProductWorkflows' => true,
'hint' => $__t('When a product is selected, one unit (per serving in purchase quantity unit) will be added to stock on consuming this recipe')
))
@include('components.userfieldsform', array(
'userfields' => $userfields,
'entity' => 'recipes'
@ -222,11 +225,6 @@
@endif
</div>
</div>
<div class="row mt-5">
<div class="col">
@include('components.productcard')
</div>
</div>
</div>
</div>

2
views/recipes.blade.php
View File

@ -137,7 +137,7 @@
<a class="btn btn-sm btn-outline-primary py-0 recipe-order-missing-button hide-when-embedded hide-on-fullscreen-card @if(FindObjectInArrayByPropertyValue($recipesResolved, 'recipe_id', $selectedRecipe->id)->need_fulfilled_with_shopping_list == 1) disabled @endif" href="#" data-toggle="tooltip" title="{{ $__t('Put missing products on shopping list') }}" data-recipe-id="{{ $selectedRecipe->id }}" data-recipe-name="{{ $selectedRecipe->name }}">
<i class="fas fa-cart-plus"></i>
</a>&nbsp;&nbsp;
<a id="selectedRecipeEditButton" class="btn btn-sm btn-outline-info hide-when-embedded hide-on-fullscreen-card py-0" href="{{ $U('/recipe/') }}{{ $selectedRecipe->id }}?product={{ $selectedRecipe->product_id }}">
<a id="selectedRecipeEditButton" class="btn btn-sm btn-outline-info hide-when-embedded hide-on-fullscreen-card py-0" href="{{ $U('/recipe/') }}{{ $selectedRecipe->id }}">
<i class="fas fa-edit"></i>
</a>
<a id="selectedRecipeDeleteButton" class="btn btn-sm btn-outline-danger hide-when-embedded hide-on-fullscreen-card py-0" href="#" data-recipe-id="{{ $selectedRecipe->id }}" data-recipe-name="{{ $selectedRecipe->name }}">