Merge branch 'dev'

frontend/controllers/SiteController.php

@@ -250,7 +250,7 @@ class SiteController extends FrontendController
         public function actionSignup()
         {
                 $model = new SignupForm();
-                /*if ($model->load(Yii::$app->request->post())) {
+                if ($model->load(Yii::$app->request->post())) {
                         $user = $model->signup();
                         if ($user) {
                                 if (Yii::$app->getUser()->login($user)) {
@@ -266,7 +266,7 @@ class SiteController extends FrontendController
                                         }
                                 }
                         }
-                }*/
+                }
 
                 // liste des établissements disponibles
                 $producersArray = Producer::getProducerPopulateDropdown();

frontend/models/SignupForm.php

@@ -69,6 +69,7 @@ class SignupForm extends Model
     public $type;
     public $free_price ;
     public $id_tax_rate_default ;
+    public $verifyCode;
 
     /**
      * @inheritdoc
@@ -186,7 +187,8 @@ class SignupForm extends Model
             ['free_price', 'number'],
             ['id_tax_rate_default', 'exist',
                     'targetClass' => TaxRate::className(),
-                    'targetAttribute' => ['id_tax_rate_default' => 'id']]
+                    'targetAttribute' => ['id_tax_rate_default' => 'id']],
+            ['verifyCode', 'captcha', 'message' => 'Veuillez recopier le code de vérification'],
         ];
     }
     
@@ -209,6 +211,7 @@ class SignupForm extends Model
             'type' => 'Type de producteur',
             'free_price' => 'Prix libre',
             'id_tax_rate_default' => 'TVA par défaut',
+            'verifyCode' => 'Code de vérification',
         ];
     }
 

frontend/views/site/signup.php

@@ -52,9 +52,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
     <h1 class="title-system-order"><span class="glyphicon glyphicon-user"></span>&nbsp;&nbsp;<?= Html::encode($this->title) ?></h1>
 
-    <div class="alert alert-warning">Inscription momentanément désactivée</div>
-
-    <!--<div class="row">
+    <div class="row">
         <div class="col-lg-5">
             <?php if(YII_ENV == 'demo'): ?>
                 <div class="alert alert-warning">
@@ -107,15 +105,17 @@ $this->params['breadcrumbs'][] = $this->title;
                         </div>
                     </div>
 
+                    <?= $form->field($model, 'verifyCode')->widget(\yii\captcha\Captcha::className(), [
+                            'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
+                    ]) ?>
+
                     <div class="form-group" id="buttons-signup">
                         <?= Html::submitButton("S'inscrire", ['class' => 'btn btn-primary', 'name' => 'signup-button']) ?>
                     </div>
                 <?php ActiveForm::end(); ?>
             <?php endif; ?>
-            
-            
         </div>
-    </div>-->
+    </div>
 </div>
 
 <!-- CGV -->