Commit 4eac4a7dcb7ff6fbf8b79d93efaa81af77ff2779
1 parent
b5b67f02
second form submit 2
Showing
6 changed files
with
66 additions
and
10 deletions
Show diff stats
common/mail/feedback.php
@@ -58,14 +58,27 @@ | @@ -58,14 +58,27 @@ | ||
58 | ?> | 58 | ?> |
59 | 59 | ||
60 | <tr> | 60 | <tr> |
61 | - <td><b><?= \Yii::t('app', 'Comment: ') ?></b></td> | 61 | + <td><b><?= \Yii::t('app', 'Комментарий: ') ?></b></td> |
62 | <td><?= $model->message ?></td> | 62 | <td><?= $model->message ?></td> |
63 | </tr> | 63 | </tr> |
64 | 64 | ||
65 | <?php | 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 | </tbody> | 84 | </tbody> |
common/models/Feedback.php
@@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
34 | 'phone', | 34 | 'phone', |
35 | 'oplata', | 35 | 'oplata', |
36 | 'promocode', | 36 | 'promocode', |
37 | - 'message', | 37 | + 'inviter', |
38 | ], | 38 | ], |
39 | self::SCENARIO_CALLBACK => [ | 39 | self::SCENARIO_CALLBACK => [ |
40 | 'name', | 40 | 'name', |
@@ -94,6 +94,7 @@ | @@ -94,6 +94,7 @@ | ||
94 | 'email', | 94 | 'email', |
95 | 'oplata', | 95 | 'oplata', |
96 | 'promocode', | 96 | 'promocode', |
97 | + 'inviter', | ||
97 | ], | 98 | ], |
98 | 'string', | 99 | 'string', |
99 | 'max' => 255, | 100 | 'max' => 255, |
console/migrations/m171211_163526_add_inviter_column_to_feedback_table.php
0 → 100644
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
@@ -112,7 +112,14 @@ | @@ -112,7 +112,14 @@ | ||
112 | if (empty(Yii::$app->request->post())) { | 112 | if (empty(Yii::$app->request->post())) { |
113 | throw new BadRequestHttpException(); | 113 | throw new BadRequestHttpException(); |
114 | } else { | 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 | if ($model->load(Yii::$app->request->post()) && $model->save()) { | 123 | if ($model->load(Yii::$app->request->post()) && $model->save()) { |
117 | 124 | ||
118 | $mailer->compose( | 125 | $mailer->compose( |
@@ -126,7 +133,7 @@ | @@ -126,7 +133,7 @@ | ||
126 | [ | 133 | [ |
127 | 'kotets.nik@gmail.com', | 134 | 'kotets.nik@gmail.com', |
128 | 'kazimirova.artweb@gmail.com', | 135 | 'kazimirova.artweb@gmail.com', |
129 | - 'tamerlan8.05.92@gmail.com', | 136 | +// 'tamerlan8.05.92@gmail.com', |
130 | ] | 137 | ] |
131 | ) | 138 | ) |
132 | ->setSubject('Bitcoin Invest участие в форуме') | 139 | ->setSubject('Bitcoin Invest участие в форуме') |
frontend/views/layouts/main.php
@@ -222,8 +222,12 @@ _________________________________________________________ --> | @@ -222,8 +222,12 @@ _________________________________________________________ --> | ||
222 | ->textInput()->Label('Впишите промокод для получения скидки -20%'); ?> | 222 | ->textInput()->Label('Впишите промокод для получения скидки -20%'); ?> |
223 | </div> | 223 | </div> |
224 | <div class="col-md-6"> | 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 | </div> | 231 | </div> |
228 | </div> | 232 | </div> |
229 | <div class="col-md-10 col-md-offset-1 form-down"> | 233 | <div class="col-md-10 col-md-offset-1 form-down"> |
@@ -273,12 +277,14 @@ _________________________________________________________ --> | @@ -273,12 +277,14 @@ _________________________________________________________ --> | ||
273 | 277 | ||
274 | <?php $form = ActiveForm::begin( | 278 | <?php $form = ActiveForm::begin( |
275 | [ | 279 | [ |
276 | - 'id' => 'feedback-form', | 280 | + 'id' => 'feedback-form2', |
277 | 'method' => 'POST', | 281 | 'method' => 'POST', |
278 | 'action' => '/site/feedback', | 282 | 'action' => '/site/feedback', |
279 | ] | 283 | ] |
280 | ); | 284 | ); |
281 | $feedback = new Feedback(['scenario' => Feedback::SCENARIO_DEFAULT]); | 285 | $feedback = new Feedback(['scenario' => Feedback::SCENARIO_DEFAULT]); |
286 | + | ||
287 | + echo Html::hiddenInput('def', "1"); | ||
282 | ?> | 288 | ?> |
283 | <div class="col-md-12"> | 289 | <div class="col-md-12"> |
284 | <div class="col-md-12"> | 290 | <div class="col-md-12"> |
frontend/web/js/script.js
@@ -6,7 +6,7 @@ $( | @@ -6,7 +6,7 @@ $( | ||
6 | */ | 6 | */ |
7 | $(document) | 7 | $(document) |
8 | .on( | 8 | .on( |
9 | - 'beforeSubmit', '#feedback-form', function(e) { | 9 | + 'beforeSubmit', '#feedback-form,#feedback-form2', function(e) { |
10 | var f = this; | 10 | var f = this; |
11 | var form = $(this); | 11 | var form = $(this); |
12 | var formData = form.serialize(); | 12 | var formData = form.serialize(); |
@@ -19,6 +19,9 @@ $( | @@ -19,6 +19,9 @@ $( | ||
19 | f.reset(); | 19 | f.reset(); |
20 | $('#feedback-modal') | 20 | $('#feedback-modal') |
21 | .modal('hide'); | 21 | .modal('hide'); |
22 | + $('#question-modal') | ||
23 | + .modal('hide'); | ||
24 | + | ||
22 | $('#success-modal') | 25 | $('#success-modal') |
23 | .modal('show'); | 26 | .modal('show'); |
24 | form.data("yiiActiveForm").validated = false; | 27 | form.data("yiiActiveForm").validated = false; |
@@ -32,7 +35,8 @@ $( | @@ -32,7 +35,8 @@ $( | ||
32 | } | 35 | } |
33 | ) | 36 | ) |
34 | .on( | 37 | .on( |
35 | - 'submit', '#feedback-form', function(e) { | 38 | + 'submit', '#feedback-form,#feedback-form2', function(e) { |
39 | + e.preventDefault(); | ||
36 | return false; | 40 | return false; |
37 | } | 41 | } |
38 | ); | 42 | ); |