Labels

Sywooch · Oct 31, 2019 · 9784e7c · 9784e7c
1 parent 4eb6de1
commit 9784e7c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/controllers/ShopController.php b/controllers/ShopController.php
@@ -71,6 +71,12 @@ public function actionIndex($url = '')
             return $this->addReview();
         }
 
+        $label = ProductLabel::findOne(['widget' => $url]);
+
+        if ($label) {
+            return $this->actionSearch($label);
+        }
+
         $url_parts = explode('/', $url);
 
         $models = [];
@@ -832,7 +838,7 @@ protected function getParentLink($models)
         return $url;
     }
 
-    public function actionSearch()
+    public function actionSearch($label = false)
     {
         $searchtext = Yii::$app->request->get('searchtext', false);
         $searchtag  = Yii::$app->request->get('tag', false);
@@ -842,7 +848,6 @@ public function actionSearch()
         $offset = ($product_page - 1) * $limit;
         $product_count = 0;
         $products = [];
-        $label = false;
 
         if ($searchtext) {
             $productsQuery = Product::find()->where(
@@ -857,15 +862,12 @@ public function actionSearch()
             );
 
             $product_count = $productsQuery->count();
-        } elseif ($searchtag) {
-            $label = ProductLabel::findOne(['widget' => $searchtag]);
-
-            if ($label) {
-                $productsQuery = Product::find()->innerJoin(ProductLabels::tableName(), ProductLabels::tableName().'.product_id='.Product::tableName().'.id')
-                                                ->where([Product::tableName().'.status' => Product::STATUS_ACTIVE])
-                                                ->andWhere(['label_id' => $label->id]);
-                $product_count = $productsQuery->count();
-            }
+        } elseif ($label) {
+
+            $productsQuery = Product::find()->innerJoin(ProductLabels::tableName(), ProductLabels::tableName().'.product_id='.Product::tableName().'.id')
+                                            ->where([Product::tableName().'.status' => Product::STATUS_ACTIVE])
+                                            ->andWhere(['label_id' => $label->id]);
+            $product_count = $productsQuery->count();
         }
 
         if ($product_count) {

diff --git a/models/ActiveRecord/ProductLabel.php b/models/ActiveRecord/ProductLabel.php
@@ -78,7 +78,7 @@ public function getContent()
         }
 
         return $this->link || $this->widget ?
-               Html::a(Html::encode($this->label), ($this->link ? $this->link : '/shop/search?tag='.$this->widget), ['style' => implode(';', $styles), 'class' => 'product_label'])
+               Html::a(Html::encode($this->label), ($this->link ? $this->link : '/shop/'.$this->widget), ['style' => implode(';', $styles), 'class' => 'product_label'])
                :
                '<span class="product_label"'.($styles ? ' style="'.implode(';', $styles).'"' : '').'>'.
                Html::encode($this->label).

diff --git a/views/shop/search.php b/views/shop/search.php
@@ -53,7 +53,14 @@
                 <i class="fa fa-ruble"></i>
             </div>
             <div class="product_item_button">
-                <button class="add_shopcart" data-id="<?= $product->id ?>" data-cnt="1">В корзину</button>
+                <div class="product_item_q">
+                    <div class="product_item_quantity_control" id="product_item_quantity_control_<?= $product->id ?>search">
+                        <span class="product_item_quantity_control_minus" data-id="<?= $product->id ?>" data-widget="search">&ndash;</span>
+                        <span class="product_item_quantity_control_plus" data-id="<?= $product->id ?>" data-widget="search">+</span>
+                        <span class="product_item_quantity_control_count">1</span>
+                    </div>
+                </div>
+                <button class="add_shopcart add_shopcart<?= $product->id ?>search" data-id="<?= $product->id ?>" data-cnt="1">В корзину</button>
             </div>
         </div>
 

diff --git a/web/js/shopcart.js b/web/js/shopcart.js
@@ -13,8 +13,8 @@ var shopcart = {
         $('.custom_form_selector').on('click', this.customSelEvent);
         $('.custom_checkbox').on('click', this.checkboxEvent);
         $('#shoporder-phone').mask("+7(999) 999-99-99");
-        $('.product_widget .product_item_quantity_control_minus').on('click', this.minusWidgetEvent);
-        $('.product_widget .product_item_quantity_control_plus').on('click', this.plusWidgetEvent);
+        $('.product_widget .product_item_quantity_control_minus, .find_products .product_item_quantity_control_minus').on('click', this.minusWidgetEvent);
+        $('.product_widget .product_item_quantity_control_plus, .find_products .product_item_quantity_control_plus').on('click', this.plusWidgetEvent);
     },
     getCurrentCount: function(obj) {
         var el = $('#product_item_quantity_control_' + $(obj).data('id') + $(obj).data('widget'));