Merge branch 'cases'

frontend/views/layouts/block/case-more.php

@@ -5,16 +5,18 @@ use yii\helpers\Html;
 use yii\helpers\Url;
 
 use common\modules\content\models\CoContent;
+use common\modules\cases\models\CaseContent;
 use common\modules\cases\models\CasesBids;
+use common\modules\cases\models\CasesPreviewType;
 
 $userIsSubscribed = false;
 $cacheEmail = Yii::$app->session->get('user_email');
 if ($cacheEmail!==false && CasesBids::find()->where(['email' => $cacheEmail])->exists()===true)
     $userIsSubscribed = true;
 
-$more = CoContent::find()
+$more = CaseContent::find()
     ->where([
-        'category_id' => 4,
+        'category_id' => \common\models\Settings::getValue('case-category-id'),
         'active' => true
     ])
     ->andWhere(['!=', 'id', $model->id])
@@ -33,7 +35,7 @@ $more = CoContent::find()
             <?php if($more) : ?>
                 <div class="col-md-6 col-xs-6 col-sm-12">
                     <div class="short_keys_block">
-                        <img src="<?=$more->preview?>" height="338" width="455">
+                        <img src="<?= ($more->previewType->type == CasesPreviewType::PREVIEW_RECTANGLE && $more->preview_mob) ? $more->preview_mob : $more->preview ?>" height="338" width="455">
                         <a href="<?=Url::to(['/'.$more->url]);?>" style="color:<?if($more->custom==CoContent::CUSTOM_WHITE){?>#fff<?}else{?>#2d3642<?}?>;" class="short_keys_title_link"><?=$more->lang->title?></a>
                         <div class="short_keys_foot">
                             <a href="<?=Url::to(['/'.$more->url]);?>" class="short_keys_btn_more"><span><?=Yii::t('case', 'Read more')?></span></a>