Merge branch 'dev'

producer/views/order/order.php

@@ -309,25 +309,27 @@ $this->setTitle('Commander') ;
                                         </tr>
                                     </thead>
                                     <?php foreach($producer->getSpecificDelays() as $day => $delay): ?>
-                                        <tr>
-                                                <td>
-                                                        <?php
-                                                        switch($day) {
-                                                                case 'monday': echo 'Lundi' ; break;
-                                                                case 'tuesday': echo 'Mardi' ; break;
-                                                                case 'wednesday': echo 'Mercredi' ; break;
-                                                                case 'thursday': echo 'Jeudi' ; break;
-                                                                case 'friday': echo 'Vendredi' ; break;
-                                                                case 'saturday': echo 'Samedi' ; break;
-                                                                case 'sunday': echo 'Dimanche' ; break;
-                                                        }
-                                                        ?>
-                                                </td>
-                                                <td>
-                                                        <span><?= $delay['order_delay'] ?> jour<?= ($delay['order_delay'] > 1) ? 's' : '' ?></span> à l'avance,
-                                                        avant <span><?= $delay['order_deadline'] ?>h</span>
-                                                </td>
-                                        </tr>
+                                        <?php if($delay['order_delay'] && $delay['order_deadline']): ?>
+                                                <tr>
+                                                        <td>
+                                                                <?php
+                                                                switch($day) {
+                                                                        case 'monday': echo 'Lundi' ; break;
+                                                                        case 'tuesday': echo 'Mardi' ; break;
+                                                                        case 'wednesday': echo 'Mercredi' ; break;
+                                                                        case 'thursday': echo 'Jeudi' ; break;
+                                                                        case 'friday': echo 'Vendredi' ; break;
+                                                                        case 'saturday': echo 'Samedi' ; break;
+                                                                        case 'sunday': echo 'Dimanche' ; break;
+                                                                }
+                                                                ?>
+                                                        </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>
+                                                        </td>
+                                                </tr>
+                                        <?php endif; ?>
                                     <?php endforeach; ?>
                             </table>
                     </div>