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

Alexey Boroda
2 parents 29c2e44d a704487c
Showing 7 changed files with 55 additions and 4 deletions Show diff stats
backend/controllers/PackageController.php
common/models/Package.php
common/models/Service.php
frontend/assets/AppAsset.php
frontend/controllers/ServiceController.php
frontend/views/service/view.php
frontend/views/site/comments.php
@@ -164,6 +164,13 @@
                         'name' => 'sort',
                         'type' => Form::NUMBER,
                     ],
+                    [
+                        'name' => 'service_id',
+                        'type' => Form::RELATION,
+                        'relationAttribute' => 'title',
+                        'relationName'      => 'service',
+                        'multiple'          => false,
+                    ]
                 ],
             ];
         }
@@ -79,7 +79,7 @@ class Package extends ActiveRecord
     {
         return [
             [['sort', 'created_at', 'updated_at'], 'default', 'value' => null],
-            [['sort', 'created_at', 'updated_at', 'image_id'], 'integer'],
+            [['sort', 'created_at', 'updated_at', 'image_id', 'service_id'], 'integer'],
             [['status'], 'boolean'],
         ];
     }
@@ -130,4 +130,8 @@ class Package extends ActiveRecord
         return $this->hasOne(Image::className(), ['id' => 'image_id']);
     }
+    public function getService(){
+        return $this->hasOne(Service::className(), ['id' => 'service_id']);
+    }
+    
 }
@@ -162,4 +162,8 @@ class Service extends ActiveRecord
     public function getQuestions(){
         return $this->hasMany(Question::className(), ['service_id' => 'id']);
     }
+    
+    public function getPackages(){
+        return $this->hasMany(Package::className(), ['service_id' => 'id']);
+    }
 }
@@ -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',
@@ -20,6 +20,9 @@
             $model = $this->findModel($id);
             if ($model->parent_id == null){
                $others = Service::find()->where(['parent_id' => $model->id])->with('services.language.alias')->all();
+               if (empty($others)){
+                   $others = Service::find()->where(['parent_id' => null, 'status' => true])->all();
+               }
             }elseif ($model->level == 1){
                 $others = Service::find()->where(['parent_id' => $model->parent_id])->with('services.language.alias')->all();
             }else{
@@ -42,6 +45,8 @@
                                 $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]);
                             }])->one();
             if (empty($model)){
                 throw new NotFoundHttpException('Model not found');
@@ -7,6 +7,7 @@
      * @var \yii\web\View $this
      * @var \artbox\core\components\SeoComponent $seo;
      */
+    use artbox\core\helpers\ImageHelper;
     use artbox\core\helpers\Url;
     use common\models\Service;
@@ -77,6 +78,36 @@
                         <?php }?>
                     </ul>
                 </div>
+            <div class="style">
+                <?php if (!empty($model->packages)){
+                  foreach ($model->packages as $package){?>
+                    <div class="packages-page-col">
+                      <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)
+                                          ->resize(262, 135)
+                                          ->quality(84)
+                                          ->renderImage()?>
+                        </div>
+                        <div class="table-packages-wr">
+                          <table cellspacing="0" cellpadding="0" border="0">
+                            <tr>
+                              <td><span class="title-packages"><?=$package->title?></span></td>
+                            </tr>
+                            <tr>
+                              <td>
+                                <span class="btn_ packages-btn"><?=\Yii::t('app','More info');?></span>
+                              </td>
+                            </tr>
+                          </table>
+                        </div>
+                      </a>
+                    </div>
+                <?php }
+                
+                }?>
+            </div>
             </div>
           <div class="col-xs-12 col-sm-8 col-md-8 col-lg-9">
                 <div class="row">
@@ -14,7 +14,7 @@
     use yii\widgets\ActiveForm;
     use yii\widgets\ListView;
-    $this->params[ 'breadcrumbs'][] = \Yii::t('app', 'Quest/Answer');
+    $this->params[ 'breadcrumbs'][] = \Yii::t('app', 'Отзывы');
     $model = new Comment(['entity_id' => $service_id, 'entity' => Service::className()]);
@@ -75,7 +75,7 @@
                 <ul class="answers-category-list">
                     <li  <?=($service_id == null ? 'class="active"' : '')?>>
                         <a href="<?=Url::current(['service_id' => null])?>">
-                            <span><?=\Yii::t('app','General issues');?></span></a></li>
+                            <span><?=\Yii::t('app','Общие отзывы');?></span></a></li>
                     <?php foreach ($services as $service){?>
                     <li <?=($service_id == $service->id ? 'class="active"' : '')?>>
                         <a href="<?=Url::current(['service_id' => $service->id])?>"><span><?=$service->title?></span></a></li>