big commti

Administrator
1 parent d56adb97
Showing 17 changed files with 57 additions and 44 deletions Show diff stats
frontend/config/main.php
frontend/controllers/CatalogController.php
frontend/controllers/OrderController.php
frontend/views/articles/index.php
frontend/views/cabinet/index.php
frontend/views/catalog/product.php
frontend/views/catalog/products.php
frontend/views/event/index.php
frontend/views/event/show.php
frontend/views/order/index.php
frontend/views/site/error.php
frontend/views/site/index.php
frontend/views/text/index.php
frontend/web/js/artbox_basket.js
frontend/web/js/artbox_basket.js.map
frontend/web/js/artbox_basket.ts
frontend/web/robots.txt
@@ -8,6 +8,7 @@ $params = array_merge(
 return [
     'id' => 'app-frontend',
+    'name'=>'Лінія Світла',
     'basePath' => dirname(__DIR__),
     'bootstrap' => [
@@ -18,7 +19,6 @@ return [
     ],
     'components' => [
-
         'authManager' => [
             'class' => 'yii\rbac\DbManager',
         ],
@@ -118,7 +118,7 @@ class CatalogController extends \yii\web\Controller
         $groups = $category->getActiveFilters()->all();
         $groups = ArrayHelper::index($groups, null, 'name');
-        $priceLimits = $productModel->priceLimits($category, $params);
+        //$priceLimits = $productModel->priceLimits($category, $params);
         /*
          * Greedy search for comments and rating
@@ -142,7 +142,7 @@ class CatalogController extends \yii\web\Controller
             'productModel'    => $productModel,
             'productProvider' => $productProvider,
             'groups'            => $groups,
-            'priceLimits'     => $priceLimits,
+            //'priceLimits'     => $priceLimits,
         ]);
     }
@@ -47,7 +47,7 @@
                     /**
                      * Проверяем товар на наличие
                      */
-                    if(!$product->stock > 0 || !$product->price > 0) {
+                    if( !$product->price > 0) {
                         /**
                          * Добавляем сообщение об ошибке
                          */
@@ -139,7 +139,7 @@
                 throw new InvalidParamException('Не указан товар');
             }
             if(!empty( $product_variant ) && $orders->load($request->post()) && $orders->save()) {
-                if($product_variant->stock <= 0 || $product_variant->price <= 0) {
+                if( $product_variant->price <= 0) {
                     $orders->delete();
                     return [
                         'error' => 'К сожалению товара ' . $product_variant->name . ' нет в наличии',
@@ -194,7 +194,7 @@
                 $order_products = [];
                 foreach($data as $product_variant_id => $item) {
                     $product_variant = ProductVariant::findOne($product_variant_id);
-                    if(!empty($product_variant) && $product_variant->stock > 0 && $product_variant->price > 0) {
+                    if(!empty($product_variant)  && $product_variant->price > 0) {
                         $product_variants[$product_variant_id] = $product_variant;
                         $order_products[$product_variant_id] = new OrdersProducts([
                             'product_name' => $product_variant->product->name,
 <?php
     use common\modules\comment\assets\CommentAsset;
-    use yii\helpers\Html;
+use frontend\widgets\Seo;
+use yii\helpers\Html;
     use yii\helpers\Url;
     use yii\widgets\Breadcrumbs;
     //use app\models\News;
@@ -12,7 +13,8 @@
 <?php
     $this->title = 'Статьи';
-
+    $this->params[ 'seo' ][ Seo::H1] =  $this->title ;
+    $this->params[ 'seo' ][ Seo::TITLE] = $this->title;
     $this->params['breadcrumbs'][] = $this->title;
 <?php
+use frontend\widgets\Seo;
+
 $this->title = 'Moй кабинет';
 $this->params['breadcrumbs'][] = $this->title;
-
+$this->params[ 'seo' ][ Seo::H1] =  $this->title ;
+$this->params[ 'seo' ][ Seo::TITLE] = $this->title;
 ?>
 <div class="block_02">
@@ -17,7 +17,7 @@ FlipclockAsset::register($this);
     $this->params[ 'seo' ][ 'fields' ][ 'name' ] = $product->name;
     $this->params[ 'seo' ][ 'h1' ] = !empty( Seo::widget([ 'row' => 'h1' ]) ) ? Seo::widget([ 'row' => 'h1' ]) : $product->name;
     $this->title = $product->name;
-    
+
     $this->params[ 'breadcrumbs' ][] = [
         'label' => $category->name,
         'url'   => [
@@ -25,6 +25,11 @@ FlipclockAsset::register($this);
             'category' => $category,
         ],
     ];
+
+    $this->params[ 'breadcrumbs' ][] = [
+        'label' => $product->brand->name,
+        'url'   => ['catalog/category', 'category' => $category, 'filters' => ['brands' => [$product->brand->alias]]],
+    ];
     $this->params[ 'breadcrumbs' ][] = $product->name . ' #' . $product->variant->sku;
 ?>
@@ -134,18 +134,18 @@ use yii\helpers\Url;
                     <div class="catalog_product_list view_table">
-                        <?= ListView::widget([
-                            'dataProvider' => $productProvider,
-                            'itemView' => function ($model, $key, $index, $widget) use($category) {
-                                return $this->render('_product_item',[
-                                    'model' => $model,
-                                    'category' => $category
-                                ]);
-                            },
-                            'layout' => "{items}<div class=\"clearfix\"></div>{pager}",
-                        ])
-
-                        ?>
+<!--                        --><?//= ListView::widget([
+//                            'dataProvider' => $productProvider,
+//                            'itemView' => function ($model, $key, $index, $widget) use($category) {
+//                                return $this->render('_product_item',[
+//                                    'model' => $model,
+//                                    'category' => $category
+//                                ]);
+//                            },
+//                            'layout' => "{items}<div class=\"clearfix\"></div>{pager}",
+//                        ])
+//
+//                        ?>
@@ -6,11 +6,13 @@ use yii\widgets\LinkPager;
 use yii\widgets\ListView;
-?>
-<?php
 $this->title = 'Акции';
-$this->registerMetaTag(['name' => 'description', 'content' => 'Акции']);
-$this->registerMetaTag(['name' => 'keywords', 'content' => 'Акции']);
+$this->params['seo']['title'] = $this->title;
+
+$this->params['seo']['h1'] = $this->title;
+
+
+
 ?>
@@ -8,7 +8,9 @@ FlipclockAsset::register($this);
 ?>
 <?php
 $this->title = $model->name;
+$this->params['seo']['title'] = $this->title;
+$this->params['seo']['h1'] = $this->title;
 ?>
 <?php
+use frontend\widgets\Seo;
 use yii\helpers\Html;
 use yii\helpers\Url;
 use common\models\Basket;
 use common\modules\product\models\ProductVariant;
 use yii\web\View;
-
+$this->title = "Корзина";
+$this->params[ 'seo' ][ Seo::H1] =  $this->title ;
+$this->params[ 'seo' ][ Seo::TITLE] = $this->title;
 /**
  * @var View             $this
  * @var ProductVariant[] $models
 <?php
+use frontend\widgets\Seo;
 use yii\helpers\Html;
 /* @var $this yii\web\View */
@@ -8,6 +9,9 @@ use yii\helpers\Html;
 /* @var $exception Exception */
 $this->title = 'Ошибка '.$code;
+
+$this->params[ 'seo' ][ Seo::TITLE] = $this->title = 'Ошибка '.$code;
+
 ?>
 <style>
 <?php
-    use frontend\widgets\Slider;
+use frontend\widgets\Seo;
+use frontend\widgets\Slider;
 use yii\helpers\Html;
 use yii\web\View;
-
-
 ?>
@@ -9,13 +9,11 @@ use yii\widgets\Breadcrumbs;
 ?>
 <?php
 $this->title = $text->meta_title;
-$this->params[ 'seo' ][ Seo::H1] = !empty($category->h1) ?$text->h1: $text->title ;
+$this->params[ 'seo' ][ Seo::H1] = !empty($text->h1) ?$text->h1: $text->title ;
 $this->params[ 'seo' ][ Seo::TITLE] = !empty($text->meta_title)? $text->meta_title : $text->title;
 $this->params[ 'seo' ][ Seo::DESCRIPTION] = !empty($text->meta_description)? $text->meta_description : '';
 $this->params[ 'seo' ][ Seo::SEO_TEXT] =!empty($text->seo_text)? $text->seo_text : '';
-$this->registerMetaTag(['name' => 'description', 'content' => $text->meta_description]);
-$this->registerMetaTag(['name' => 'keywords', 'content' => $text->meta_keywords]);
 ?>
 <div class="container">
@@ -59,11 +59,11 @@ var ArtboxBasket = (function () {
             $.each(this._items, function (index, value) {
                 sum += value.price * value.count;
             });
-            return sum;
+            return sum.toFixed(2);
         },
         enumerable: true,
         configurable: true
     });
     return ArtboxBasket;
-}());
+})();
 //# sourceMappingURL=artbox_basket.js.map
 \ No newline at end of file
-{"version":3,"file":"artbox_basket.js","sourceRoot":"","sources":["artbox_basket.ts"],"names":[],"mappings":"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"}
 \ No newline at end of file
+{"version":3,"file":"artbox_basket.js","sourceRoot":"","sources":["artbox_basket.ts"],"names":["ArtboxBasket","ArtboxBasket.constructor","ArtboxBasket.items","ArtboxBasket.add","ArtboxBasket.set","ArtboxBasket.updateModal","ArtboxBasket.updateCart","ArtboxBasket.count","ArtboxBasket.sum"],"mappings":"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"}
 \ No newline at end of file
@@ -50,6 +50,6 @@ class ArtboxBasket {
         $.each(this._items, function(index, value) {
             sum += value.price * value.count;
         });
-        return sum;
+        return sum.toFixed(2);
     }
 }
 \ No newline at end of file
 User-agent: *
-Disallow: /order/main
-Disallow: /*search
-Disallow: /?sort
-Disallow: /*event
-Disallow: /?page
-Host: www.linija-svitla.ua
-Sitemap: http://www.linija-svitla.ua/sitemap.xml
 \ No newline at end of file
+
+Disallow: /
 \ No newline at end of file