Merge branch 'dev'

backend/views/distribution/index.php

@@ -544,7 +544,7 @@ $this->setPageTitle('Distributions') ;
                         <option value="0">--</option>
                         <option v-for="user in users" :value="user.id_user" @click="userChange">
                                 <template v-if="user.name_legal_person && user.name_legal_person.length">
-                                        {{ user.name_legal_person  }}
+                                        Personne morale / {{ user.name_legal_person  }}
                                 </template>
                                 <template v-else>
                                         {{ user.lastname +' '+ user.name }}

backend/views/subscription/_form.php

@@ -54,7 +54,11 @@ use common\helpers\GlobalParam ;
     <?php endif; ?>
     <div class="col-md-5" id="bloc-select-user">
         <?= $form->field($model, 'id_user')->dropDownList( ArrayHelper::map(User::find()->joinWith('userProducer')->where('user_producer.id_producer = '.GlobalParam::getCurrentProducerId())->andWhere('user_producer.active = 1')->orderBy('lastname ASC, name ASC')->all(), 'id', function($model, $defaultValue) {
-            return $model['lastname'].' '.$model['name'];
+                if (isset($model['name_legal_person']) && strlen($model['name_legal_person'])) {
+                        return 'Personne morale / '.$model['name_legal_person'];
+                } else {
+                        return $model['lastname'] . ' ' . $model['name'];
+                }
         }), ['prompt' => '--','class' => 'form-control user-id', ]) ?>
     </div>
     <div class="col-md-1" id="or-user">

producer/controllers/SiteController.php

@@ -94,6 +94,7 @@ class SiteController extends ProducerBaseController
                         'query' => PointSale::find()
                                 ->where([
                                         'id_producer' => $this->getProducer()->id,
+                                        'restricted_access' => 0
                                 ]),
                         'pagination' => [
                                 'pageSize' => 50,