diff --git a/changelog/58_UNRELEASED_2020-xx-xx.md b/changelog/58_UNRELEASED_2020-xx-xx.md index 6c2cd1df..ef04ffad 100644 --- a/changelog/58_UNRELEASED_2020-xx-xx.md +++ b/changelog/58_UNRELEASED_2020-xx-xx.md @@ -14,6 +14,7 @@ ### Shopping list fixes - Fixed that the "shopping list to stock workflow"-dialog was not visible in compact view +- Fixed that when printing the shopping list configured userfields were not included ### Recipe fixes - Fixed that when editing an ingredient with "Only check if a single unit is in stock" set, the quantity unit was always set to the products stock quantity unit regardless if a different one was selected for that ingredient diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php index e0dcb905..315c51c1 100644 --- a/views/shoppinglist.blade.php +++ b/views/shoppinglist.blade.php @@ -209,6 +209,11 @@ {{ $__t('Product') }} / {{ $__t('Note') }} {{ $__t('Amount') }} + + @include('components.userfields_thead', array( + 'userfields' => $userfields + )) + @@ -220,6 +225,12 @@ {{ $listItem->amount }} @if(!empty($listItem->product_id)){{ $__n($listItem->amount, 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 + + @include('components.userfields_tbody', array( + 'userfields' => $userfields, + 'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $listItem->product_id) + )) + @endforeach