Merge branch 'dev'

producer/views/order/order.php

@@ -236,7 +236,7 @@ $producer = GlobalParam::getCurrentProducer() ;
                                             <span class="other">
                                                 <span v-if="product.description.length">/</span> 
                                                 <span class="description">{{ product.description }}</span> 
-                                                <span v-if="product.weight">({{ product.weight }}g)</span>
+                                                <span v-if="product.weight">({{ product.weight }}&nbsp;g)</span>
                                             </span>
                                             <span v-if="product.quantity_max > 0 && ((product.quantity_form / product.coefficient_unit == product.quantity_remaining) || ((product.quantity_remaining * product.coefficient_unit) - product.quantity_form) < product.step)" class="label label-danger">
                                                 Épuisé

producer/views/site/index.php

@@ -173,9 +173,10 @@ $this->setPageTitle(Html::encode($producer->type.' à '.$producer->city)) ;
         if($hasProductWeight) {
                 $columnsProducts[] = [
                         'attribute' => 'weight',
+                        'format' => 'raw',
                         'value' => function($model) {
                                 if(strlen($model->weight)) {
-                                        return $model->weight.' g' ;
+                                        return $model->weight.' g' ;
                                 }
                                 return '' ;
                         }