From 966211b71ad8d39ee2111fdf4c598827ae0c29b6 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sat, 2 Jan 2021 17:30:28 +0100
Subject: [PATCH] Fixed shopping list product userfields (fixes #1246)

---
 views/shoppinglist.blade.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index d9b497a5..d6fe522c 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -265,7 +265,7 @@
 					))
 					@include('components.userfields_tbody', array(
 					'userfields' => $productUserfields,
-					'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $listItem->product_id)
+					'userfieldValues' => FindAllObjectsInArrayByPropertyValue($productUserfieldValues, 'object_id', $listItem->product_id)
 					))
 
 				</tr>
@@ -352,6 +352,9 @@
 						@include('components.userfields_thead', array(
 						'userfields' => $userfields
 						))
+						@include('components.userfields_thead', array(
+						'userfields' => $productUserfields
+						))
 
 					</tr>
 				</thead>
@@ -370,7 +373,11 @@
 
 						@include('components.userfields_tbody', array(
 						'userfields' => $userfields,
-						'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $listItem->product_id)
+						'userfieldValues' => FindAllObjectsInArrayByPropertyValue($userfieldValues, 'object_id', $listItem->id)
+						))
+						@include('components.userfields_tbody', array(
+						'userfields' => $productUserfields,
+						'userfieldValues' => FindAllObjectsInArrayByPropertyValue($productUserfieldValues, 'object_id', $listItem->product_id)
 						))
 
 					</tr>