From e2c036ced0d1382b03c6a963bb7965d1d40488e2 Mon Sep 17 00:00:00 2001
From: prashant-webkul <prashant.singh852@webkul.com>
Date: Mon, 29 Oct 2018 11:39:09 +0530
Subject: [PATCH] Search and Bug fixes

---
 .../Resources/views/layouts/master.blade.php  |  2 +-
 .../views/settings/sliders/create.blade.php   |  2 +-
 .../views/settings/sliders/edit.blade.php     |  2 +-
 packages/Webkul/Checkout/src/Cart.php         |  3 +-
 packages/Webkul/Core/src/Models/Search.php    |  9 ++++
 .../src/Repositories/SearchRepository.php     | 51 +++++++++++++++++++
 .../Criteria/SearchByAttributeCriteria.php    | 40 +++++++++++++++
 .../Criteria/SearchByCategoryCriteria.php     | 36 +++++++++++++
 .../SearchBySuperAttributeCriteria.php        | 20 ++++++++
 .../src/Http/Controllers/ReviewController.php |  4 +-
 .../src/Repositories/ProductRepository.php    | 29 +++++++++++
 .../src/Http/Controllers/ReviewController.php | 41 ---------------
 .../src/Http/Controllers/SearchController.php | 23 ++++++---
 packages/Webkul/Shop/src/Http/routes.php      |  5 ++
 .../Shop/src/Resources/assets/sass/app.scss   |  5 ++
 .../Webkul/Shop/src/Resources/lang/en/app.php |  5 ++
 .../views/customers/session/index.blade.php   |  1 -
 .../views/layouts/header/index.blade.php      | 10 ++--
 .../Resources/views/search/search.blade.php   | 11 ++++
 19 files changed, 241 insertions(+), 58 deletions(-)
 create mode 100644 packages/Webkul/Core/src/Models/Search.php
 create mode 100644 packages/Webkul/Core/src/Repositories/SearchRepository.php
 create mode 100644 packages/Webkul/Product/src/Contracts/Criteria/SearchByAttributeCriteria.php
 create mode 100644 packages/Webkul/Product/src/Contracts/Criteria/SearchByCategoryCriteria.php
 create mode 100644 packages/Webkul/Product/src/Contracts/Criteria/SearchBySuperAttributeCriteria.php
 create mode 100644 packages/Webkul/Shop/src/Resources/views/search/search.blade.php

diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
index 3dbe608e0..b3e607592 100644
--- a/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/master.blade.php
@@ -61,7 +61,7 @@
         <script>
             function loadTinyMCE() {
                 tinymce.init({
-                    selector: 'textarea',
+                    selector: 'textarea#tiny',
                     height: 300,
                     width: 535,
                     plugins: 'image imagetools media wordcount save fullscreen',
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
index 7eafcc64f..0f5a32f9a 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/create.blade.php
@@ -49,7 +49,7 @@
                     <div class="control-group" :class="[errors.has('content') ? 'has-error' : '']">
                         <label for="content">{{ __('admin::app.settings.sliders.content') }}</label>
 
-                        <textarea class="control" id="add_content" name="content" rows="5"></textarea>
+                        <textarea id="tiny" class="control" id="add_content" name="content" rows="5"></textarea>
 
                         <span class="control-error" v-if="errors.has('content')">@{{ errors.first('content') }}</span>
                     </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
index b8ed706be..337d3142f 100644
--- a/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/sliders/edit.blade.php
@@ -51,7 +51,7 @@
                         <label for="content">{{ __('admin::app.settings.sliders.content') }}</label>
 
                         <div class="panel-body">
-                            <textarea class="control" id="add_content" name="content" v-validate="'required'" rows="5">{{ $slider->content ? : old('content') }}</textarea>
+                            <textarea id="tiny" class="control" id="add_content" name="content" v-validate="'required'" rows="5">{{ $slider->content ? : old('content') }}</textarea>
                         </div>
 
                         <span class="control-error" v-if="errors.has('content')">@{{ errors.first('content') }}</span>
diff --git a/packages/Webkul/Checkout/src/Cart.php b/packages/Webkul/Checkout/src/Cart.php
index dee4ecfaa..f9bb47978 100644
--- a/packages/Webkul/Checkout/src/Cart.php
+++ b/packages/Webkul/Checkout/src/Cart.php
@@ -1149,6 +1149,7 @@ class Cart {
      * @return mixed
      */
     public function moveConfigurableFromWishlistToCart($configurableproductId, $productId) {
+        // dd('moving configurable');
         $product = $this->product->find($configurableproductId);
 
         $canAdd = $this->product->find($productId)->haveSufficientQuantity(1);
@@ -1196,7 +1197,7 @@ class Cart {
             'weight' => $weight = ($product->type == 'configurable' ? $child->weight : $product->weight),
             'total_weight' => $weight,
             'base_total_weight' => $weight,
-            'additional' => json_encode($additional)
+            'additional' => $additional
         ];
 
         return ['parent' => $parentData, 'child' => $childData];
diff --git a/packages/Webkul/Core/src/Models/Search.php b/packages/Webkul/Core/src/Models/Search.php
new file mode 100644
index 000000000..218bb83f9
--- /dev/null
+++ b/packages/Webkul/Core/src/Models/Search.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Webkul\Core\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Search extends Model
+{
+}
\ No newline at end of file
diff --git a/packages/Webkul/Core/src/Repositories/SearchRepository.php b/packages/Webkul/Core/src/Repositories/SearchRepository.php
new file mode 100644
index 000000000..37d4dabb6
--- /dev/null
+++ b/packages/Webkul/Core/src/Repositories/SearchRepository.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Webkul\Core\Repositories;
+
+use Illuminate\Container\Container as App;
+
+use Webkul\Core\Eloquent\Repository;
+
+use Webkul\Product\Repositories\ProductRepository as Product;
+
+// use Webkul\Product\Contracts\Criteria\searchByAttributeCriteria;
+
+/**
+ * Search Reposotory
+ *
+ * @author    Prashant Singh <prashant.singh852@webkul.com> @prashant-webkul
+ * @copyright 2018 Webkul Software Pvt Ltd (http://www.webkul.com)
+ */
+class SearchRepository extends Repository
+{
+    /**
+     * Specify Model class name
+     *
+     * @return mixed
+     */
+    protected $product;
+
+
+    public function __construct(App $app, Product $product) {
+        parent::__construct($app);
+
+        $this->product = $product;
+    }
+
+    function model()
+    {
+        return 'Webkul\Product\Models\Product';
+    }
+
+    public function searchAttributes(){
+        // $this->pushCriteria(app(searchByAttributeCriteria::class));
+    }
+
+    public function search($data) {
+        $term  = $data['term'];
+
+        $products = $this->product->searchProductByAttribute($term);
+
+        dd($products);
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Product/src/Contracts/Criteria/SearchByAttributeCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/SearchByAttributeCriteria.php
new file mode 100644
index 000000000..ab7f8e28a
--- /dev/null
+++ b/packages/Webkul/Product/src/Contracts/Criteria/SearchByAttributeCriteria.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Webkul\Product\Contracts\Criteria;
+
+use Prettus\Repository\Contracts\CriteriaInterface;
+use Prettus\Repository\Contracts\RepositoryInterface;
+
+use Webkul\Attribute\Repositories\AttributeRepository;
+
+use Webkul\Product\Helpers\AbstractProduct;
+
+/**
+ * Class MyCriteria.
+ *
+ * @package namespace App\Criteria;
+ */
+class SearchByAttributeCriteria extends AbstractProduct implements CriteriaInterface
+{
+    /**
+     * @param  Webkul\Attribute\Repositories\AttributeRepository $attribute
+     * @return void
+     */
+    public function __construct(AttributeRepository $attribute)
+    {
+        $this->attribute = $attribute;
+    }
+
+    /**
+     * Apply criteria in query repository
+     *
+     * @param string              $model
+     * @param RepositoryInterface $repository
+     *
+     * @return mixed
+     */
+    public function apply($model, RepositoryInterface $repository)
+    {
+        return $model = $model->leftJoin('product_attribute_values as pav', 'products.id', '=', 'pav.product_id')->where('attribute_id', '=', 75)->where('products.parent_id', '=', null);
+    }
+}
\ No newline at end of file
diff --git a/packages/Webkul/Product/src/Contracts/Criteria/SearchByCategoryCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/SearchByCategoryCriteria.php
new file mode 100644
index 000000000..f34c81b04
--- /dev/null
+++ b/packages/Webkul/Product/src/Contracts/Criteria/SearchByCategoryCriteria.php
@@ -0,0 +1,36 @@
+<?php
+
+namespace Webkul\Product\Contracts\Criteria;
+
+use Prettus\Repository\Contracts\CriteriaInterface;
+use Prettus\Repository\Contracts\RepositoryInterface;
+
+use Webkul\Attribute\Repositories\AttributeRepository;
+
+use Webkul\Product\Helpers\AbstractProduct;
+
+/**
+ * Class MyCriteria.
+ *
+ * @package namespace App\Criteria;
+ */
+class SearchByCategoryCriteria extends AbstractProduct implements CriteriaInterface
+{
+    /**
+     * Apply criteria in query repository
+     *
+     * @param string              $model
+     * @param RepositoryInterface $repository
+     *
+     * @return mixed
+     */
+    public function apply($model, RepositoryInterface $repository)
+    {
+
+        //->leftJoin('category_translations', 'categories.id', '=', 'category_translations.id')->addSelect('category_translations.name')
+
+        $model = $model->leftJoin('product_categories', 'products.id', '=', 'product_categories.product_id')->leftJoin('categories', 'product_categories.category_id', '=', 'categories.id')->leftJoin('category_translations', 'categories.id', '=', 'category_translations.id');
+
+        return $model;
+    }
+}
diff --git a/packages/Webkul/Product/src/Contracts/Criteria/SearchBySuperAttributeCriteria.php b/packages/Webkul/Product/src/Contracts/Criteria/SearchBySuperAttributeCriteria.php
new file mode 100644
index 000000000..39d2f9d10
--- /dev/null
+++ b/packages/Webkul/Product/src/Contracts/Criteria/SearchBySuperAttributeCriteria.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Webkul\Product\Contracts\Criteria;
+
+use Prettus\Repository\Contracts\CriteriaInterface;
+use Prettus\Repository\Contracts\RepositoryInterface;
+
+use Webkul\Attribute\Repositories\AttributeRepository;
+
+use Webkul\Product\Helpers\AbstractProduct;
+
+/**
+ * Class MyCriteria.
+ *
+ * @package namespace App\Criteria;
+ */
+class SearchBySuperAttributeCriteria extends AbstractProduct implements CriteriaInterface
+{
+
+}
\ No newline at end of file
diff --git a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php
index 2d24aaed6..9372c2a08 100644
--- a/packages/Webkul/Product/src/Http/Controllers/ReviewController.php
+++ b/packages/Webkul/Product/src/Http/Controllers/ReviewController.php
@@ -76,7 +76,7 @@ class ReviewController extends Controller
         return view($this->_config['view'],compact('review'));
     }
 
-     /**
+    /**
      * Update the specified resource in storage.
      *
      * @param  \Illuminate\Http\Request $request
@@ -92,7 +92,7 @@ class ReviewController extends Controller
         return redirect()->route($this->_config['redirect']);
     }
 
-     /**
+    /**
      * Delete the review of the current product
      *
      * @return response
diff --git a/packages/Webkul/Product/src/Repositories/ProductRepository.php b/packages/Webkul/Product/src/Repositories/ProductRepository.php
index 9cd78da9a..9ae3afa84 100644
--- a/packages/Webkul/Product/src/Repositories/ProductRepository.php
+++ b/packages/Webkul/Product/src/Repositories/ProductRepository.php
@@ -17,6 +17,8 @@ use Webkul\Product\Contracts\Criteria\FilterByAttributesCriteria;
 use Webkul\Product\Contracts\Criteria\FilterByCategoryCriteria;
 use Webkul\Product\Contracts\Criteria\NewProductsCriteria;
 use Webkul\Product\Contracts\Criteria\FeaturedProductsCriteria;
+use Webkul\Product\Contracts\Criteria\SearchByAttributeCriteria;
+use Webkul\Product\Contracts\Criteria\SearchByCategoryCriteria;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 
 /**
@@ -471,4 +473,31 @@ class ProductRepository extends Repository
                 return $query->distinct()->addSelect('products.*')->orderBy('id', 'desc');
             })->paginate(4, ['products.id']);
     }
+
+    /**
+     * Search Product by Attribute
+     *
+     * @return Collection
+     */
+    public function searchProductByAttribute($term) {
+        // $findIn = $this->breakTheTerm($term);
+
+        $this->pushCriteria(app(SearchByAttributeCriteria::class));
+        // $this->pushCriteria(app(SearchByCategoryCriteria::class));
+
+        return $this->scopeQuery(function($query) use($term) {
+            return $query->distinct()->addSelect('products.*')->where('pav.text_value', 'like', '%'.$term.'%');
+            // ->where('category_translations.name', 'like', '%'.'clothes'.'%');
+        })->get();
+    }
+
+    /**
+     * break the search term into explode by using space and tell which exploded item is attribute
+     * , category, super attribute or combination of them.
+     */
+    public function breakTheTerm($term) {
+        $explodedTerm = (explode(" ", $term));
+
+        dd($term);
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
index 6b52ca9ae..7f9e5a96f 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/ReviewController.php
@@ -46,8 +46,6 @@ class ReviewController extends Controller
      */
     public function __construct(Product $product, ProductReview $productReview)
     {
-        $this->middleware('admin')->only(['update', 'destroy']);
-
         $this->middleware('customer')->only(['create', 'store', 'destroy']);
 
         $this->product = $product;
@@ -57,16 +55,6 @@ class ReviewController extends Controller
         $this->_config = request('_config');
     }
 
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-    */
-    public function index()
-    {
-        return view($this->_config['view']);
-    }
-
     /**
      * Show the form for creating a new resource.
      *
@@ -122,35 +110,6 @@ class ReviewController extends Controller
         return view($this->_config['view'],compact('product'));
     }
 
-    /**
-     * Show the form for editing the specified resource.
-     *
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function edit($id)
-    {
-        $review = $this->productReview->find($id);
-
-        return view($this->_config['view'],compact('review'));
-    }
-
-    /**
-     * Update the specified resource in storage.
-     *
-     * @param  \Illuminate\Http\Request $request
-     * @param  int  $id
-     * @return \Illuminate\Http\Response
-     */
-    public function update(Request $request, $id)
-    {
-        $this->productReview->update(request()->all(), $id);
-
-        session()->flash('success', 'Review updated successfully.');
-
-        return redirect()->route($this->_config['redirect']);
-    }
-
     /**
      * Delete the review of the current product
      *
diff --git a/packages/Webkul/Shop/src/Http/Controllers/SearchController.php b/packages/Webkul/Shop/src/Http/Controllers/SearchController.php
index 0b2fc348e..9733142a1 100644
--- a/packages/Webkul/Shop/src/Http/Controllers/SearchController.php
+++ b/packages/Webkul/Shop/src/Http/Controllers/SearchController.php
@@ -6,6 +6,8 @@ use Webkul\Shop\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Illuminate\Http\Response;
 
+use Webkul\Core\Repositories\SearchRepository as Search;
+
 /**
  * Search controller
  *
@@ -16,20 +18,29 @@ use Illuminate\Http\Response;
  class SearchController extends controller
 {
     protected $_config;
-    protected $sliders;
-    protected $current_channel;
 
-    public function __construct(Sliders $s)
+    protected $search;
+
+    public function __construct(Search $search)
     {
         $this->_config = request('_config');
 
-        $this->sliders = $s;
+        $this->search = $search;
     }
 
     /**
      * Index to handle the view loaded with the search results
      */
-    public function index($data) {
-        return redirect()->back();
+    public function index() {
+        $results = null;
+
+        $results = $this->search->search(request()->all());
+
+        if($results) {
+            return view($this->_config['view'])->with('results', $results);
+        } else {
+            return view($this->_config['view'])->with('results', null);
+        }
+
     }
 }
diff --git a/packages/Webkul/Shop/src/Http/routes.php b/packages/Webkul/Shop/src/Http/routes.php
index 66db30e76..c0eaf2540 100644
--- a/packages/Webkul/Shop/src/Http/routes.php
+++ b/packages/Webkul/Shop/src/Http/routes.php
@@ -12,6 +12,11 @@ Route::group(['middleware' => ['web', 'theme', 'locale', 'currency']], function
         'view' => 'shop::products.index'
     ]);
 
+    //Store front search
+    Route::get('/search', 'Webkul\Shop\Http\Controllers\SearchController@index')->defaults('_config', [
+        'view' => 'shop::search.search'
+    ])->name('shop.search.index');
+
     //checkout and cart
     //Cart Items(listing)
     Route::get('checkout/cart', 'Webkul\Shop\Http\Controllers\CartController@index')->defaults('_config', [
diff --git a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
index f0e786e0e..7a62ba1ff 100644
--- a/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
+++ b/packages/Webkul/Shop/src/Resources/assets/sass/app.scss
@@ -727,6 +727,11 @@ section.slider-block {
                             height: 24px;
                             width: 24px;
                             cursor: pointer;
+                            border: none;
+                            padding: 0;
+                            font: inherit;
+                            cursor: pointer;
+                            outline: inherit;
                         }
                     }
                 }
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 2e7043236..b5e6e0d8d 100644
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -24,6 +24,11 @@ return [
         'locale' => 'Locale',
     ],
 
+    'search' => [
+        'no-results' => 'No Results Found.',
+        'page-title' => 'Bagisto - Search'
+    ],
+
     'reviews' => [
         'title' => 'Title',
         'add-review-page-title' => 'Add Review',
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
index 14ef86d89..b92aae2d1 100644
--- a/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/session/index.blade.php
@@ -32,7 +32,6 @@
                 </div>
 
                 <input class="btn btn-primary btn-lg" type="submit" value="{{ __('shop::app.customer.login-form.button_title') }}">
-
             </div>
         </form>
     </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
index fc91e0539..e416ec05f 100644
--- a/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/layouts/header/index.blade.php
@@ -15,11 +15,13 @@
 
             <ul class="search-container">
                 <li class="search-group">
-                    <input type="search" class="search-field" placeholder="Search for products">
+                    <form role="search" action="{{ route('shop.search.index') }}" method="GET" @submit.prevent="onSubmit" style="display: inherit;">
+                        <input type="search" name="term" class="search-field" placeholder="products, categories" v-validate="'required'">
 
-                    <div class="search-icon-wrapper">
-                        <span class="icon icon-search"></span>
-                    </div>
+                        <div class="search-icon-wrapper">
+                            <button class="icon icon-search" class="background: none;"></button>
+                        </div>
+                    </form>
                 </li>
             </ul>
         </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/search/search.blade.php b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php
new file mode 100644
index 000000000..deb5c3fe4
--- /dev/null
+++ b/packages/Webkul/Shop/src/Resources/views/search/search.blade.php
@@ -0,0 +1,11 @@
+@extends('shop::layouts.master')
+
+@section('page_title')
+    {{ __('shop::app.search.page-title') }}
+@endsection
+
+@section('content-wrapper')
+    @if(!$results)
+        {{  __('shop::app.search.no-results') }}
+    @endif
+@endsection