fix: custom field passing had a mega error :-/

src/QUI/ERP/Accounting/Article.php

@@ -490,18 +490,6 @@ public function toArray()
             $discount = $this->Discount->toJSON();
         }
 
-        $customFields = array_filter($this->customFields, function ($v) {
-            if (is_string($v)) {
-                return true;
-            }
-
-            if (is_numeric($v)) {
-                return true;
-            }
-
-            return false;
-        });
-
         return [
             // article data
             'id'           => $this->getId(),
@@ -515,7 +503,7 @@ public function toArray()
             'discount'     => $discount,
             'control'      => $this->attributes['control'],
             'class'        => self::class,
-            'customFields' => $customFields,
+            'customFields' => $this->customFields,
 
             // calculated data
             'calculated'   => [
@@ -558,6 +546,5 @@ public function getCustomFields()
         return $this->customFields;
     }
 
-
     //endregion
 }

src/QUI/ERP/Accounting/ArticleView.html

@@ -13,6 +13,15 @@
         <div class="articles-article-information-description">
             {$this->getAttribute('description')}
         </div>
+
+        <ul class="quiqqer-order-basket-articles-article-fields">
+            {foreach $customFields as $field}
+            <li class="quiqqer-order-basket-articles-article-fields-field">
+                <span>{$field.title}:</span>
+                <span>{$field.custom_calc.valueText}</span>
+            </li>
+            {/foreach}
+        </ul>
     </td>
 
     {if $this->getAttribute('quantity') !== false}

src/QUI/ERP/Accounting/ArticleView.php

@@ -83,11 +83,28 @@ public function toHTML()
         $Engine   = QUI::getTemplateManager()->getEngine();
         $Currency = $this->getCurrency();
 
-        $article = $this->Article->toArray();
-        $calc    = $article['calculated'];
+        $customFields = [];
+        $article      = $this->Article->toArray();
+        $calc         = $article['calculated'];
 
         $this->setAttributes($article);
 
+        foreach ($article['customFields'] as $field) {
+            if (!isset($field['title'])) {
+                continue;
+            }
+
+            if (!isset($field['custom_calc']['valueText'])) {
+                continue;
+            }
+
+            if (!isset($field['custom_calc']['value'])) {
+                continue;
+            }
+
+            $customFields[] = $field;
+        }
+
         $Engine->assign([
             'this'                  => $this,
             'position'              => $this->position,
@@ -96,7 +113,8 @@ public function toHTML()
             'calculated_basisPrice' => $Currency->format($calc['basisPrice']),
             'calculated_price'      => $Currency->format($calc['price']),
             'calculated_sum'        => $Currency->format($calc['sum']),
-            'calculated_nettoSum'   => $Currency->format($calc['nettoSum'])
+            'calculated_nettoSum'   => $Currency->format($calc['nettoSum']),
+            'customFields'          => $customFields
         ]);
 
         return $Engine->fetch(dirname(__FILE__).'/ArticleView.html');

src/QUI/ERP/User.php

@@ -300,7 +300,8 @@ public function getAttributes()
         $attributes['firstname'] = $this->getAttribute('firstname');
         $attributes['lastname']  = $this->getAttribute('lastname');
         $attributes['username']  = $this->getAttribute('username');
-        $attributes['isCompany'] = $this->getAttribute('isCompany');
+
+        //$attributes['isCompany'] = $this->getAttribute('isCompany');
 
         return $attributes;
     }