Commandes : système de statut de commande

backend/controllers/CronController.php

@@ -41,6 +41,7 @@ namespace backend\controllers;
 use common\helpers\MeanPayment;
 use domain\Distribution\Distribution\ExportManager;
 use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\User\User\User;
 use Yii;
 use yii\filters\AccessControl;
@@ -149,9 +150,8 @@ class CronController extends BackendController
                          */
                         $arrayOrders = Order::searchAll([
                             'distribution.date' => $date,
-                            'distribution.id_producer' => $producer->id
-                        ], [
-                            'conditions' => 'date_delete IS NULL'
+                            'distribution.id_producer' => $producer->id,
+                            'order_status_alias' => OrderStatus::ALIAS_ORDERED
                         ]);
 
                         $configCredit = $producerModule->getConfig('credit');
@@ -174,9 +174,8 @@ class CronController extends BackendController
                         if (!strlen($forceDate) && $producerModule->getConfig('option_notify_producer_order_summary')) {
                             $arrayOrders = Order::searchAll([
                                 'distribution.date' => $date,
-                                'distribution.id_producer' => $producer->id
-                            ], [
-                                'conditions' => 'date_delete IS NULL'
+                                'distribution.id_producer' => $producer->id,
+                                'order_status_alias' => OrderStatus::ALIAS_ORDERED
                             ]);
 
                             $mail = Yii::$app->mailerService->getMailer()->compose(

backend/controllers/DistributionController.php

@@ -293,7 +293,7 @@ class DistributionController extends BackendController
         if ($ordersArray) {
             foreach ($ordersArray as $order) {
                 $orderModule->initOrder($order);
-                if (is_null($order->date_delete)) {
+                if($orderModule->getSolver()->isOrderStatusValid($order)) {
                     $revenues += $orderModule->getOrderAmount($order);
                     $revenuesWithTax += $orderModule->getOrderAmountWithTax($order);
                     $weight += $order->weight;

backend/controllers/DocumentController.php

@@ -48,6 +48,7 @@ use domain\Document\Document\Document;
 use domain\Document\Invoice\Invoice;
 use domain\Document\Quotation\Quotation;
 use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\Order\ProductOrder\ProductOrder;
 use domain\Payment\Payment;
 use kartik\mpdf\Pdf;
@@ -650,8 +651,10 @@ class DocumentController extends BackendController
 
     public function actionAjaxAddProduct($idDocument, $classDocument, $idProduct, $quantity, $price)
     {
+        $orderModule = $this->getOrderModule();
         $documentModule = $this->getDocumentModule();
         $productModule = $this->getProductModule();
+        $userCurrent = $this->getUserCurrent();
 
         if ($documentModule->isValidClass($classDocument)) {
             $document = $this->findModel($idDocument, $classDocument);
@@ -664,12 +667,13 @@ class DocumentController extends BackendController
                     $order->id_user = $document->id_user;
                     $order->id_point_sale = null;
                     $order->id_distribution = null;
-                    $order->status = 'tmp-order';
                     $order->origin = Order::ORIGIN_ADMIN;
                     $order->date = date('Y-m-d H:i:s');
                     $fieldIdDocument = 'id_' . $classDocumentComplete::tableName();
                     $order->$fieldIdDocument = $document->id;
                     $order->save();
+                    $orderModule->getManager()->changeOrderStatus($order, OrderStatus::ALIAS_ORDERED, $userCurrent);
+
                 } else {
                     $order = $document->orders[0];
                 }

backend/controllers/OrderController.php

@@ -46,6 +46,7 @@ use domain\Distribution\Distribution\Distribution;
 use domain\Distribution\PointSaleDistribution\PointSaleDistribution;
 use domain\Distribution\ProductDistribution\ProductDistribution;
 use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\Order\ProductOrder\ProductOrder;
 use domain\Payment\Payment;
 use domain\PointSale\PointSale\PointSale;
@@ -82,7 +83,7 @@ class OrderController extends BackendController
     /**
      * Traite le formulaire d'ajout/modification de commande.
      */
-    public function processOrderForm(
+    /*public function processOrderForm(
         Distribution $distribution,
         string $date,
         array $pointsSale,
@@ -163,12 +164,12 @@ class OrderController extends BackendController
                 }
             }
         }
-    }
+    }*/
 
     /**
      * Page principale de la gestion des commandes.
      */
-    public function actionIndex($date = '', $returnData = false)
+    /*public function actionIndex($date = '', $returnData = false)
     {
         $distributionModule = $this-> getDistributionModule();
         $productModule = $this->getProductModule();
@@ -406,7 +407,7 @@ class OrderController extends BackendController
         } else {
             return $this->render('index', $datas);
         }
-    }
+    }*/
 
     /**
      * Génère un fichier d'export des commandes au format CSV.
@@ -735,7 +736,7 @@ class OrderController extends BackendController
 
         $order = $orderModule->findOneOrderById($idOrder);
         if ($order) {
-            $orderModule->deleteOrder($order);
+            $orderModule->getManager()->deleteOrder($order, $this->getUserCurrent());
         }
 
         return ['success'];
@@ -750,7 +751,7 @@ class OrderController extends BackendController
         $orderModule = $this->getOrderModule();
         $order = $orderModule->findOneOrderById($idOrder);
         if ($order) {
-            $orderModule->deleteOrder($order);
+            $orderModule->getManager()->deleteOrder($order, $this->getUserCurrent());
         }
 
         $this->redirect(['index', 'date' => $date]);
@@ -784,6 +785,7 @@ class OrderController extends BackendController
         $pointSale = $pointSaleModule->findOnePointSaleById($idPointSale);
         $distribution = $distributionModule->findOneDistribution($date);
         $producerCurrent = $this->getProducerCurrent();
+        $userCurrent = $this->getUserCurrent();
 
         if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $date)
             && ($idUser || strlen($username))
@@ -798,7 +800,6 @@ class OrderController extends BackendController
             $order->id_distribution = $distribution->id;
             $order->origin = Order::ORIGIN_ADMIN;
             $order->comment = $comment;
-            $order->status = 'tmp-order';
 
             if ($idUser) {
                 $order->id_user = $idUser;
@@ -816,6 +817,8 @@ class OrderController extends BackendController
 
             $order->save();
 
+            $orderModule->getManager()->changeOrderStatus($order, OrderStatus::ALIAS_ORDERED, $userCurrent);
+
             $user = false;
             $userProducer = false;
             if (isset($order->user) && $order->user) {

backend/controllers/PointSaleController.php

@@ -41,6 +41,7 @@ namespace backend\controllers;
 use common\helpers\GlobalParam;
 use domain\Distribution\PointSaleDistribution\PointSaleDistribution;
 use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\PointSale\PointSale\PointSale;
 use domain\PointSale\PointSale\PointSaleSearch;
 use domain\PointSale\UserPointSale\UserPointSale;
@@ -192,16 +193,17 @@ class PointSaleController extends BackendController
             $ordersArray = Order::searchAll(
                 [
                     'id_point_sale' => $id,
+                    'order_status_alias' => OrderStatus::ALIAS_ORDERED
                 ],
                 [
-                    'conditions' => 'date_delete IS NULL AND distribution.date > :today',
+                    'conditions' => 'distribution.date > :today',
                     'params' => [':today' => date('Y-m-d')]
                 ]
             );
 
             if ($ordersArray) {
                 foreach ($ordersArray as $order) {
-                    $orderModule->deleteOrder($order, true);
+                    $orderModule->getManager()->deleteOrder($order,  $this->getUserCurrent(), true);
                 }
             }
 

backend/controllers/ProducerAdminController.php

@@ -41,6 +41,7 @@ namespace backend\controllers;
 use common\helpers\Ajax;
 use common\helpers\Alwaysdata;
 use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\Producer\Producer\Producer;
 use domain\Product\Product\Product;
 use Yii;
@@ -190,8 +191,9 @@ class ProducerAdminController extends BackendController
             if ($withOrders) {
                 $countOrders = Order::searchCount([
                     'id_user' => $idUser,
-                    'distribution.id_producer' => $fromProducerId
-                ], ['conditions' => 'date_delete IS NULL']);
+                    'distribution.id_producer' => $fromProducerId,
+                    'order_status_alias' => OrderStatus::ALIAS_ORDERED
+                ]);
             }
 
             if (($withOrders && $countOrders) || !$withOrders) {

backend/controllers/ReportController.php

@@ -42,6 +42,8 @@ use common\helpers\CSV;
 use common\helpers\GlobalParam;
 use common\helpers\MeanPayment;
 use common\helpers\Price;
+use domain\Order\Order\OrderRepositoryQuery;
+use domain\Order\OrderStatus\OrderStatus;
 use Yii;
 use yii\filters\AccessControl;
 
@@ -134,7 +136,7 @@ class ReportController extends BackendController
             WHERE `order`.id = product_order.id_order
             AND product.id_producer = " . ((int)GlobalParam::getCurrentProducerId()) . "
             AND product_order.id_product = product.id
-            AND `order`.date_delete IS NULL
+            AND ".OrderRepositoryQuery::getSqlFilterIsValid()."
             " . $conditionUsers . "
             " . $conditionPointsSale . "
             " . $conditionDistributions . "

backend/controllers/SubscriptionController.php

@@ -151,6 +151,7 @@ class SubscriptionController extends BackendController
      */
     public function actionUpdate($id)
     {
+        $orderModule = $this->getOrderModule();
         $subscriptionModule = $this->getSubscriptionModule();
         $productSubscriptionModule = $this->getProductSubscriptionModule();
         $productModule = $this->getProductModule();
@@ -208,8 +209,8 @@ class SubscriptionController extends BackendController
                 $messageOrdersDeleted = '';
 
                 if ($model->date_end) {
-                    $countOrdersDeleted = $subscriptionModule->getOrderManager()
-                        ->deleteOrdersIncomingDistributionsFromSubscription($subscription, true);
+                    $countOrdersDeleted = $orderModule->getManager()
+                        ->deleteOrdersIncomingDistributionsFromSubscription($subscription, $this->getUserCurrent(), true);
                     if ($countOrdersDeleted) {
                         $messageOrdersDeleted = '<br />' . $countOrdersDeleted . ' commandes supprimées';
                     }
@@ -237,12 +238,13 @@ class SubscriptionController extends BackendController
      */
     public function actionDelete(int $id)
     {
+        $orderModule = $this->getOrderModule();
         $subscriptionModule = $this->getSubscriptionModule();
 
         $subscription = $subscriptionModule->getRepository()->findOneSubscriptionById($id);
 
         if($subscription) {
-            $subscriptionModule->getOrderManager()->deleteOrdersIncomingDistributionsFromSubscription($subscription);
+            $orderModule->getManager()->deleteOrdersIncomingDistributionsFromSubscription($subscription, $this->getUserCurrent());
             $subscriptionModule->deleteSubscription($subscription);
             $this->setFlash('success', 'Abonnement supprimé');
         }
@@ -255,6 +257,7 @@ class SubscriptionController extends BackendController
 
     public function actionUpdateDistributions(int $idSubscription, bool $generate = false, bool $update = false)
     {
+        $orderModule = $this->getOrderModule();
         $subscriptionModule = $this->getSubscriptionModule();
         $distributionModule = $this-> getDistributionModule();
         $subscription = $subscriptionModule->findOneSubscriptionById($idSubscription);
@@ -263,8 +266,8 @@ class SubscriptionController extends BackendController
 
             if ($generate) {
                 if ($update) {
-                    $subscriptionModule->getOrderManager()
-                        ->deleteOrdersIncomingDistributionsFromSubscription($subscription);
+                    $orderModule->getManager()
+                        ->deleteOrdersIncomingDistributionsFromSubscription($subscription, $this->getUserCurrent());
                 }
                 foreach ($matchedDistributionsArray as $distribution) {
                     $subscriptionModule->createOrderFromSubscription($subscription, $distribution->date);

backend/views/user/index.php

@@ -39,6 +39,7 @@
 use common\helpers\GlobalParam;
 use common\helpers\Price;
 use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\Producer\Producer\ProducerModule;
 use domain\User\User\UserModule;
 use domain\User\UserProducer\UserProducer;
@@ -144,7 +145,8 @@ $this->render('_menu_filter', [
                     $url = Yii::$app->urlManager->createUrl(['user/orders', 'id' => $model['id']]);
                     $countOrders = Order::searchCount([
                         'id_user' => $model['id'],
-                    ], ['conditions' => 'date_delete IS NULL']);
+                        'order_status_alias' => OrderStatus::ALIAS_ORDERED
+                    ]);
 
                     $html = '';
                     if ($countOrders) {

backend/web/js/vuejs/distribution-index.js

@@ -178,7 +178,7 @@ if($(selector).length) {
                             app.ordersUpdate = JSON.parse(JSON.stringify(response.data.orders));
 
                             for (i = 0; i < app.orders.length; i++) {
-                                if (!app.orders[i].date_delete) {
+                                if (!app.orders[i].order_status_alias == 'ordered') {
                                     app.countOrders++;
                                 }
                             }

common/components/BusinessLogic.php

@@ -38,6 +38,8 @@ class BusinessLogic
             $this->getPointSaleModule(),
             $this->getProductModule(),
             $this->getProductOrderModule(),
+            $this->getOrderStatusModule(),
+            $this->getOrderStatusHistoryModule(),
             $this->getQuotationModule(),
             $this->getInvoiceModule(),
             $this->getDeliveryNoteModule(),

common/components/BusinessLogicTrait.php

@@ -15,6 +15,8 @@ use domain\Feature\Feature\FeatureModule;
 use domain\Feature\FeatureProducer\FeatureProducerModule;
 use domain\Opinion\OpinionModule;
 use domain\Order\Order\OrderModule;
+use domain\Order\OrderStatus\OrderStatusModule;
+use domain\Order\OrderStatusHistory\OrderStatusHistoryModule;
 use domain\Order\ProductOrder\ProductOrderModule;
 use domain\Payment\PaymentModule;
 use domain\PointSale\PointSale\PointSaleModule;
@@ -38,6 +40,16 @@ use domain\User\UserUserGroup\UserUserGroupModule;
 
 trait BusinessLogicTrait
 {
+    public function getOrderStatusModule(): OrderStatusModule
+    {
+        return OrderStatusModule::getInstance();
+    }
+
+    public function getOrderStatusHistoryModule(): OrderStatusHistoryModule
+    {
+        return OrderStatusHistoryModule::getInstance();
+    }
+
     public function getUnitModule(): UnitModule
     {
         return UnitModule::getInstance();

console/migrations/m240527_083421_create_table_order_status_history.php

@@ -0,0 +1,46 @@
+<?php
+
+use yii\db\Migration;
+use yii\db\Schema;
+
+/**
+ * Class m240527_083421_create_table_order_status_history
+ */
+class m240527_083421_create_table_order_status_history extends Migration
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function safeUp()
+    {
+        $this->dropColumn('order', 'status');
+        $this->addColumn('order', 'order_status_alias', Schema::TYPE_STRING);
+        $this->dropTable('order_status_history');
+        $this->createTable('order_status_history', [
+            'id' => 'pk',
+            'id_order' => Schema::TYPE_INTEGER,
+            'order_status_alias' => Schema::TYPE_STRING,
+            'date' => Schema::TYPE_DATETIME,
+            'id_user' => Schema::TYPE_INTEGER
+        ]);
+        $this->createIndex('id_order', 'order_status_history', 'id_order');
+        $this->createIndex('id_user', 'order_status_history', 'id_user');
+        $this->addForeignKey('fk_id_order', 'order_status_history', 'id_order', 'order', 'id');
+        $this->addForeignKey('fk_id_user', 'order_status_history', 'id_user', 'user', 'id');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function safeDown()
+    {
+        $this->dropColumn('order', 'order_status_alias');
+        $this->addColumn('order', 'status', Schema::TYPE_STRING);
+
+        $this->dropIndex('id_order', 'order_status_history');
+        $this->dropIndex('id_user', 'order_status_history');
+        $this->dropForeignKey('fk_id_order', 'order_status_history');
+        $this->dropForeignKey('fk_id_user', 'order_status_history');
+        $this->dropTable('order_status_history');
+    }
+}

domain/Order/Order/Order.php

@@ -43,6 +43,8 @@ use domain\Distribution\Distribution\Distribution;
 use domain\Document\DeliveryNote\DeliveryNote;
 use domain\Document\Invoice\Invoice;
 use domain\Document\Quotation\Quotation;
+use domain\Order\OrderStatus\OrderStatus;
+use domain\Order\OrderStatusHistory\OrderStatusHistory;
 use domain\Order\ProductOrder\ProductOrder;
 use domain\Payment\Payment;
 use domain\PointSale\PointSale\PointSale;
@@ -51,6 +53,8 @@ use domain\User\User\User;
 
 class Order extends ActiveRecordCommon
 {
+    protected OrderStatus $orderStatusObject;
+
     const EVENT_DELETE = 'order.event.delete';
 
     var $amount = 0;
@@ -80,6 +84,35 @@ class Order extends ActiveRecordCommon
     const STATE_PREPARATION = 'preparation';
     const STATE_DELIVERED = 'delivered';
 
+
+    public function getOrderStatusAlias(): ?string
+    {
+        return $this->order_status_alias;
+    }
+
+    public function setOrderStatusAlias(string $orderStatusAlias): self
+    {
+        $this->order_status_alias = $orderStatusAlias;
+        return $this;
+    }
+
+    public function getOrderStatus(): OrderStatus
+    {
+        return $this->orderStatusObject;
+    }
+
+    public function setOrderStatus(OrderStatus $orderStatus): self
+    {
+        $this->setOrderStatusAlias($orderStatus->getAlias());
+        $this->orderStatusObject = $orderStatus;
+        return $this;
+    }
+
+    public function getOrderStatusHistory(): array
+    {
+        return $this->orderStatusHistoryRelation;
+    }
+
     /**
      * @inheritdoc
      */
@@ -94,7 +127,7 @@ class Order extends ActiveRecordCommon
     public function rules()
     {
         return [
-            [['id_user', 'date', 'status'], 'required', 'message' => ''],
+            [['id_user', 'date'], 'required', 'message' => ''],
             [
                 [
                     'id_user',
@@ -108,7 +141,7 @@ class Order extends ActiveRecordCommon
                 'integer'
             ],
             [['auto_payment', 'tiller_synchronization', 'delivery_home', 'ignore_when_invoicing'], 'boolean'],
-            [['status', 'reference', 'delivery_address', 'online_payment_url', 'tiller_external_id'], 'string'],
+            [['order_status_alias', 'reference', 'delivery_address', 'online_payment_url', 'tiller_external_id'], 'string'],
             [['date', 'date_update', 'comment', 'comment_point_sale', 'mean_payment', 'tiller_external_id'], 'safe']
         ];
     }
@@ -123,10 +156,10 @@ class Order extends ActiveRecordCommon
             'id_user' => 'Id User',
             'date' => 'Date',
             'date_update' => 'Date de modification',
+            'order_status_alias' => 'Statut',
             'id_point_sale' => 'Point de vente',
             'id_distribution' => 'Date de distribution',
             'id_subscription' => 'Abonnement',
-            'status' => 'Statut',
             'id_invoice' => 'Facture',
             'id_quotation' => 'Devis',
             'id_delivery_note' => 'Bon de livraison',
@@ -228,4 +261,10 @@ class Order extends ActiveRecordCommon
     {
         $this->populateFieldObject('id_delivery_note', 'deliveryNote', $deliveryNote);
     }
+
+    public function getOrderStatusHistoryRelation()
+    {
+        return $this->hasMany(OrderStatusHistory::class, ['id_order' => 'id'])
+            ->orderBy(['order_status.id' => SORT_DESC]);
+    }
 }

domain/Order/Order/OrderBuilder.php

@@ -16,6 +16,8 @@ use domain\Document\Document\DocumentInterface;
 use domain\Document\Document\DocumentSolver;
 use domain\Document\Invoice\Invoice;
 use domain\Order\Order\Event\OrderDeleteEvent;
+use domain\Order\OrderStatus\OrderStatus;
+use domain\Order\OrderStatus\OrderStatusRepository;
 use domain\Order\ProductOrder\ProductOrder;
 use domain\Order\ProductOrder\ProductOrderBuilder;
 use domain\Order\ProductOrder\ProductOrderSolver;
@@ -64,6 +66,7 @@ class OrderBuilder extends AbstractBuilder
     protected DeliveryNoteBuilder $deliveryNoteBuilder;
     protected DocumentSolver $documentSolver;
     protected ProducerSolver $producerSolver;
+    protected OrderStatusRepository $orderStatusRepository;
 
     public function loadDependencies(): void
     {
@@ -89,6 +92,7 @@ class OrderBuilder extends AbstractBuilder
         $this->deliveryNoteBuilder = $this->loadService(DeliveryNoteBuilder::class);
         $this->documentSolver = $this->loadService(DocumentSolver::class);
         $this->producerSolver = $this->loadService(ProducerSolver::class);
+        $this->orderStatusRepository = $this->loadService(OrderStatusRepository::class);
     }
 
     public function instanciateOrder(Distribution $distribution): Order
@@ -226,6 +230,14 @@ class OrderBuilder extends AbstractBuilder
         $taxCalculationMethod = $this->getProducerContext()->option_tax_calculation_method;
         $this->initOrderAmount($order, $taxCalculationMethod);
         $this->initOrderPaidAmount($order);
+        $this->initOrderStatus($order);
+    }
+
+    public function initOrderStatus(Order $order)
+    {
+        $orderStatusAlias = $order->getOrderStatusAlias() ?: OrderStatus::ALIAS_ORDERED;
+        $orderStatus = $this->orderStatusRepository->getOrderStatusByAlias($orderStatusAlias);
+        $order->setOrderStatus($orderStatus);
     }
 
     /**
@@ -310,35 +322,6 @@ class OrderBuilder extends AbstractBuilder
         }
     }
 
-    public function deleteOrder(Order $order, bool $force = false): bool
-    {
-        $return = false;
-        $this->initOrder($order);
-
-        // delete
-        if ($this->producerSolver->getConfig('option_behavior_cancel_order') == Producer::BEHAVIOR_DELETE_ORDER_DELETE ||
-            ($this->producerSolver->getConfig('option_behavior_cancel_order') == Producer::BEHAVIOR_DELETE_ORDER_STATUS && strlen($order->date_delete))
-            || $force) {
-
-            $this->productOrderBuilder->deleteProductOrdersByOrder($order);
-
-            $return = $this->delete($order);
-        }
-        // status 'delete'
-        elseif ($this->producerSolver->getConfig('option_behavior_cancel_order') == Producer::BEHAVIOR_DELETE_ORDER_STATUS) {
-            $order->date_delete = date('Y-m-d H:i:s');
-            $return = $this->update($order);
-        }
-
-        if($return) {
-            $orderDeleteEvent = new OrderDeleteEvent();
-            $orderDeleteEvent->order = $order;
-            $order->trigger(Order::EVENT_DELETE, $orderDeleteEvent);
-        }
-
-        return $return;
-    }
-
     /**
      * Ajuste le crédit pour que la commande soit payée.
      */
@@ -388,36 +371,6 @@ class OrderBuilder extends AbstractBuilder
         $this->saveUpdate($order);
     }
 
-    /**
-     * Changement de statut d'une commande.
-     */
-    public function updateOrderStatus(Order $order, string $newStatus, string $origin): void
-    {
-        $orderStatusArray = GlobalParam::get('orderStatus');
-        $userCurrent = $this->userSolver->getCurrent();
-
-        switch ($newStatus) {
-            case 'new-order' :
-                $order->status = $newStatus;
-                $order->save();
-                break;
-            case 'waiting-paiement-on-delivery':
-            case 'waiting-paiement-by-credit':
-            case 'paid-by-credit':
-            case 'waiting-delevery' :
-            case 'delivered':
-            case 'refunded':
-            case 'cancel':
-                if (in_array($newStatus, $orderStatusArray[$order->status]['nextStatusAllow'])) {
-                    $order->status = $newStatus;
-                    $order->save();
-                }
-                break;
-            default:
-                throw new NotFoundHttpException('Statut de commande inconnu.');
-        }
-    }
-
     // initReference
     // generateReference
     public function generateOrderReference(Order $order): void
@@ -471,7 +424,7 @@ class OrderBuilder extends AbstractBuilder
                 if ($pointSale->id == $order->id_point_sale) {
                     $pointSale->orders[] = $order;
 
-                    if (is_null($order->date_delete)) {
+                    if($this->orderSolver->isOrderStatusValid($order)) {
                         $pointSale->revenues += (float)$order->amount;
                         $pointSale->revenues_with_tax += (float)$order->amount_with_tax;
                     }

domain/Order/Order/OrderManager.php

@@ -4,8 +4,120 @@ namespace domain\Order\Order;
 
 use domain\_\AbstractService;
 use domain\_\ManagerInterface;
+use domain\Distribution\Distribution\DistributionRepository;
+use domain\Distribution\Distribution\DistributionSolver;
+use domain\Order\Order\Event\OrderDeleteEvent;
+use domain\Order\OrderStatus\OrderStatus;
+use domain\Order\OrderStatus\OrderStatusRepository;
+use domain\Order\OrderStatusHistory\OrderStatusHistoryManager;
+use domain\Producer\Producer\Producer;
+use domain\Producer\Producer\ProducerSolver;
+use domain\Subscription\Subscription\Subscription;
+use domain\User\User\User;
 
 class OrderManager extends AbstractService implements ManagerInterface
 {
-    
+    protected ProducerSolver $producerSolver;
+    protected OrderBuilder $orderBuilder;
+    protected OrderStatusRepository $orderStatusRepository;
+    protected OrderStatusHistoryManager $orderStatusHistoryManager;
+    protected DistributionRepository $distributionRepository;
+    protected \domain\Subscription\Subscription\OrderManager $subscriptionOrderManager;
+    protected OrderRepository $orderRepository;
+    protected DistributionSolver $distributionSolver;
+    protected OrderSolver $orderSolver;
+
+    public function loadDependencies(): void
+    {
+        $this->producerSolver = $this->loadService(ProducerSolver::class);
+        $this->orderBuilder = $this->loadService(OrderBuilder::class);
+        $this->orderStatusRepository = $this->loadService(OrderStatusRepository::class);
+        $this->orderStatusHistoryManager = $this->loadService(OrderStatusHistoryManager::class);
+        $this->distributionRepository = $this->loadService(DistributionRepository::class);
+        $this->subscriptionOrderManager = $this->loadService(\domain\Subscription\Subscription\OrderManager::class);
+        $this->orderRepository = $this->loadService(OrderRepository::class);
+        $this->distributionSolver = $this->loadService(DistributionSolver::class);
+        $this->orderSolver = $this->loadService(OrderSolver::class);
+    }
+
+    public function changeOrderStatus(Order $order, string $orderStatusAlias, User $user)
+    {
+        $orderStatus = $this->orderStatusRepository->getOrderStatusByAlias($orderStatusAlias);
+
+        $order->setOrderStatus($orderStatus);
+        $this->orderBuilder->update($order);
+
+        $this->orderStatusHistoryManager->create(
+            $order,
+            $orderStatus,
+            new \DateTime(),
+            $user
+        );
+    }
+
+    public function deleteOrder(Order $order, User $user, bool $force = false): bool
+    {
+        $return = false;
+        $this->orderBuilder->initOrder($order);
+
+        // delete
+        if ($this->producerSolver->getConfig('option_behavior_cancel_order') == Producer::BEHAVIOR_DELETE_ORDER_DELETE ||
+            ($this->producerSolver->getConfig('option_behavior_cancel_order') == Producer::BEHAVIOR_DELETE_ORDER_STATUS
+                && $this->orderSolver->isOrderStatusCanceled($order))
+            || $force) {
+
+            $this->changeOrderStatus($order, OrderStatus::ALIAS_DELETED, $user);
+
+        }
+        // cancel
+        elseif ($this->producerSolver->getConfig('option_behavior_cancel_order') == Producer::BEHAVIOR_DELETE_ORDER_STATUS) {
+            $this->changeOrderStatus($order, OrderStatus::ALIAS_CANCELED, $user);
+            $this->orderBuilder->update($order);
+        }
+
+        if($return) {
+            $orderDeleteEvent = new OrderDeleteEvent();
+            $orderDeleteEvent->order = $order;
+            $order->trigger(Order::EVENT_DELETE, $orderDeleteEvent);
+        }
+
+        return $return;
+    }
+
+    public function updateOrdersIncomingDistributionsFromSubscription(Subscription $subscription, User $userAction, $update = false): array
+    {
+        $orderArray = [];
+        $matchedDistributionsArray = $this->distributionRepository->findDistributionsIncomingMatchWithSubscrtiption($subscription, true);
+
+        if ($update) {
+            $this->deleteOrdersIncomingDistributionsFromSubscription($subscription, $userAction);
+        }
+
+        if (count($matchedDistributionsArray)) {
+            foreach ($matchedDistributionsArray as $distribution) {
+                $orderArray[] = $this->subscriptionOrderManager->createOrderFromSubscription($subscription, $distribution->date);
+            }
+        }
+
+        return $orderArray;
+    }
+
+    public function deleteOrdersIncomingDistributionsFromSubscription(Subscription $subscription, User $userAction, bool $deleteAfterDateEnd = false): int
+    {
+        $ordersArray = $this->orderRepository->findOrdersIncomingBySubscription($subscription, !$deleteAfterDateEnd);
+        $countOrdersDeleted = 0;
+
+        if ($ordersArray && count($ordersArray)) {
+            foreach ($ordersArray as $order) {
+                if ($this->distributionSolver->isDistributionAvailable($order->distribution)) {
+                    $theOrder = $this->orderRepository->findOneOrderById($order->id);
+                    $this->orderBuilder->initOrder($theOrder);
+                    $this->deleteOrder($order, $userAction, true);
+                    $countOrdersDeleted++;
+                }
+            }
+        }
+
+        return $countOrdersDeleted;
+    }
 }

domain/Order/Order/OrderRepository.php

@@ -11,6 +11,7 @@ use domain\Document\DeliveryNote\DeliveryNote;
 use domain\Document\Invoice\Invoice;
 use domain\Document\Invoice\InvoiceRepository;
 use domain\Document\Invoice\InvoiceSolver;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\Order\ProductOrder\ProductOrderRepository;
 use domain\Payment\Payment;
 use domain\Payment\PaymentSolver;
@@ -722,7 +723,7 @@ class OrderRepository extends AbstractRepository
 
         $ordersArray = Order::searchAll([], [
             'orderby' => 'IF(ISNULL(date_update), `order`.`date`, `order`.`date_update`) DESC',
-            'conditions' => $conditionsOrders . ' AND (origin = \'' . Order::ORIGIN_USER . '\' OR origin = \'' . Order::ORIGIN_ADMIN . '\' OR (origin = \'' . Order::ORIGIN_AUTO . '\' AND (date_update IS NOT NULL OR date_delete IS NOT NULL)))',
+            'conditions' => $conditionsOrders . ' AND (origin = \'' . Order::ORIGIN_USER . '\' OR origin = \'' . Order::ORIGIN_ADMIN . '\' OR (origin = \'' . Order::ORIGIN_AUTO . '\' AND (date_update IS NOT NULL OR order_status_alias LIKE \''.OrderStatus::ALIAS_CANCELED.'\')))',
             'params' => $paramsOrders,
         ]);
 
@@ -733,7 +734,8 @@ class OrderRepository extends AbstractRepository
     {
         return Order::searchCount([
             'id_user' => $user->id,
-        ], ['conditions' => 'date_delete IS NULL']);
+            'order_status_alias' => OrderStatus::ALIAS_ORDERED
+        ]);
     }
 
     public function getTotalAmountSpent(User $user): float

domain/Order/Order/OrderRepositoryQuery.php

@@ -4,6 +4,7 @@ namespace domain\Order\Order;
 
 use domain\Document\DeliveryNote\DeliveryNote;
 use domain\Document\Invoice\Invoice;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\User\User\User;
 use domain\_\AbstractRepositoryQuery;
 
@@ -55,9 +56,14 @@ class OrderRepositoryQuery extends AbstractRepositoryQuery
         return $this;
     }
 
+    public static function getSqlFilterIsValid(): string
+    {
+        return "`order`.order_status_alias LIKE '".OrderStatus::ALIAS_ORDERED."'";
+    }
+
     public function filterIsValid(): self
     {
-        $this->andWhere('date_delete IS NULL');
+        $this->andWhere(['order_status_alias' => OrderStatus::ALIAS_ORDERED]);
 
         return $this;
     }

domain/Order/Order/OrderSolver.php

@@ -5,6 +5,8 @@ namespace domain\Order\Order;
 use common\helpers\Price;
 use domain\Document\Document\Document;
 use domain\Document\Document\DocumentSolver;
+use domain\Order\OrderStatus\OrderStatus;
+use domain\Order\OrderStatusHistory\OrderStatusHistory;
 use domain\Order\ProductOrder\ProductOrderSolver;
 use domain\Payment\Payment;
 use domain\Payment\PaymentSolver;
@@ -204,7 +206,7 @@ class OrderSolver extends AbstractService implements SolverInterface
 
         if (count($ordersArray)) {
             foreach ($ordersArray as $order) {
-                if (is_null($order->date_delete)) {
+                if($this->isOrderStatusValid($order)) {
                     foreach ($order->productOrder as $productOrder) {
                         if ($productOrder->id_product == $product->id) {
                             $quantity += $this->productOrderSolver->getQuantityPieces($productOrder);
@@ -226,7 +228,7 @@ class OrderSolver extends AbstractService implements SolverInterface
 
         if (count($ordersArray)) {
             foreach ($ordersArray as $order) {
-                if (is_null($order->date_delete) || $ignoreCancel) {
+                if ($this->isOrderStatusValid($order) || $ignoreCancel) {
                     foreach ($order->productOrder as $productOrder) {
                         if ($productOrder->id_product == $product->id &&
                             ((is_null($unit) && $productOrder->product->unit == $productOrder->unit)
@@ -248,7 +250,7 @@ class OrderSolver extends AbstractService implements SolverInterface
     // getClassHistory
     public function getHistoryClass(Order $order): string
     {
-        if (!is_null($order->date_delete)) {
+        if($this->isOrderStatusCanceled($order)) {
             return 'commande-delete';
         }
 
@@ -280,12 +282,13 @@ class OrderSolver extends AbstractService implements SolverInterface
                 'date' => $order->date_update
             ];
         }
-        if (!is_null($order->date_delete)) {
+        if ($this->isOrderStatusCanceled($order)) {
             $arr = [
                 'class' => 'delete',
                 'glyphicon' => 'remove',
                 'str' => 'Annulée',
-                'date' => $order->date_delete
+                'date' => $this->getOrderStatusHistoryByOrderStatusAlias($order,OrderStatus::ALIAS_CANCELED)
+                    ->getDate()->format('Y-m-d H:i:s')
             ];
         }
 
@@ -546,4 +549,41 @@ class OrderSolver extends AbstractService implements SolverInterface
 
         return $amount;
     }
+
+    public function getOrderStatusHistoryByOrderStatusAlias(Order $order, string $orderStatusAlias): ?OrderStatusHistory
+    {
+        foreach($order->getOrderStatusHistory() as $orderStatusHistory) {
+            if($orderStatusHistory->getOrderStatusAlias() == $orderStatusAlias) {
+                return $orderStatusHistory;
+            }
+        }
+
+        return null;
+    }
+
+    public function isOrderStatusValid(Order $order): bool
+    {
+        return $this->isOrderStatusOrdered($order);
+    }
+
+    public function isOrderStatusCanceledOrDeleted(Order $order): bool
+    {
+        return $this->isOrderStatusCanceled($order)
+            || $this->isOrderStatusDeleted($order);
+    }
+
+    public function isOrderStatusOrdered(Order $order): bool
+    {
+        return $order->getOrderStatusAlias() == OrderStatus::ALIAS_ORDERED;
+    }
+
+    public function isOrderStatusCanceled(Order $order): bool
+    {
+        return $order->getOrderStatusAlias() == OrderStatus::ALIAS_CANCELED;
+    }
+
+    public function isOrderStatusDeleted(Order $order): bool
+    {
+        return $order->getOrderStatusAlias() == OrderStatus::ALIAS_DELETED;
+    }
 }

domain/Order/Order/TillerManager.php

@@ -6,6 +6,7 @@ use common\components\Tiller\TillerClientInterface;
 use common\components\Tiller\TillerClientV2;
 use common\components\Tiller\TillerClientV3;
 use common\helpers\MeanPayment;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\Order\ProductOrder\ProductOrderSolver;
 use domain\Producer\Producer\ProducerSolver;
 use domain\_\AbstractManager;
@@ -74,9 +75,8 @@ class TillerManager extends AbstractManager
             if (!$isSynchro) {
                 $orders = Order::searchAll([
                     'distribution.date' => $date,
-                    'order.tiller_synchronization' => 1
-                ], [
-                    'conditions' => 'date_delete IS NULL'
+                    'order.tiller_synchronization' => 1,
+                    'order_status_alias' => OrderStatus::ALIAS_ORDERED
                 ]);
 
                 $strDate = date('Y-m-d\T12:i:s+0000', strtotime($date) + 1);
@@ -212,9 +212,8 @@ class TillerManager extends AbstractManager
 
             $ordersOpendistrib = Order::searchAll([
                 'distribution.date' => $date,
-                'order.tiller_synchronization' => 1
-            ], [
-                'conditions' => 'date_delete IS NULL'
+                'order.tiller_synchronization' => 1,
+                'order_status_alias' => OrderStatus::ALIAS_ORDERED
             ]);
 
             $ordersOpendistribSynchro = [];

domain/Order/OrderStatus/OrderStatus.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace domain\Order\OrderStatus;
+
+class OrderStatus
+{
+    const ALIAS_ORDERED = 'ordered';
+    const ALIAS_CANCELED = 'canceled';
+    const ALIAS_DELETED = 'deleted';
+
+    public string $alias;
+    public string $name;
+
+    public function getAlias(): string
+    {
+        return $this->alias;
+    }
+
+    public function setAlias(string $alias): self
+    {
+        $this->alias = $alias;
+        return $this;
+    }
+
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    public function setName(string $name): self
+    {
+        $this->name = $name;
+        return $this;
+    }
+}

domain/Order/OrderStatus/OrderStatusBuilder.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace domain\Order\OrderStatus;
+
+use domain\_\AbstractBuilder;
+
+class OrderStatusBuilder extends AbstractBuilder
+{
+    public function instanciateOrderStatus(string $alias, string $name): OrderStatus
+    {
+        $orderStatus = new OrderStatus();
+
+        $orderStatus->setAlias($alias);
+        $orderStatus->setName($name);
+
+        return $orderStatus;
+    }
+}

domain/Order/OrderStatus/OrderStatusDefinition.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace domain\Order\OrderStatus;
+
+use domain\_\AbstractDefinition;
+
+class OrderStatusDefinition extends AbstractDefinition
+{
+    public function getEntityFqcn(): string
+    {
+        return OrderStatus::class;
+    }
+
+    public function getOrderStatusList(): array
+    {
+        return [
+            OrderStatus::ALIAS_ORDERED => [
+                'name' => 'Commandée'
+            ],
+            OrderStatus::ALIAS_CANCELED => [
+                'name' => 'Annulée'
+            ],
+            OrderStatus::ALIAS_DELETED => [
+                'name' => 'Supprimée'
+            ]
+        ];
+    }
+}

domain/Order/OrderStatus/OrderStatusModule.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace domain\Order\OrderStatus;
+
+use domain\_\AbstractModule;
+
+class OrderStatusModule extends AbstractModule
+{
+    public function getDefinition(): OrderStatusDefinition
+    {
+        return  OrderStatusDefinition::getInstance();
+    }
+
+    public function getServices(): array
+    {
+        return [
+            OrderStatusDefinition::class,
+            OrderStatusRepository::class,
+            OrderStatusBuilder::class,
+        ];
+    }
+}

domain/Order/OrderStatus/OrderStatusRepository.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace domain\Order\OrderStatus;
+
+use domain\_\AbstractRepository;
+use yii\base\ErrorException;
+
+class OrderStatusRepository extends AbstractRepository
+{
+    protected OrderStatusDefinition $orderStatusDefinition;
+
+    public function loadDependencies(): void
+    {
+        $this->orderStatusDefinition = $this->loadService(OrderStatusDefinition::class);
+    }
+
+    public function getDefaultOptionsSearch(): array
+    {
+        return [];
+    }
+
+    public function getOrderStatusByAlias(string $alias): OrderStatus
+    {
+        $orderStatusArray = $this->orderStatusDefinition->getOrderStatusList();
+
+        if(isset($orderStatusArray[$alias])) {
+            return OrderStatusBuilder::getInstance()->instanciateOrderStatus(
+                $alias,
+                $orderStatusArray[$alias]['name']
+            );
+        }
+        else {
+            throw new ErrorException('Statut de commande introuvable : '.$alias);
+        }
+    }
+}

domain/Order/OrderStatusHistory/OrderStatusHistory.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace domain\Order\OrderStatusHistory;
+
+use common\components\ActiveRecordCommon;
+use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
+use domain\User\User\User;
+
+class OrderStatusHistory extends ActiveRecordCommon
+{
+    protected OrderStatus $orderStatusObject;
+
+    public function getOrder(): Order
+    {
+        return $this->orderRelation;
+    }
+
+    public function setOrder(Order $order): self
+    {
+        $this->populateFieldObject('id_order', 'orderRelation', $order);
+        return $this;
+    }
+
+    public function getUser(): User
+    {
+        return $this->userRelation;
+    }
+
+    public function setUser(User $user): self
+    {
+        $this->populateFieldObject('id_user', 'userRelation', $user);
+        return $this;
+    }
+
+    public function getDate(): \DateTime
+    {
+        return new \DateTime(strtotime($this->date));
+    }
+
+    public function setDate(\DateTime $date): self
+    {
+        $this->date = $date->format('Y-m-d H:i:s');
+        return $this;
+    }
+
+    public function getOrderStatusAlias(): string
+    {
+        return $this->order_status_alias;
+    }
+
+    public function setOrderStatusAlias(string $orderStatusAlias): self
+    {
+        $this->order_status_alias = $orderStatusAlias;
+        return $this;
+    }
+
+    public function getOrderStatus(): OrderStatus
+    {
+        return $this->orderStatusObject;
+    }
+
+    public function setOrderStatus(OrderStatus $orderStatus): self
+    {
+        $this->orderStatusObject = $orderStatus;
+        $this->setOrderStatusAlias($orderStatus->getAlias());
+        return $this;
+    }
+
+    public static function tableName()
+    {
+        return 'order_status_history';
+    }
+
+    public function rules()
+    {
+        return [
+            [['id_order', 'order_status_alias', 'date', 'id_user'], 'required'],
+            [['id_order', 'id_user'], 'integer'],
+            [['order_status_alias'], 'string'],
+            [['date'], 'safe'],
+        ];
+    }
+
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'id_order' => 'Commande',
+            'order_status_alias' => 'Statut',
+            'date' => 'Date',
+            'id_user' => 'Utilisateur'
+        ];
+    }
+
+    /* Relations */
+
+    private function getOrderRelation()
+    {
+        return $this->hasOne(Order::class, ['id' => 'id_order']);
+    }
+
+    private function getUserRelation()
+    {
+        return $this->hasOne(User::class, ['id' => 'id_user']);
+    }
+}

domain/Order/OrderStatusHistory/OrderStatusHistoryBuilder.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace domain\Order\OrderStatusHistory;
+
+use domain\_\AbstractBuilder;
+use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
+use domain\User\User\User;
+
+class OrderStatusHistoryBuilder extends AbstractBuilder
+{
+    public function instanciateOrderStatusHistory(
+        Order $order,
+        OrderStatus $orderStatus,
+        \DateTime $date,
+        User $user
+    ): OrderStatusHistory
+    {
+        $orderStatusHistory = new OrderStatusHistory();
+
+        $orderStatusHistory->setOrder($order);
+        $orderStatusHistory->setOrderStatus($orderStatus);
+        $orderStatusHistory->setDate($date);
+        $orderStatusHistory->setUser($user);
+
+        return $orderStatusHistory;
+    }
+}

domain/Order/OrderStatusHistory/OrderStatusHistoryDefinition.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace domain\Order\OrderStatusHistory;
+
+use domain\_\AbstractDefinition;
+
+class OrderStatusHistoryDefinition extends AbstractDefinition
+{
+    public function getEntityFqcn(): string
+    {
+        return OrderStatusHistory::class;
+    }
+}

domain/Order/OrderStatusHistory/OrderStatusHistoryManager.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace domain\Order\OrderStatusHistory;
+
+use domain\_\AbstractManager;
+use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
+use domain\User\User\User;
+
+class OrderStatusHistoryManager extends AbstractManager
+{
+    protected OrderStatusHistoryBuilder $orderStatusHistoryBuilder;
+
+    public function loadDependencies(): void
+    {
+        $this->orderStatusHistoryBuilder = $this->loadService(OrderStatusHistoryBuilder::class);
+    }
+
+    public function create(
+        Order $order,
+        OrderStatus $orderStatus,
+        \DateTime $date,
+        User $user
+    ): OrderStatusHistory
+    {
+        $orderStatusHistory = $this->orderStatusHistoryBuilder->instanciateOrderStatusHistory($order, $orderStatus, $date, $user);
+        $this->orderStatusHistoryBuilder->create($orderStatusHistory);
+        return $orderStatusHistory;
+    }
+}

domain/Order/OrderStatusHistory/OrderStatusHistoryModule.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace domain\Order\OrderStatusHistory;
+
+use domain\_\AbstractModule;
+
+class OrderStatusHistoryModule extends AbstractModule
+{
+    public function getDefinition(): OrderStatusHistoryDefinition
+    {
+        return OrderStatusHistoryDefinition::getInstance();
+    }
+
+    public function getServices(): array
+    {
+        return [
+            OrderStatusHistoryDefinition::class,
+            OrderStatusHistoryBuilder::class,
+            OrderStatusHistoryManager::class,
+        ];
+    }
+}

domain/Producer/Producer/ProducerRepository.php

@@ -6,6 +6,8 @@ use common\helpers\Departments;
 use common\helpers\Price;
 use domain\Document\Document\DocumentInterface;
 use domain\Document\Document\DocumentSolver;
+use domain\Order\Order\OrderRepositoryQuery;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\PointSale\PointSale\PointSale;
 use domain\Producer\ProducerPriceRange\ProducerPriceRangeRepository;
 use domain\User\User\User;
@@ -181,7 +183,7 @@ class ProducerRepository extends AbstractRepository
             SELECT SUM('.$selectSum.') AS turnover
             FROM `order`, product_order, distribution, tax_rate
             WHERE `order`.id = product_order.id_order
-            AND `order`.date_delete IS NULL
+            AND '.OrderRepositoryQuery::getSqlFilterIsValid().'
             AND distribution.id_producer = :id_producer
             AND `order`.id_distribution = distribution.id
             AND distribution.date > :date_start

domain/Subscription/Subscription/OrderManager.php

@@ -75,41 +75,4 @@ class OrderManager extends AbstractManager
 
         return $ordersSubscriptionsArray;
     }
-
-    public function updateOrdersIncomingDistributionsFromSubscription(Subscription $subscription, $update = false): array
-    {
-        $orderArray = [];
-        $matchedDistributionsArray = $this->distributionRepository->findDistributionsIncomingMatchWithSubscrtiption($subscription, true);
-
-        if ($update) {
-            $this->deleteOrdersIncomingDistributionsFromSubscription($subscription);
-        }
-
-        if (count($matchedDistributionsArray)) {
-            foreach ($matchedDistributionsArray as $distribution) {
-                $orderArray[] = $this->createOrderFromSubscription($subscription, $distribution->date);
-            }
-        }
-
-        return $orderArray;
-    }
-
-    public function deleteOrdersIncomingDistributionsFromSubscription(Subscription $subscription, bool $deleteAfterDateEnd = false): int
-    {
-        $ordersArray = $this->orderRepository->findOrdersIncomingBySubscription($subscription, !$deleteAfterDateEnd);
-        $countOrdersDeleted = 0;
-
-        if ($ordersArray && count($ordersArray)) {
-            foreach ($ordersArray as $order) {
-                if ($this->distributionSolver->isDistributionAvailable($order->distribution)) {
-                    $theOrder = $this->orderRepository->findOneOrderById($order->id);
-                    $this->orderBuilder->initOrder($theOrder);
-                    $this->orderBuilder->deleteOrder($order, true);
-                    $countOrdersDeleted++;
-                }
-            }
-        }
-
-        return $countOrdersDeleted;
-    }
 }

producer/controllers/OrderController.php

@@ -44,6 +44,7 @@ use common\helpers\Password;
 use domain\Config\Unit\UnitDefinition;
 use domain\Distribution\Distribution\Distribution;
 use domain\Order\Order\Order;
+use domain\Order\OrderStatus\OrderStatus;
 use domain\Order\ProductOrder\ProductOrder;
 use domain\PointSale\PointSale\PointSale;
 use domain\Producer\Producer\Producer;
@@ -228,7 +229,6 @@ class OrderController extends ProducerBaseController
                 $order = new Order;
                 $order->load(\Yii::$app->request->post());
                 $order->id_user = $user ? $user->id : null;
-                $order->status = 'tmp-order';
                 $order->date = date('Y-m-d H:i:s');
                 $order->origin = Order::ORIGIN_USER;
             }
@@ -389,7 +389,12 @@ class OrderController extends ProducerBaseController
 
             $order->comment_point_sale = ($pointSale && strlen($pointSaleModule->getComment($pointSale))) ?
                 $pointSaleModule->getComment($pointSale) : '';
-            $order->date_delete = null; // la commande est automatiquement réactivée lors d'une modification
+
+            // une commande annulée est automatiquement réactivée lors d'une modification
+            if($orderModule->getSolver()->isOrderStatusCanceled($order)) {
+                $orderModule->getManager()->changeOrderStatus($order, OrderStatus::ALIAS_ORDERED, $this->getUserCurrent());
+            }
+
             $order->delivery_home = isset($posts['Order']['delivery_home']) ? $posts['Order']['delivery_home'] : false;
             $order->delivery_address = (isset($posts['Order']['delivery_address']) && $order->delivery_home) ? $posts['Order']['delivery_address'] : null;
 
@@ -406,7 +411,7 @@ class OrderController extends ProducerBaseController
             $order->save();
 
             $orderModule->generateOrderReference($order);
-            $orderModule->updateOrderStatus($order, 'new-order', 'user');
+            $orderModule->getManager()->changeOrderStatus($order, OrderStatus::ALIAS_ORDERED, $user);
             $producerModule->addUser($user, $producer);
 
             // suppression de tous les enregistrements ProductOrder
@@ -547,14 +552,14 @@ class OrderController extends ProducerBaseController
             throw new \yii\web\NotFoundHttpException('Commande introuvable');
         }
 
-        $orderModule->initOrder($order);
+        $orderModule->getBuilder()->initOrder($order);
 
         if (!$orderModule->isOrderStateOpen($order)) {
             throw new UserException('Vous ne pouvez plus annuler cette commande.');
         }
 
         if ($orderModule->isOrderbelongsToUser($order, GlobalParam::getCurrentUser())) {
-            $orderModule->deleteOrder($order);
+            $orderModule->getManager()->deleteOrder($order, $this->getUserCurrent());
             $this->setFlash('success', 'Votre commande a bien été annulée.');
         }
 

producer/controllers/SubscriptionController.php

@@ -89,6 +89,7 @@ class SubscriptionController extends ProducerBaseController
 
     public function actionAjaxProcess()
     {
+        $orderModule = $this->getOrderModule();
         $subscriptionModule = $this->getSubscriptionModule();
         $model = new SubscriptionForm();
         $model->id_producer = GlobalParam::getCurrentProducerId();
@@ -110,8 +111,8 @@ class SubscriptionController extends ProducerBaseController
         if ($model->load($posts) && $model->validate() && $model->save()) {
 
             $subscription = $subscriptionModule->getRepository()->findOneSubscriptionById($model->id);
-            $subscriptionModule->getOrderManager()
-                ->updateOrdersIncomingDistributionsFromSubscription($subscription, $isUpdate);
+            $orderModule->getManager()
+                ->updateOrdersIncomingDistributionsFromSubscription($subscription, $this->getUserCurrent(), $isUpdate);
 
             if ($isUpdate) {
                 $this->setFlash('success', "L'abonnement a bien été modifié");
@@ -240,8 +241,8 @@ class SubscriptionController extends ProducerBaseController
         if($subscription) {
             $subscriptionModule->getBuilder()->deleteSubscription($subscription);
             // @TODO : gérer via événements
-            $this->getSubscriptionModule()->getOrderManager()
-                ->deleteOrdersIncomingDistributionsFromSubscription($subscription);
+            $this->getOrderModule()->getManager()
+                ->deleteOrdersIncomingDistributionsFromSubscription($subscription, $this->getUserCurrent());
 
             $this->setFlash('success', "L'abonnement a bien été modifié");
         }