Eugeny Galkovskiy / timeinvest

Commit 148144e8997ce5dc86aeabf0fec84fbae18c8ac6

Authored by Eugeny Galkovskiy
2 parents 53303a00 89ac7d13

Merge remote-tracking branch 'origin/master'

Showing 6 changed files with 66 additions and 10 deletions   Show diff stats
Inline Side-by-side
common/mail/feedback.php
  Show/Hide comments   View file @148144e
... ... @@ -58,14 +58,27 @@
58 58 ?>
59 59  
60 60 <tr>
61   - <td><b><?= \Yii::t('app', 'Comment: ') ?></b></td>
  61 + <td><b><?= \Yii::t('app', 'Комментарий: ') ?></b></td>
62 62 <td><?= $model->message ?></td>
63 63 </tr>
64 64  
65 65 <?php
66 66  
67 67 }
68   -
  68 +
  69 + if ( isset($model->inviter) ) {
  70 +
  71 + ?>
  72 +
  73 + <tr>
  74 + <td><b><?= \Yii::t('app', 'ФИО пригласителя: ') ?></b></td>
  75 + <td><?= $model->inviter ?></td>
  76 + </tr>
  77 +
  78 + <?php
  79 +
  80 + }
  81 +
69 82 ?>
70 83  
71 84 </tbody>
... ...
common/models/Feedback.php
  Show/Hide comments   View file @148144e
... ... @@ -34,7 +34,7 @@
34 34 'phone',
35 35 'oplata',
36 36 'promocode',
37   - 'message',
  37 + 'inviter',
38 38 ],
39 39 self::SCENARIO_CALLBACK => [
40 40 'name',
... ... @@ -94,6 +94,7 @@
94 94 'email',
95 95 'oplata',
96 96 'promocode',
  97 + 'inviter',
97 98 ],
98 99 'string',
99 100 'max' => 255,
... ...
console/migrations/m171211_163526_add_inviter_column_to_feedback_table.php 0 → 100644
  Show/Hide comments   View file @148144e
  1 +<?php
  2 +
  3 +use yii\db\Migration;
  4 +
  5 +/**
  6 + * Handles adding inviter to table `frrdback`.
  7 + */
  8 +class m171211_163526_add_inviter_column_to_feedback_table extends Migration
  9 +{
  10 + /**
  11 + * @inheritdoc
  12 + */
  13 + public function up()
  14 + {
  15 + $this->addColumn('feedback', 'inviter', $this->string(100));
  16 + }
  17 +
  18 + /**
  19 + * @inheritdoc
  20 + */
  21 + public function down()
  22 + {
  23 + $this->dropColumn('feedback', 'inviter');
  24 + }
  25 +}
... ...
frontend/controllers/SiteController.php
  Show/Hide comments   View file @148144e
... ... @@ -112,7 +112,14 @@
112 112 if (empty(Yii::$app->request->post())) {
113 113 throw new BadRequestHttpException();
114 114 } else {
115   - $model = new Feedback(['scenario'=>Feedback::SCENARIO_FEEDBACK]);
  115 + $def = Yii::$app->request->post('def');
  116 + if ( isset($def) ){
  117 + $model = new Feedback(['scenario'=>Feedback::SCENARIO_DEFAULT]);
  118 + }
  119 + else{
  120 + $model = new Feedback(['scenario'=>Feedback::SCENARIO_FEEDBACK]);
  121 + }
  122 +
116 123 if ($model->load(Yii::$app->request->post()) && $model->save()) {
117 124  
118 125 $mailer->compose(
... ... @@ -126,7 +133,7 @@
126 133 [
127 134 'kotets.nik@gmail.com',
128 135 'kazimirova.artweb@gmail.com',
129   - 'tamerlan8.05.92@gmail.com',
  136 +// 'tamerlan8.05.92@gmail.com',
130 137 ]
131 138 )
132 139 ->setSubject('Bitcoin Invest участие в форуме')
... ...
frontend/views/layouts/main.php
  Show/Hide comments   View file @148144e
... ... @@ -222,8 +222,12 @@ _________________________________________________________ --&gt;
222 222 ->textInput()->Label('Впишите промокод для получения скидки -20%'); ?>
223 223 </div>
224 224 <div class="col-md-6">
225   - <label class="control-label" for="feedback-inviter">ФИО пригласителя</label>
226   - <input type="text" id="feedback-inviter" class="form-control" name="Feedback[inviter]" aria-invalid="false">
  225 +
  226 + <?= $form->field($feedback, 'inviter')
  227 + ->textInput()->Label('ФИО пригласителя'); ?>
  228 +
  229 +<!-- <label class="control-label" for="feedback-inviter">ФИО пригласителя</label>-->
  230 +<!-- <input type="text" id="feedback-inviter" class="form-control" name="Feedback[inviter]" aria-invalid="false">-->
227 231 </div>
228 232 </div>
229 233 <div class="col-md-10 col-md-offset-1 form-down">
... ... @@ -331,12 +335,14 @@ _________________________________________________________ --&gt;
331 335  
332 336 <?php $form = ActiveForm::begin(
333 337 [
334   - 'id' => 'feedback-form',
  338 + 'id' => 'feedback-form2',
335 339 'method' => 'POST',
336 340 'action' => '/site/feedback',
337 341 ]
338 342 );
339 343 $feedback = new Feedback(['scenario' => Feedback::SCENARIO_DEFAULT]);
  344 +
  345 + echo Html::hiddenInput('def', "1");
340 346 ?>
341 347 <div class="col-md-12">
342 348 <div class="col-md-12">
... ...
frontend/web/js/script.js
  Show/Hide comments   View file @148144e
... ... @@ -6,7 +6,7 @@ $(
6 6 */
7 7 $(document)
8 8 .on(
9   - 'beforeSubmit', '#feedback-form', function(e) {
  9 + 'beforeSubmit', '#feedback-form,#feedback-form2', function(e) {
10 10 var f = this;
11 11 var form = $(this);
12 12 var formData = form.serialize();
... ... @@ -19,6 +19,9 @@ $(
19 19 f.reset();
20 20 $('#feedback-modal')
21 21 .modal('hide');
  22 + $('#question-modal')
  23 + .modal('hide');
  24 +
22 25 $('#success-modal')
23 26 .modal('show');
24 27 form.data("yiiActiveForm").validated = false;
... ... @@ -32,7 +35,8 @@ $(
32 35 }
33 36 )
34 37 .on(
35   - 'submit', '#feedback-form', function(e) {
  38 + 'submit', '#feedback-form,#feedback-form2', function(e) {
  39 + e.preventDefault();
36 40 return false;
37 41 }
38 42 );
... ...