Merge remote-tracking branch 'origin/master'

# Conflicts: # frontend/views/layouts/main.php

Merge remote-tracking branch 'origin/master'
# Conflicts: # frontend/views/layouts/main.php
Anastasia
2 parents 03ffbf5b 4ef198f9
Showing 8 changed files with 91 additions and 28 deletions Show diff stats
backend/views/layouts/menu_items.php
common/messages/ru/app.php
common/models/blog/TagLang.php
frontend/components/UrlManager.php
frontend/controllers/SiteController.php
frontend/helpers/Url.php
frontend/views/layouts/main.php
frontend/views/service/view.php
@@ -61,7 +61,7 @@
                     ],
                     [
-                        'label'  => \Yii::t('app', 'Package Offers'),
+                        'label'  => \Yii::t('app', 'Package offerings'),
                         'url'    => [ '/package/index' ],
                     ],
@@ -24,7 +24,7 @@ return [
     'All callbacks'             =>'Все отзывы',
     'All questions'             =>'Все вопросы',
     'All categories'            =>'Все рубрики',
-
+    'Doctors'                   =>'Врачи',
     'Ua short valute'           =>'грн',
@@ -47,12 +47,12 @@ return [
     'Asc question'              =>'Задать вопрос',
     'Request password reset'    =>'Запрос на восстановление пароля',
-
+    'Comments'                  =>'Коментарии',
     'Buy'                       =>'Купить',
     'Contacts'                  =>'Контакты',
-
+    'Label'                     =>'Название',
     'ours clients'              =>'наших клиентов',
@@ -90,7 +90,7 @@ return [
     'Slide Down'                =>'свернуть',
     'Save'                      =>'Сохранить',
     'Message'                   =>'Сообщение',
-    
+    'Slides'                    =>'Слайды',
     'Phone'                     =>'Телефон',
@@ -50,7 +50,7 @@
                 'id'          => 'ID',
                 'blog_tag_id' => 'Blog Tag ID',
                 'language_id' => 'Language ID',
-                'label'       => \Yii::t('core', 'Label'),
+                'label'       => \Yii::t('app', 'Label'),
             ];
         }
@@ -62,6 +62,7 @@
             //            $this->checkRedirect($request->url);
             $request = $this->parseLanguage($request);
+
             /**
              * @var Alias $alias
              */
@@ -111,8 +112,11 @@
                     $params,
                 ];
             }
-            
-            return parent::parseRequest($request);
+            $request=parent::parseRequest($request);
+            $request[0]=rtrim($request[0],'/');
+
+
+            return $request;
         }
         /**
@@ -122,6 +126,7 @@
          */
         public function createUrl($params)
         {
+
             if ($this->hideDefaultLanguagePrefix && ( $this->languages->getCurrent(
                     )->url == $this->languages->getDefault()->url )) {
                 $prefix = '';
@@ -136,7 +141,10 @@
                     return $prefix . '/' . $params[ 'alias' ][ 'value' ];
                 }
             }
-            
+
+
+
+
             return $prefix . parent::createUrl($params);
         }
@@ -153,7 +161,7 @@
             if (in_array($split[ 0 ], array_keys($this->languages->getActive()))) {
                 if ($this->hideDefaultLanguagePrefix && ( $split[ 0 ] == $this->languages->getDefault()->url )) {
                     unset($split[ 0 ]);
-                    
+
                     \Yii::$app->response->redirect('/' . implode('/', $split), 301)
                                         ->send();
                     \Yii::$app->end();
@@ -188,6 +196,7 @@
          */
         protected function checkRedirect(string $url)
         {
+
             //            $redirect = Redirect::find()
             //                                ->where(
             //                                    [
@@ -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', [
@@ -227,7 +228,10 @@
         public function actionPage6(){
             return $this->render('page6');
         }
+
+
+        # Вопрос/ответ
         public function actionQuestions($service_id = null){
             Language::getCurrent();
@@ -269,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' => 'Спасибо за Ваш отзыв. После проверки модератором он появиться на сайте'
@@ -285,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,
@@ -22,9 +22,9 @@
             $languages = \Yii::$container->get($languagesClass);
             $url = '/' . $languages->getCurrent()->url;
-            
+
             $urlManager = \Yii::$app->urlManager;
-            
+
             if (( $languages->getCurrent()->id === $languages->getDefault(
                     )->id ) && $urlManager->hideDefaultLanguagePrefix) {
                 $url = '/';
@@ -79,7 +79,7 @@
   <!DOCTYPE html >
   <html xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html" lang="<?= \Yii::$app->language ?>">
     <head>
-  
+      
       <meta charset="<?= \Yii::$app->charset ?>">
       <meta name="viewport" content="width=device-width">
       <link type="image/x-icon" href="favicon.ico" rel="icon">
@@ -157,8 +157,8 @@
                 </div>
                 <ul class="hidden-xs hidden-sm">
-                  <li><a href="#" class="new"><span> <?=\Yii::t('app','Second thing')?>  </span></a></li>
-                  <li><a href="<?=(isset($aliases['{"0":"site/questions"}'])) ? Url::to(['alias' => $aliases['{"0":"site/questions"}']]): Url::to(['site/questions'])?>"><?=\Yii::t('app','Quest/Answer')?></a></li>
+                  <li><a href="/vtoroe-mnenie" class="new"><span> <?=\Yii::t('app','Second thing')?>  </span></a></li>
+                  <li><a href="<?=(isset($aliases['{"0":"site/questions"}'])) ?Url::to(['alias' => $aliases['{"0":"site/questions"}']]): Url::to(['site/questions']): Url::to(['site/questions'])?>"><?=\Yii::t('app','Quest/Answer')?></a></li>
                   <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Callbacks')?></a></li>
                 </ul>
 <!--                -->
@@ -199,11 +199,40 @@
                 $items[] = [
                     'label' => \Yii::t('app', 'Package offerings'),
                     'url'   => Url::to(['package/index']),
-                ]
+                ];
+
+                # определяю, кому из итемов присвоить class="active'
+                $itemKey=0;
+                $test=[];
+                foreach ($items as $key => $item)
+                {
+
+                    if(strpos(\Yii::$app->request->url,$item['url'])!==false )
+                    {
+                        $test[$key]['label']=$item['label'];
+                        $test[$key]['options'] = [ 'class' => 'active' ];
+
+                    }
+                    elseif( \Yii::$app->request->url=='/' && $item['label']==\Yii::t('app', 'Prices'))
+                    {
+                        $test[$key]['label']=$item['label'];
+                        $test[$key]['options'] = [ 'class' => 'active' ];
+                        $test[$key]['url']= Url::to(['site/prices']);
+
+                    }
+                    else
+                    {
+                        $test[$key]['label']=$item['label'];
+                        $test[$key]['url']=$item['url'];
+                    }
+
+                }
+
+
             ?>
             <?php echo Nav::widget(
                 [
-                    'items'         => $items,
+                    'items'         => $test,
                     'activateItems' => false,
                 ]
             ); ?>
@@ -265,9 +294,11 @@
           <div class="menu-second-mob">
             <ul class="footer-menu">
-              <li><a href="<?= Url::to([ 'site/contacts' ]) ?>"><?= \Yii::t('app', 'Contacts') ?></a></li>
-              <li><a href="#" class="new"><span><?= \Yii::t('app', 'Second thing') ?></span></a></li>
-              <li><a href="#"><?= \Yii::t('app', 'Quest/Answer') ?></a></li>
+              <li><a href="<?= Url::to([ 'site/contact' ]) ?>"><?= \Yii::t('app', 'Contacts') ?></a></li>
+              <li><a href="/vtoroe-mnenie" class="new"><span><?= \Yii::t('app', 'Second thing') ?></span></a></li>
+              <li><a href="<?=(isset($aliases['{"0":"site/questions"}'])) ?
+                      Url::to(['alias' => $aliases['{"0":"site/questions"}']]) : Url::to(['site/questions'])?>">
+                      <?= \Yii::t('app', 'Quest/Answer') ?></a></li>
               <li><a href="#"><?= \Yii::t('app', 'Callbacks') ?></a></li>
             </ul>
           </div>
@@ -351,9 +382,10 @@
               <div class="col-xs-9 col-sm-2">
                 <ul class="footer-menu">
                   <li><a href="<?=Url::to(['site/about'])?>"><?=\Yii::t('app','About us')?></a></li>
-                  <li><a href="#" ><?=\Yii::t('app','Contacts');?></a></li>
-                  <li><a href="<?=Url::to(['site/questions'])?>" class="new"><span><?=\Yii::t('app','Second thing');?></span></a></li>
-                  <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Quest/Answer');?></a></li>
+                  <li><a href="<?= Url::to([ 'site/contact' ]);?>" ><?=\Yii::t('app','Contacts');?></a></li>
+                  <li><a href="/vtoroe-mnenie" class="new"><span><?=\Yii::t('app','Second thing');?></span></a></li>
+                  <li><a href="<?=(isset($aliases['{"0":"site/questions"}'])) ?
+                          Url::to(['alias' => $aliases['{"0":"site/questions"}']]) : Url::to(['site/questions'])?>"><?=\Yii::t('app','Quest/Answer');?></a></li>
                   <li><a href="<?=Url::to(['site/comments'])?>"><?=\Yii::t('app','Callbacks');?></a></li>
                 </ul>
               </div>
@@ -63,7 +63,13 @@
                            if (($model->id == $service->id or $model->parent_id == $service->id) and !empty($service->services)) {?>
                             <ul>
                               <?php foreach ($service->services as $item){?>
-                              <li class="<?=($model->id == $item->id ? 'active' : '')?>"><a href="<?=Url::to(['alias' => $item->language->alias])?>"><?=$item->title?></a></li>
+                                  <?php if($model->id == $item->id) : ?>
+                                      <li class="active"><a ><?=$item->title?></a></li>
+
+                                  <?php else: ?>
+                                      <li class=""><a href="<?=Url::to(['alias' => $item->language->alias])?>"><?=$item->title?></a></li>
+                                  <?php endif;?>
+
                               <?php }?>
                             </ul>
                           <?php } ?>