fix: candyman-gmbh/projektplanung#52

src/QUI/ERP/Order/Controls/Basket/Basket.html

@@ -52,7 +52,7 @@
                 {foreach $product.attributes as $attribute}
                 <li class="quiqqer-order-basket-articles-article-fields-field">
                     <span>{$attribute.title}:</span>
-                    <span>{$attribute.valueText} {$attribute.value}</span>
+                    <span>{$this->getValueText($attribute.valueText)} {$attribute.value}</span>
                 </li>
                 {/foreach}
             </ul>
@@ -66,7 +66,7 @@
             data-label="{locale group='quiqqer/erp' var='article.list.articles.header.unitprice'}"
         >
             {if !isset($product.displayPrice) || $product.displayPrice}
-                {$product.price}
+            {$product.price}
             {/if}
         </td>
         <td class="quiqqer-order-basket-articles-article-sum"

src/QUI/ERP/Order/Controls/Basket/Basket.php

@@ -61,12 +61,32 @@ public function getBody()
             'Basket'   => $this->Basket,
             'Project'  => $this->Project,
             'Products' => $View,
-            'products' => $View->getProducts()
+            'products' => $View->getProducts(),
+            'this'     => $this
         ]);
 
         return $Engine->fetch(\dirname(__FILE__).'/Basket.html');
     }
 
+    /**
+     * @param $fieldValueText
+     * @return mixed|string
+     */
+    public function getValueText($fieldValueText)
+    {
+        $current = QUI::getLocale()->getCurrent();
+
+        if (!\is_array($fieldValueText)) {
+            return $fieldValueText;
+        }
+
+        if (isset($fieldValueText[$current])) {
+            return $fieldValueText[$current];
+        }
+
+        return '';
+    }
+
     //region project
 
     /**

src/QUI/ERP/Order/Controls/OrderProcess/Basket.html

@@ -2,11 +2,16 @@
     <h1>{locale group="quiqqer/order" var="ordering.step.title.Basket"}</h1>
 </header>
 
+{if $this->getAttribute('Order')}
 {template_event name="quiqqer::order::orderProcessBasketBegin" Basket=$Basket}
+{/if}
 
 {$BasketControl->create()}
 
+{if $this->getAttribute('Order')}
 {template_event name="quiqqer::order::orderProcessBasketEnd" Basket=$Basket assign=content}
+{/if}
+
 {if !empty($content)}
 <div class="quiqqer-order-basket-end">
     {$content}

src/QUI/ERP/Order/Controls/OrderProcess/Basket.php

@@ -118,7 +118,8 @@ public function getBody()
 
         $Engine->assign([
             'BasketControl' => $BasketControl,
-            'Basket'        => $this->Basket
+            'Basket'        => $this->Basket,
+            'this'          => $this
         ]);
 
         return $Engine->fetch(\dirname(__FILE__).'/Basket.html');