Commit b186d3bf8daa1710fa4a518a9fea98f958050947

Authored by Alexey Boroda
2 parents d57c8c00 133ef5d8

Merge remote-tracking branch 'origin/master'

models/OrderPayment.php
@@ -3,9 +3,7 @@ @@ -3,9 +3,7 @@
3 namespace artweb\artbox\ecommerce\models; 3 namespace artweb\artbox\ecommerce\models;
4 4
5 use artweb\artbox\language\behaviors\LanguageBehavior; 5 use artweb\artbox\language\behaviors\LanguageBehavior;
6 -use Yii;  
7 use yii\db\ActiveQuery; 6 use yii\db\ActiveQuery;
8 -use yii\db\ActiveRecord;  
9 use yii\web\Request; 7 use yii\web\Request;
10 /** 8 /**
11 * This is the model class for table "order_payment". 9 * This is the model class for table "order_payment".
models/Product.php
@@ -373,7 +373,10 @@ @@ -373,7 +373,10 @@
373 $name = ''; 373 $name = '';
374 if (!empty( $this->category->lang->category_synonym )) { 374 if (!empty( $this->category->lang->category_synonym )) {
375 $name = $name . $this->category->lang->category_synonym . ' '; 375 $name = $name . $this->category->lang->category_synonym . ' ';
  376 + } else {
  377 + $name = $name . $this->category->lang->title . ' ';
376 } 378 }
  379 +
377 if (!empty( $this->brand )) { 380 if (!empty( $this->brand )) {
378 $name = $name . $this->brand->lang->title . ' '; 381 $name = $name . $this->brand->lang->title . ' ';
379 } 382 }
models/ProductFrontendSearch.php
@@ -100,7 +100,7 @@ @@ -100,7 +100,7 @@
100 'allModels' => $this->getSearchQuery($category, $params, $in_stock) 100 'allModels' => $this->getSearchQuery($category, $params, $in_stock)
101 ->with('variant', 'videos')->all(), 101 ->with('variant', 'videos')->all(),
102 'pagination' => [ 102 'pagination' => [
103 - 'pageSize' => 11, 103 + 'pageSize' => 12,
104 ], 104 ],
105 'sort' => $sort, 105 'sort' => $sort,
106 ] 106 ]