kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-20 04:12:59 +00:00
Code Issues Projects Releases Wiki Activity

Allow decimal amounts in general for the shopping list

Browse Source
This commit is contained in:
Bernd Bestel
2020-08-24 20:25:50 +02:00
parent ece880ea44
commit 3b564294e3
5 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/RecipesService.php
View File

@@ -38,10 +38,10 @@ class RecipesService extends BaseService
{
$product = $this->getDataBase()->products($recipePosition->product_id);
$toOrderAmount = ceil(($recipePosition->missing_amount - $recipePosition->amount_on_shopping_list) / $product->qu_factor_purchase_to_stock);
$toOrderAmount = round(($recipePosition->missing_amount - $recipePosition->amount_on_shopping_list) / $product->qu_factor_purchase_to_stock, 2);
if ($recipe->not_check_shoppinglist == 1)
{
$toOrderAmount = ceil($recipePosition->missing_amount / $product->qu_factor_purchase_to_stock);
$toOrderAmount = round($recipePosition->missing_amount / $product->qu_factor_purchase_to_stock, 2);
}
if($toOrderAmount > 0)

2
services/StockService.php
View File

@@ -905,7 +905,7 @@ class StockService extends BaseService
if ($productRow != null && !empty($productRow))
{
$newAmount = $productRow->amount - $amount;
if ($newAmount < 1)
if ($newAmount < 0.01)
{
$productRow->delete();
}