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

Started working on qu unit conversion handling (references #177)

Browse Source
This commit is contained in:
Bernd Bestel 2019-09-15 17:06:52 +02:00
parent 6094096675
commit c532a67884
No known key found for this signature in database
GPG Key ID: 71BD34C0D4891300
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
migrations/0082.sql
View File

@ -35,6 +35,7 @@ SELECT CASE WHEN((
WHERE from_qu_id = NEW.from_qu_id WHERE from_qu_id = NEW.from_qu_id
AND to_qu_id = NEW.to_qu_id AND to_qu_id = NEW.to_qu_id
AND IFNULL(product_id, 0) = IFNULL(NEW.product_id, 0) AND IFNULL(product_id, 0) = IFNULL(NEW.product_id, 0)
AND id != NEW.id
UNION UNION
SELECT 1 SELECT 1
FROM products FROM products

2
views/quantityunitconversionform.blade.php
View File

@ -58,7 +58,7 @@
'id' => 'factor', 'id' => 'factor',
'label' => 'Factor', 'label' => 'Factor',
'min' => 0, 'min' => 0,
'step' => 0.01, 'step' => 0.001,
'value' => $value, 'value' => $value,
'invalidFeedback' => $__t('The amount cannot be lower than %s and must be a valid number', '0'), 'invalidFeedback' => $__t('The amount cannot be lower than %s and must be a valid number', '0'),
'additionalHtmlElements' => '<p id="qu-conversion-info" class="form-text text-info d-none"></p>', 'additionalHtmlElements' => '<p id="qu-conversion-info" class="form-text text-info d-none"></p>',