diff --git a/views/recipes.blade.php b/views/recipes.blade.php index f347da93..44897f71 100644 --- a/views/recipes.blade.php +++ b/views/recipes.blade.php @@ -85,7 +85,7 @@ @if(FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->need_fulfilled == 1) {{ $L('Enough in stock') }} @else {{ $L('Not enough in stock, #1 missing, #2 already on shopping list', FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->missing_amount, FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->amount_on_shopping_list) }} @endif @if(!empty($selectedRecipePosition->note)) -
{{ $selectedRecipePosition->note }}
+
{!! nl2br($selectedRecipePosition->note) !!}
@endif @php $lastGroup = $selectedRecipePosition->ingredient_group; @endphp @@ -116,7 +116,7 @@ @if(FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->need_fulfilled == 1) {{ $L('Enough in stock') }} @else {{ $L('Not enough in stock, #1 missing, #2 already on shopping list', FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->missing_amount, FindObjectInArrayByPropertyValue($recipesFulfillment, 'recipe_pos_id', $selectedRecipePosition->id)->amount_on_shopping_list) }} @endif @if(!empty($selectedRecipePosition->note)) -
{{ $selectedRecipePosition->note }}
+
{!! nl2br($selectedRecipePosition->note) !!}
@endif @php $lastGroup = $selectedRecipePosition->ingredient_group; @endphp diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php index 358ebd6a..72e6486a 100644 --- a/views/shoppinglist.blade.php +++ b/views/shoppinglist.blade.php @@ -71,7 +71,7 @@ - @if(!empty($listItem->product_id)) {{ FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name }}
@endif{{ $listItem->note }} + @if(!empty($listItem->product_id)) {{ FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->name }}
@endif{!! nl2br($listItem->note) !!} {{ $listItem->amount + $listItem->amount_autoadded }} @if(!empty($listItem->product_id)){{ Pluralize($listItem->amount + $listItem->amount_autoadded, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name, FindObjectInArrayByPropertyValue($quantityunits, 'id', FindObjectInArrayByPropertyValue($products, 'id', $listItem->product_id)->qu_id_purchase)->name_plural) }}@endif