big commti

Administrator
1 parent 0aaf09fd
Showing 13 changed files with 40 additions and 25 deletions Show diff stats
.htaccess
.htpasswd
common/config/main.php
common/modules/product/controllers/ManageController.php
common/modules/product/controllers/VariantController.php
common/modules/product/helpers/ProductHelper.php
common/modules/product/models/Category.php
console/controllers/SiteMapController.php
frontend/config/main.php
frontend/controllers/CatalogController.php
frontend/views/catalog/product.php
frontend/views/layouts/main.php
frontend/widgets/Seo.php
@@ -2,8 +2,6 @@ AddDefaultCharset utf-8
 <IfModule mod_rewrite.c>
-    Options +FollowSymlinks
-
     RewriteEngine On
 </IfModule>
-root:$apr1$yVolX6PS$4ga2ZthXEzR1Ii1Ru39iX0
 \ No newline at end of file
@@ -8,6 +8,10 @@ return [
 //        ],
     ],
     'components' => [
+        'cache' => [
+            'class' => 'yii\caching\MemCache',
+            'keyPrefix' => 'linija_'
+        ],
         'assetManager' => [
             'bundles' => [
                 'yii\web\JqueryAsset' =>[
@@ -19,10 +23,6 @@ return [
             'class' => 'common\components\SmsSender',
         ],
-        'cache' => [
-            'class' => 'yii\caching\FileCache',
-        ],
-
         'i18n' => [
             'translations' => [
                 '*' => [
@@ -103,6 +103,7 @@ class ManageController extends Controller
     {
         $model = $this->findModel($id);
         if ($model->load(Yii::$app->request->post())) {
+            $model->unlinkAll('options',true);
             if ($model->save()) {
                 return $this->redirect(['view', 'id' => $model->product_id]);
             }
@@ -117,7 +117,7 @@ class VariantController extends Controller
     {
         $model = $this->findModel($id);
         if ($model->load(Yii::$app->request->post())) {
-
+            $model->unlinkAll('options',true);
             if ($model->save()) {
@@ -250,11 +250,11 @@
                             Product::tableName() . '.product_id IN (       
                         SELECT DISTINCT products
     FROM (
-        SELECT product_id AS products
-        FROM product_option
+        SELECT product_id AS products FROM product WHERE product_id IN(
+        SELECT product_id FROM  product_option
             INNER JOIN tax_option ON tax_option.tax_option_id = product_option.option_id
             INNER JOIN tax_group ON tax_group.tax_group_id = tax_option.tax_group_id
-        WHERE tax_group.alias LIKE \''. $key .'\' AND tax_option.alias IN (\'' . implode('\',\'', $param) . '\') OR product_id IN (
+        WHERE tax_group.alias LIKE \''. $key .'\' AND tax_option.alias IN (\'' . implode('\',\'', $param) . '\')) OR product_id IN (
 		  (SELECT product_id AS products
         FROM product_variant_option
             INNER JOIN product_variant ON product_variant_option.product_variant_id = product_variant.product_variant_id
@@ -240,7 +240,7 @@ class Category extends \yii\db\ActiveRecord
             ->where(['tax_option.tax_option_id'=>$query1->union($query2)])
             ->innerJoin('tax_group','tax_group.tax_group_id = tax_option.tax_group_id')
             ->orderBy('tax_option.sort, tax_group.sort');
-        return $query3;
+        return $query3->all();
     }
     public function getTaxGroupsForMenu()
@@ -86,7 +86,7 @@ class SiteMapController extends Controller
     public function getFilters($category){
-        return $category->getActiveFilters()->all();
+        return $category->getActiveFilters();
     }
@@ -19,6 +19,7 @@ return [
     ],
     'components' => [
+
         'authManager' => [
             'class' => 'yii\rbac\DbManager',
         ],
@@ -116,9 +116,9 @@ class CatalogController extends \yii\web\Controller
         $brands = $brandModel->getBrands($category, $params)
             ->all();
-        $groups = $category->getActiveFilters()->all();
+        $groups = $category->getActiveFilters();
         $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,
         ]);
     }
 <?php
-    
+/**
+ * @var $product Product
+ */
     use common\components\artboximage\ArtboxImageHelper;
     use common\models\Orders;
-    use frontend\assets\FotoramaAsset;
+use common\modules\product\models\Product;
+use frontend\assets\FotoramaAsset;
     use frontend\widgets\Seo;
     use common\modules\comment\widgets\CommentWidget;
     use yii\bootstrap\ActiveForm;
@@ -11,12 +14,15 @@ use yii\helpers\Url;
 use yii\widgets\MaskedInput;
 use frontend\assets\FlipclockAsset;
     FotoramaAsset::register($this);
-FlipclockAsset::register($this);
+    FlipclockAsset::register($this);
+    $this->title = $product->name;
+
+
     $this->params[ 'seo' ][ 'key' ] = $category->name;
     $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[ 'seo' ][ 'h1' ] =  $product->name;
+
     $this->params[ 'breadcrumbs' ][] = [
         'label' => $category->name,
@@ -199,15 +199,24 @@ use common\models\Event;
                 <div class="clearfix"></div>
             </header>
             <div id="brand_bar">
-                
                 <div class="container">
-                    <?= $this->render('../partial/brand_list')?>
+                <?php if($this->beginCache('brand_list',[
+                    'duration' => 3600 *24
+                ])){ ?>
+
+                        <?= $this->render('../partial/brand_list')?>
+
+                <?php $this->endCache(); } ?>
                 </div>
             </div>
-            
+            <?php if($this->beginCache('main-menu',[
+                'duration' => 3600 *24
+            ])){ ?>
             <?= $this->render('main-menu') ?>
+            <?php $this->endCache(); } ?>
+
             <div class="wrapper white">
                 <div class="container">
@@ -110,7 +110,8 @@ class Seo extends Widget
                     return $default;
-                } else if(!$this->checkFilter($filter)){
+                } else if(!empty($filter) && !$this->checkFilter($filter)){
+
                     $array = $this->arrayBuilder($filter);
                     return $this->getNameString($array);
                 }