Merge conflict

Alex Savenko
2 parents 5953b4fa b3e4096c
Showing 11 changed files with 309 additions and 151 deletions Show diff stats
common/config/main.php
frontend/assets/AppAsset.php
frontend/config/main.php
frontend/controllers/ServiceController.php
frontend/controllers/SiteController.php
frontend/views/layouts/main.php
frontend/views/package/view.php
frontend/views/service/view.php
frontend/views/site/index.php
frontend/web/js/script.js
t10.gz
@@ -28,7 +28,7 @@
         ],
         'components' => [
             'cache'              => [
-                'class' => 'yii\caching\DummyCache',
+                'class' => 'yii\caching\FileCache',
             ],
             'i18n'               => [
                 'translations' => [
@@ -13,7 +13,7 @@
         public $baseUrl = '@web';
         public $css = [
             'css/style.css',
-            '//fonts.googleapis.com/css?family=Ubuntu:400,500,700&amp;subset=cyrillic,cyrillic-ext,latin-ext'
+//            '//fonts.googleapis.com/css?family=Ubuntu:400,500,700&amp;subset=cyrillic,cyrillic-ext,latin-ext'
         ];
         public $js = [
             'js/script.js',
@@ -192,7 +192,7 @@
                  document.getElementById("comment-form").reset();
                               var data = $("#comment-form").data(\'yiiActiveForm\');
                               $("#comment-form").find(".submit-close-c-a span").click();
-                              $("#comment-form").parent().parent().parent().find(".service-c-a-btns").after("<p>Ваш отзыв появиться после проверки модератором</p>")
+                              $("#comment-form").parent().parent().parent().find(".service-c-a-btns").after("<p>Ваш отзыв появится после проверки модератором</p>")
                               data.validated = false;
                     }',
@@ -20,14 +20,14 @@
         public function actionView($id){
             $model = $this->findModel($id);
             if ($model->parent_id == null){
-               $others = Service::find()->where(['parent_id' => $model->id])->with('services.language.alias')->all();
+               $others = Service::find()->where(['parent_id' => $model->id])->with(['services.language.alias', 'language.alias'])->all();
                if (empty($others)){
-                   $others = Service::find()->where(['parent_id' => null, 'status' => true])->all();
+                   $others = Service::find()->where(['parent_id' => null, 'status' => true])->with(['services.language.alias', 'language.alias'])->all();
                }
             }elseif ($model->level == 1){
-                $others = Service::find()->where(['parent_id' => $model->parent_id])->with('services.language.alias')->all();
+                $others = Service::find()->where(['parent_id' => $model->parent_id])->with(['services.language.alias', 'language.alias'])->all();
             }else{
-                $others = Service::find()->where(['parent_id' => (new Query())->select('parent_id')->from('service')->where(['id' => $model->parent_id])])->with('services.language.alias')->all();
+                $others = Service::find()->where(['parent_id' => (new Query())->select('parent_id')->from('service')->where(['id' => $model->parent_id])])->with(['services.language.alias', 'language.alias'])->all();
             }
@@ -82,13 +82,13 @@
             $model = Service::find()
                             ->where(['id' => $id, 'status' => true])
                             ->with(['language.alias',  'prices' => function (ActiveQuery $query){
-                                $query->where(['status' => true])->orderBy('sort');
+                                $query->where(['status' => true])->with('language')->orderBy('sort');
                             }, 'comments' => function (ActiveQuery $query){
                                 $query->where(['status' => true]);
                             }, 'questions' => function (ActiveQuery $query){
                                 $query->where(['status' => true])->with('doctor');
                             },'packages' => function (ActiveQuery $query){
-                                $query->with(['image', 'language'])->where(['status' => true]);
+                                $query->with(['image', 'language.alias'])->where(['status' => true]);
                             }])->one();
             if (empty($model)){
                 throw new NotFoundHttpException('Model not found');
 <?php
+    
     namespace frontend\controllers;
     use artbox\core\models\Alias;
@@ -15,13 +16,11 @@
     use yii\db\ActiveQuery;
     use yii\db\Expression;
     use yii\filters\VerbFilter;
-    use yii\helpers\ArrayHelper;
     use yii\helpers\Json;
     use yii\swiftmailer\Mailer;
     use yii\web\BadRequestHttpException;
     use yii\web\Controller;
     use yii\web\Response;
-    use yii\helpers\VarDumper as d;
     /**
      * Site controller
@@ -62,34 +61,70 @@
          */
         public function actionIndex()
         {
-            $slides = Slide::find()->with('language')->where(['status' => true])->orderBy('sort')->with('language.image')->all();
-            $services = Service::find()->where(['is not' ,'image_id', NULL])->andWhere(
+            $slides = Slide::find()
+                           ->with('language')
+                           ->where([ 'status' => true ])
+                           ->orderBy('sort')
+                           ->with('language.image')
+                           ->all();
+            $services = Service::find()
+                               ->where(
+                                   [
+                                       'is not',
+                                       'image_id',
+                                       null,
+                                   ]
+                               )
+                               ->andWhere(
+                                   [
+                                       'status' => true,
+                                       'level'  => 0,
+                                   ]
+                               )
+                               ->with(
+                                   [
+                                       'image',
+                                       'language.alias',
+                                       'services' => function (ActiveQuery $query) {
+                                           $query->where([ 'status' => true ])
+                                                 ->with([ 'language.alias' ]);
+                                       },
+                                   ]
+                               )
+                               ->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',
+                                      'image',
+                                  ]
+                              )
+                              ->where([ 'status' => true ])
+                              ->orderBy('sort')
+                              ->limit(3)
+                              ->all();
+            $settings = Settings::getInstance();
+            return $this->render(
+                'index',
                 [
-                    'status' => true,
-                    'level'  => 0,
+                    'slides'   => $slides,
+                    'services' => $services,
+                    'comments' => $comments,
+                    'settings' => $settings,
+                    'package'  => $package,
                 ]
-            )
-                                                                              ->with(
-                                                                                  [
-                                                                                      'image',
-                                                                                      'language.alias',
-                                                                                      'services' => function (ActiveQuery $query) {
-                                                                                          $query->where(['status' => true])->with(['language.alias']);
-                                                                                      },
-                                                                                  ]
-                                                                              )->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', [
-                'slides' => $slides,
-                'services' => $services,
-                'comments' => $comments,
-                'settings' => $settings,
-                'package'  => $package
-            ]);
+            );
         }
         /**
@@ -104,8 +139,8 @@
             return $this->render(
                 'contact',
                 [
-                    'contact' => $contact,
-                    'settings' => $settings
+                    'contact'  => $contact,
+                    'settings' => $settings,
                 ]
             );
         }
@@ -186,115 +221,157 @@
                 }
             }
         }
-        public function actionPrices(){
-            $services = Service::find()->innerJoinWith(['prices' => function (ActiveQuery $query){
-                $query->where(['price.status' => true]);
-            }])->all();
+        public function actionPrices()
+        {
+            $services = Service::find()
+                               ->innerJoinWith(
+                                   [
+                                       'prices' => function (ActiveQuery $query) {
+                                           $query->where([ 'price.status' => true ])
+                                                 ->with('language');
+                                       },
+                                   ]
+                               )
+                               ->with('language.alias')
+                               ->all();
-            return $this->render('prices', [
-               'services' => $services,
-            ]);
+            return $this->render(
+                'prices',
+                [
+                    'services' => $services,
+                ]
+            );
         }
-        
-        public function actionPage1(){
+        public function actionPage1()
+        {
             return $this->render('page1');
         }
-    
-        public function actionPage2(){
+        
+        public function actionPage2()
+        {
             return $this->render('page2');
         }
-
-        public function actionPage22(){
+        
+        public function actionPage22()
+        {
             return $this->render('page2-2');
         }
-
-        public function actionPage23(){
+        
+        public function actionPage23()
+        {
             return $this->render('page2-3');
         }
-    
-        public function actionPage3(){
+        
+        public function actionPage3()
+        {
             return $this->render('page3');
         }
-    
-        public function actionPage4(){
+        
+        public function actionPage4()
+        {
             return $this->render('page4');
         }
-    
-        public function actionPage5(){
+        
+        public function actionPage5()
+        {
             return $this->render('page5');
         }
-    
-        public function actionPage6(){
+        
+        public function actionPage6()
+        {
             return $this->render('page6');
         }
-
-
         # Вопрос/ответ
-        public function actionQuestions($service_id = null){
+        public function actionQuestions($service_id = null)
+        {
             Language::getCurrent();
-            if (\Yii::$app->request->isAjax){
+            if (\Yii::$app->request->isAjax) {
                 Yii::$app->response->format = Response::FORMAT_JSON;
                 $model = new Question();
                 $model->scenario = Question::SCENARIO_QUESTION;
-                if ($model->load(\Yii::$app->request->post()) and $model->save()){
+                if ($model->load(\Yii::$app->request->post()) and $model->save()) {
                     return [
-                      'status' => true,
-                      'message' => 'Спасибо за Ваш вопрос'
+                        'status'  => true,
+                        'message' => 'Спасибо за Ваш вопрос',
                     ];
-                }else{
+                } else {
                     return [
-                        'status' => false,
-                        'message' => 'Ошибка'
+                        'status'  => false,
+                        'message' => 'Ошибка',
                     ];
                 }
             }
-            $dataProvider = new ActiveDataProvider([
-                   'query' => Question::find()->where(['status' => true])->andFilterWhere(['service_id' => $service_id])->with(['doctor.language']),
-                   'pagination' => [
-                       'pageSize' => 10,
-                   ],
-                ]);
-            $services = Service::find()->where(['status' => true])->andWhere(['parent_id' => null])->all();
+            $dataProvider = new ActiveDataProvider(
+                [
+                    'query'      => Question::find()
+                                            ->where([ 'status' => true ])
+                                            ->andFilterWhere([ 'service_id' => $service_id ])
+                                            ->with([ 'doctor.language' ]),
+                    'pagination' => [
+                        'pageSize' => 10,
+                    ],
+                ]
+            );
+            $services = Service::find()
+                               ->where([ 'status' => true ])
+                               ->andWhere([ 'parent_id' => null ])
+                               ->with('language')
+                               ->all();
             $route = [];
-            foreach ($services as $service){
-               $route[] = Json::encode(['site/questions', 'service_id' => $service->id]);
+            foreach ($services as $service) {
+                $route[] = Json::encode(
+                    [
+                        'site/questions',
+                        'service_id' => $service->id,
+                    ]
+                );
             }
             $route [] = '{"0":"site/questions"}';
-            $alias = Alias::find()->where(['route' => $route])->andWhere(['language_id' => Language::getCurrent()->id])->indexBy('route')->asArray()->all();
-            return $this->render('questions', [
-               'dataProvider' => $dataProvider,
-               'services'  => $services,
-               'service_id' => $service_id,
-                'alias' => $alias
-            ]);
+            $alias = Alias::find()
+                          ->where([ 'route' => $route ])
+                          ->andWhere([ 'language_id' => Language::getCurrent()->id ])
+                          ->indexBy('route')
+                          ->asArray()
+                          ->all();
+            return $this->render(
+                'questions',
+                [
+                    'dataProvider' => $dataProvider,
+                    'services'     => $services,
+                    'service_id'   => $service_id,
+                    'alias'        => $alias,
+                ]
+            );
         }
-    
-        public function actionComments($service_id = null){
-
-            if (\Yii::$app->request->isAjax){
+        
+        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())){
-                    if(!$model->entity_id)$model->entity_id=0;
-                    $model->entity=Service::className();
+                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' => 'Спасибо за Ваш отзыв. После проверки модератором он появиться на сайте'
+                        'status'  => true,
+                        'message' => 'Спасибо за Ваш отзыв. После проверки модератором он появится на сайте',
                     ];
-                }else{
+                } else {
                     return [
-                        'status' => false,
-                        'message' => 'Ошибка'
+                        'status'  => false,
+                        'message' => 'Ошибка',
                     ];
                 }
             }
-
-
+            
             # подкоректировал логику для сохранрения в БД/выдачи вопросов с категории "Общие вопросы"
             # закрепил за ними entity_id=0
             if($service_id==null)$service_id=0;
@@ -55,7 +55,14 @@
                            [
                                'language.alias',
                                'services' => function (ActiveQuery $query) {
-                                  $query->where(['status' => true])->with(['language.alias']);
+                                  $query->where(['status' => true])->with(
+                                      [
+                                          'language.alias',
+                                          'services' => function (ActiveQuery $query) {
+                                              $query->where(['status' => true])->with(['language.alias']);
+                                          },
+                                      ]
+                                  );
                                },
                            ]
                        )->orderBy('sort')
@@ -133,39 +140,56 @@ $this-&gt;registerMetaTag(
 <?php $this->beginPage() ?>
   <!DOCTYPE html >
   <html xmlns="http://www.w3.org/1999/html" xmlns="http://www.w3.org/1999/html" lang="<?= \Yii::$app->language ?>">
-    <head>
+  <head>
+    
+    <script type="text/javascript">
+        WebFontConfig = {
+            google: {families: [ 'Ubuntu:400,500,700' ]}
+        };
+        (function() {
+            var wf = document.createElement('script');
+            wf.src = ('https:' == document.location.protocol ? 'https' : 'http') + '://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js';
+            wf.type = 'text/javascript';
+            wf.async = 'true';
+            var s = document.getElementsByTagName('script')[ 0 ];
+            s.parentNode.insertBefore(wf, s);
+        })(); </script>
+    
+    <script>
-        <meta  charset="utf-8">
         <!-- Global site tag (gtag.js) - Google Analytics -->
         <script async src="https://www.googletagmanager.com/gtag/js?id=UA-120861020-1"></script>
-        <script>
-            window.dataLayer = window.dataLayer || [];
-            function gtag(){dataLayer.push(arguments);}
-            gtag('js', new Date());
-
-            gtag('config', 'UA-120861020-1');
-        </script>
-        <!-- Google Tag Manager -->
-        <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-                    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-                j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-                'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-            })(window,document,'script','dataLayer','GTM-N6R7982');</script>
-        <!-- End Google Tag Manager -->
-      <meta charset="<?= \Yii::$app->charset ?>">
-      <meta name="viewport" content="width=device-width">
-      <link type="image/x-icon" href="favicon.ico" rel="icon">
-        <?= Html::csrfMetaTags() ?>
-      <title><?=Html::encode($seo->title)?></title>
-        <div class="row" itemscope itemtype="http://schema.org">
-        <?php $this->head() ?>
-    </head>
+    <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', 'UA-120861020-1');
+    </script>
+    <!-- Google Tag Manager -->
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+            new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+            j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+            'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+        })(window,document,'script','dataLayer','GTM-N6R7982');</script>
+    <!-- End Google Tag Manager -->
+    <meta charset="<?= \Yii::$app->charset ?>">
+    <meta name="viewport" content="width=device-width">
+    <link type="image/x-icon" href="favicon.ico" rel="icon">
+      <?= Html::csrfMetaTags() ?>
+    <title><?=Html::encode($seo->title)?></title>
+      <?php $this->head() ?>
+  </head>
     <body id="body">
     <!-- Google Tag Manager (noscript) -->
     <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N6R7982"
                       height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
     <!-- End Google Tag Manager (noscript) -->
         <?php $this->beginBody() ?>
+      <!-- Google Tag Manager (noscript) -->
+      <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-N6R7982"
+          height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+      <!-- End Google Tag Manager (noscript) -->
                   <div class="transition-loader">
                       <div class="transition-loader-inner">
                           <label></label>
@@ -4,10 +4,21 @@
      * @var \yii\web\View $this;
      */
     use common\models\Package;
+    use yii\web\View;
+    
     $seo = \Yii::$app->get('seo');
     $this->params[ 'entity'] = Package::className();
     $this->params['entity_id'] = $package->id;
     $this->params['breadcrumbs'][] = (!empty($seo->h1)) ? $seo->h1 :$package->title;
+    
+    $js = <<<JS
+    $(document).on('beforeSubmit', '#visit-form', function() {
+             dataLayer.push({'event': 'formsend_package'});
+             console.log('push');
+             return true;
+    });
+JS;
+  $this->registerJs($js, View::POS_LOAD);
     ?>
@@ -9,11 +9,10 @@
      */
     use artbox\core\helpers\ImageHelper;
     use artbox\core\helpers\Url;
-    use common\models\Service;
     use artbox\core\models\Alias;
-    use artbox\core\models\Language;
-
-
+    use common\models\Service;
+    use yii\web\View;
+    
     $seo = \Yii::$app->get('seo');
     $this->params['entity'] = Service::className();
     $this->params['entity_id'] = $model->id;
@@ -49,7 +48,53 @@
     }
+
     $aliases = Alias::find()->where(['route' => '{"0":"site/questions"}'])->indexBy('route')->andWhere(['language_id' => Language::getCurrent()->id])->asArray()->all();
+    
+    
+    $js = <<<JS
+    $(document).on('beforeSubmit', '#comment-form', function() {
+             dataLayer.push({'event': 'formsend_review'});
+             console.log('push');
+             return true;
+    });
+
+$(document).on('beforeSubmit', '#question-form', function() {
+             dataLayer.push({'event': 'formsend_question'});
+             console.log('push');
+             return true;
+    });
+
+
+    $(document).on('beforeSubmit', '#visit-form', function() {
+        var service_id = {$model->id};
+        var parent_id = {$model->parent_id};
+        if (service_id == 4 || parent_id == 4){
+            window.dataLayer.push({'event': 'formsend_dermatologiya'});
+        }
+        if (service_id == 16 || parent_id == 16){
+           dataLayer.push({'event': 'formsend_vedenie-beremennosti'});
+        }
+        if (service_id == 22 || parent_id == 22){
+             dataLayer.push({'event': 'formsend_lechenie-besplodiya'});
+        }
+        if (service_id == 21 || parent_id == 21){
+             dataLayer.push({'event': 'formsend_labioplastika'});
+        }
+        if (service_id == 19 || parent_id == 19){
+            dataLayer.push({'event': 'formsend_zabolevaniya-sheyki-matki'});
+        }
+        if (service_id == 20 || parent_id == 20){
+            dataLayer.push({'event': 'formsend_polovye-infekcii'});
+        }
+             console.log('push');
+             return true;
+    });
+JS;
+
+    $this->registerJs($js, View::POS_LOAD);
+    
+
     $this->params[ 'breadcrumbs' ][] = (!empty($seo->h1)) ? $seo->h1 :$model->title;
     ?>
     <?=$microdata;?>
@@ -76,7 +76,7 @@ JS;
           <!--размер img 1920x556-->
             <?=ImageHelper::set($slide->language->image->getPath())
                           ->cropResize(1920, 556)
-                          ->quality(84)
+                          ->quality(82)
                           ->renderImage()?>
         </a>
       </div>
@@ -98,9 +98,8 @@ JS;
             <!--263x146px-->
               <?=ImageHelper::set($service->image->getPath())
                             ->cropResize(263, 146)
-                            ->quality(84)
-                            ->renderImage(['alt'=>ucfirst($service->title).' - Консультация врача и лечение заболеваний',
-                                'title'=>ucfirst($service->title).' - Консультация врача и лечение заболеваний'])?>
+                            ->quality(82)
+                            ->renderImage()?>
           </div>
           <div class="style categories-home-links-wr">
             <div class="style categories-home-links-title">
@@ -162,16 +161,14 @@ JS;
     <div class="row">
       <?php foreach ($package as $item){?>
       <div class="col-xs-12 col-sm-4 package-offers-wr">
-        <a href="<?=Url::to(['alias' => $item->alias])?>">
-          <div class="img">
-              <?php #die(var_dump($item->language->attributes)); ?>
-              <?=ImageHelper::set(($item->image) ? $item->image->getPath() : null)
+        <a href="<?=Url::to(['alias' => $item->language->alias])?>">
+          <div class="img"><?=ImageHelper::set(($item->image) ? $item->image->getPath() : null)
                                          ->cropResize(388, 240)
-                                         ->quality(84)
+                                         ->quality(82)
                                          ->renderImage()?></div>
           <div class="rotate"><?=ImageHelper::set(($item->image) ? $item->image->getPath() : null)
                                             ->cropResize(388, 240)
-                                            ->quality(84)
+                                            ->quality(82)
                                             ->renderImage()?></div>
           <p><?=$item->title?></p>
           <span class="btn_"><?=\Yii::t('app','Buy')?></span>
@@ -143,24 +143,21 @@ $(document).ready(function() {
         })
     }
-    
+
     function phoneMask() {
         var phoneInput = '.phones_mask input'
-        if($('body').find('.phones_mask').find('input').length>0){
-            $(phoneInput).mask('(000) 000-00-00',{placeholder:'(0__)___-__-__'});
+        if($('body').find(phoneInput).length>0){
+            $(phoneInput).mask('+38(000)000-00-00',{placeholder:'+38(000)000-00-00'});
             $(phoneInput).focus(function () {
-
-                var text = $(this).val();
-                $(this).val(text);
-                if(($(this).val())== '') {$(this).val('(0')}
-            });
+                if(($(this).val())== '') {$(this).val('+38(0')}
+            })
             $(phoneInput).focusout(function () {
                 var phoneVal = $(this).val()
                 //if(phoneVal == '+38(0' || phoneVal == '+38(' || phoneVal == '+38' || phoneVal == '+3' || phoneVal == '+') {$(this).val('')}
-                if(phoneVal.length <15) {$(this).val('')}
+                if(phoneVal.length <17) {$(this).val('')}
             })
         }
     }
@@ -381,7 +378,7 @@ $(document).ready(function() {
             $('.categories-home .img').click(function () {
                 var link = $(this).parent().find('.categories-home-links-title a').attr('href');
                 document.location.href = link;
-            })
+            });
             var scrollPos = $(window).scrollTop();
             var windHeight = $(window).height();
             var bl = $('.section-box-2');
@@ -460,6 +457,13 @@ $(document).ready(function() {
        var form = $(this);
        var id = form.attr('id');
        var url = form.attr('action');
+       if (id == 'total_question_form'){
+           dataLayer.push({'event': 'formsend_question'});
+           console.log('formsend_question');
+       }else{
+           dataLayer.push({'event': 'formsend_review'});
+           console.log('formsend_review');
+       }
         $.post(
             $(this).attr("action"), $(this).serialize(), function(data) {
                 document.getElementById(id).reset();