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

# Conflicts: # frontend/controllers/SiteController.php # frontend/views/site/index.php

Merge branch 'master' of gitlab.artweb.com.ua:steska/clinica
# Conflicts: # frontend/controllers/SiteController.php # frontend/views/site/index.php
alex
2 parents 1645a556 41fb7b5b
Showing 10 changed files with 187 additions and 159 deletions Show diff stats
frontend/assets/AppAsset.php
frontend/config/main.php
frontend/controllers/SiteController.php
frontend/microdata/MicrodataFabric.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
@@ -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;
                     }',
@@ -16,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
@@ -364,7 +362,7 @@
                     $model->save();
                     return [
                         'status'  => true,
-                        'message' => 'Спасибо за Ваш отзыв. После проверки модератором он появиться на сайте',
+                        'message' => 'Спасибо за Ваш отзыв. После проверки модератором он появится на сайте',
                     ];
                 } else {
                     return [
@@ -376,34 +374,24 @@
             # подкоректировал логику для сохранрения в БД/выдачи вопросов с категории "Общие вопросы"
             # закрепил за ними 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 ]),
-                    //'SELECT * FROM \"comment\" WHERE (\"status\"=TRUE) AND (\"entity\"=\'common\\models\\Service\')'
-                    'pagination' => [
-                        'pageSize' => 10,
-                    ],
-                ]
-            );
-            $services = Service::find()
-                               ->where([ 'status' => true ])
-                               ->andWhere([ 'parent_id' => null ])
-                               ->with('language')
-                               ->all();
-            
-            return $this->render(
-                'comments',
-                [
-                    'dataProvider' => $dataProvider,
-                    'services'     => $services,
-                    'service_id'   => $service_id,
-                ]
-            );
+            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])//'SELECT * FROM \"comment\" WHERE (\"status\"=TRUE) AND (\"entity\"=\'common\\models\\Service\')'
+                                                           ->orderBy(['id'=>SORT_DESC]),
+                                                        'pagination' => [
+                                                           'pageSize' => 10,
+                                                       ],
+
+                                                   ]);
+            $services = Service::find()->where(['status' => true])->andWhere(['parent_id' => null])->all();
+
+            return $this->render('comments', [
+                'dataProvider' => $dataProvider,
+                'services'  => $services,
+                'service_id' => $service_id
+            ]);
         }
     }
 <?php
-namespace frontend\microdata;
-
-use frontend\microdata\Microdata;
-
-
-
-
-class MicrodataFabric extends Microdata
-{
-    public static function createJsonFromProduct($product)
+    
+    namespace frontend\microdata;
+    
+    use frontend\microdata\Microdata;
+    
+    class MicrodataFabric extends Microdata
     {
-        return  ($product==null)?
-            new ProductMicrodata(array_merge(['url'=>123],self::getDefaultSettings()))
-            :
-            new ProductMicrodata(array_merge($product,['url'=>123],self::getDefaultSettings()));
-    }
-    public static function createJsonFromArticle($article=null)
-    {
-
-        return  ($article==null)?
-            new ArticleMicrodata(array_merge(['url'=>123],self::getDefaultSettings()))
-            :
-            new ArticleMicrodata(array_merge($article,['url'=>123],self::getDefaultSettings()));
-    }
-	public static function createJsonFromOrganization($article=null)
-	{
-
-		return  ($article==null)?
-			new OrganizationMicrodata(array_merge(self::getDefaultSettings()))
-			:
-			#die(var_dump(self::getDefaultSettings()));
-			#die(var_dump(array_merge($article,self::getDefaultSettings())));
-			new OrganizationMicrodata(array_merge($article,
-				self::getDefaultSettings()));
-	}
-
-
-
-
-
-
-    protected static function getDefaultSettings(){
-	    return [
-		    'context'=>"http://schema.org",
-
-	    ];
-
-
-
-    }
-
-}
 \ No newline at end of file
+        public static function createJsonFromProduct($product)
+        {
+            return ( $product == null ) ? new ProductMicrodata(
+                array_merge([ 'url' => 123 ], self::getDefaultSettings())
+            ) : new ProductMicrodata(array_merge($product, [ 'url' => 123 ], self::getDefaultSettings()));
+        }
+        public static function createJsonFromArticle($article = null)
+        {
+            
+            return ( $article == null ) ? new ArticleMicrodata(
+                array_merge([ 'url' => 123 ], self::getDefaultSettings())
+            ) : new ArticleMicrodata(array_merge($article, [ 'url' => 123 ], self::getDefaultSettings()));
+        }
+        public static function createJsonFromOrganization($article = null)
+        {
+            
+            return ( $article == null ) ? new OrganizationMicrodata(
+                array_merge(self::getDefaultSettings())
+            ) : #die(var_dump(self::getDefaultSettings()));
+                #die(var_dump(array_merge($article,self::getDefaultSettings())));
+                new OrganizationMicrodata(
+                    array_merge(
+                        $article,
+                        self::getDefaultSettings()
+                    )
+                );
+        }
+        
+        protected static function getDefaultSettings()
+        {
+            return [
+                'context' => "http://schema.org",
+            
+            ];
+            
+        }
+        
+    }
 \ No newline at end of file
@@ -140,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>
@@ -290,41 +307,14 @@ $this-&gt;registerMetaTag(
                     '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' ];
-                        $test[$key]['url']= false;
-
-
-                    }
-                    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'         => $test,
+                    'items'         => $items,
                     'activateItems' => false,
                 ]
             ); ?>
@@ -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,11 @@
      */
     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\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 +49,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>
@@ -162,18 +162,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();