Merge branch 'dev'

producer/views/order/order.php

@@ -289,10 +289,10 @@ $producer = GlobalParam::getCurrentProducer() ;
                                                         <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>
+                                                        <template v-if="product.price_with_tax >= 0">{{ formatPrice(product.price_with_tax) }}<br /><span class="unit">{{ product.wording_unit }}</span></template>
                                                     </td>
                                                     <td class="td-quantity">
-                                                        <template v-if="product.price_with_tax > 0">
+                                                        <template v-if="product.price_with_tax >= 0">
                                                             <div class="input-group">
                                                                 <span class="input-group-btn">
                                                                     <button class="btn btn-default btn-moins" type="button" @click="productQuantityClick(product, product.unit == 'piece' ? -1 : -parseFloat(product.step))" :disabled="product.quantity_form == 0"><span class="glyphicon glyphicon-minus"></span></button>
@@ -306,7 +306,7 @@ $producer = GlobalParam::getCurrentProducer() ;
                                                         </template>
                                                     </td>
                                                     <td class="price-total">
-                                                        <template v-if="product.price_with_tax > 0 && product.quantity_form > 0">
+                                                        <template v-if="product.price_with_tax >= 0 && product.quantity_form > 0">
                                                             {{ formatPrice(product.price_with_tax * (product.quantity_form / product.coefficient_unit )) }}
                                                         </template>
                                                     </td>