Merge remote-tracking branch 'origin/master'

Alexey Boroda
2 parents 6628fe31 543f1653
Showing 4 changed files with 36 additions and 4 deletions Show diff stats
frontend/controllers/SiteController.php
frontend/models/Order.php
frontend/views/layouts/main.php
frontend/views/site/index.php
@@ -5,6 +5,7 @@
     use artbox\catalog\models\Brand;
     use artbox\catalog\models\Category;
     use artbox\catalog\models\Product;
+    use artbox\core\models\DummyAlias;
     use artbox\core\models\Feedback;
     use artbox\weblog\models\Article;
     use common\models\LoginForm;
@@ -59,6 +60,17 @@
          */
         public function actionIndex()
         {
+            /**
+             * @var \artbox\core\components\SeoComponent $seo
+             */
+            $seo = \Yii::$app->get('seo');
+            $seo->setAlias(
+                new DummyAlias(
+                    [
+                        'title' => \Yii::t('app', 'Главная страница'),
+                    ]
+                )
+            );
             $categories = Category::find()
                                   ->with('categories.lang', 'lang')
                                   ->where([ 'level' => 0 ])
@@ -5,7 +5,8 @@
     use artbox\catalog\models\Variant;
     use artbox\order\models\Delivery;
     use artbox\order\models\Payment;
-
+    use yii\behaviors\BlameableBehavior;
+    
     class Order extends \artbox\order\models\Order
     {
         public $variantId;
@@ -47,6 +48,17 @@
             );
         }
+        public function behaviors()
+        {
+            return [
+                [
+                    'class'              => BlameableBehavior::className(),
+                    'createdByAttribute' => 'user_id',
+                    'updatedByAttribute' => false,
+                ],
+            ];
+        }
+        
         /**
          * @inheritdoc
          */
@@ -129,6 +129,12 @@ _________________________________________________________ --&gt;
                                 ]
                             );
                         }
+                        echo Html::a(
+                            \Yii::t('app', 'Контакты'),
+                            [
+                                'site/contact',
+                            ]
+                        );
                     ?>
                 </div>
                 <div class="col-xs-6 right-top-nav">
@@ -179,7 +185,7 @@ _________________________________________________________ --&gt;
                                     'alt' => 'logo',
                                 ]
                             ),
-                            [ '/site/index' ],
+                            '/ru/',
                             [
                                 'class' => 'navbar-brand home',
                             ]
@@ -381,6 +387,8 @@ _________________________________________________________ --&gt;
                                                  'placeholder' => $loginForm->getAttributeLabel('password'),
                                              ]
                                          );
+                              echo $login->field($loginForm, 'rememberMe')
+                                         ->checkbox();
                               echo Html::submitButton(
                                   \Yii::t('app', 'Login'),
                                   [
@@ -455,7 +463,7 @@ _________________________________________________________ --&gt;
           ?>
         <div class="modal fade" id="callback-modal" tabindex="-1" role="dialog" aria-labelledby="Login" aria-hidden="true">
           <div class="modal-dialog modal-sm">
-      
+  
             <div class="modal-content">
               <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -152,7 +152,7 @@ _________________________________________________________ --&gt;
           if (!empty($topItems)) {
               ?>
             <div class="heading text-center">
-              <h2><?php echo \Yii::t('app', 'Акции'); ?></h2>
+              <h2><?php echo \Yii::t('app', 'Топ'); ?></h2>
             </div>
             <div class="product-carousel">
               <div class="homepage owl-carousel">