Merge branch 'master' of gitlab.artweb.com.ua:steska/clinica

Alex Savenko
2 parents c33bd4b4 01e892e9
Showing 1 changed file with 17 additions and 4 deletions Show diff stats
frontend/controllers/SiteController.php
@@ -80,6 +80,7 @@
                                                                               )->orderBy([ new Expression('sort ASC NULLS LAST') ])
                                                                               ->all();
             $comments = Comment::find()->where(['status' => true, 'on_main' => true])->limit(6)->all();
+
             $package = Package::find()->with(['language.alias'])->where(['status' => true])->orderBy('sort')->limit(3)->all();
             $settings = Settings::getInstance();
             return $this->render('index', [
@@ -272,11 +273,15 @@
         }
  
         public function actionComments($service_id = null){
-        
+
             if (\Yii::$app->request->isAjax){
                 Yii::$app->response->format = Response::FORMAT_JSON;
                 $model = new Comment();
-                if ($model->load(\Yii::$app->request->post()) and $model->save()){
+                #if ($model->load(\Yii::$app->request->post()) and $model->save()){
+                if ($model->load(\Yii::$app->request->post())){
+                    if(!$model->entity_id)$model->entity_id=0;
+                    $model->entity=Service::className();
+                    $model->save();
                     return [
                         'status' => true,
                         'message' => 'Спасибо за Ваш отзыв. После проверки модератором он появиться на сайте'
@@ -288,14 +293,22 @@
                     ];
                 }
             }
+
+
+            # подкоректировал логику для сохранрения в БД/выдачи вопросов с категории "Общие вопросы"
+            # закрепил за ними entity_id=0
+            if($service_id==null)$service_id=0;
             $dataProvider = new ActiveDataProvider([
-                                                       'query' => Comment::find()->where(['status' => true])->andWhere(['entity' => Service::className()])->andFilterWhere(['entity_id' => $service_id]),
+                                                       'query' => Comment::find()
+                                                           ->where(['status' => true])
+                                                           ->andWhere(['entity' => Service::className()])
+                                                           ->andFilterWhere(['entity_id' => $service_id]),//'SELECT * FROM \"comment\" WHERE (\"status\"=TRUE) AND (\"entity\"=\'common\\models\\Service\')'
                                                        'pagination' => [
                                                            'pageSize' => 10,
                                                        ],
                                                    ]);
             $services = Service::find()->where(['status' => true])->andWhere(['parent_id' => null])->all();
-        
+
             return $this->render('comments', [
                 'dataProvider' => $dataProvider,
                 'services'  => $services,