Administrator / liniya-svitla

Commit 5181a91a824e1da3819261ff24d3642c5c84dc1b

Authored by Administrator
1 parent d56adb97

big commti

Showing 17 changed files with 57 additions and 44 deletions   Show diff stats
Inline Side-by-side
frontend/config/main.php
  Show/Hide comments   View file @5181a91
... ... @@ -8,6 +8,7 @@ $params = array_merge(
8 8  
9 9 return [
10 10 'id' => 'app-frontend',
  11 + 'name'=>'Лінія Світла',
11 12 'basePath' => dirname(__DIR__),
12 13 'bootstrap' => [
13 14  
... ... @@ -18,7 +19,6 @@ return [
18 19  
19 20 ],
20 21 'components' => [
21   -
22 22 'authManager' => [
23 23 'class' => 'yii\rbac\DbManager',
24 24 ],
... ...
frontend/controllers/CatalogController.php
  Show/Hide comments   View file @5181a91
... ... @@ -118,7 +118,7 @@ class CatalogController extends \yii\web\Controller
118 118  
119 119 $groups = $category->getActiveFilters()->all();
120 120 $groups = ArrayHelper::index($groups, null, 'name');
121   - $priceLimits = $productModel->priceLimits($category, $params);
  121 + //$priceLimits = $productModel->priceLimits($category, $params);
122 122  
123 123 /*
124 124 * Greedy search for comments and rating
... ... @@ -142,7 +142,7 @@ class CatalogController extends \yii\web\Controller
142 142 'productModel' => $productModel,
143 143 'productProvider' => $productProvider,
144 144 'groups' => $groups,
145   - 'priceLimits' => $priceLimits,
  145 + //'priceLimits' => $priceLimits,
146 146 ]);
147 147  
148 148 }
... ...
frontend/controllers/OrderController.php
  Show/Hide comments   View file @5181a91
... ... @@ -47,7 +47,7 @@
47 47 /**
48 48 * Проверяем товар на наличие
49 49 */
50   - if(!$product->stock > 0 || !$product->price > 0) {
  50 + if( !$product->price > 0) {
51 51 /**
52 52 * Добавляем сообщение об ошибке
53 53 */
... ... @@ -139,7 +139,7 @@
139 139 throw new InvalidParamException('Не указан товар');
140 140 }
141 141 if(!empty( $product_variant ) && $orders->load($request->post()) && $orders->save()) {
142   - if($product_variant->stock <= 0 || $product_variant->price <= 0) {
  142 + if( $product_variant->price <= 0) {
143 143 $orders->delete();
144 144 return [
145 145 'error' => 'К сожалению товара ' . $product_variant->name . ' нет в наличии',
... ... @@ -194,7 +194,7 @@
194 194 $order_products = [];
195 195 foreach($data as $product_variant_id => $item) {
196 196 $product_variant = ProductVariant::findOne($product_variant_id);
197   - if(!empty($product_variant) && $product_variant->stock > 0 && $product_variant->price > 0) {
  197 + if(!empty($product_variant) && $product_variant->price > 0) {
198 198 $product_variants[$product_variant_id] = $product_variant;
199 199 $order_products[$product_variant_id] = new OrdersProducts([
200 200 'product_name' => $product_variant->product->name,
... ...
frontend/views/articles/index.php
  Show/Hide comments   View file @5181a91
1 1 <?php
2 2 use common\modules\comment\assets\CommentAsset;
3   - use yii\helpers\Html;
  3 +use frontend\widgets\Seo;
  4 +use yii\helpers\Html;
4 5 use yii\helpers\Url;
5 6 use yii\widgets\Breadcrumbs;
6 7 //use app\models\News;
... ... @@ -12,7 +13,8 @@
12 13 <?php
13 14 $this->title = 'Статьи';
14 15  
15   -
  16 + $this->params[ 'seo' ][ Seo::H1] = $this->title ;
  17 + $this->params[ 'seo' ][ Seo::TITLE] = $this->title;
16 18  
17 19 $this->params['breadcrumbs'][] = $this->title;
18 20  
... ...
frontend/views/cabinet/index.php
  Show/Hide comments   View file @5181a91
1 1 <?php
  2 +use frontend\widgets\Seo;
  3 +
2 4 $this->title = 'Moй кабинет';
3 5 $this->params['breadcrumbs'][] = $this->title;
4   -
  6 +$this->params[ 'seo' ][ Seo::H1] = $this->title ;
  7 +$this->params[ 'seo' ][ Seo::TITLE] = $this->title;
5 8 ?>
6 9  
7 10 <div class="block_02">
... ...
frontend/views/catalog/product.php
  Show/Hide comments   View file @5181a91
... ... @@ -17,7 +17,7 @@ FlipclockAsset::register($this);
17 17 $this->params[ 'seo' ][ 'fields' ][ 'name' ] = $product->name;
18 18 $this->params[ 'seo' ][ 'h1' ] = !empty( Seo::widget([ 'row' => 'h1' ]) ) ? Seo::widget([ 'row' => 'h1' ]) : $product->name;
19 19 $this->title = $product->name;
20   -
  20 +
21 21 $this->params[ 'breadcrumbs' ][] = [
22 22 'label' => $category->name,
23 23 'url' => [
... ... @@ -25,6 +25,11 @@ FlipclockAsset::register($this);
25 25 'category' => $category,
26 26 ],
27 27 ];
  28 +
  29 + $this->params[ 'breadcrumbs' ][] = [
  30 + 'label' => $product->brand->name,
  31 + 'url' => ['catalog/category', 'category' => $category, 'filters' => ['brands' => [$product->brand->alias]]],
  32 + ];
28 33 $this->params[ 'breadcrumbs' ][] = $product->name . ' #' . $product->variant->sku;
29 34 ?>
30 35  
... ...
frontend/views/catalog/products.php
  Show/Hide comments   View file @5181a91
... ... @@ -134,18 +134,18 @@ use yii\helpers\Url;
134 134 <div class="catalog_product_list view_table">
135 135  
136 136  
137   - <?= ListView::widget([
138   - 'dataProvider' => $productProvider,
139   - 'itemView' => function ($model, $key, $index, $widget) use($category) {
140   - return $this->render('_product_item',[
141   - 'model' => $model,
142   - 'category' => $category
143   - ]);
144   - },
145   - 'layout' => "{items}<div class=\"clearfix\"></div>{pager}",
146   - ])
147   -
148   - ?>
  137 +<!-- --><?//= ListView::widget([
  138 +// 'dataProvider' => $productProvider,
  139 +// 'itemView' => function ($model, $key, $index, $widget) use($category) {
  140 +// return $this->render('_product_item',[
  141 +// 'model' => $model,
  142 +// 'category' => $category
  143 +// ]);
  144 +// },
  145 +// 'layout' => "{items}<div class=\"clearfix\"></div>{pager}",
  146 +// ])
  147 +//
  148 +// ?>
149 149  
150 150  
151 151  
... ...
frontend/views/event/index.php
  Show/Hide comments   View file @5181a91
... ... @@ -6,11 +6,13 @@ use yii\widgets\LinkPager;
6 6  
7 7 use yii\widgets\ListView;
8 8  
9   -?>
10   -<?php
11 9 $this->title = 'Акции';
12   -$this->registerMetaTag(['name' => 'description', 'content' => 'Акции']);
13   -$this->registerMetaTag(['name' => 'keywords', 'content' => 'Акции']);
  10 +$this->params['seo']['title'] = $this->title;
  11 +
  12 +$this->params['seo']['h1'] = $this->title;
  13 +
  14 +
  15 +
14 16 ?>
15 17  
16 18  
... ...
frontend/views/event/show.php
  Show/Hide comments   View file @5181a91
... ... @@ -8,7 +8,9 @@ FlipclockAsset::register($this);
8 8 ?>
9 9 <?php
10 10 $this->title = $model->name;
  11 +$this->params['seo']['title'] = $this->title;
11 12  
  13 +$this->params['seo']['h1'] = $this->title;
12 14 ?>
13 15  
14 16  
... ...
frontend/views/order/index.php
  Show/Hide comments   View file @5181a91
1 1 <?php
2 2  
  3 +use frontend\widgets\Seo;
3 4 use yii\helpers\Html;
4 5 use yii\helpers\Url;
5 6 use common\models\Basket;
6 7 use common\modules\product\models\ProductVariant;
7 8 use yii\web\View;
8   -
  9 +$this->title = "Корзина";
  10 +$this->params[ 'seo' ][ Seo::H1] = $this->title ;
  11 +$this->params[ 'seo' ][ Seo::TITLE] = $this->title;
9 12 /**
10 13 * @var View $this
11 14 * @var ProductVariant[] $models
... ...
frontend/views/site/error.php
  Show/Hide comments   View file @5181a91
1 1 <?php
2 2  
  3 +use frontend\widgets\Seo;
3 4 use yii\helpers\Html;
4 5  
5 6 /* @var $this yii\web\View */
... ... @@ -8,6 +9,9 @@ use yii\helpers\Html;
8 9 /* @var $exception Exception */
9 10  
10 11 $this->title = 'Ошибка '.$code;
  12 +
  13 +$this->params[ 'seo' ][ Seo::TITLE] = $this->title = 'Ошибка '.$code;
  14 +
11 15 ?>
12 16 
13 17 <style>
... ...
frontend/views/site/index.php
  Show/Hide comments   View file @5181a91
1 1 <?php
2   - use frontend\widgets\Slider;
  2 +use frontend\widgets\Seo;
  3 +use frontend\widgets\Slider;
3 4 use yii\helpers\Html;
4 5 use yii\web\View;
5 6  
6   -
7   -
8 7 ?>
9 8  
10 9  
... ...
frontend/views/text/index.php
  Show/Hide comments   View file @5181a91
... ... @@ -9,13 +9,11 @@ use yii\widgets\Breadcrumbs;
9 9 ?>
10 10 <?php
11 11 $this->title = $text->meta_title;
12   -$this->params[ 'seo' ][ Seo::H1] = !empty($category->h1) ?$text->h1: $text->title ;
  12 +$this->params[ 'seo' ][ Seo::H1] = !empty($text->h1) ?$text->h1: $text->title ;
13 13 $this->params[ 'seo' ][ Seo::TITLE] = !empty($text->meta_title)? $text->meta_title : $text->title;
14 14 $this->params[ 'seo' ][ Seo::DESCRIPTION] = !empty($text->meta_description)? $text->meta_description : '';
15 15 $this->params[ 'seo' ][ Seo::SEO_TEXT] =!empty($text->seo_text)? $text->seo_text : '';
16 16  
17   -$this->registerMetaTag(['name' => 'description', 'content' => $text->meta_description]);
18   -$this->registerMetaTag(['name' => 'keywords', 'content' => $text->meta_keywords]);
19 17 ?>
20 18  
21 19 <div class="container">
... ...
frontend/web/js/artbox_basket.js
  Show/Hide comments   View file @5181a91
... ... @@ -59,11 +59,11 @@ var ArtboxBasket = (function () {
59 59 $.each(this._items, function (index, value) {
60 60 sum += value.price * value.count;
61 61 });
62   - return sum;
  62 + return sum.toFixed(2);
63 63 },
64 64 enumerable: true,
65 65 configurable: true
66 66 });
67 67 return ArtboxBasket;
68   -}());
  68 +})();
69 69 //# sourceMappingURL=artbox_basket.js.map
70 70 \ No newline at end of file
... ...
frontend/web/js/artbox_basket.js.map
  Show/Hide comments   View file @5181a91
1   -{"version":3,"file":"artbox_basket.js","sourceRoot":"","sources":["artbox_basket.ts"],"names":[],"mappings":"AAAA;IAKI;QACI,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,IAAI;YAC3B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC;YACvB,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACP,CAAC;IAVD,sBAAI,+BAAK;aAAT;YACI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC;QACvB,CAAC;;;OAAA;IASM,0BAAG,GAAV,UAAW,kBAAkB,EAAE,KAAK;QAChC,CAAC,CAAC,IAAI,CAAC,iCAAiC,GAAC,kBAAkB,GAAC,SAAS,GAAC,KAAK,EAAE,UAAU,IAAI;YACvF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAClD,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,GAAG,EAAE,MAAM,EAAE,KAAK;YACnD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;IACM,0BAAG,GAAV,UAAW,kBAAkB,EAAE,KAAK;QAChC,CAAC,CAAC,IAAI,CAAC,iCAAiC,GAAC,kBAAkB,GAAC,SAAS,GAAC,KAAK,EAAE,UAAU,IAAI;YACvF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;YAC1B,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,GAAG,EAAE,MAAM,EAAE,KAAK;YACnD,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACP,CAAC;IACM,kCAAW,GAAlB,UAAmB,KAAK,EAAE,SAAS,EAAE,IAAY;QAAZ,oBAAY,GAAZ,YAAY;QAE7C,IAAI,QAAQ,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;QAC7B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,EAAE,CAAA,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;YAChB,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QAAC,IAAI,CAAC,EAAE,CAAA,CAAC,IAAI,CAAC,CAAC,CAAC;YACb,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;IACM,iCAAU,GAAjB,UAAkB,SAAS;QACvB,IAAI,IAAI,GAAG,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC;IACD,sBAAI,+BAAK;aAAT;YACI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAC3C,CAAC;;;OAAA;IACD,sBAAI,6BAAG;aAAP;YACI,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,UAAS,KAAK,EAAE,KAAK;gBACrC,GAAG,IAAI,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;YACrC,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,CAAC;QACf,CAAC;;;OAAA;IACL,mBAAC;AAAD,CAAC,AAtDD,IAsDC"}
2 1 \ No newline at end of file
  2 +{"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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"}
3 3 \ No newline at end of file
... ...
frontend/web/js/artbox_basket.ts
  Show/Hide comments   View file @5181a91
... ... @@ -50,6 +50,6 @@ class ArtboxBasket {
50 50 $.each(this._items, function(index, value) {
51 51 sum += value.price * value.count;
52 52 });
53   - return sum;
  53 + return sum.toFixed(2);
54 54 }
55 55 }
56 56 \ No newline at end of file
... ...
frontend/web/robots.txt
  Show/Hide comments   View file @5181a91
1 1 User-agent: *
2   -Disallow: /order/main
3   -Disallow: /*search
4   -Disallow: /?sort
5   -Disallow: /*event
6   -Disallow: /?page
7   -Host: www.linija-svitla.ua
8   -Sitemap: http://www.linija-svitla.ua/sitemap.xml
9 2 \ No newline at end of file
  3 +
  4 +Disallow: /
10 5 \ No newline at end of file
... ...