Merge branch 'dev'

backend/views/distribution/index.php

@@ -173,9 +173,9 @@ $this->setPageTitle('Distributions') ;
                             <span class="info-box-icon bg-yellow"><i class="fa fa-euro"></i></span>
                             <div class="info-box-content">
                                 <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-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>

common/models/SubscriptionSearch.php

@@ -134,7 +134,8 @@ class SubscriptionSearch extends Subscription
         $query->andFilterWhere([
             'or',
             ['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]) ;