Merge branch 'dev'

producer/views/order/order.php

@@ -326,7 +326,7 @@ $this->setTitle('Commander') ;
                                                         </td>
                                                         <td>
                                                                 <span><?= $delay['order_delay'] ?> jour<?= ($delay['order_delay'] > 1) ? 's' : '' ?></span> à l'avance,
-                                                                avant <span><?= ($delay['order_deadline'] == 24) ? '00' : $delay['order_deadline'] ; ?>h</span>
+                                                                avant <span><?= ($delay['order_deadline'] == 24) ? 'minuit' : $delay['order_deadline'].'h' ; ?></span>
                                                         </td>
                                                 </tr>
                                         <?php endif; ?>