From 8fa59c684060537f03413bc76cfe5452ff74b116 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 11 Sep 2019 13:54:07 +0200 Subject: [PATCH] wip #3030 @0.25 --- app/Models/Product.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Models/Product.php b/app/Models/Product.php index aec395c..db10a99 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -281,6 +281,9 @@ class Product extends CubistMagicPageModel if ($specEntity->type == 'numeric_list' && is_array($val)) { $specValue .= ' ' . implode(' ' . $specEntity->separator . ' ', $val); } else { + if (is_array($val)) { + $val = array_unshift($val); + } $specValue = $val; } $specValue .= ' ' . $specEntity->unit; @@ -292,6 +295,9 @@ class Product extends CubistMagicPageModel } $specValue = $val['first'] . ' ' . __('à') . ' ' . $val['second'] . ' ' . $specEntity->unit; } else if ($specEntity->type == 'list') { + if (is_array($val)) { + continue; + } $option = Json::decodeRecursive($specEntity->options, Json::TYPE_ARRAY)[$val]; $locale = App::getLocale(); -- 2.39.5