Browse Source

Merge branch 'dev'

prodstable
Guillaume Bourgeois 5 years ago
parent
commit
da0600e8b2
2 changed files with 4 additions and 3 deletions
  1. +2
    -2
      backend/views/distribution/index.php
  2. +2
    -1
      common/models/SubscriptionSearch.php

+ 2
- 2
backend/views/distribution/index.php View File

<span class="info-box-icon bg-yellow"><i class="fa fa-euro"></i></span> <span class="info-box-icon bg-yellow"><i class="fa fa-euro"></i></span>
<div class="info-box-content"> <div class="info-box-content">
<span class="info-box-text">CA</span> <span class="info-box-text">CA</span>
<span class="info-box-number">{{ distribution.revenues }} <span class="normal">/ {{ distribution.potential_revenues }}</span></span>
<span class="info-box-number">{{ distribution.revenues }} <span class="normal" v-if="distribution.potential_revenues != '0.00 €'">/ {{ distribution.potential_revenues }}</span></span>
<span class="info-box-text">Poids</span> <span class="info-box-text">Poids</span>
<span class="info-box-number">{{ distribution.weight }} kg <span class="normal">/ {{ distribution.potential_weight }} kg</span></span>
<span class="info-box-number">{{ distribution.weight }} kg <span class="normal" v-if="distribution.potential_weight > 0">/ {{ distribution.potential_weight }} kg</span></span>
</div> </div>
</div> </div>
</div> </div>

+ 2
- 1
common/models/SubscriptionSearch.php View File

$query->andFilterWhere([ $query->andFilterWhere([
'or', 'or',
['like', 'user.lastname', $this->username], ['like', 'user.lastname', $this->username],
['like', 'user.name', $this->username]
['like', 'user.name', $this->username],
['like', 'subscription.username', $this->username]
]); ]);
$query->andFilterWhere(['like', 'product.name', $this->product_name]) ; $query->andFilterWhere(['like', 'product.name', $this->product_name]) ;

Loading…
Cancel
Save