Ver código fonte

[backend] Distributions : optimisation chargement ajax des distributions (commandes, produits)

dev
Guillaume Bourgeois 5 anos atrás
pai
commit
265106496c
2 arquivos alterados com 14 adições e 7 exclusões
  1. +2
    -2
      backend/controllers/DistributionController.php
  2. +12
    -5
      common/models/Order.php

+ 2
- 2
backend/controllers/DistributionController.php Ver arquivo

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

+ 12
- 5
common/models/Order.php Ver arquivo

@@ -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 ;
}

Carregando…
Cancelar
Salvar