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

Alexey Boroda
2 parents ab352e5b 6728c0f0
Showing 10 changed files with 149 additions and 23 deletions Show diff stats
backend/controllers/VisitController.php
backend/web/core/css/custom.css
common/messages/ru/app.php
common/models/Question.php
common/models/Visit.php
console/migrations/m180623_131646_add_request_webpage_column_to_visit_table.php
frontend/config/main.php
frontend/views/layouts/main.php
frontend/views/service/view.php
frontend/views/site/comments.php
@@ -59,7 +59,11 @@
                         ],
                         'created_at' => [
                             'type' => Index::DATETIME_COL,
-                        ]
+                        ],
+	                    'request_webpage' =>
+		                    [
+			                    'type' => Index::STRING_COL
+		                    ]
                     ],
                     'model'            => Visit::className(),
                     'hasLanguage'      => false,
@@ -99,6 +103,10 @@
                             'name' => 'created_at',
                             'type' => Form::STRING,
                         ],
+	                    [
+		                    'name' => 'request_webpage',
+		                    'type' => Form::STRING,
+	                    ],
                     ],
                 ],
@@ -183,6 +191,7 @@
                     'name' => 'updated_at',
                     'type' => Form::STRING,
                 ],
+
             ];
         }
@@ -5402,4 +5402,40 @@ padding: 0 10px;
 }
 .has-success .help-block, .has-success .control-label, .has-success .radio, .has-success .checkbox, .has-success .radio-inline, .has-success .checkbox-inline, .has-success.radio label, .has-success.checkbox label, .has-success.radio-inline label, .has-success.checkbox-inline label {
     color: #428442;
-}
 \ No newline at end of file
+}
+
+/********file input settings***********/
+
+ .file-caption .file-caption-name {
+    border: 0 !important;
+    box-shadow: none !important;
+    margin-top: -8px;
+
+}
+
+.file-caption-main .btn-file {
+    margin-right: 0;
+}
+
+.file-caption-main .file-caption {
+    height: 36px;
+}
+.file-caption-main {
+    margin-top: 10px;
+}
+.file-caption-main .btn-file input[type=file] {
+    margin-top: 0;
+    cursor: pointer;
+}
+.file-caption-main .fileinput-remove-button {
+    font-size: 0;
+    margin: 0 15px !important;
+}
+.file-caption-main .btn-file, .file-caption-main .btn-file span, .file-caption-main .btn-file, .file-caption-main .btn-file input {cursor: pointer}
+#module-imagemanager a.delete-image-item {
+    margin-top: 5px;
+    font-size: 0;
+    margin-bottom: 10px;
+}
+
+/********end file input settings***********/
@@ -62,6 +62,7 @@ return [
     'Send question'             =>'Отправить вопрос',
     'Department'                =>'отделение',
     'General issues'            =>'Общие вопросы',
+	'General callbacks' => 'Общие отзывы',
     'Give feedback'             =>'Оставить отзыв',
     'Callbacks'                 =>'Отзывы',
     'Callback'                  =>'Обратная связь',
@@ -102,12 +103,12 @@ return [
     'Price list description'    =>'Цены на услуги медицинской клиники ABClinik',
-
-
-
+	'Request_webpage' => 'Страница перехода',
     'FIO'                       =>'ФИО',
     'Email'                     =>'Email',
     'Office address'            =>'Украина, Киев, ул. Кудрявская, 31/33',
     'Go to Homepage'            =>'На главную',
     'ABC short'                 =>'ABClinic — медицинский центр',
+	'ABC short reverse' => 'медицинский центр ABClinic  ',
+
 ];
 \ No newline at end of file
@@ -150,5 +150,12 @@
         {
             return $this->hasOne(Doctor::className(), [ 'id' => 'doctor_id' ]);
         }
+    
+        public function getEntityObject(){
+            if ($this->entity !== null){
+                return $this->hasOne($this->entity, ['id' => 'entity_id']);
+            }
+            return null;
+        }
     }
@@ -79,7 +79,8 @@
                         'name',
                         'phone',
                         'entity',
-                        'email'
+	                    'email',
+	                    'request_webpage'
                     ],
                     'string',
                     'max' => 255,
@@ -100,6 +101,7 @@
                 'entity'    => Yii::t('app', 'Entity'),
                 'entity_id' => Yii::t('app', 'Entity ID'),
                 'email'     => Yii::t('app', 'Email'),
+	            'request_webpage' => Yii::t('app', 'Request_webpage'),
             ];
         }
+<?php
+
+use yii\db\Migration;
+
+/**
+ * Handles adding request_webpage to table `visit`.
+ */
+class m180623_131646_add_request_webpage_column_to_visit_table extends Migration
+{
+	/**
+	 * {@inheritdoc}
+	 */
+	public function safeUp()
+	{
+		$this->addColumn('visit', 'request_webpage', $this->string(255));
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function safeDown()
+	{
+		$this->dropColumn('visit', 'request_webpage');
+	}
+}
 <?php
     use common\models\SlashRedirect;
     use frontend\components\UrlManager;
+use yii\helpers\Url;
     $params = array_merge(
         require( __DIR__ . '/../../common/config/params.php' ),
@@ -28,6 +29,7 @@
                     'name',
                     'phone',
                     'message',
+
                 ],
                 'rules'      => [
                     [
@@ -138,7 +140,8 @@
                     'email',
                     'comment',
                     'entity_id',
-                    'entity'
+	                'entity',
+
                 ],
                 'rules'      => [
                     [
@@ -154,7 +157,9 @@
                     'email' => 'Email',
                     'comment' => 'Ваш отзыв',
                     'entity_id' => false,
-                    'entity' => false
+	                'entity' => false,
+
+
                 ],
                 'inputOptions'    => [
@@ -251,7 +256,8 @@
                     'message',
                     'entity',
-                    'entity_id'
+	                'entity_id',
+	                'request_webpage',
                 ],
                 'rules'      => [
                     [
@@ -267,7 +273,8 @@
                     'phone' => \Yii::t('app','Phone'),
                     'message' => \Yii::t('app','Message'),
                     'entity_id' => false,
-                    'entity' => false
+	                'entity' => false,
+	                'request_webpage' => false
                 ],
                 'inputOptions'    => [
@@ -277,6 +284,16 @@
                     'entity_id' => [
                         'type' => 'hiddenInput'
                     ],
+	                'request_webpage' => [
+		                'type' => 'hiddenInput',
+		                'options' =>
+			                [
+				                #'value' => \Yii::$app->homeUrl,
+				                #   'value' => 'test 123',
+				                'value' => $_SERVER['REQUEST_URI'],
+			                ],
+
+	                ],
                     'name'   => [
                         'template' => '<div class="input-wr">{input}</div>'
                     ],
@@ -33,10 +33,7 @@
     use frontend\assets\MapAsset;
-
-
-    
-    AppAsset::register($this);
+AppAsset::register($this);
     SliderAsset::register($this);
     MapAsset::register($this);
     $user = \Yii::$app->user->identity;
@@ -71,6 +68,22 @@
                        ->all();
+# для автоматической генерации SEO параметров (title/description) в ситуациях, когда этих параметров нету
+# мне нужно будет автоматически их подгенеривать, поэтому вместо $seo->title, которые является readOnly я использую эту переменную
+$seoTitleName = $seo->title;
+if ($seo->title == ''
+	&& \Yii::$app->controller->id == 'site'
+	&& \Yii::$app->controller->action->id == 'comments'
+) {
+	$currentServiceId = (!empty(\Yii::$app->request->get('service_id'))) ? \Yii::$app->request->get('service_id') : 0;
+	$serviceModel = new Service(['id' => $currentServiceId]);
+	if ($currentServiceId !== 0) {
+		$serviceName = $serviceModel->language->title;
+		$seoTitleName = $this->params['breadcrumbs'][0] . ' - ' . $serviceName . ' - ' . \Yii::t('app', 'ABC short reverse');
+	} else $seoTitleName = $this->params['breadcrumbs'][0] . ' - ' . \Yii::t('app', 'General callbacks') . ' - ' . \Yii::t('app', 'ABC short reverse');
+
+}
+
 //-----------------------------------------------------------------------------------------------------------------------
 //                                             Блок с микроразметкой для FB
@@ -116,11 +129,10 @@ $this-&gt;registerMetaTag(
         'content' =>$seo->title,
     ]
 );
-
 $this->registerMetaTag(
 	[
 		'name' => 'description',
-		'content' => $seo->desc,
+		'content' => (\Yii::$app->controller->id == 'site' && \Yii::$app->controller->action->id == 'comments' && $seo->desc == null) ? $seoTitleName : $seo->desc,
 	]
 );
@@ -136,6 +148,10 @@ $this-&gt;registerMetaTag(
     );
     $module = \Yii::$app->getModule('feedback');
     $aliases = Alias::find()->where(['route' => '{"0":"site/questions"}'])->indexBy('route')->andWhere(['language_id' => Language::getCurrent()->id])->asArray()->all();
+$commentUrl = Alias::find()->where(['route' => '{"0":"site/comments","service_id":0}'])->indexBy('route')->andWhere(['language_id' => Language::getCurrent()->id])->asArray()->all();
+
+
+
 ?>
@@ -178,7 +194,11 @@ $this-&gt;registerMetaTag(
     <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>
+
+
+
+
+      <title><?= Html::encode($seoTitleName); ?></title>
       <?php $this->head() ?>
   </head>
     <body id="body">
@@ -275,11 +295,15 @@ $this-&gt;registerMetaTag(
                 <div class="hidden-xs btn-header-wr">
                     <span class="btn_ modal-link" data-form="write-to"><?=\Yii::t('app', 'Make an appointment') ?></span>
                 </div>
-                
+
                 <ul class="hidden-xs hidden-sm">
                   <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>
+                    <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="<?= (isset($commentUrl)) ? Url::to(['/' . $commentUrl['{"0":"site/comments","service_id":0}']['value']]) :
+			                Url::to(['site/comments']) ?>"><?= \Yii::t('app', 'Callbacks') ?></a></li>
                 </ul>
 <!--                -->
 <!--                <div class="lang-sep-wr hidden-xs hidden-sm">-->
@@ -15,6 +15,7 @@
     use yii\web\View;
     $seo = \Yii::$app->get('seo');
+#  die(var_dump($seo));
     $this->params['entity'] = Service::className();
     $this->params['entity_id'] = $model->id;
@@ -142,10 +143,11 @@ JS;
                       <a class="packages-page-link" href="<?=Url::to(['alias' => $package->language->alias])?>">
                         <div class="img-packages-page">
                           <!--555x344-->
-                            <?=ImageHelper::set(($package->image) ? $package->image->getPath() : null)
+	                        <?=
+	                        ImageHelper::set(($package->image) ? $package->image->getPath() : null)
                                           ->cropResize(262, 185)
                                           ->quality(84)
-                                          ->renderImage()?>
+		                        ->renderImage(); ?>
                         </div>
                         <div class="table-packages-wr">
                           <table cellspacing="0" cellpadding="0" border="0">
@@ -26,7 +26,10 @@
     <div class="container">
         <div class="row">
             <div class="col-xs-12 col-sm-12">
-                <h1 class="title-pages"><?=\Yii::t('app','Callbacks')?></h1>
+                <h1 class="title-pages">
+	                <?= ($service_id == 0) ? $data[''] . ' - ' . \Yii::t('app', 'Callbacks') :
+		                $data[$service_id] . ' - ' . \Yii::t('app', 'Callbacks')
+	                ?></h1>
             </div>
         </div>
         <div class="row">