Merge remote-tracking branch 'origin/master'

Eugeny Galkovskiy
2 parents 53303a00 89ac7d13
Showing 6 changed files with 66 additions and 10 deletions Show diff stats
common/mail/feedback.php
common/models/Feedback.php
console/migrations/m171211_163526_add_inviter_column_to_feedback_table.php
frontend/controllers/SiteController.php
frontend/views/layouts/main.php
frontend/web/js/script.js
@@ -58,14 +58,27 @@
                 ?>
                 <tr>
-                    <td><b><?= \Yii::t('app', 'Comment: ') ?></b></td>
+                    <td><b><?= \Yii::t('app', 'Комментарий: ') ?></b></td>
                     <td><?= $model->message ?></td>
                 </tr>
                 <?php
             }
-      
+    
+          if ( isset($model->inviter) ) {
+    
+              ?>
+    
+              <tr>
+                  <td><b><?= \Yii::t('app', 'ФИО пригласителя: ') ?></b></td>
+                  <td><?= $model->inviter ?></td>
+              </tr>
+              
+              <?php
+    
+          }
+          
       ?>
   </tbody>
@@ -34,7 +34,7 @@
                         'phone',
                         'oplata',
                         'promocode',
-                        'message',
+                        'inviter',
                     ],
                     self::SCENARIO_CALLBACK => [
                         'name',
@@ -94,6 +94,7 @@
                         'email',
                         'oplata',
                         'promocode',
+                        'inviter',
                     ],
                     'string',
                     'max' => 255,
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles adding inviter to table `frrdback`.
+ */
+class m171211_163526_add_inviter_column_to_feedback_table extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function up()
+    {
+        $this->addColumn('feedback', 'inviter', $this->string(100));
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function down()
+    {
+        $this->dropColumn('feedback', 'inviter');
+    }
+}
@@ -112,7 +112,14 @@
             if (empty(Yii::$app->request->post())) {
                 throw new BadRequestHttpException();
             } else {
-                $model = new Feedback(['scenario'=>Feedback::SCENARIO_FEEDBACK]);
+                $def = Yii::$app->request->post('def');
+                if ( isset($def) ){
+                    $model = new Feedback(['scenario'=>Feedback::SCENARIO_DEFAULT]);
+                }
+                else{
+                    $model = new Feedback(['scenario'=>Feedback::SCENARIO_FEEDBACK]);
+                }
+                
                 if ($model->load(Yii::$app->request->post()) && $model->save()) {
                     $mailer->compose(
@@ -126,7 +133,7 @@
                                [
                                    'kotets.nik@gmail.com',
                                    'kazimirova.artweb@gmail.com',
-                                   'tamerlan8.05.92@gmail.com',
+//                                   'tamerlan8.05.92@gmail.com',
                                ]
                            )
                            ->setSubject('Bitcoin Invest участие в форуме')
@@ -222,8 +222,12 @@ _________________________________________________________ --&gt;
                               ->textInput()->Label('Впишите промокод для получения скидки -20%'); ?>
                       </div>
                       <div class="col-md-6">
-                          <label class="control-label" for="feedback-inviter">ФИО пригласителя</label>
-                          <input type="text" id="feedback-inviter" class="form-control" name="Feedback[inviter]" aria-invalid="false">
+    
+                          <?= $form->field($feedback, 'inviter')
+                                   ->textInput()->Label('ФИО пригласителя'); ?>
+                          
+<!--                          <label class="control-label" for="feedback-inviter">ФИО пригласителя</label>-->
+<!--                          <input type="text" id="feedback-inviter" class="form-control" name="Feedback[inviter]" aria-invalid="false">-->
                       </div>
                   </div>
                   <div class="col-md-10 col-md-offset-1 form-down">
@@ -331,12 +335,14 @@ _________________________________________________________ --&gt;
                   <?php $form = ActiveForm::begin(
                       [
-                          'id'     => 'feedback-form',
+                          'id'     => 'feedback-form2',
                           'method' => 'POST',
                           'action' => '/site/feedback',
                       ]
                   );
                       $feedback = new Feedback(['scenario' => Feedback::SCENARIO_DEFAULT]);
+                      
+                      echo Html::hiddenInput('def', "1");
                   ?>
                   <div class="col-md-12">
                       <div class="col-md-12">
@@ -6,7 +6,7 @@ $(
          */
         $(document)
             .on(
-                'beforeSubmit', '#feedback-form', function(e) {
+                'beforeSubmit', '#feedback-form,#feedback-form2', function(e) {
                     var f = this;
                     var form = $(this);
                     var formData = form.serialize();
@@ -19,6 +19,9 @@ $(
                                 f.reset();
                                 $('#feedback-modal')
                                     .modal('hide');
+                                $('#question-modal')
+                                    .modal('hide');
+
                                 $('#success-modal')
                                     .modal('show');
                                 form.data("yiiActiveForm").validated = false;
@@ -32,7 +35,8 @@ $(
                 }
             )
             .on(
-                'submit', '#feedback-form', function(e) {
+                'submit', '#feedback-form,#feedback-form2', function(e) {
+                    e.preventDefault();
                     return false;
                 }
             );