From 80beff2cae4f6f16916ce3758a2b66d29fd03a6e Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Mon, 19 Oct 2020 20:03:26 +0200
Subject: [PATCH] Fixed price input decimals, started reviewing all number
 inputs (fixes #1076, references #998)

---
 views/choreform.blade.php                      |  3 ++-
 views/components/numberpicker.blade.php        |  7 ++++---
 views/components/productamountpicker.blade.php |  3 ++-
 views/components/userfieldsform.blade.php      |  3 ++-
 views/consume.blade.php                        | 10 +++++++---
 views/inventory.blade.php                      |  2 ++
 views/mealplan.blade.php                       |  3 ++-
 views/productbarcodesform.blade.php            |  3 ++-
 views/productform.blade.php                    | 12 ++++++++----
 views/purchase.blade.php                       |  9 ++++++---
 views/quantityunitconversionform.blade.php     |  3 ++-
 views/quantityunitpluraltesting.blade.php      |  3 ++-
 views/recipeform.blade.php                     |  6 ++++--
 views/recipeposform.blade.php                  |  3 ++-
 views/recipes.blade.php                        |  3 ++-
 views/shoppinglistitemform.blade.php           |  1 +
 views/stockentryform.blade.php                 |  6 ++++--
 views/stocksettings.blade.php                  |  4 +++-
 views/transfer.blade.php                       |  3 ++-
 19 files changed, 59 insertions(+), 28 deletions(-)

diff --git a/views/choreform.blade.php b/views/choreform.blade.php
index a844a625..3ebb9651 100644
--- a/views/choreform.blade.php
+++ b/views/choreform.blade.php
@@ -255,7 +255,8 @@
 			'id' => 'product_amount',
 			'label' => 'Amount',
 			'hintId' => 'amount_qu_unit',
-			'min' => 0.0001,
+			'min' => 0.01,
+			'decimals' => 2,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
 			'isRequired' => false,
 			'value' => $value
diff --git a/views/components/numberpicker.blade.php b/views/components/numberpicker.blade.php
index 0ad4543a..ee647cae 100644
--- a/views/components/numberpicker.blade.php
+++ b/views/components/numberpicker.blade.php
@@ -5,6 +5,7 @@
 @php if(!isset($value)) { $value = 1; } @endphp
 @php if(empty($min)) { $min = 0; } @endphp
 @php if(empty($max)) { $max = 999999; } @endphp
+@php if(empty($decimals)) { $decimals = 0; } @endphp
 @php if(empty($hint)) { $hint = ''; } @endphp
 @php if(empty($hintId)) { $hintId = ''; } @endphp
 @php if(empty($additionalCssClasses)) { $additionalCssClasses = ''; } @endphp
@@ -33,9 +34,9 @@
 			name="{{ $id }}"
 			@endif
 			value="{{ $value }}"
-			min="{{ $min }}"
-			max="{{ $max }}"
-			step="{{ $min }}"
+			min="{{ number_format($min, $decimals, '.', '') }}"
+			max="{{ number_format($max, $decimals, '.', '') }}"
+			step="@if($decimals == 0){{1}}@else{{'.' . substr('0000000001', -$decimals)}}@endif"
 			@if($isRequired)
 			required
 			@endif>
diff --git a/views/components/productamountpicker.blade.php b/views/components/productamountpicker.blade.php
index 2864f644..d94cb21b 100644
--- a/views/components/productamountpicker.blade.php
+++ b/views/components/productamountpicker.blade.php
@@ -11,7 +11,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'display_amount',
 			'label' => 'Amount',
-			'min' => 0,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => $value,
 			'invalidFeedback' => $__t('This cannot be negative and must be an integral number'),
 			'additionalGroupCssClasses' => 'col-4 mb-1',
diff --git a/views/components/userfieldsform.blade.php b/views/components/userfieldsform.blade.php
index 9b0dbf57..f8311384 100644
--- a/views/components/userfieldsform.blade.php
+++ b/views/components/userfieldsform.blade.php
@@ -41,7 +41,8 @@
 	'id' => '',
 	'label' => $userfield->caption,
 	'noNameAttribute' => true,
-	'min' => 0,
+	'min' => 0.01,
+	'decimals' => 2,
 	'isRequired' => false,
 	'additionalCssClasses' => 'userfield-input',
 	'additionalAttributes' => 'data-userfield-name="' . $userfield->name . '"'
diff --git a/views/consume.blade.php b/views/consume.blade.php
index 82bb1c8b..2f40f018 100644
--- a/views/consume.blade.php
+++ b/views/consume.blade.php
@@ -43,15 +43,19 @@
 			'nextInputSelector' => '#amount',
 			'disallowAddProductWorkflows' => true
 			))
-			<label for="consume-exact-amount" class="d-none">
-				<input type="checkbox" id="consume-exact-amount" name="exact_amount">
+			<label for="consume-exact-amount"
+				class="d-none">
+				<input type="checkbox"
+					id="consume-exact-amount"
+					name="exact_amount">
 				{{ $__t('Consume exact amount') }}
 			</label>
 			@include('components.numberpicker', array(
 			'id' => 'amount',
 			'label' => 'Amount',
 			'hintId' => 'amount_qu_unit',
-			'min' => 1,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => 0,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
 			'additionalHtmlContextHelp' => '<div id="tare-weight-handling-info"
diff --git a/views/inventory.blade.php b/views/inventory.blade.php
index 39c23757..4b68fe51 100644
--- a/views/inventory.blade.php
+++ b/views/inventory.blade.php
@@ -23,6 +23,7 @@
 			'label' => 'New amount',
 			'hintId' => 'new_amount_qu_unit',
 			'min' => 0,
+			'decimals' => 2,
 			'value' => 1,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
 			'additionalAttributes' => 'data-not-equal="-1"',
@@ -64,6 +65,7 @@
 			'id' => 'price',
 			'label' => 'Price',
 			'min' => 0,
+			'decimals' => 2,
 			'value' => '',
 			'hint' => $__t('in %s per purchase quantity unit', GROCY_CURRENCY),
 			'additionalHtmlContextHelp' => '<br><span class="small text-muted">' . $__t('This will apply to added products') . '</span>',
diff --git a/views/mealplan.blade.php b/views/mealplan.blade.php
index d45e3e4d..2434b938 100644
--- a/views/mealplan.blade.php
+++ b/views/mealplan.blade.php
@@ -61,7 +61,8 @@
 					@include('components.numberpicker', array(
 					'id' => 'recipe_servings',
 					'label' => 'Servings',
-					'min' => 1,
+					'min' => 0.01,
+					'decimals' => 2,
 					'value' => '1',
 					'invalidFeedback' => $__t('This cannot be lower than %s', '1')
 					))
diff --git a/views/productbarcodesform.blade.php b/views/productbarcodesform.blade.php
index 8ecf9a00..6673e958 100644
--- a/views/productbarcodesform.blade.php
+++ b/views/productbarcodesform.blade.php
@@ -55,7 +55,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'qu_factor_purchase_to_stock',
 			'label' => 'Factor purchase to stock quantity unit',
-			'min' => 1,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => $value,
 			'isRequired' => true,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
diff --git a/views/productform.blade.php b/views/productform.blade.php
index bccbc1f0..623077e6 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -142,7 +142,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'min_stock_amount',
 			'label' => 'Minimum stock amount',
-			'min' => 0,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => $value,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
 			'additionalGroupCssClasses' => 'mb-1'
@@ -244,7 +245,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'qu_factor_purchase_to_stock',
 			'label' => 'Factor purchase to stock quantity unit',
-			'min' => 1,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => $value,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
 			'additionalCssClasses' => 'input-group-qu',
@@ -285,7 +287,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'tare_weight',
 			'label' => 'Tare weight',
-			'min' => 0,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => $value,
 			'invalidFeedback' => $__t('This cannot be lower than %s', '0'),
 			'additionalAttributes' => $additionalAttributes,
@@ -313,7 +316,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'calories',
 			'label' => 'Energy (kcal)',
-			'min' => 0,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => $value,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '0'),
 			'hint' => $__t('Per stock quantity unit'),
diff --git a/views/purchase.blade.php b/views/purchase.blade.php
index b4b717dc..63c49fab 100644
--- a/views/purchase.blade.php
+++ b/views/purchase.blade.php
@@ -47,7 +47,8 @@
 			'id' => 'amount',
 			'label' => 'Amount',
 			'hintId' => 'amount_qu_unit',
-			'min' => 1,
+			'min' => 0.01,
+			'decimals' => 2,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
 			'additionalHtmlContextHelp' => '<div id="tare-weight-handling-info"
 				class="text-info font-italic d-none">' . $__t('Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated') . '</div>'
@@ -93,7 +94,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'price',
 			'label' => 'Price',
-			'min' => 0,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => '',
 			'hintId' => 'price-hint',
 			'invalidFeedback' => $__t('The price cannot be lower than %s', '0'),
@@ -133,7 +135,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'qu_factor_purchase_to_stock',
 			'label' => 'Factor purchase to stock quantity unit',
-			'min' => 1,
+			'min' => 0.01,
+			'decimals' => 2,
 			'additionalGroupCssClasses' => 'd-none',
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
 			'additionalCssClasses' => 'input-group-qu',
diff --git a/views/quantityunitconversionform.blade.php b/views/quantityunitconversionform.blade.php
index 781b50cb..432f06cc 100644
--- a/views/quantityunitconversionform.blade.php
+++ b/views/quantityunitconversionform.blade.php
@@ -81,7 +81,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'factor',
 			'label' => 'Factor',
-			'min' => 0,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => $value,
 			'invalidFeedback' => $__t('This cannot be lower than %1$s and must be a valid number with max. %2$s decimal places', '0', '3'),
 			'additionalHtmlElements' => '<p id="qu-conversion-info"
diff --git a/views/quantityunitpluraltesting.blade.php b/views/quantityunitpluraltesting.blade.php
index ffc5ef33..03817d00 100644
--- a/views/quantityunitpluraltesting.blade.php
+++ b/views/quantityunitpluraltesting.blade.php
@@ -38,7 +38,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'amount',
 			'label' => 'Amount',
-			'min' => 0,
+			'min' => 0.01,
+			'decimals' => 2,
 			'isRequired' => false,
 			'value' => 1
 			))
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index d7da2254..9ca0ad36 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -91,7 +91,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'base_servings',
 			'label' => 'Servings',
-			'min' => 1,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => $value,
 			'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
 			'hint' => $__t('The ingredients listed here result in this amount of servings')
@@ -333,7 +334,8 @@
 					@include('components.numberpicker', array(
 					'id' => 'includes_servings',
 					'label' => 'Servings',
-					'min' => 1,
+					'min' => 0.01,
+					'decimals' => 2,
 					'value' => '1',
 					'invalidFeedback' => $__t('This cannot be lower than %s', '1')
 					))
diff --git a/views/recipeposform.blade.php b/views/recipeposform.blade.php
index 8f9e8085..f42d129c 100644
--- a/views/recipeposform.blade.php
+++ b/views/recipeposform.blade.php
@@ -106,7 +106,8 @@
 			@include('components.numberpicker', array(
 			'id' => 'price_factor',
 			'label' => 'Price factor',
-			'min' => 0,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => '',
 			'hint' => $__t('The resulting price of this ingredient will be multiplied by this factor'),
 			'invalidFeedback' => $__t('This cannot be lower than %s', '0'),
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index 42ceeda1..98cc4198 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -297,7 +297,8 @@
 								@include('components.numberpicker', array(
 								'id' => 'servings-scale',
 								'label' => 'Desired servings',
-								'min' => 1,
+								'min' => 0.01,
+								'decimals' => 2,
 								'value' => $recipe->desired_servings,
 								'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
 								'additionalAttributes' => 'data-recipe-id="' . $recipe->id . '"',
diff --git a/views/shoppinglistitemform.blade.php b/views/shoppinglistitemform.blade.php
index 097787f9..ea4cf508 100644
--- a/views/shoppinglistitemform.blade.php
+++ b/views/shoppinglistitemform.blade.php
@@ -65,6 +65,7 @@
 			'label' => 'Amount',
 			'hintId' => 'amount_qu_unit',
 			'min' => 0.01,
+			'decimals' => 2,
 			'value' => $value,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '0.01')
 			))
diff --git a/views/stockentryform.blade.php b/views/stockentryform.blade.php
index 93b5f889..2cb5af43 100644
--- a/views/stockentryform.blade.php
+++ b/views/stockentryform.blade.php
@@ -66,7 +66,8 @@
 			'id' => 'qu_factor_purchase_to_stock',
 			'label' => 'Factor purchase to stock quantity unit',
 			'value' => $stockEntry->qu_factor_purchase_to_stock,
-			'min' => 1,
+			'min' => 0.01,
+			'decimals' => 2,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
 			'additionalCssClasses' => 'input-group-qu',
 			'additionalHtmlElements' => '<p id="qu-conversion-info"
@@ -88,7 +89,8 @@
 			'id' => 'price',
 			'value' => $price,
 			'label' => 'Price',
-			'min' => 0,
+			'min' => 0.01,
+			'decimals' => 2,
 			'hint' => $__t('in %s per purchase quantity unit', GROCY_CURRENCY),
 			'invalidFeedback' => $__t('The price cannot be lower than %s', '0'),
 			'isRequired' => false
diff --git a/views/stocksettings.blade.php b/views/stocksettings.blade.php
index f6c1dcd2..f314f8df 100644
--- a/views/stocksettings.blade.php
+++ b/views/stocksettings.blade.php
@@ -71,6 +71,7 @@
 		'additionalAttributes' => 'data-setting-key="stock_default_purchase_amount"',
 		'label' => 'Default amount for purchase',
 		'min' => 0,
+		'decimals' => 2,
 		'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
 		'additionalCssClasses' => 'user-setting-control'
 		))
@@ -80,7 +81,8 @@
 		'id' => 'stock_default_consume_amount',
 		'additionalAttributes' => 'data-setting-key="stock_default_consume_amount"',
 		'label' => 'Default amount for consume',
-		'min' => 1,
+		'min' => 0,
+		'decimals' => 2,
 		'invalidFeedback' => $__t('This cannot be lower than %s', '1'),
 		'additionalCssClasses' => 'user-setting-control'
 		))
diff --git a/views/transfer.blade.php b/views/transfer.blade.php
index 1e96f3d1..f422c9ca 100644
--- a/views/transfer.blade.php
+++ b/views/transfer.blade.php
@@ -46,7 +46,8 @@
 			'id' => 'amount',
 			'label' => 'Amount',
 			'hintId' => 'amount_qu_unit',
-			'min' => 1,
+			'min' => 0.01,
+			'decimals' => 2,
 			'value' => 1,
 			'invalidFeedback' => $__t('The amount cannot be lower than %s', '1'),
 			'additionalHtmlContextHelp' => '<div id="tare-weight-handling-info"