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

Fixed consume amount validation when consuming a parent product (fixes #1306)

Browse Source 
More a workaround for now, the max constraint is just removed when the product has child products,
but the amount to be consumed is checked by StockService anyway, so should not be a problem...
This commit is contained in:
Bernd Bestel 2021-07-11 10:21:36 +02:00
parent 684aef0a42
commit 40e16db01f
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grocy.openapi.json
View File

@ -4480,6 +4480,10 @@
"spoil_rate_percent": {
"type": "number",
"format": "number"
},
"has_childs": {
"type": "boolean",
"description": "True when the product is a parent products of others"
}
},
"example": {

6
public/viewjs/consume.js
View File

@ -127,6 +127,7 @@
},
function(xhr)
{
Grocy.FrontendHelpers.ShowGenericError('Error while saving, probably this item already exists', xhr.response);
Grocy.FrontendHelpers.EndUiBusy("consume-form");
console.error(xhr);
}
@ -650,6 +651,11 @@ function RefreshForm()
}
}
if (productDetails.has_childs)
{
$("#display_amount").removeAttr("max");
}
Grocy.FrontendHelpers.ValidateForm("consume-form");
}

3
services/StockService.php
View File

@ -683,7 +683,8 @@ class StockService extends BaseService
'location' => $location,
'average_shelf_life_days' => $averageShelfLifeDays,
'spoil_rate_percent' => $spoilRate,
'is_aggregated_amount' => $stockCurrentRow->is_aggregated_amount
'is_aggregated_amount' => $stockCurrentRow->is_aggregated_amount,
'has_childs' => $this->getDatabase()->products()->where('parent_product_id = :1', $product->id)->count() !== 0,
];
}