Use producamountpicker "everywhere" (closes #1015)

views/components/datetimepicker.blade.php

@@ -19,8 +19,12 @@
 <div id="datetimepicker-wrapper"
 	class="form-group {{ $additionalGroupCssClasses }}">
 	<label for="{{ $id }}">{{ $__t($label) }}
+		@if(!empty($hint))
+		&nbsp;<i class="fas fa-question-circle"
+			data-toggle="tooltip"
+			title="{{ $hint }}"></i>
+		@endif
 		<span class="small text-muted">
-			@if(!empty($hint)){{ $__t($hint) }}@endif
 			<time id="datetimepicker-timeago"
 				class="timeago timeago-contextual"></time>
 		</span>
@@ -63,13 +67,21 @@
 		<div id="datetimepicker-earlier-than-info"
 			class="form-text text-info font-italic d-none">{{ $earlierThanInfoText }}</div>
 		@if(isset($shortcutValue) && isset($shortcutLabel))
-		<div class="form-check w-100">
-			<input class="form-check-input"
-				type="checkbox"
-				id="datetimepicker-shortcut"
-				data-datetimepicker-shortcut-value="{{ $shortcutValue }}">
-			<label class="form-check-label"
-				for="datetimepicker-shortcut">{{ $__t($shortcutLabel) }}</label>
+		<div class="form-group my-0">
+			<div class="custom-control custom-checkbox">
+				<input type="hidden"
+					name="datetimepicker-shortcut"
+					value="0">
+				<input class="form-check-input custom-control-input"
+					type="checkbox"
+					id="datetimepicker-shortcut"
+					name="datetimepicker-shortcut"
+					value="1"
+					data-datetimepicker-shortcut-value="{{ $shortcutValue }}">
+				<label class="form-check-label custom-control-label"
+					for="datetimepicker-shortcut">{{ $__t($shortcutLabel) }}
+				</label>
+			</div>
 		</div>
 		@endif
 	</div>

views/components/datetimepicker2.blade.php

@@ -18,8 +18,12 @@
 <div id="datetimepicker2-wrapper"
 	class="form-group {{ $additionalGroupCssClasses }}">
 	<label for="{{ $id }}">{{ $__t($label) }}
+		@if(!empty($hint))
+		&nbsp;<i class="fas fa-question-circle"
+			data-toggle="tooltip"
+			title="{{ $hint }}"></i>
+		@endif
 		<span class="small text-muted">
-			@if(!empty($hint)){{ $__t($hint) }}@endif
 			<time id="datetimepicker2-timeago"
 				class="timeago timeago-contextual"></time>
 		</span>

views/components/productamountpicker.blade.php

@@ -3,10 +3,13 @@
 @endpush
 
 @php if(empty($additionalGroupCssClasses)) { $additionalGroupCssClasses = ''; } @endphp
+@php if(empty($additionalHtmlContextHelp)) { $additionalHtmlContextHelp = ''; } @endphp
 
-<div class="form-group row {{ $additionalGroupCssClasses }}">
+<div class="form-group row mb-0 {{ $additionalGroupCssClasses }}">
 	<div class="col">
-		<div class="row">
+		{!! $additionalHtmlContextHelp !!}
+
+		<div class="row my-0">
 
 			@include('components.numberpicker', array(
 			'id' => 'display_amount',
@@ -15,11 +18,12 @@
 			'decimals' => $userSettings['stock_decimal_places_amounts'],
 			'value' => $value,
 			'invalidFeedback' => $__t('This cannot be negative and must be an integral number'),
-			'additionalGroupCssClasses' => 'col-4 mb-1',
-			'additionalCssClasses' => 'input-group-productamountpicker'
+			'additionalGroupCssClasses' => 'col-5 mb-1',
+			'additionalCssClasses' => 'input-group-productamountpicker',
+			'additionalHtmlContextHelp' => ''
 			))
 
-			<div class="form-group col-8 mb-1">
+			<div class="form-group col-7 mb-1">
 				<label for="qu_id">{{ $__t('Quantity unit') }}</label>
 				<select required
 					class="form-control input-group-productamountpicker"

views/components/recipepicker.blade.php

@@ -6,15 +6,19 @@
 @php if(empty($prefillById)) { $prefillById = ''; } @endphp
 @php if(!isset($isRequired)) { $isRequired = true; } @endphp
 @php if(empty($hint)) { $hint = ''; } @endphp
-@php if(empty($hintId)) { $hintId = ''; } @endphp
 @php if(empty($nextInputSelector)) { $nextInputSelector = ''; } @endphp
 
 <div class="form-group"
 	data-next-input-selector="{{ $nextInputSelector }}"
 	data-prefill-by-name="{{ $prefillByName }}"
 	data-prefill-by-id="{{ $prefillById }}">
-	<label for="recipe_id">{{ $__t('Recipe') }}&nbsp;&nbsp;<span id="{{ $hintId }}"
-			class="small text-muted">{{ $hint }}</span></label>
+	<label for="recipe_id">{{ $__t('Recipe') }}
+		@if(!empty($hint))
+		&nbsp;<i class="fas fa-question-circle"
+			data-toggle="tooltip"
+			title="{{ $hint }}"></i>
+		@endif
+	</label>
 	<select class="form-control recipe-combobox"
 		id="recipe_id"
 		name="recipe_id"