From b57fd83cb83286ab632577261c8dee790fbc7714 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sat, 21 Sep 2019 13:08:42 +0200
Subject: [PATCH] Fixed various smaller problems after some testing

---
 controllers/RecipesController.php               | 1 +
 public/viewjs/components/productamountpicker.js | 8 +++++++-
 views/components/productpicker.blade.php        | 1 +
 views/components/recipepicker.blade.php         | 2 ++
 views/productform.blade.php                     | 2 +-
 views/recipeform.blade.php                      | 2 +-
 views/recipes.blade.php                         | 2 ++
 views/stockoverview.blade.php                   | 2 ++
 8 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/controllers/RecipesController.php b/controllers/RecipesController.php
index 8f6cd3da..93b20cd3 100644
--- a/controllers/RecipesController.php
+++ b/controllers/RecipesController.php
@@ -110,6 +110,7 @@ class RecipesController extends BaseController
 			return $this->AppContainer->view->render($response, 'recipeposform', [
 				'mode' => 'create',
 				'recipe' => $this->Database->recipes($args['recipeId']),
+				'recipePos' => new \stdClass(),
 				'products' => $this->Database->products()->orderBy('name'),
 				'quantityUnits' => $this->Database->quantity_units()->orderBy('name'),
 				'quantityUnitConversionsResolved' => $this->Database->quantity_unit_conversions_resolved()
diff --git a/public/viewjs/components/productamountpicker.js b/public/viewjs/components/productamountpicker.js
index 7e60c5b2..ced3987c 100644
--- a/public/viewjs/components/productamountpicker.js
+++ b/public/viewjs/components/productamountpicker.js
@@ -3,9 +3,10 @@ Grocy.Components.ProductAmountPicker.AllowAnyQuEnabled = false;
 
 Grocy.Components.ProductAmountPicker.Reload = function(productId, destinationQuId, forceInitialDisplayQu = false)
 {
+	var conversionsForProduct = FindAllObjectsInArrayByPropertyValue(Grocy.QuantityUnitConversionsResolved, 'product_id', productId);
+
 	if (!Grocy.Components.ProductAmountPicker.AllowAnyQuEnabled)
 	{
-		var conversionsForProduct = FindAllObjectsInArrayByPropertyValue(Grocy.QuantityUnitConversionsResolved, 'product_id', productId);
 		$("#qu_id").find("option").remove().end();
 		$("#qu_id").attr("data-destination-qu-name", FindObjectInArrayByPropertyValue(Grocy.QuantityUnits, 'id', destinationQuId).name);
 		conversionsForProduct.forEach(conversion =>
@@ -27,6 +28,11 @@ Grocy.Components.ProductAmountPicker.Reload = function(productId, destinationQuI
 		Grocy.Components.ProductAmountPicker.InitalValueSet = true;
 	}
 
+	if (conversionsForProduct.length === 1)
+	{
+		$("#qu_id").val($("#qu_id option:first").val());
+	}
+
 	$(".input-group-productamountpicker").trigger("change");
 }
 
diff --git a/views/components/productpicker.blade.php b/views/components/productpicker.blade.php
index 5352d7ad..ecef52c9 100644
--- a/views/components/productpicker.blade.php
+++ b/views/components/productpicker.blade.php
@@ -10,6 +10,7 @@
 @php if(!isset($label)) { $label = 'Product'; } @endphp
 @php if(!isset($disabled)) { $disabled = false; } @endphp
 @php if(empty($hint)) { $hint = ''; } @endphp
+@php if(empty($nextInputSelector)) { $nextInputSelector = ''; } @endphp
 
 <div class="form-group" data-next-input-selector="{{ $nextInputSelector }}" data-disallow-add-product-workflows="{{ BoolToString($disallowAddProductWorkflows) }}" data-disallow-all-product-workflows="{{ BoolToString($disallowAllProductWorkflows) }}" data-prefill-by-name="{{ $prefillByName }}" data-prefill-by-id="{{ $prefillById }}">
 	<label for="product_id">{{ $__t($label) }} <i class="fas fa-barcode"></i><span id="barcode-lookup-disabled-hint" class="small text-muted d-none"> {{ $__t('Barcode lookup is disabled') }}</span>&nbsp;&nbsp;<span class="small text-muted">{{ $hint }}</span></label>
diff --git a/views/components/recipepicker.blade.php b/views/components/recipepicker.blade.php
index 52430ffa..1a1237cf 100644
--- a/views/components/recipepicker.blade.php
+++ b/views/components/recipepicker.blade.php
@@ -6,6 +6,8 @@
 @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>
diff --git a/views/productform.blade.php b/views/productform.blade.php
index 1a20faf6..f6ccda39 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -203,7 +203,7 @@
 				</div>
 			</div>
 
-			@php if($mode == 'edit') { $value = $product->calories; } else { $value = ''; } @endphp
+			@php if($mode == 'edit') { $value = $product->calories; } else { $value = 0; } @endphp
 			@include('components.numberpicker', array(
 				'id' => 'calories',
 				'label' => 'Energy (kcal)',
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index bd1aabca..9b1d2f14 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -24,7 +24,7 @@
 
 		<script>
 			Grocy.EditMode = '{{ $mode }}';
-			Grocy.QuantityUnits = {!! json_encode($quantityUnits) !!};
+			Grocy.QuantityUnits = {!! json_encode($quantityunits) !!};
 			Grocy.QuantityUnitConversionsResolved = {!! json_encode($quantityUnitConversionsResolved) !!};
 		</script>
 
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index 306f2870..14cf1ab7 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -161,12 +161,14 @@
 							'additionalAttributes' => 'data-recipe-id="' . $selectedRecipe->id . '"'
 						))
 					</div>
+					@if(!empty($selectedRecipeTotalCalories) && intval($selectedRecipeTotalCalories) > 0)
 					<div class="col-2">
 						<label>{{ $__t('Energy (kcal)') }}</label>
 						<p class="mb-0">
 							<h3 class="locale-number-format pt-0" data-format="generic">{{ $selectedRecipeTotalCalories }}</h3>
 						</p>
 					</div>
+					@endif
 					@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
 					<div class="col-6">
 						<label>{{ $__t('Costs') }}&nbsp;&nbsp;
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index 59d39480..fe4cb13e 100644
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -162,9 +162,11 @@
 									data-consume-amount="1">
 									<i class="fas fa-utensils"></i> {{ $__t('Consume %1$s of %2$s as spoiled', '1 ' . FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->qu_id_stock)->name, FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name) }}
 								</a>
+								@if(GROCY_FEATURE_FLAG_RECIPES)
 								<a class="dropdown-item" type="button" href="{{ $U('/recipes?search=') }}{{ FindObjectInArrayByPropertyValue($products, 'id', $currentStockEntry->product_id)->name }}">
 									<i class="fas fa-cocktail"></i> {{ $__t('Search for recipes containing this product') }}
 								</a>
+								@endif
 							</div>
 						</div>
 					</td>