diff --git a/common/mail/feedback.php b/common/mail/feedback.php index a766846..b0102d0 100644 --- a/common/mail/feedback.php +++ b/common/mail/feedback.php @@ -58,14 +58,27 @@ ?> - + message ?> inviter) ) { + + ?> + + + + inviter ?> + + + diff --git a/common/models/Feedback.php b/common/models/Feedback.php index b5e6d2d..aa10fd2 100644 --- a/common/models/Feedback.php +++ b/common/models/Feedback.php @@ -34,7 +34,7 @@ 'phone', 'oplata', 'promocode', - 'message', + 'inviter', ], self::SCENARIO_CALLBACK => [ 'name', @@ -94,6 +94,7 @@ 'email', 'oplata', 'promocode', + 'inviter', ], 'string', 'max' => 255, diff --git a/console/migrations/m171211_163526_add_inviter_column_to_feedback_table.php b/console/migrations/m171211_163526_add_inviter_column_to_feedback_table.php new file mode 100644 index 0000000..8ff86a7 --- /dev/null +++ b/console/migrations/m171211_163526_add_inviter_column_to_feedback_table.php @@ -0,0 +1,25 @@ +addColumn('feedback', 'inviter', $this->string(100)); + } + + /** + * @inheritdoc + */ + public function down() + { + $this->dropColumn('feedback', 'inviter'); + } +} diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index 34fbded..2d269ba 100644 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -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 участие в форуме') diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 81c2f67..f8696b9 100644 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -222,8 +222,12 @@ _________________________________________________________ --> ->textInput()->Label('Впишите промокод для получения скидки -20%'); ?>
- - + + field($feedback, 'inviter') + ->textInput()->Label('ФИО пригласителя'); ?> + + +
@@ -273,12 +277,14 @@ _________________________________________________________ --> 'feedback-form', + 'id' => 'feedback-form2', 'method' => 'POST', 'action' => '/site/feedback', ] ); $feedback = new Feedback(['scenario' => Feedback::SCENARIO_DEFAULT]); + + echo Html::hiddenInput('def', "1"); ?>
diff --git a/frontend/web/js/script.js b/frontend/web/js/script.js index 47ae931..52e2a0e 100644 --- a/frontend/web/js/script.js +++ b/frontend/web/js/script.js @@ -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; } ); -- libgit2 0.21.4