Merge branch 'dev'

common/models/Order.php

@@ -653,12 +653,14 @@ class Order extends ActiveRecordCommon
                         'order_deadline',
                         $this->distribution->id_producer
                 );
+                
+                
 
                 $orderDate = strtotime($this->distribution->date);
                 $today = strtotime(date('Y-m-d'));
                 $todayHour = date('G');
 
-                $nbDays = (int)(($orderDate - $today) / (24 * 60 * 60));
+                $nbDays = (int) round((($orderDate - $today) / (24 * 60 * 60)));
 
                 if ($nbDays <= 0) {
                         return self::STATE_DELIVERED;
@@ -667,7 +669,7 @@ class Order extends ActiveRecordCommon
                                 ($nbDays == $orderDelay && $todayHour < $orderDeadline))) {
                         return self::STATE_OPEN;
                 }
-
+		
                 return self::STATE_PREPARATION;
         }
 
@@ -873,4 +875,4 @@ class Order extends ActiveRecordCommon
                 return $username ;
         }
 
-}
+}

producer/controllers/OrderController.php

@@ -437,7 +437,6 @@ class OrderController extends ProducerBaseController
 
                 if ($order && User::getCurrentId() == $order->id_user) {
                         $order->delete();
-                        $order->changeOrderStatus('canceled', 'user');
                         Yii::$app->session->setFlash('success', 'Votre commande a bien été annulée.');
                 }