Correction bug annulation de commande du jour lors de la suppression d'un abonnement.

common/models/Subscription.php

@@ -404,10 +404,21 @@ class Subscription extends ActiveRecordCommon
             ':id_subscription' => $this->id
         ]; 
         
+        
+        $orderDeadline = Producer::getConfig('order_deadline') ;
+        $hour = date('G') ;
+        
+        if($hour >= $orderDeadline) {
+            $conditionDistributionDate = 'distribution.date > :date_today' ;
+        }
+        else {
+            $conditionDistributionDate = 'distribution.date >= :date_today' ;
+        }
+        
         $orders = Order::find()
             ->joinWith('distribution')
             ->where('distribution.id_producer = :id_producer')
-            ->andWhere('distribution.date >= :date_today')
+            ->andWhere($conditionDistributionDate)
             ->andWhere('distribution.date >= :date_begin')
             ->andWhere('order.id_subscription = :id_subscription') ;
             
@@ -425,6 +436,7 @@ class Subscription extends ActiveRecordCommon
             foreach($ordersArray as $order) {
                 
                 $theOrder = Order::searchOne(['id' => $order->id]) ;
+
                 // remboursement de la commande
                 if ($theOrder->id_user && $theOrder->getAmount(Order::AMOUNT_PAID) && $configCredit) {
                     $theOrder->saveCreditHistory(