Commandes : système de statuts de commandes

domain/Order/Order/OrderManager.php

@@ -140,8 +140,8 @@ class OrderManager extends AbstractService implements ManagerInterface
             && $subscription->pointSale) {
 
             $order = $this->orderBuilder->createOrder($distribution);
-            $this->changeOrderStatus($order, OrderStatus::ALIAS_ORDERED, $userAction);
             $this->orderBuilder->updateOrderFromSubscription($order, $subscription);
+            $this->changeOrderStatus($order, OrderStatus::ALIAS_ORDERED, $userAction);
 
             return $order;
         }

producer/views/layouts/main.php

@@ -42,6 +42,7 @@ use common\helpers\Image;
 use domain\Feature\Feature\Feature;
 use domain\Feature\Feature\FeatureModule;
 use domain\Order\Order\Order;
+use domain\Order\Order\OrderRepositoryQuery;
 use domain\PointSale\PointSale\PointSaleModule;
 use domain\Producer\Producer\ProducerModule;
 use domain\Product\Product\ProductModule;
@@ -214,6 +215,7 @@ $mainColor = $producer->option_main_color ?: '#ee6f42' ;
                 ])
                 ->params([':date_today' => date('Y-m-d')])
                 ->andWhere('distribution.date >= :date_today')
+                ->andWhere(OrderRepositoryQuery::getSqlFilterIsValid())
                 ->count();
             $labelOrders = $countOrders > 0 ? 'success' : 'default';