Merge branch 'dev'

backend/controllers/DistributionController.php

@@ -156,8 +156,8 @@ class DistributionController extends BackendController
                 }])
                 ->orderBy('product_distribution.active DESC, order ASC')
                 ->asArray()
-                ->all();
-                
+                ->all(); 
+            
             $potentialRevenues = 0;
             $potentialWeight = 0;
             

common/models/Order.php

@@ -206,10 +206,15 @@ class Order extends ActiveRecordCommon
      */
     public function initPaidAmount() 
     {
-        $history = CreditHistory::find()
-            ->where(['id_order' => $this->id])
-            ->all();
-
+        if(isset($this->creditHistory)) {
+            $history = $this->creditHistory ;
+        }
+        else {
+            $history = CreditHistory::find()
+             ->where(['id_order' => $this->id])
+             ->all();
+        }
+        
         $this->paid_amount = 0 ;
 
         if(count($history)) {
@@ -665,7 +670,9 @@ class Order extends ActiveRecordCommon
         if(is_array($orders)) {
             if(count($orders)) {
                 foreach($orders as $order) {
-                    $order->init() ;
+                    if(is_a($order, 'common\models\Order')) {
+                        $order->init() ;
+                    }
                 }
                 return $orders ;
             }