From d0a19e42d35c78dda5c53a41aa701cabd53d9f02 Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Mon, 25 Apr 2016 18:21:11 +0300
Subject: [PATCH] test

---
 common/modules/fileloader/assets/FileloaderAsset.php |   8 ++++----
 frontend/controllers/AjaxController.php              |  34 ++++++++++++++++++++++++++++++++--
 frontend/messages/ru/app.php                         |   7 +++++++
 frontend/views/ajax/feedback_form.php                | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------
 frontend/web/css/style.css                           |   3 +++
 frontend/web/js/forms.js                             |  16 ++++++++++++++--
 6 files changed, 140 insertions(+), 42 deletions(-)

diff --git a/common/modules/fileloader/assets/FileloaderAsset.php b/common/modules/fileloader/assets/FileloaderAsset.php
index 6b58ddd..5f26d32 100644
--- a/common/modules/fileloader/assets/FileloaderAsset.php
+++ b/common/modules/fileloader/assets/FileloaderAsset.php
@@ -20,13 +20,13 @@
         ];
 
         public $depends = [
-            '\yii\web\YiiAsset',
-            '\yii\web\JqueryAsset',
-            '\yii\bootstrap\BootstrapAsset',
+//            '\yii\web\YiiAsset',
+//            '\yii\web\JqueryAsset',
+//            '\yii\bootstrap\BootstrapAsset',
         ];
 
         public $jsOptions = [
-            'position' => View::POS_HEAD,
+            'position' => View::POS_END,
         ];
 
     }
\ No newline at end of file
diff --git a/frontend/controllers/AjaxController.php b/frontend/controllers/AjaxController.php
index e0d3484..238c3fc 100644
--- a/frontend/controllers/AjaxController.php
+++ b/frontend/controllers/AjaxController.php
@@ -151,8 +151,38 @@
             $request = \Yii::$app->request;
             $response = \Yii::$app->response;
             $response->format = $response::FORMAT_JSON;
-            $model = new Feedback([]);
-            $form = $this->renderAjax('feedback_form');
+            $model = new Feedback();
+            if(!empty( \Yii::$app->user->identity )) {
+                /**
+                 * @var User $user
+                 */
+                $user = \Yii::$app->user->identity;
+                $phones = $user->getPhones();
+                $model->name = $user->name;
+                if(!empty( $phones )) {
+                    $model->phone = $phones[ 1 ]['phone'];
+                }
+                if(!empty( $user->email )) {
+                    $model->email = $user->email;
+                }
+            }
+            $form = $this->renderAjax('feedback_form', [ 'model' => $model ]);
+            return ['result' => ['form' => $form]];
+        }
+
+        public function actionPostFeedback()
+        {
+            $request = \Yii::$app->request;
+            $response = \Yii::$app->response;
+            $response->format = $response::FORMAT_JSON;
+            $model = new Feedback();
+            if($model->load($request->post())) {
+                if($model->save()) {
+                    return ['result' => ['message' => 'Success']];
+                }
+            }
+            $form = $this->renderAjax('feedback_form', [ 'model' => $model ]);
+            return ['error' => 'Error detected', 'result' => ['form' => $form]];
         }
 
     }
diff --git a/frontend/messages/ru/app.php b/frontend/messages/ru/app.php
index a4f98e8..416d162 100644
--- a/frontend/messages/ru/app.php
+++ b/frontend/messages/ru/app.php
@@ -172,4 +172,11 @@
         'Not found'                   => 'Ничего не найдено',
         'Registration success'        => 'Спасибо за Регистрацию! Будучи некоммерческой организацией, мы свободны в своём развитии и нам не нужно идти на компромиссы. Вам понравится это отличие.',
         'achievement'                 => 'Достижения',
+        'Feedback ID'                 => 'Id обращения',
+        'Feedback name'               => 'Ваши имя и фамилия',
+        'Feedback phone'              => 'Контактный телефон',
+        'Feedback email'              => 'E-mail',
+        'Feedback answer'             => 'Вопрос',
+        'Feedback file'               => 'Файл',
+        'Feedback date add'           => 'Дата обращения',
     ];
\ No newline at end of file
diff --git a/frontend/views/ajax/feedback_form.php b/frontend/views/ajax/feedback_form.php
index e22bae9..7605990 100644
--- a/frontend/views/ajax/feedback_form.php
+++ b/frontend/views/ajax/feedback_form.php
@@ -1,51 +1,97 @@
+<?php
+    /**
+     * @var Feedback $model
+     */
+?>
 <div id="modal_form_contacts">
     <div class="closed-form"></div>
     <div class="form-resume-wr">
         <div class="form-resume-sub style">Отправить сообщение администрации МФП</div>
         <?php
+            use common\models\Feedback;
+            use common\modules\fileloader\widgets\FileloaderWidget;
+            use yii\helpers\Html;
             use yii\widgets\ActiveForm;
 
-            $form = ActiveForm::begin([ 'options' => [ 'enctype' => 'multipart/form-data' ] ]);
+            $form = ActiveForm::begin([
+                'options' => [
+                    'enctype' => 'multipart/form-data',
+                    'class'   => 'feedback_form',
+                ],
+            ]);
+            echo $form->field($model, 'name', [ 'options' => [ 'class' => 'input-blocks-wrapper' ] ])
+                      ->textInput([ 'class' => 'custom-input-2' ]);
+            echo $form->field($model, 'phone', [ 'options' => [ 'class' => 'input-blocks-wrapper' ] ])
+                      ->textInput([ 'class' => 'custom-input-2' ]);
+            echo $form->field($model, 'email', [ 'options' => [ 'class' => 'input-blocks-wrapper' ] ])
+                      ->textInput([ 'class' => 'custom-input-2' ]);
+            echo $form->field($model, 'answer', [ 'options' => [ 'class' => 'input-blocks-wrapper' ] ])
+                      ->textarea([ 'class' => 'custom-input-2' ]);
         ?>
-            <div class="input-blocks-wrapper">
-                <label for="qst_name">Ваши имя и фамилия</label>
-                <input class="custom-input-2" id="qst_name" name="" type="text">
-            </div>
-
-            <div class="input-blocks-wrapper">
-                <label for="qst_phone">Контактный телефон</label>
-                <input class="custom-input-2" id="qst_phone" name="" type="text">
-            </div>
-
-            <div class="input-blocks-wrapper">
-                <label for="qst_phone">E-mail</label>
-                <input class="custom-input-2" id="qst_phone" name="" type="text">
-            </div>
-
-            <div class="input-blocks-wrapper">
-                <label for="qst_text">Вопрос</label>
-                <textarea class="custom-input-2" id="qst_text" name=""></textarea>
-            </div>
-
-            <div class="input-blocks-wrapper">
-                <div class="contacts-form-wrapper style">
-                    <div class="contacts-form style"><span>Прикрепить файл</span></div>
-                    <div class="contacts-form-help style">
-                        <span>Максимальный размер файла 5 МБ</span>
-                    </div>
+        <div class="input-blocks-wrapper">
+            <?php
+                echo $form->field($model, 'fileloader')
+                          ->label(false)
+                          ->widget(FileloaderWidget::className(), [
+                              'labelOptions' => [
+                                  'label' => '<div class="contacts-form-wrapper style"><div class="contacts-form style"><span>Прикрепить файл</span></div><div class="contacts-form-help style"><span>Максимальный размер файла 5 МБ</span></div></div>',
+                              ],
+                              'inputOptions' => [
+                                  'multiple' => false,
+                                  'class'    => 'hidden',
+                              ],
+                              'options'      => [ 'class' => 'fileloader-file' ],
+                          ]);
+            ?>
+        </div>
+        <?php
+        ?>
+        <?php
+            /*
+            ?>
+                <div class="input-blocks-wrapper">
+                    <label for="qst_name">Ваши имя и фамилия</label>
+                    <input class="custom-input-2" id="qst_name" name="" type="text">
+                </div>
+
+                <div class="input-blocks-wrapper">
+                    <label for="qst_phone">Контактный телефон</label>
+                    <input class="custom-input-2" id="qst_phone" name="" type="text">
+                </div>
+
+                <div class="input-blocks-wrapper">
+                    <label for="qst_phone">E-mail</label>
+                    <input class="custom-input-2" id="qst_phone" name="" type="text">
                 </div>
 
-                <div class="tst-input-hidden-cont">
-                    <input class="" type="file" value=""/>
+                <div class="input-blocks-wrapper">
+                    <label for="qst_text">Вопрос</label>
+                    <textarea class="custom-input-2" id="qst_text" name=""></textarea>
                 </div>
 
-            </div>
+                <div class="input-blocks-wrapper">
+                    <div class="contacts-form-wrapper style">
+                        <div class="contacts-form style"><span>Прикрепить файл</span></div>
+                        <div class="contacts-form-help style">
+                            <span>Максимальный размер файла 5 МБ</span>
+                        </div>
+                    </div>
+
+                    <div class="tst-input-hidden-cont">
+                        <input class="" type="file" value=""/>
+                    </div>
+
+                </div>
+            */
+        ?>
 
-            <div class="form-actions style">
-                <button type="submit" class="login-button">Отправить</button>
-            </div>
+        <div class="form-actions style">
+            <?php
+                echo Html::submitButton('Отправить', [ 'class' => 'login-button feedback_submit' ]);
+            ?>
+        </div>
         <?php
-        $form->end();
+            $form->end();
         ?>
         <div class="res_form_line"></div>
     </div>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 3e5c399..aece6be 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -8037,3 +8037,6 @@ li.active-menu-admin:hover a .ico_num {
     display: none;
 }
 .tender_questions_ .input-blocks-comm-button {margin-top: 20px}
+.hidden {
+    display: none;
+}
\ No newline at end of file
diff --git a/frontend/web/js/forms.js b/frontend/web/js/forms.js
index 884d1f9..c033a3c 100755
--- a/frontend/web/js/forms.js
+++ b/frontend/web/js/forms.js
@@ -72,9 +72,11 @@ $(document).ready(
         function addContacts()
         {
             $.post(
-                "/site/forms-modal-contacts", function(data)
+                "/ajax/get-feedback", function(data)
                 {
-                    $('.forms-modal-hide').append(data)
+
+                    $('.forms-modal-hide').append(data.result.form)
+
                 }
              )
              .fail(
@@ -85,6 +87,7 @@ $(document).ready(
                  }
              )
              .done(
+
                  function()
                  {
                      var newMarg = $(window).scrollTop();
@@ -114,6 +117,7 @@ $(document).ready(
             function(e)
             {
                 e.preventDefault()
+                console.log('dsadasdaS');
                 addRemoveBlocks()
                 addContacts()
             }
@@ -593,5 +597,13 @@ $(document).ready(
             $(this).parent().find('.help-block').hide();
         });
 
+        $(document).on('submit', '.feedback_form', function(e) {
+            e.preventDefault();
+            console.log('event');
+            $.post('/ajax/post-feedback', $(this).serialize(), function(data) {
+                console.log(data);
+            });
+        });
+
     }
 )
\ No newline at end of file
--
libgit2 0.21.4