Crédit pain : comportement user_etablissement

Adaptation des fonctionnalités dépendantes suite à l'ajout du champs 
"actif" dans la table "user_etablissement".

backend/controllers/CommandeController.php

     {
 
         // changement état
-        $production = Production::find()->where(['date' => $date])->one();
+        $production = Production::find()->where(['date' => $date, 'id_etablissement' => Yii::$app->user->identity->id_etablissement])->one();
         $production->actif = $actif;
         $production->save();
-
+        
         // add commandes automatiques
         if($actif)
         {

backend/controllers/UserController.php

                 ->select('*')
                 ->from('user, user_etablissement')
                 ->where('user.id = user_etablissement.id_user')
+                ->andWhere('user_etablissement.actif = 1')
                 ->andWhere('user_etablissement.id_etablissement = '.Yii::$app->user->identity->id_etablissement)
         ]);
         
             $user_etablissement = new UserEtablissement() ;
             $user_etablissement->id_user = $model->id ;
             $user_etablissement->id_etablissement = Yii::$app->user->identity->id_etablissement ;
+            $user_etablissement->credit = 0 ;
+            $user_etablissement->actif = 1 ;
             $user_etablissement->save() ;
             
             // send mail
                 ->select('*')
                 ->from('user, user_etablissement')
                 ->where('user.id = user_etablissement.id_user')
+                ->andWhere('user_etablissement.actif = 1')
                 ->andWhere('user_etablissement.id_etablissement = '.Yii::$app->user->identity->id_etablissement)
                 ->all() ;
         

backend/views/commande/index.php

                                             </span>
                                             <span class="the-title"></span>
                                             <span class="choix-user">
-                                                <?= Html::activeDropDownList(new User, 'id', ArrayHelper::map(User::find()->joinWith('userEtablissement')->where('user_etablissement.id_etablissement = '.Yii::$app->user->identity->id_etablissement)->all(), 'id', function($model, $defaultValue) {
+                                                <?= Html::activeDropDownList(new User, 'id', ArrayHelper::map(User::find()->joinWith('userEtablissement')->where('user_etablissement.id_etablissement = '.Yii::$app->user->identity->id_etablissement)->andWhere('user_etablissement.actif = 1')->all(), 'id', function($model, $defaultValue) {
                                                         return $model['nom'].' '.$model['prenom'];
                                                     }), ['prompt' => '--','class' => 'form-control user-id']) ?>
                                                 OU <input type="text" class="form-control username" placeholder="Choisissez un nom" />

backend/views/commandeauto/_form.php

 <div class="commandeauto-form">
 <?php $form = ActiveForm::begin(['enableClientValidation' => false]); ?>
     <div class="col-md-5" id="bloc-select-user">
-        <?= $form->field($model, 'id_user')->dropDownList( ArrayHelper::map(User::find()->joinWith('userEtablissement')->where('user_etablissement.id_etablissement = '.Yii::$app->user->identity->id_etablissement)->orderBy('nom ASC, prenom ASC')->all(), 'id', function($model, $defaultValue) {
+        <?= $form->field($model, 'id_user')->dropDownList( ArrayHelper::map(User::find()->joinWith('userEtablissement')->where('user_etablissement.id_etablissement = '.Yii::$app->user->identity->id_etablissement)->andWhere('user_etablissement.actif = 1')->orderBy('nom ASC, prenom ASC')->all(), 'id', function($model, $defaultValue) {
             return $model['nom'].' '.$model['prenom'];
         }), ['prompt' => '--','class' => 'form-control user-id', ]) ?>
     </div>

common/models/User.php

             ->from(['user_etablissement', 'etablissement'])
             ->where('user_etablissement.id_etablissement = etablissement.id')
             ->andWhere(['user_etablissement.id_user' => $this->id])
+            ->andWhere(['user_etablissement.actif' => 1])
             ->all();   
         
         $arr_etabs = array() ;

frontend/controllers/CommandeController.php

                 ->where(['id_etablissement'=>$id, 'id_user' => Yii::$app->user->identity->id])
                 ->one() ;
         
-        $user_etablissement->delete() ;
+        $user_etablissement->actif = 0 ;
+        $user_etablissement->save() ;
+        
         $this->redirect(['commande/index']) ;
     }
 

frontend/models/AddEtablissementForm.php

                 }
                 
                 $user_etablissement_exist = UserEtablissement::find()
-                ->where(['id_user'=>Yii::$app->user->identity->id, 'id_etablissement' =>$this->id_etablissement])
+                ->where([
+                    'id_user' => Yii::$app->user->identity->id, 
+                    'id_etablissement' => $this->id_etablissement,
+                    'actif' => 1
+                 ])
                 ->one() ;
                 
                 if($user_etablissement_exist)
     {       
         $etablissement = Etablissement::findOne($this->id_etablissement) ;
         
-        $user_etablissement = new UserEtablissement() ;
-        $user_etablissement->id_user = Yii::$app->user->identity->id ;
-        $user_etablissement->id_etablissement = $this->id_etablissement ;
-        $user_etablissement->save() ;
-
+        $user_etablissement_exist = UserEtablissement::find()
+            ->where([
+                'id_user' => Yii::$app->user->identity->id, 
+                'id_etablissement' => $this->id_etablissement,
+                'actif' => 0
+             ])
+            ->one() ;
+        
+        if($user_etablissement_exist)
+        {
+            $user_etablissement_exist->actif = 1 ;
+            $user_etablissement_exist->save() ;
+        }
+        else {
+            $user_etablissement = new UserEtablissement() ;
+            $user_etablissement->id_user = Yii::$app->user->identity->id ;
+            $user_etablissement->id_etablissement = $this->id_etablissement ;
+            $user_etablissement->credit = 0 ;
+            $user_etablissement->actif = 1 ;
+            $user_etablissement->save() ;
+        }
+        
         Yii::$app->session->setFlash('success', 'La boulangerie <strong>'.Html::encode($etablissement->nom).'</strong> a bien été ajoutée à votre tableau de bord.') ;
     }
 }

frontend/models/SignupForm.php

                             $etab_user = new UserEtablissement ;
                             $etab_user->id_etablissement = $this->id_etablissement ;
                             $etab_user->id_user = $user->id ;
+                            $etab_user->credit = 0 ;
+                            $etab_user->actif = 1 ;
                             $etab_user->save() ;
                         }
                     }
                     $etab_user = new UserEtablissement ;
                     $etab_user->id_etablissement = $etablissement->id ;
                     $etab_user->id_user = $user->id ;
+                    $etab_user->credit = 0 ;
+                    $etab_user->actif = 1 ;
                     $etab_user->save() ;
                 }