From 37c8e2646398c096d83a24837dd5279a3c3ddf3b Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Thu, 19 May 2016 18:09:36 +0300
Subject: [PATCH] test

---
 common/models/FeedbackCompany.php                             | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 common/models/FeedbackCompanySearch.php                       | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 console/migrations/m160519_124222_create_feedback_company.php | 36 ++++++++++++++++++++++++++++++++++++
 frontend/controllers/AccountsController.php                   | 40 +++++++++++++++++++++++++++++++++++++++-
 frontend/controllers/AjaxController.php                       | 15 +++++++++++++++
 frontend/messages/ru/app.php                                  |  2 +-
 frontend/views/accounts/feedback-company.php                  | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 frontend/views/company/_feedback_company.php                  | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 frontend/views/layouts/admin.php                              |  3 +++
 frontend/views/layouts/company.php                            | 24 +++---------------------
 frontend/views/layouts/gallery-company.php                    | 24 +++---------------------
 frontend/views/search/project.php                             |  4 ++--
 frontend/web/css/style.css                                    |  7 +++++--
 13 files changed, 380 insertions(+), 48 deletions(-)
 create mode 100644 common/models/FeedbackCompany.php
 create mode 100644 common/models/FeedbackCompanySearch.php
 create mode 100644 console/migrations/m160519_124222_create_feedback_company.php
 create mode 100644 frontend/views/accounts/feedback-company.php
 create mode 100644 frontend/views/company/_feedback_company.php

diff --git a/common/models/FeedbackCompany.php b/common/models/FeedbackCompany.php
new file mode 100644
index 0000000..eb93589
--- /dev/null
+++ b/common/models/FeedbackCompany.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace common\models;
+
+use Yii;
+use yii\behaviors\TimestampBehavior;
+
+/**
+ * This is the model class for table "feedback_company".
+ *
+ * @property integer $feedback_company_id
+ * @property integer $date_add
+ * @property string $name
+ * @property string $phone
+ * @property string $ip
+ * @property integer $user_id
+ * @property integer $status
+ *
+ * @property User $user
+ */
+class FeedbackCompany extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'feedback_company';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['name', 'phone', 'user_id'], 'required'],
+            [['user_id'], 'integer'],
+            [['name', 'phone'], 'string', 'max' => 255],
+            [['phone'], 'match', 'pattern' => '/^\+?(?:\d{0,3})?[\(\s]?\d{0,5}[\)\s]?\d{3}[-\s]?\d{2}[-\s]?\d{2}$/'],
+            [['user_id'], 'exist', 'skipOnError' => true, 'targetClass' => User::className(), 'targetAttribute' => ['user_id' => 'id'], 'filter' => ['type' => 2]],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'feedback_company_id' => 'Feedback Company ID',
+            'date_add' => Yii::t('app', 'Feedback date add'),
+            'name' => Yii::t('app', 'Feedback name'),
+            'phone' => Yii::t('app', 'Feedback phone'),
+            'ip' => 'Ip',
+            'user_id' => 'User ID',
+            'status' => Yii::t('app', 'status'),
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            [
+                'class'              => TimestampBehavior::className(),
+                'createdAtAttribute' => 'date_add',
+                'updatedAtAttribute' => false,
+            ],
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getUser()
+    {
+        return $this->hasOne(User::className(), ['id' => 'user_id']);
+    }
+}
diff --git a/common/models/FeedbackCompanySearch.php b/common/models/FeedbackCompanySearch.php
new file mode 100644
index 0000000..43e05f6
--- /dev/null
+++ b/common/models/FeedbackCompanySearch.php
@@ -0,0 +1,63 @@
+<?php
+
+    namespace common\models;
+
+    use Yii;
+    use yii\data\ActiveDataProvider;
+
+    /**
+     * FeedbackCompanySearch represents the model behind the search form about
+     * `common\models\FeedbackCompany`.
+     */
+    class FeedbackCompanySearch extends FeedbackCompany
+    {
+
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                [
+                    [
+                        'name',
+                        'date_add',
+                        'phone',
+                        'status',
+                    ],
+                    'safe',
+                ],
+            ];
+        }
+
+        public function search($params)
+        {
+            $query = FeedbackCompany::find();
+
+            $query->where([ 'user_id' => \Yii::$app->user->id ]);
+
+            $dataProvider = new ActiveDataProvider([
+                'query' => $query,
+            ]);
+
+            $this->load($params);
+
+            if(!$this->validate()) {
+                return $dataProvider;
+            }
+
+            $query->andFilterWhere([
+                'like',
+                'LOWER(name)',
+                mb_strtolower($this->name),
+            ])
+                  ->andFilterWhere([
+                      'like',
+                      'LOWER(phone)',
+                      mb_strtolower($this->phone),
+                  ]);
+
+            return $dataProvider;
+
+        }
+    }
diff --git a/console/migrations/m160519_124222_create_feedback_company.php b/console/migrations/m160519_124222_create_feedback_company.php
new file mode 100644
index 0000000..6cd4f49
--- /dev/null
+++ b/console/migrations/m160519_124222_create_feedback_company.php
@@ -0,0 +1,36 @@
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles the creation for table `feedback_company`.
+ */
+class m160519_124222_create_feedback_company extends Migration
+{
+    /**
+     * @inheritdoc
+     */
+    public function up()
+    {
+        $this->createTable('feedback_company', [
+            'feedback_company_id' => $this->primaryKey(),
+            'date_add' => $this->integer()->notNull(),
+            'name' => $this->string()->notNull(),
+            'phone' => $this->string()->notNull(),
+            'ip' => $this->string()->notNull(),
+            'user_id' => $this->integer()->notNull(),
+            'status' => $this->integer()->notNull()->defaultValue(1),
+        ]);
+
+        $this->addForeignKey('feedback_company_user', '{{%feedback_company}}', 'user_id', '{{%user}}', 'id', 'CASCADE', 'CASCADE');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function down()
+    {
+        $this->dropForeignKey('feedback_company_user', '{{%feedback_company}}');
+        $this->dropTable('feedback_company');
+    }
+}
diff --git a/frontend/controllers/AccountsController.php b/frontend/controllers/AccountsController.php
index 65df06d..bd05c35 100755
--- a/frontend/controllers/AccountsController.php
+++ b/frontend/controllers/AccountsController.php
@@ -8,6 +8,8 @@
     use common\models\Currency;
     use common\models\Department;
     use common\models\Employment;
+    use common\models\FeedbackCompany;
+    use common\models\FeedbackCompanySearch;
     use common\models\Fields;
     use common\models\File;
     use common\models\Gallery;
@@ -59,7 +61,6 @@
                     'class' => AccessControl::className(),
                     'rules' => [
                         [
-                            //'actions' => ['cabinet','change-password', 'bookmarks', 'projects'],
                             'allow' => true,
                             'roles' => [ '@' ],
                         ],
@@ -74,6 +75,7 @@
                         'projects-delete'  => [ 'POST' ],
                         'blog-delete'      => [ 'POST' ],
                         'gallery-cover'    => [ 'POST' ],
+                        'feedback-delete'  => [ 'POST' ],
                     ],
                 ],
             ];
@@ -288,6 +290,42 @@
         }
 
         /**
+         * Page of Company feedback
+         * @return string
+         */
+        public function actionFeedbackCompany()
+        {
+            $searchModel = new FeedbackCompanySearch();
+            $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+            return $this->render('feedback-company', [
+                'searchModel'  => $searchModel,
+                'dataProvider' => $dataProvider,
+            ]);
+        }
+
+        /**
+         * Delete company feedback
+         * @return string
+         */
+        public function actionFeedbackDelete($id)
+        {
+            $model = FeedbackCompany::find()
+                                    ->where([
+                                        'feedback_company_id' => $id,
+                                        'user_id'             => \Yii::$app->user->id,
+                                    ])
+                                    ->one();
+
+            if(empty($model)) {
+                throw new NotFoundHttpException('Заявка не найдена');
+            } else {
+                $model->delete();
+                return $this->redirect(['accounts/feedback-company']);
+            }
+        }
+
+        /**
          * Page of User's image galleries
          * @return string
          */
diff --git a/frontend/controllers/AjaxController.php b/frontend/controllers/AjaxController.php
index 3d9431b..af61f4c 100644
--- a/frontend/controllers/AjaxController.php
+++ b/frontend/controllers/AjaxController.php
@@ -2,6 +2,7 @@
     namespace frontend\controllers;
 
     use common\models\Feedback;
+    use common\models\FeedbackCompany;
     use common\models\Portfolio;
     use common\models\PortfolioUser;
     use common\models\User;
@@ -188,4 +189,18 @@
             return ['error' => 'Error detected', 'result' => ['form' => $form]];
         }
 
+        public function actionFeedbackCompany()
+        {
+            $request = \Yii::$app->request;
+            $response = \Yii::$app->response;
+            $response->format = $response::FORMAT_JSON;
+            $model = new FeedbackCompany(['ip' => $request->userIP]);
+            if($model->load($request->post())) {
+                if($model->save()) {
+                    return ['result' => ['message' => 'Вопрос успешно отправлен, представители компании свяжутся с Вами в ближайшее время']];
+                }
+            }
+            return ['error' => 'Ошибка формы'];
+        }
+
     }
diff --git a/frontend/messages/ru/app.php b/frontend/messages/ru/app.php
index 416d162..fd507d9 100644
--- a/frontend/messages/ru/app.php
+++ b/frontend/messages/ru/app.php
@@ -10,7 +10,7 @@
         'description'                 => 'Описание',
         'cover'                       => 'Фото главное',
         'chat_id'                     => 'Chat ID',
-        'status'                      => 'Status',
+        'status'                      => 'Статус',
         'comment'                     => 'Comment',
         'from_user'                   => 'From User',
         'to_user'                     => 'To User',
diff --git a/frontend/views/accounts/feedback-company.php b/frontend/views/accounts/feedback-company.php
new file mode 100644
index 0000000..e9abd01
--- /dev/null
+++ b/frontend/views/accounts/feedback-company.php
@@ -0,0 +1,62 @@
+<?php
+    use common\models\FeedbackCompanySearch;
+    use yii\data\ActiveDataProvider;
+    use yii\grid\ActionColumn;
+    use yii\grid\GridView;
+    use yii\grid\SerialColumn;
+    use yii\helpers\Html;
+    use yii\web\View;
+
+    /**
+     * @var View                  $this
+     * @var FeedbackCompanySearch $searchModel
+     * @var ActiveDataProvider    $dataProvider
+     */
+    $this->title = 'Заявки';
+    $this->params[ 'breadcrumbs' ][] = $this->title;
+?>
+<div class="login-left-column-title fix"><?= $this->title ?></div>
+<div class="admin-table-portfolio">
+    <?= GridView::widget([
+        'options'      => [ 'class' => 'style admin-all-pages-wr fix_last_td_' ],
+        'dataProvider' => $dataProvider,
+        'filterModel'  => $searchModel,
+        'columns'      => [
+            [ 'class' => SerialColumn::className() ],
+            [
+                'attribute' => 'date_add',
+                'value' => function($model, $key) {
+                    return date('Y-m-d H:i:s', $model->date_add);
+                }
+            ],
+            [
+                'attribute' => 'name',
+                'label' => 'Имя и фамилия',
+            ],
+            'phone',
+            [
+                'attribute' => 'status',
+            ],
+            [
+                'class'    => ActionColumn::className(),
+                'buttons'  => [
+                    'delete' => function($url, $model, $key) {
+                        return Html::a(Html::tag('span', '', [
+                            'class' => 'glyphicon glyphicon-trash',
+                        ]), [
+                            'accounts/feedback-delete',
+                            'id' => $model->feedback_company_id,
+                        ], [
+                            'title'        => 'Удалить',
+                            'aria-label'   => 'Удалить',
+                            'data-confirm' => 'Вы уверены, что хотите удалить данную заявку?',
+                            'data-method'  => 'post',
+                            'data-pjax'    => 0,
+                        ]);
+                    },
+                ],
+                'template' => '{delete}',
+            ],
+        ],
+    ]); ?>
+</div>
diff --git a/frontend/views/company/_feedback_company.php b/frontend/views/company/_feedback_company.php
new file mode 100644
index 0000000..612b6f8
--- /dev/null
+++ b/frontend/views/company/_feedback_company.php
@@ -0,0 +1,66 @@
+<?php
+    /**
+     * @var User $company
+     * @var User $user
+     * @var View $this
+     */
+    use common\models\FeedbackCompany;
+    use common\models\User;
+    use yii\helpers\Html;
+    use yii\web\View;
+    use yii\widgets\ActiveForm;
+
+    $user = \Yii::$app->user->identity;
+    $model = new FeedbackCompany([ 'user_id' => $company->id ]);
+    if(!empty( $user )) {
+        $model->name = $user->name;
+        $phones = $user->getPhones();
+        if(!empty( $phones )) {
+            $model->phone = $phones[ 1 ][ 'phone' ];
+        }
+    }
+?>
+    <div class="performance-vacancy-call-back">
+        <div class="performance-vacancy-call-back-title">Оставьте заявку<br/>и мы вам перезвоним
+        </div>
+        <?php
+            $form = ActiveForm::begin([
+                'action'  => [ 'ajax/feedback-company' ],
+                'method'  => 'POST',
+                'options' => [ 'class' => 'callback' ],
+            ]);
+            echo $form->field($model, 'user_id')
+                      ->label(false)
+                      ->hiddenInput();
+            echo $form->field($model, 'name', [ 'options' => [ 'class' => 'input-blocks-wrapper' ] ])
+                      ->textInput([ 'placeholder' => 'Иванов Иван' ]);
+            echo $form->field($model, 'phone', [ 'options' => [ 'class' => 'input-blocks-wrapper' ] ])
+                      ->textInput([ 'placeholder' => '+38(093)111-11-11' ]);
+            echo Html::submitInput('Перезвонить мне', [ 'id' => 'feedback_company_submit' ]);
+            $form->end();
+        ?>
+        <div class="performance-vacancy-call-back-conf">Гарантируем конфидециальность</div>
+    </div>
+<?php
+    $js = "
+        $(document).on('click', '#feedback_company_submit', function(e) {
+            e.preventDefault();
+            var form = $(this).parents('form');
+            var action = $(form).attr('action');
+            var id = $(form).attr('id');
+            $('#'+id).data('yiiActiveForm').submitting = true;
+            $('#'+id).yiiActiveForm('validate');
+            if($(form).find('.input-blocks-wrapper.has-error').length <= 0) {
+                $.post(action, $(form).serialize(), function(data) {
+                    if(data.error) {
+                        alert(data.error);
+                    } else {
+                        alert(data.result.message);
+                        document.getElementById(id).reset();
+                    }
+                });
+            }
+        });
+    ";
+    $this->registerJs($js);
+?>
\ No newline at end of file
diff --git a/frontend/views/layouts/admin.php b/frontend/views/layouts/admin.php
index 7b3797e..3c1e23a 100755
--- a/frontend/views/layouts/admin.php
+++ b/frontend/views/layouts/admin.php
@@ -110,6 +110,9 @@
                                 'label'  => 'Вакансии',
                                 'url'    => [ 'accounts/vacancy' ],
                                 'active' => preg_match('/^vacancy.*$/', $this->context->action->id) ? true : false,
+                            ], [
+                                'label'  => 'Заявки',
+                                'url'    => [ 'accounts/feedback-company' ],
                             ]);
 
                         }
diff --git a/frontend/views/layouts/company.php b/frontend/views/layouts/company.php
index 3a13dde..f229b1a 100755
--- a/frontend/views/layouts/company.php
+++ b/frontend/views/layouts/company.php
@@ -19,27 +19,9 @@
                 <div class="box-all">
                     <?php
                         if($this->params[ 'company' ]->id != \Yii::$app->user->getId()) {
-                            ?>
-                            <div class="performance-vacancy-call-back">
-                                <div class="performance-vacancy-call-back-title">Оставьте заявку<br/>и мы вам перезвоним
-                                </div>
-                                <form class="callback" action="">
-
-                                    <div class="input-blocks-wrapper">
-                                        <label for="callbac_name">Имя</label>
-                                        <input id="callbac_name" type="text"/>
-                                    </div>
-
-                                    <div class="input-blocks-wrapper">
-                                        <label for="callbac_phone">Телефон</label>
-                                        <input id="callbac_phone" type="text"/>
-                                    </div>
-
-                                    <input id="callbac_submit" type="submit" value="Перезвонить мне"/>
-                                </form>
-                                <div class="performance-vacancy-call-back-conf">Гарантируем конфидециальность</div>
-                            </div>
-                            <?php
+                            // Форма "оставить заявку"
+                            echo $this->render('//company/_feedback_company', ['company' => $this->params['company']]);
+                            // Конец формы "оставить заявку"
                             if(!empty( \Yii::$app->user->identity )) {
                                 ?>
                                 <div class="performance-vacancy-add-favorite">
diff --git a/frontend/views/layouts/gallery-company.php b/frontend/views/layouts/gallery-company.php
index f499ee4..85fba1f 100755
--- a/frontend/views/layouts/gallery-company.php
+++ b/frontend/views/layouts/gallery-company.php
@@ -16,27 +16,9 @@
                 <div class="box-all">
                     <?php
                         if($this->params[ 'company' ]->id != \Yii::$app->user->getId()) {
-                            ?>
-                            <div class="performance-vacancy-call-back">
-                                <div class="performance-vacancy-call-back-title">Оставьте заявку<br/>и мы вам перезвоним
-                                </div>
-                                <form class="callback" action="">
-
-                                    <div class="input-blocks-wrapper">
-                                        <label for="callbac_name">Имя</label>
-                                        <input id="callbac_name" type="text"/>
-                                    </div>
-
-                                    <div class="input-blocks-wrapper">
-                                        <label for="callbac_phone">Телефон</label>
-                                        <input id="callbac_phone" type="text"/>
-                                    </div>
-
-                                    <input id="callbac_submit" type="submit" value="Перезвонить мне"/>
-                                </form>
-                                <div class="performance-vacancy-call-back-conf">Гарантируем конфидециальность</div>
-                            </div>
-                            <?php
+                            // Форма "оставить заявку"
+                            echo $this->render('//company/_feedback_company', ['company' => $this->params['company']]);
+                            // Конец формы "оставить заявку"
                             if(!empty( \Yii::$app->user->identity )) {
                                 ?>
                                 <div class="performance-vacancy-add-favorite">
diff --git a/frontend/views/search/project.php b/frontend/views/search/project.php
index 8c56afa..0a5e7ac 100755
--- a/frontend/views/search/project.php
+++ b/frontend/views/search/project.php
@@ -117,7 +117,7 @@
     </div>
     <div>
         <?php
-            /* Временно убираем карту 17.05.2016
+
             ?>
         <div class="section-box" style="height: 720px; overflow: hidden">
             <div class="map-settings-opacity"></div>
@@ -303,7 +303,7 @@
             </div>
             <div id="map_canvas" style="width: 100%; height:100%;"></div>
             <?php
-            */
+
             /* Решено убрать нижний слайдер
             ?>
             <div class="slider_map-wr">
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index 61355a4..7c89c1b 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -2925,7 +2925,6 @@ input[type=file]::-webkit-file-upload-button {
 .company-performer-comments-bl .rating {
     padding-left: 0;
     margin-left: -4px;
-    width: 2000px;
     overflow: hidden
 }
 
@@ -7846,10 +7845,14 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked +
     background: #fff
 }
 
-.field_list .help-block, .admin-avatar .help-block {
+.field_list .help-block, .admin-avatar .help-block, .performance-vacancy-call-back .help-block {
     float: left;
 }
 
+.performance-vacancy-call-back .help-block {
+    width: auto;
+}
+
 .help-block:before {
     content: '';
     width: 20px;
--
libgit2 0.21.4