Merge branch 'dev'

producer/views/order/order.php

@@ -236,12 +236,12 @@ $producer = GlobalParam::getCurrentProducer() ;
                                             <span class="other">
                                                 <span v-if="product.description.length">/</span> 
                                                 <span class="description">{{ product.description }}</span> 
-                                                <span v-if="product.unit == 'piece' && product.weight">({{ product.weight }}g)</span>
+                                                <span v-if="product.weight">({{ product.weight }}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é
                                             </span>
-                                            <div class="recipe" v-if="product.recipe.length">{{ product.recipe }}</div>
+                                            <div class="recipe" v-if="product.recipe.length">{{ product.recipe }}</div>
                                         </td>
                                         <td class="price-unit">
                                                 <template v-if="product.price_with_tax > 0">{{ formatPrice(product.price_with_tax) }}<br /><span class="unit">{{ product.wording_unit }}</span></template>

producer/views/site/index.php

@@ -174,7 +174,7 @@ $this->setPageTitle(Html::encode($producer->type.' à '.$producer->city)) ;
                 $columnsProducts[] = [
                         'attribute' => 'weight',
                         'value' => function($model) {
-                                if($model->unit == 'piece' && strlen($model->weight)) {
+                                if(strlen($model->weight)) {
                                         return $model->weight.' g' ;
                                 }
                                 return '' ;