From cc4dfcad767b619e6808839ea2c3a54ea6fda91e Mon Sep 17 00:00:00 2001
From: rahul shukla <rahulshukla.symfony517@webkul.com>
Date: Tue, 9 Jul 2019 14:47:40 +0530
Subject: [PATCH] issue #1160, filterable attribute & configuration updated for
 validation

---
 .../views/configuration/field-type.blade.php  |  2 +-
 .../Repositories/ProductFlatRepository.php    | 17 +++++++-
 .../list/layered-navigation.blade.php         | 42 ++++++++++++++++++-
 3 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
index 8d2790707..15f3dfc3f 100755
--- a/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/configuration/field-type.blade.php
@@ -82,7 +82,7 @@
 
         <div class="control-group {{ $field['type'] }}" @if ($field['type'] == 'multiselect') :class="[errors.has('{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}][]') ? 'has-error' : '']" @else :class="[errors.has('{{ $firstField }}[{{ $secondField }}][{{ $thirdField }}][{{ $field['name'] }}]') ? 'has-error' : '']" @endif>
 
-            <label for="{{ $name }}" {{ !isset($field['validation']) || strpos('required', $field['validation']) === false ? '' : 'class=required' }}>
+            <label for="{{ $name }}" {{ !isset($field['validation']) || preg_match('/\brequired\b/', $field['validation']) == false ? '' : 'class=required' }}>
 
                 {{ trans($field['title']) }}
 
diff --git a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
index 2d7c82a82..21c153762 100644
--- a/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductFlatRepository.php
@@ -37,7 +37,7 @@ class ProductFlatRepository extends Repository
     }
 
     /**
-     * Maximum Price of Category Prodcut
+     * Maximum Price of Category Product
      *
      * @param int  $categoryId
      * return integer
@@ -51,7 +51,7 @@ class ProductFlatRepository extends Repository
     }
 
      /**
-     * Maximum Price of Prodcut
+     * Maximum Price of Product
      *
      * return integer
      */
@@ -59,4 +59,17 @@ class ProductFlatRepository extends Repository
     {
         return $this->model->max('price');
     }
+
+    /**
+     * get Category Product
+     *
+     * return array
+     */
+    public function getCategoryProduct($categoryId)
+    {
+        return $this->model
+            ->leftJoin('product_categories', 'product_flat.product_id', 'product_categories.product_id')
+            ->where('product_categories.category_id', $categoryId)
+            ->get();
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php b/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php
index 333b5342a..2291916d5 100755
--- a/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/products/list/layered-navigation.blade.php
@@ -2,6 +2,46 @@
 
 @inject ('productFlatRepository', 'Webkul\Product\Repositories\ProductFlatRepository')
 
+@inject ('productAttributeValueRepository', 'Webkul\Product\Repositories\ProductAttributeValueRepository')
+
+<?php
+    $filterAttributes = [];
+
+    if (isset($category)) {
+        $categoryProduct = $productFlatRepository->getCategoryProduct($category->id);
+
+        foreach ($categoryProduct as $product) {
+            $attributes = $productAttributeValueRepository->findByField('product_id', $product->product_id);
+
+            if ($product->product->type == 'configurable') {
+                foreach ($product->product->super_attributes as $super_attribute) {
+                    $productAttribute[] =  $super_attribute->id;
+                }
+            }
+
+            foreach ($attributes as $attribute) {
+                if ($attribute) {
+                    $productAttribute[] =  $attribute->attribute_id;
+                }
+            }
+        }
+
+        if (isset($productAttribute)) {
+            foreach ($attributeRepository->getFilterAttributes() as $filterAttribute) {
+                if (in_array($filterAttribute->id, array_unique($productAttribute))) {
+                    $filterAttributes[] = $filterAttribute;
+                } else  if ($filterAttribute ['code'] == 'price') {
+                    $filterAttributes[] = $filterAttribute;
+                }
+            }
+        }
+
+        $filterAttributes = collect($filterAttributes);
+    } else {
+        $filterAttributes = $attributeRepository->getFilterAttributes();
+    }
+?>
+
 <div class="layered-filter-wrapper">
 
     {!! view_render_event('bagisto.shop.products.list.layered-nagigation.before') !!}
@@ -85,7 +125,7 @@
 
             data: function() {
                 return {
-                    attributes: @json($attributeRepository->getFilterAttributes()),
+                    attributes: @json($filterAttributes),
                     appliedFilters: {}
                 }
             },