Changes:

-Comments added (with default template) -Discounts added -Dynamic menu

Changes:
-Comments added (with default template) -Discounts added -Dynamic menu
Alexey Boroda
1 parent 6fb4a732
Showing 17 changed files with 404 additions and 11 deletions Show diff stats
backend/views/page/_form.php
common/models/Blog.php
common/models/Comments.php
common/models/Page.php
common/modules/comment/Module.php
console/migrations/m160929_141228_columns_for_page_table.php
frontend/config/main.php
frontend/controllers/CatalogController.php
frontend/controllers/CommentsController.php
frontend/controllers/DiscountController.php
frontend/views/blog/view.php
frontend/views/comments/index.php
frontend/views/discount/discount.php
frontend/views/discount/empty.php
frontend/views/layouts/main.php
frontend/views/site/index.php
source/actions.html
@@ -40,6 +40,10 @@ use mihaildev\elfinder\ElFinder;
  
     <?= $form->field($model, 'in_menu')->checkbox() ?>
  
+    <?= $form->field($model, 'in_top_menu')->checkbox() ?>
+
+    <?= $form->field($model, 'sort_order')->textInput() ?>
+
     <div class="form-group">
         <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
     </div>
@@ -3,6 +3,7 @@
 namespace common\models;
  
 use common\behaviors\SaveImgBehavior;
+use common\modules\comment\models\CommentModel;
 use Yii;
  
 /**
+<?php
+
+namespace common\models;
+
+use common\modules\comment\models\CommentModel;
+use yii\base\Model;
+
+/**
+ * This is the model class for table "Comments".
+ *
+ */
+class Comments extends Model
+{
+    public $id;
+
+//    public function getComments()
+//    {
+//        return CommentModel::find()
+//            ->where([
+//                'entity_id' => 'id',
+//                'artbox_comment.entity' => self::className(),
+//                'artbox_comment.status' => CommentModel::STATUS_ACTIVE,
+//                'artbox_comment.artbox_comment_pid' => NULL
+//            ]);
+//    }
+}
@@ -14,6 +14,8 @@
      * @property string  $seo_text
      * @property string  $h1
      * @property bool    $in_menu
+     * @property bool    $in_top_menu
+     * @property string  $sort_order
      */
     class Page extends \yii\db\ActiveRecord
     {
@@ -49,6 +51,12 @@
             return [
                 [
                     [
+                        'sort_order'
+                    ],
+                    'integer'
+                ],
+                [
+                    [
                         'body',
                         'seo_text',
                     ],
@@ -69,6 +77,7 @@
                 [
                     [
                         'in_menu',
+                        'in_top_menu'
                     ],
                     'boolean',
                 ],
@@ -98,7 +107,9 @@
                 'meta_description' => 'Meta Description',
                 'seo_text'         => 'Seo Text',
                 'h1'               => 'H1',
-                'in_menu'          => 'Show in menu',
+                'in_menu'          => 'Show in main menu',
+                'in_top_menu'      => 'Show in top menu',
+                'sort_order'       => 'Sort order',
             ];
         }
     }
@@ -56,7 +56,7 @@
          *
          * @var bool
          */
-        public static $enableRating = true;
+        public static $enableRating = false;
  
         /**
          * Initializes the module.
+<?php
+
+use yii\db\Migration;
+
+class m160929_141228_columns_for_page_table extends Migration
+{
+    public function up()
+    {
+        $this->addColumn('page', 'in_top_menu', $this->boolean()->defaultValue(false));
+        $this->addColumn('page', 'sort_order', $this->integer()->defaultValue(1));
+    }
+
+    public function down()
+    {
+        $this->dropColumn('page', 'in_top_menu');
+        $this->dropColumn('page', 'sort_order');
+    }
+}
@@ -49,7 +49,6 @@ return [
                     'route_map' => [
                         'catalog' => 'catalog/category',
                         'product' => 'catalog/product',
-
                     ]
                 ],
                 '/' => 'site/index',
@@ -155,10 +155,12 @@ class CatalogController extends \yii\web\Controller
         $stockProgram = Category::find()
             ->where([
                 'stock_program' => true,
+                'parent_id' => $category->category_id,
             ])->all();
         $onOrder = Category::find()
             ->where([
                 'on_order' => true,
+                'parent_id' => $category->category_id,
             ])->all();
         return $this->render('products', [
             'category'        => $category,
+<?php
+
+namespace frontend\controllers;
+
+use yii\base\Controller;
+
+class CommentsController extends Controller
+{
+    public function actionIndex()
+    {
+        return $this->render('index');
+    }
+}
+<?php
+namespace frontend\controllers;
+
+use yii\web\Controller;
+use common\modules\product\models\Product;
+
+class DiscountController extends Controller
+{
+    public function actionIndex()
+    {
+        $products = Product::find()
+            ->where([
+                'akciya' => true,
+            ])->with('variant', 'category')
+            ->all();
+        if (!empty($products))
+        {
+            return $this->render('discount', [
+                'products' => $products,
+            ]);
+        }
+        else
+        {
+            return $this->render('empty');
+        }
+    }
+}
 \ No newline at end of file
@@ -5,6 +5,8 @@
  * @var View $this
  */
 use common\models\Blog;
+use common\models\Comments;
+use common\modules\comment\widgets\CommentWidget;
 use yii\helpers\Url;
 use yii\web\View;
  
+<?php
+/**
+ * @var Comments $comments
+ */
+use common\models\Comments;
+use common\modules\comment\widgets\CommentWidget;
+
+?>
+
+
+<?php
+$comments = new Comments([
+    'id' => 1,
+]);
+echo CommentWidget::widget([
+    'model' => $comments,
+    'entityIdAttribute' => 'id'
+]);
+?>
 \ No newline at end of file
+<?php
+/**
+ * @var Product[] $products
+ * @var View $this
+ */
+use common\modules\product\models\Product;
+use yii\web\View;
+use common\components\artboximage\ArtboxImageHelper;
+use yii\helpers\Url;
+
+$this->title = 'Акции';
+$this->params['breadcrumbs'][] = $this->title;
+
+?>
+
+<div class="col-md-12">
+    <div class="title8">Акции</div>
+    <div class="actions_cont">
+        <?php
+        foreach ($products as $product) {
+        ?>
+        <div class="col-md-3 action">
+            <a href="<?php echo Url::to([
+                'catalog/product',
+                'product' => $product->alias,
+                'variant' => $product->variant->sku,
+            ])?>">
+                <div class="picture"><?php echo ArtboxImageHelper::getImage($product->getImageUrl(), 'category_thumb'); ?></div>
+                <div class="a_down">
+                    <div class="price"><?php echo $product->variant->price; ?> <span>€</span></div>
+                    <div class="titles">
+                        <div class="line1"><?php echo $product->name; ?></div>
+                        <div class="line2"><?php echo $product->category->name; ?></div>
+                    </div>
+                </div>
+            </a>
+        </div>
+        <?php } ?>
+        <div style="clear:both;"></div>
+    </div>
+
+    <div class="down act_d">
+        <div class="d_title">Стильные элитные обои для вашего дома</div>
+        <p>Продумывая дизайн своей квартиры, мы непременно тщательно выбираем "одежду" для стен - красивые модные обои.</p>
+        <p class="spoiler">fdsfsdf</p>
+        <div class="more">
+            <a href="#">Узнать больше</a>
+        </div>
+    </div>
+</div>
+<?php
+/**
+ * @var View $this
+ */
+use yii\web\View;
+
+$this->title = 'Акции';
+$this->params['breadcrumbs'][] = $this->title;
+
+echo "Товары не найдены";
 \ No newline at end of file
@@ -3,14 +3,29 @@
  * @var Category[] $brands_menu
  * @var \yii\web\View $this
  * @var string $content
+ * @var Page[] $top_menu
+ * @var Page[] $main_menu
  */
  
+use common\models\Page;
 use common\modules\product\models\Category;
 use frontend\assets\AppAsset;
 use yii\helpers\Html;
 use yii\helpers\Url;
 use yii\widgets\Breadcrumbs;
  
+$top_menu = Page::find()->where([
+    'in_top_menu' => true,
+])->orderBy([
+    'sort_order' => SORT_ASC,
+])->all();
+
+$main_menu = Page::find()->where([
+    'in_menu' => true,
+])->orderBy([
+    'sort_order' => SORT_ASC,
+])->all();
+
 $this->registerMetaTag([
     'name' => 'robots',
     'content' => 'noindex,nofollow',
@@ -39,11 +54,12 @@ $brands = Category::find()
 <?php $this->beginBody(); ?>
 <nav class="navbar nav1">
     <ul class="nav navbar-nav">
-        <li><a href="<?php echo Url::to(['site/page', 'id' => 2]); ?>">О нас</a></li>
         <li><a href="<?php echo Url::to('/new-collections'); ?>">Новые коллекции</a></li>
         <li><a href="<?php echo Url::to('/article'); ?>">События</a></li>
         <li><a href="<?php echo Url::to('/blog'); ?>">Блог</a></li>
-        <li><a href="<?php echo Url::to(['site/page', 'id' => 5]); ?>">Контакты</a></li>
+        <?php foreach ($top_menu as $page) { ?>
+        <li><a href="<?php echo Url::to(['site/page', 'id' => $page->id]); ?>"><?php echo $page->title; ?></a></li>
+        <?php } ?>
     </ul>
 </nav>
 <header>
@@ -74,10 +90,9 @@ $brands = Category::find()
                     'id' => 19,
                 ]); ?>">Обои</a></li>
             <li><a href=" <?= Url::to(['catalog/category','category' => 'brendy-tekstilya']) ?>">Текстиль</a></li>
-            <li><a href="<?php echo Url::to(['site/page', 'id' => 6]); ?>">Карнизы</a></li>
-            <li><a href="<?php echo Url::to(['site/page', 'id' => 7]); ?>">Напольные покрытия</a></li>
-            <li><a href="<?php echo Url::to(['site/page', 'id' => 8]); ?>">Contract Concept</a></li>
-            <li><a href="<?php echo Url::to(['site/page', 'id' => 9]); ?>">Мебель</a></li>
+            <?php foreach ($main_menu as $page) { ?>
+            <li><a href="<?php echo Url::to(['site/page', 'id' => $page->id]); ?>"><?php echo $page->title; ?></a></li>
+            <?php } ?>
         </ul>
     </div>
 </section>
@@ -49,8 +49,8 @@ $this-&gt;title = &quot;Главная&quot;;
     </section>
     <section class="main-box2">
         <div class="col-md-4">
-            <div class="center_line"><a href="#" class="big_link">Акции</a></div>
-            <div class="center_line mar13_17"><a href="#" class="but_lines">Отзывы клиентов</a></div>
+            <div class="center_line"><a href="<?php echo Url::to(['/discount']); ?>" class="big_link">Акции</a></div>
+            <div class="center_line mar13_17"><a href="<?php echo Url::to(['/comments']); ?>" class="but_lines">Отзывы клиентов</a></div>
             <div class="center_line"><a href="<?php echo Url::to(['/blog']); ?>" class="big_link">Блог</a></div>
             <div class="blog_block">
                 <a href="<?php echo Url::to([
+<!DOCTYPE HTML>
+<html lang="ru">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="robots" content="noindex,nofollow">
+	<title>Акции</title>
+    <link rel="stylesheet" type="text/css" href="css/bootstrap.min.css">
+    <link rel="stylesheet" type="text/css" href="css/bootstrap-theme.min.css">
+    <link rel="stylesheet" type="text/css" href="css/fonts.css">
+    <link rel="stylesheet" type="text/css" href="css/style.css">
+</head>
+<body>
+    <nav class="navbar nav1">
+        <ul class="nav navbar-nav">
+            <li><a href="about.html">О нас</a></li>
+            <li><a href="#">Новые коллекции</a></li>
+            <li><a href="dates.html">События</a></li>
+            <li><a href="blog.html">Блог</a></li>
+            <li><a href="contacts.html">Контакты</a></li>
+        </ul>
+    </nav>
+    <header>
+        <div class="container">
+            <a href="index.html" class="main"></a>
+        </div>
+    </header>
+    <section class="menu">
+        <div class="container">
+            <ul>
+                <li class="col-md-2 col-sm-2 col-xs-12"><a href="walls.html">Обои</a></li>
+                <li class="col-md-2 col-sm-2 col-xs-12"><a href="textile.html">Текстиль</a></li>
+                <li class="col-md-2 col-sm-2 col-xs-12"><a href="eaves.html">Карнизы</a></li>
+                <li class="col-md-2 col-sm-2 col-xs-12"><a href="floor.html">Напольные покрытия</a></li>
+                <li class="col-md-2 col-sm-2 col-xs-12"><a href="contract.html">Contract Concept</a></li>
+                <li class="col-md-2 col-sm-2 col-xs-12"><a href="furniture.html">Мебель</a></li>
+            </ul>
+        </div>
+    </section>
+    <div class="container cont">
+        <div class="col-md-12">
+            <div class="nav_up">
+                <a href="index.html">Baccara Home</a> — <span>Акции</span>
+            </div>
+            <div class="col-md-12">
+                <div class="title8">Акции</div>
+                <div class="actions_cont">
+                    <div class="col-md-3 action">
+                        <a href="#">
+                            <div class="picture"><img src="images/act1.png"></div>
+                            <div class="a_down">
+                                <div class="price">5,00 <span>€</span></div>
+                                <div class="titles">
+                                    <div class="line1">HW</div>
+                                    <div class="line2">Gloriosus Revolution</div>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-md-3 action">
+                        <a href="#">
+                            <div class="picture"><img src="images/act2.png"></div>
+                            <div class="a_down">
+                                <div class="price">5,00 <span>€</span></div>
+                                <div class="titles">
+                                    <div class="line1">HW</div>
+                                    <div class="line2">Lioquid Fantasy</div>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-md-3 action">
+                        <a href="#">
+                            <div class="picture"><img src="images/act3.png"></div>
+                            <div class="a_down">
+                                <div class="price">5,00 <span>€</span></div>
+                                <div class="titles">
+                                    <div class="line1">Hookedonwalls</div>
+                                    <div class="line2">Jealous Walls</div>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-md-3 action">
+                        <a href="#">
+                            <div class="picture"><img src="images/act4.png"></div>
+                            <div class="a_down">
+                                <div class="price">5,00 <span>€</span></div>
+                                <div class="titles">
+                                    <div class="line1">Hohenberger</div>
+                                    <div class="line2">Roommate</div>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-md-3 action">
+                        <a href="#">
+                            <div class="picture"><img src="images/act1.png"></div>
+                            <div class="a_down">
+                                <div class="price">5,00 <span>€</span></div>
+                                <div class="titles">
+                                    <div class="line1">HW</div>
+                                    <div class="line2">Gloriosus Revolution</div>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-md-3 action">
+                        <a href="#">
+                            <div class="picture"><img src="images/act2.png"></div>
+                            <div class="a_down">
+                                <div class="price">5,00 <span>€</span></div>
+                                <div class="titles">
+                                    <div class="line1">HW</div>
+                                    <div class="line2">Lioquid Fantasy</div>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-md-3 action">
+                        <a href="#">
+                            <div class="picture"><img src="images/act3.png"></div>
+                            <div class="a_down">
+                                <div class="price">5,00 <span>€</span></div>
+                                <div class="titles">
+                                    <div class="line1">Hookedonwalls</div>
+                                    <div class="line2">Jealous Walls</div>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                    <div class="col-md-3 action">
+                        <a href="#">
+                            <div class="picture"><img src="images/act4.png"></div>
+                            <div class="a_down">
+                                <div class="price">5,00 <span>€</span></div>
+                                <div class="titles">
+                                    <div class="line1">Hohenberger</div>
+                                    <div class="line2">Roommate</div>
+                                </div>
+                            </div>
+                        </a>
+                    </div>
+                    
+                    <div style="clear:both;"></div>
+                </div>
+                
+                <div class="down act_d">
+                    <div class="d_title">Стильные элитные обои для вашего дома</div>
+                    <p>Продумывая дизайн своей квартиры, мы непременно тщательно выбираем "одежду" для стен - красивые модные обои.</p>
+                    <p class="spoiler">fdsfsdf</p>
+                    <div class="more">
+                        <a href="#">Узнать больше</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <footer>
+        <div class="container">
+        <div class="col-md-3 fleft">
+            <p>© 2006 - 2015 Шоу-рум “BACCARA HOME”</p>
+        </div>
+        <div class="col-md-3 fcenter col-xs-6">
+            <ul>
+                <li><a href="#">О нас</a></li>
+                <li><a href="#">Новые коллекции</a></li>
+                <li><a href="#">События</a></li>
+                <li><a href="#">Блог</a></li>
+                <li><a href="contacts.html">Контакты</a></li>
+            </ul>
+        </div>
+        <div class="col-md-3">
+        </div>
+        <div class="col-md-3 fright col-xs-6">
+            <div class="socbuts">
+                <ul>
+                    <li><a href="https://www.facebook.com/baccaraRoom/?fref=ts" target="_blank"><img src="images/icon_fb.png"></a></li>
+                    <li><a href="https://www.instagram.com/baccarahome/" target="_blank"><img src="images/icon_inst.png"></a></li>
+                    <li><a href="https://www.youtube.com/channel/UCr6GslF0IhlOwr7XlLsQAbw" target="_blank"><img src="images/icon_yt.png"></a></li>
+                    <li><a href="https://www.pinterest.com/baccarahome/?etslf=36773&eq=baccara%20home" target="_blank"><img src="images/icon_pin.png"></a></li>
+                </ul>
+            </div>
+            <div class="hours">Часы работы<br/>
+            пн–пт: 10:00 – 19:30<br/>
+                сб: 11:00 – 18:00</div>
+        </div>
+        </div>
+    </footer>
+    <script type="text/javascript" src="js/jquery-3.1.0.min.js"></script>
+    <script type="text/javascript" src="js/bootstrap.min.js"></script>
+    <script type="text/javascript" src="js/npm.js"></script>
+    <script type="text/javascript" src="js/script.js"></script>
+</body>
+</html>
 \ No newline at end of file